Fix singleton issues with graph opts

src/Linq2GraphQL.Client/GraphClient.cs

@@ -22,10 +22,10 @@ public GraphClient(HttpClient httpClient, IOptions<GraphClientOptions> options,
 
         HttpClient = httpClient;
 
-        SerializerOptions = new JsonSerializerOptions
+        SerializerOptions = new()
         {
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-            WriteIndented = true
+            Converters = {  }
         };
 
         SubscriptionUrl = GetSubscriptionUrl();

src/Linq2GraphQL.Client/QueryExecutor.cs

@@ -40,8 +40,8 @@ public T ProcessResponse(string con, string name, string query)
             throw new GraphQueryExecutionException(errors, query);
         }
 
-        var hasData = document.RootElement.TryGetProperty(dataPathPropertyName, out var dataElement);
-        var hasResult = dataElement.TryGetProperty(name, out var resultElement);
+        document.RootElement.TryGetProperty(dataPathPropertyName, out var dataElement);
+        dataElement.TryGetProperty(name, out var resultElement);
 
         if (resultElement.ValueKind == JsonValueKind.Null)
         {

src/Linq2GraphQL.Generator/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Linq2GraphQL.Generator": {
       "commandName": "Project",
-      "commandLineArgs": "https://localhost:50741/graphql/ -c=\"SampleNullableClient\" -n=\"Linq2GraphQL.TestClientNullable\" -o=\"C:\\Code\\Github\\Linq2GraphQL.Client\\test\\Linq2GraphQL.TestClientNullable\\Generated\" -s=true -nu=true"
+      "commandLineArgs": "https://localhost:7184/graphql/ -c=\"SampleClient\" -n=\"Linq2GraphQL.TestClient\" -o=\"C:\\Code\\Linq2GraphQL.Client\\test\\Linq2GraphQL.TestClient\\Generated\" -s=true"
     }
   }
 }

src/Linq2GraphQL.Generator/Templates/Client/ClientExtensionsTemplate.cs

@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version: 17.0.0.0
+//     Runtime Version: 16.0.0.0
 //  
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -15,8 +15,8 @@ namespace Linq2GraphQL.Generator.Templates.Client
     /// Class to produce the template output
     /// </summary>
 
-    #line 1 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
+    #line 1 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class ClientExtensionsTemplate : ClientExtensionsTemplateBase
     {
 #line hidden
@@ -25,82 +25,65 @@ public partial class ClientExtensionsTemplate : ClientExtensionsTemplateBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("using Linq2GraphQL.Client;\r\nusing Microsoft.Extensions.DependencyInjection;\r\nusin" +
-                    "g Microsoft.Extensions.Options;\r\n\r\nnamespace ");
+            this.Write("using Linq2GraphQL.Client;\r\nusing Microsoft.Extensions.DependencyInjection;\r\nusing Microsoft.Extensions.Options;\r\n\r\nnamespace ");
 
-            #line 7 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+            #line 7 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(namespaceName));
 
             #line default
             #line hidden
             this.Write(";\r\n\r\npublic static class ");
 
-            #line 9 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+            #line 9 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
 
             #line default
             #line hidden
             this.Write("Extensions \r\n{\r\n    private const string ClientName = \"");
 
-            #line 11 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+            #line 11 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
 
             #line default
             #line hidden
             this.Write("\";\r\n        \r\n    public static IGraphClientBuilder<");
 
-            #line 13 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+            #line 13 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
 
             #line default
             #line hidden
             this.Write("> Add");
 
-            #line 13 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+            #line 13 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
 
             #line default
             #line hidden
-            this.Write("(this IServiceCollection services)\r\n    {\r\n        var graphClientOptions = new G" +
-                    "raphClientOptions();\r\n        return GraphClientBuilder(services, graphClientOpt" +
-                    "ions);\r\n    }\r\n    \r\n    public static IGraphClientBuilder<");
+            this.Write("(this IServiceCollection services)\r\n    {\r\n        var graphClientOptions = new GraphClientOptions();\r\n        return GraphClientBuilder(services, graphClientOptions);\r\n    }\r\n    \r\n    public static IGraphClientBuilder<");
 
-            #line 19 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+            #line 19 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
 
             #line default
             #line hidden
             this.Write("> Add");
 
-            #line 19 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+            #line 19 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
 
             #line default
             #line hidden
-            this.Write(@"(this IServiceCollection services, Action<GraphClientOptions> opts)
-    {
-        var graphClientOptions = new GraphClientOptions();
-        opts(graphClientOptions);
-
-        return GraphClientBuilder(services, graphClientOptions);
-    }
-
-    private static IGraphClientBuilder<");
+            this.Write("(this IServiceCollection services, Action<GraphClientOptions> opts)\r\n    {\r\n        var graphClientOptions = new GraphClientOptions();\r\n        opts(graphClientOptions);\r\n        \r\n        return GraphClientBuilder(services, graphClientOptions);\r\n    }\r\n\r\n    private static IGraphClientBuilder<");
 
-            #line 27 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+            #line 27 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
 
             #line default
             #line hidden
-            this.Write(@"> GraphClientBuilder(IServiceCollection services,
-        GraphClientOptions graphClientOptions)
-    {
-        var opts = Options.Create(graphClientOptions);
-        services.AddSingleton(opts);
-        services.AddMemoryCache();        
-        return new ClientBuilder<");
+            this.Write("> GraphClientBuilder(IServiceCollection services,\r\n        GraphClientOptions graphClientOptions)\r\n    {\r\n        var opts = Options.Create(graphClientOptions);\r\n        services.AddKeyedSingleton(ClientName, opts); \r\n        services.AddMemoryCache();        \r\n        return new ClientBuilder<");
 
-            #line 33 "C:\Code\DevOps\Linq2GraphQL\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
+            #line 33 "C:\Code\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Client\ClientExtensionsTemplate.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(clientName));
 
             #line default
@@ -116,7 +99,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public class ClientExtensionsTemplateBase
     {
         #region Fields
@@ -131,7 +114,7 @@ public class ClientExtensionsTemplateBase
         /// <summary>
         /// The string builder that generation-time code is using to assemble generated output
         /// </summary>
-        public System.Text.StringBuilder GenerationEnvironment
+        protected System.Text.StringBuilder GenerationEnvironment
         {
             get
             {

src/Linq2GraphQL.Generator/Templates/Client/ClientExtensionsTemplate.tt

@@ -28,7 +28,7 @@ public static class <#= clientName #>Extensions
         GraphClientOptions graphClientOptions)
     {
         var opts = Options.Create(graphClientOptions);
-        services.AddSingleton(opts);
+        services.AddKeyedSingleton(ClientName, opts);
         services.AddMemoryCache();        
         return new ClientBuilder<<#= clientName #>>(ClientName, services);
     }