Added Required

Author: joadan

src/Linq2GraphQL.Generator/GraphQLSchema/RootSchema.cs

@@ -170,8 +170,7 @@ private TypeInfo GetFieldTypeInfo()
 
         var isList = allTypes.Any(e => e.Kind == TypeKind.List);
         var isNoneNull = allTypes.Any(e => e.Kind == TypeKind.NonNull);
-        var csharpNullable = !isNoneNull && csharpType != null && csharpTypeName != "string";
-
+      
         var graphTypeDefinition = isNoneNull ? baseFieldType.Name + "!" : baseFieldType.Name;
         if (isList)
         {
@@ -180,13 +179,14 @@ private TypeInfo GetFieldTypeInfo()
 
         return new TypeInfo
         {
+            
             Kind = baseFieldType.Kind,
             IsList = isList,
             IsNoneNull = isNoneNull,
             CSharpType = csharpType,
             CSharpTypeName = csharpTypeName,
             GraphTypeDefinition = graphTypeDefinition,
-            IsEnum = baseFieldType.Kind == TypeKind.Enum
+            IsEnum = baseFieldType.Kind == TypeKind.Enum          
         };
     }
 
@@ -261,7 +261,7 @@ public class TypeInfo
     public bool IsNoneNull { get; set; }
     public bool IsList { get; set; }
 
-   
+
     private bool CSharpNullQuestion()
     {
         if (GeneratorSettings.Current.Nullable)

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:\\temp\\Linq2GraphQL\\Linq2GraphQL.TestClientNullable\\Generated\" -s=true -nu=true"
+      "commandLineArgs": "https://localhost:50741/graphql/ -c=\"SampleNullableClient\" -n=\"Linq2GraphQL.TestClientNullable\" -o=\"C:\\Code\\Github\\Linq2GraphQL.Client\\test\\Linq2GraphQL.TestClientNullable\\Generated\" -s=true -nu=true"
     }
   }
 }

src/Linq2GraphQL.Generator/Templates/Class/ClassTemplate.tt.cs

@@ -14,19 +14,33 @@ public ClassTemplate(GraphqlType classType, string namespaceName)
 
     public bool IsInput => classType.Kind == TypeKind.InputObject;
 
-   
+
     public string GetFieldCSharpName(Field field)
     {
 
         if (field.GraphqlType.IsPageInfo())
         {
             return "Linq2GraphQL.Client.Common.PageInfo";
         }
-        return field.FieldInfo.CSharpTypeNameFull;
 
+        var result = "";
+        if (GeneratorSettings.Current.Nullable && field.FieldInfo.IsNoneNull)
+        {
+            result += "required ";
+        }
+
+        result += field.FieldInfo.CSharpTypeNameFull;
+
+        return result;
 
+
+    }
+
+
+    public bool NullableEnabled()
+    {
+        return GeneratorSettings.Current.Nullable;
     }
 
-   
 
 }

test/Linq2GraphQL.TestClientNullable/Generated/Client/MutationMethods.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System;
+using Linq2GraphQL.Client;
+
+namespace Linq2GraphQL.TestClientNullable;
+
+public class MutationMethods
+{
+    private readonly GraphClient client;
+
+    public MutationMethods(GraphClient client)
+    {
+        this.client = client;
+    }
+
+    public GraphQuery<Customer?> UpdateCustomer(Guid customerId, string name)
+    {
+	    var arguments = new List<ArgumentValue>
+        {
+    	    new("customerId","UUID!", customerId),
+    	    new("name","String!", name),
+        };
+
+        return new GraphQuery<Customer?>(client,  "updateCustomer", OperationType.Mutation, arguments); 
+    }
+
+    }

test/Linq2GraphQL.TestClientNullable/Generated/Client/QueryMethods.cs

@@ -31,4 +31,22 @@ public GraphQuery<List<Customer>> CustomerList()
         return new GraphQuery<Customer?>(client,  "customerNullable", OperationType.Query, arguments); 
     }
 
+    public GraphQuery<List<Customer?>> CustomerListAllNullable()
+    {
+	    var arguments = new List<ArgumentValue>
+        {
+        };
+
+        return new GraphQuery<List<Customer?>>(client,  "customerListAllNullable", OperationType.Query, arguments); 
+    }
+
+    public GraphQuery<List<Customer>> CustomerListNullable()
+    {
+	    var arguments = new List<ArgumentValue>
+        {
+        };
+
+        return new GraphQuery<List<Customer>>(client,  "customerListNullable", OperationType.Query, arguments); 
+    }
+
     }

test/Linq2GraphQL.TestClientNullable/Generated/Client/SampleNullableClient.cs

@@ -11,8 +11,10 @@ public SampleNullableClient(HttpClient httpClient, IOptions<GraphClientOptions>
     {
         var client = new GraphClient(httpClient, options, provider);
         Query = new QueryMethods(client);
+        Mutation = new MutationMethods(client);
     }
 
     public QueryMethods Query { get; private set; }
+    public MutationMethods Mutation { get; private set; }
 
 }

test/Linq2GraphQL.TestClientNullable/Generated/Input/InputFactory.cs

@@ -9,12 +9,12 @@ namespace Linq2GraphQL.TestClientNullable;
 public partial class Address : GraphQLTypeBase
 {
     [JsonPropertyName("name")]
-	public string Name { get; set; }  
+	public required string Name { get; set; }  
 
     [JsonPropertyName("street")]
-	public string Street { get; set; }  
+	public required string Street { get; set; }  
 
     [JsonPropertyName("postalCode")]
-	public string PostalCode { get; set; }  
+	public required string PostalCode { get; set; }  
 
 }

test/Linq2GraphQL.TestClientNullable/Generated/Types/Address.cs

@@ -9,16 +9,16 @@ namespace Linq2GraphQL.TestClientNullable;
 public partial class Customer : GraphQLTypeBase
 {
     [JsonPropertyName("customerId")]
-	public Guid CustomerId { get; set; }  
+	public required Guid CustomerId { get; set; }  
 
     [JsonPropertyName("customerName")]
-	public string CustomerName { get; set; }  
+	public required string CustomerName { get; set; }  
 
     [JsonPropertyName("status")]
-	public CustomerStatus Status { get; set; }  
+	public required CustomerStatus Status { get; set; }  
 
     [JsonPropertyName("orders")]
-	public List<Order> Orders { get; set; }  
+	public required List<Order> Orders { get; set; }  
 
     [JsonPropertyName("address")]
 	public Address? Address { get; set; }  

test/Linq2GraphQL.TestClientNullable/Generated/Types/Customer.cs

@@ -9,9 +9,9 @@ namespace Linq2GraphQL.TestClientNullable;
 public partial class Item : GraphQLTypeBase
 {
     [JsonPropertyName("itemId")]
-	public string ItemId { get; set; }  
+	public required string ItemId { get; set; }  
 
     [JsonPropertyName("itemName")]
-	public string ItemName { get; set; }  
+	public required string ItemName { get; set; }  
 
 }