Fix SG generation

pekkah · Jan 17, 2024 · b6ad1fc · b6ad1fc
1 parent b2ef73c
commit b6ad1fc
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 10 deletions.
diff --git a/samples/GraphQL.Samples.SG.Arguments/Program.cs b/samples/GraphQL.Samples.SG.Arguments/Program.cs
@@ -50,7 +50,7 @@ public static int[] RangeWithInputObject([FromArguments]QueryOptions options)
 
 
 [InputType]
-public class QueryOptions
+public partial class QueryOptions
 {
     public int Start { get; set; } = 0;
 

diff --git a/samples/GraphQL.Samples.SG.Namespace/Program.cs b/samples/GraphQL.Samples.SG.Namespace/Program.cs
@@ -42,7 +42,7 @@ public class World
     }
 
     [InputType]
-    public class HelloInput
+    public partial class HelloInput
     {
         public string Name { get; set; }
     }

diff --git a/src/GraphQL.Server.SourceGenerators/InputTypeEmitter.cs b/src/GraphQL.Server.SourceGenerators/InputTypeEmitter.cs
@@ -58,7 +58,14 @@ public static string TrySetProperty(string fieldName, string name, string type)
           // {{name}} is an scalar type
           if (argumentValue.TryGetValue("{{fieldName}}", out var {{fieldName}}Value))
           {
-            {{name}} = {{fieldName}}Value as {{type}};
+            if ({{fieldName}}Value is null)
+            {
+              {{name}} = default;
+            }
+            else 
+            {
+              {{name}} = ({{type}}){{fieldName}}Value;
+            }
           }
           """;
 
@@ -69,7 +76,7 @@ public static string TrySetPropertyObjectValue(string fieldName, string name, st
           {
               if ({{fieldName}}Value is null)
               {
-                {{name}} = null;
+                {{name}} = default;
               }
               else 
               {

diff --git a/...ors.Tests/Snapshots/InputTypeFacts.Generate_InputType#InputMessageInputType.g.verified.cs b/...ors.Tests/Snapshots/InputTypeFacts.Generate_InputType#InputMessageInputType.g.verified.cs
@@ -32,13 +32,27 @@ public void Parse(IReadOnlyDictionary<string, object?> argumentValue)
         // Id is an scalar type
         if (argumentValue.TryGetValue("id", out var idValue))
         {
-            Id = idValue as string;
+            if (idValue is null)
+            {
+                Id = default;
+            }
+            else
+            {
+                Id = (string)idValue;
+            }
         }
 
         // Content is an scalar type
         if (argumentValue.TryGetValue("content", out var contentValue))
         {
-            Content = contentValue as string;
+            if (contentValue is null)
+            {
+                Content = default;
+            }
+            else
+            {
+                Content = (string)contentValue;
+            }
         }
     }
 }

diff --git a/...putTypeFacts.Generate_InputType_with_complex_property#InputMessageInputType.g.verified.cs b/...putTypeFacts.Generate_InputType_with_complex_property#InputMessageInputType.g.verified.cs
@@ -33,7 +33,7 @@ public void Parse(IReadOnlyDictionary<string, object?> argumentValue)
         {
             if (contentValue is null)
             {
-                Content = null;
+                Content = default;
             }
             else
             {

diff --git a/...peFacts.Generate_InputType_with_listof_nullable_class#InputMessageInputType.g.verified.cs b/...peFacts.Generate_InputType_with_listof_nullable_class#InputMessageInputType.g.verified.cs
@@ -33,7 +33,7 @@ public void Parse(IReadOnlyDictionary<string, object?> argumentValue)
         {
             if (contentValue is null)
             {
-                Content = null;
+                Content = default;
             }
             else
             {

diff --git a/...s/InputTypeFacts.Generate_InputType_with_nullable_int#InputMessageInputType.g.verified.cs b/...s/InputTypeFacts.Generate_InputType_with_nullable_int#InputMessageInputType.g.verified.cs
@@ -31,7 +31,14 @@ public void Parse(IReadOnlyDictionary<string, object?> argumentValue)
         // Content is an scalar type
         if (argumentValue.TryGetValue("content", out var contentValue))
         {
-            Content = contentValue as int;
+            if (contentValue is null)
+            {
+                Content = default;
+            }
+            else
+            {
+                Content = (int)contentValue;
+            }
         }
     }
 }

diff --git a/...nputTypeFacts.Generate_InputType_with_nullable_string#InputMessageInputType.g.verified.cs b/...nputTypeFacts.Generate_InputType_with_nullable_string#InputMessageInputType.g.verified.cs
@@ -31,7 +31,14 @@ public void Parse(IReadOnlyDictionary<string, object?> argumentValue)
         // Content is an scalar type
         if (argumentValue.TryGetValue("content", out var contentValue))
         {
-            Content = contentValue as string;
+            if (contentValue is null)
+            {
+                Content = default;
+            }
+            else
+            {
+                Content = (string)contentValue;
+            }
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 if (contentValue is null)
                 {
-                    Content = null;
+                    Content = default;
                 }
                 else
                 {
@@ Expand Down @@