nullable reference types

Author: tocsoft

Tocsoft.GraphQLCodeGen.Cli/Templates/cs/CSharp.template

@@ -36,6 +36,7 @@ namespace {{Namespace}}
 {{!# jsonConverters }} 
 {{!# BeforeInterfaceOperation}}
 {{!# StringifyEnums}} true
+{{!# Nullable }} disabled
 
 {{!# JsonPropertyAttributeName}}
 	{{~ifTemplate 'JsonConverter' 'Newtonsoft.Json'~}}JsonProperty{{~/ifTemplate~}}
@@ -427,5 +428,5 @@ namespace {{Namespace}}
 	{{~#if isCollection }}IEnumerable<{{/if~}}
 	{{~#if prefix }}{{@root.ClassName}}.{{/if~}}
 	{{#if fixCase}}{{pascalCase name}}{{/if}}{{#unless fixCase}}{{name}}{{/unless}}
-	{{~#if isValueType}}{{#if nullable}}?{{/if}}{{/if~}}
+	{{~ifTemplate 'Nullable' 'enabled'~}}{{#if nullable}}?{{/if}}{{else}}{{~#if isValueType}}{{#if nullable}}?{{/if}}{{/if~}}{{~/ifTemplate~}}
 	{{~#if isCollection}}>{{/if}}

Tocsoft.GraphQLCodeGen.Tests/Files/NullableReferenceTypes/NonNullableWithValue.gql

@@ -0,0 +1,7 @@
+query q($temp: String!){
+    testNonNull(id: $temp)
+	{
+        nullable,
+        nonnullable
+    }
+}

Tocsoft.GraphQLCodeGen.Tests/Files/NullableReferenceTypes/NullableWithValue.gql

@@ -0,0 +1,7 @@
+query q($temp: String){
+    test(id: $temp)
+	{
+        nullable,
+        nonnullable
+    }
+}

Tocsoft.GraphQLCodeGen.Tests/Files/NullableReferenceTypes/gqlsettings.json

@@ -0,0 +1,7 @@
+{
+  "root": true,
+  "schema": "schema.gql",
+  "output": "test.cs",
+  "class": "Sample.Client.Test",
+
+}

Tocsoft.GraphQLCodeGen.Tests/Files/NullableReferenceTypes/schema.gql

@@ -0,0 +1,21 @@
+
+schema {
+  query: Query
+}
+
+type Query {
+  testNonNull(id: string!): Droid!
+  test(id: string): Droid
+}
+
+
+type Droid {
+    nullable: Episode
+    nonnullable: Episode!
+}
+
+enum Episode {
+  NEWHOPE
+  EMPIRE
+  JEDI
+}

Tocsoft.GraphQLCodeGen.Tests/NullableReferenceTypes.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Tocsoft.GraphQLCodeGen.Tests
+{
+    public class NullableReferenceTypes
+    {
+        private readonly CodeGeneratorTester tester;
+
+        public NullableReferenceTypes()
+        {
+            tester = new CodeGeneratorTester();
+        }
+
+        [Fact]
+        public async Task NullableWithValue_Enabled()
+        {
+            tester.AddQuery("./Files/NullableReferenceTypes/NullableWithValue.gql");
+            tester.Configure(s =>
+            {
+                s.TemplateSettings["Nullable"] = "enabled";
+            });
+
+            var code = await tester.Generate();
+            await tester.Verify();
+
+            Assert.Contains("public Test.DroidResult? Test { get; set; }", code);
+            Assert.Contains("Task<Test.NullableWithValueQResult> NullableWithValueQAsync(string? temp);", code);
+        }
+        [Fact]
+        public async Task NonNullableWithValue_Enabled()
+        {
+            tester.AddQuery("./Files/NullableReferenceTypes/NonNullableWithValue.gql");
+            tester.Configure(s =>
+            {
+                s.TemplateSettings["Nullable"] = "enabled";
+            });
+
+            var code = await tester.Generate();
+            await tester.Verify();
+            Assert.Contains("public Test.DroidResult TestNonNull { get; set; }", code);
+            Assert.Contains("Task<Test.NonNullableWithValueQResult> NonNullableWithValueQAsync(string temp);", code);
+        }
+
+        [Fact]
+        public async Task NullableWithValue_Disabled()
+        {
+            tester.AddQuery("./Files/NullableReferenceTypes/NullableWithValue.gql");
+            tester.Configure(s =>
+            {
+                s.TemplateSettings["Nullable"] = "disabled";
+            });
+
+            var code = await tester.Generate();
+            await tester.Verify();
+            Assert.Contains("public Test.DroidResult TestNonNull { get; set; }", code);
+            Assert.Contains("Task<Test.NullableWithValueQResult> NullableWithValueQAsync(string temp);", code);
+        }
+
+        [Fact]
+        public async Task NonNullableWithValue_Disabled()
+        {
+            tester.AddQuery("./Files/NullableReferenceTypes/NonNullableWithValue.gql");
+            tester.Configure(s =>
+            {
+                s.TemplateSettings["Nullable"] = "disabled";
+            });
+
+            var code = await tester.Generate();
+            await tester.Verify();
+            Assert.Contains("public Test.DroidResult TestNonNull { get; set; }", code);
+            Assert.Contains("Task<Test.NonNullableWithValueQResult> NonNullableWithValueQAsync(string temp);", code);
+        }
+    }
+}

Tocsoft.GraphQLCodeGen.Tests/Tocsoft.GraphQLCodeGen.Tests.csproj

@@ -42,6 +42,9 @@
     <None Update="Files\SchemaFiles\gqlsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Files\NullableReferenceTypes\gqlsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Files\ToggleJsonConverter\gqlsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>