Merge branch 'main' into multiple-methods

Author: joadan

src/Linq2GraphQL.Client/GraphBaseExecute.cs

@@ -1,4 +1,5 @@
-using System.Linq.Expressions;
+using Linq2GraphQL.Client.Schema;
+using System.Linq.Expressions;
 
 namespace Linq2GraphQL.Client;
 
@@ -13,6 +14,7 @@ public abstract class GraphBaseExecute<T, TResult>
 
     private readonly SemaphoreSlim _lock = new(1, 1);
     private bool intialized;
+    private GraphQLSchema schema;
 
     public GraphBaseExecute(GraphClient client, OperationType operationType, QueryNode queryNode,
         Expression<Func<T, TResult>> selector)
@@ -32,7 +34,7 @@ private async Task InitQueryAsync()
         {
             if (!intialized)
             {
-                var schema = await client.GetSchemaForSafeModeAsync();
+                schema = await client.GetSchemaForSafeModeAsync();
                 QueryNode.SetAllUniqueVariableNames();
                 QueryNode.AddPrimitiveChildren(true, schema);
                 intialized = true;
@@ -43,12 +45,10 @@ private async Task InitQueryAsync()
         {
             _lock.Release();
         }
-
-
-
-
     }
 
+    public GraphQLSchema Schema => schema;
+
     private string GetQueryVariablesString()
     {
         var args = QueryNode.GetAllActiveArguments();

src/Linq2GraphQL.Client/GraphClient.cs

@@ -11,7 +11,7 @@ public class GraphClient
 {
     private readonly IMemoryCache cache;
     private readonly IOptions<GraphClientOptions> options;
-
+   
     public GraphClient(HttpClient httpClient, IOptions<GraphClientOptions> options, IServiceProvider provider)
     {
         this.options = options;
@@ -64,7 +64,9 @@ public async Task<GraphQLSchema> GetSchemaForSafeModeAsync()
             return null;
         }
 
-        return await cache.GetOrCreateAsync("__schema", async entry =>
+        var cackeKey = "Linq2GraphQL_Schema:" + HttpClient.BaseAddress;
+
+        return await cache.GetOrCreateAsync(cackeKey, async entry =>
         {
             var executor = new QueryExecutor<GraphQLSchema>(this);
 

src/Linq2GraphQL.Client/QueryExecutor.cs

@@ -17,7 +17,6 @@ internal QueryExecutor(GraphClient client)
     internal async Task<T> ExecuteRequestAsync(string name, GraphQLRequest graphRequest)
     {
         var json = JsonSerializer.Serialize(graphRequest, client.SerializerOptions);
-
         using var response = await client.HttpClient.PostAsJsonAsync("", graphRequest, client.SerializerOptions);
 
         if (!response.IsSuccessStatusCode)

test/Linq2GraphQL.Tests/QueryTests.cs

@@ -64,6 +64,8 @@ public async Task Customers_WithIncludeSelect()
 
         var result = await query.ExecuteAsync();
 
+        var schema = query.Schema;
+
         var customer1 = result[0];
         Assert.NotEqual(default, customer1.CustomerId);
         Assert.Equal(default, customer1.CustomerName);

test/Linq2GraphQL.Tests/SampleClientFixture.cs

@@ -19,7 +19,7 @@ public SampleClientFixture()
         sampleClient = new SampleClient(client, Options.Create(new GraphClientOptions
         {
             SubscriptionProtocol = SubscriptionProtocol.ServerSentEvents,
-            UseSafeMode = false
+            UseSafeMode = true
         }), application.Services);
         //Please note currently only ServerSentEvents work in test project
     }

version.json

@@ -1,6 +1,6 @@
 {
-  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.12-prerelease",
+  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "0.13-prerelease",
   "publicReleaseRefSpec": [
     "^refs/heads/main$",
     "^refs/heads/release/v\\d+(?:\\.\\d+)?$"