Merge pull request #42 from Linq2GraphQL/input-type-required

Input type required

Author: joadan

docs/Linq2GraphQL.Docs/Components/GenerateClient.razor.cs

@@ -57,7 +57,7 @@ private async Task CopyIntrospection()
             await toastService.AddToastAsync(new ToastModel
             {
                 Title = "Copy Complete",
-                Message = "Introspection queryExecute has been copied to the clipboard"
+                Message = "Introspection query has been copied to the clipboard"
             });
 
         }
@@ -79,6 +79,12 @@ private async Task SaveEntriesAsync(List<FileEntry> entries)
             memoryStream.Seek(0, SeekOrigin.Begin);
             await tablerService.SaveAsBinary($"{options.ClientName}.zip", "application/zip", memoryStream.ToArray());
 
+            await toastService.AddToastAsync(new ToastModel
+            {
+                Title = "Generate Complete",
+                Message = $"{options.ClientName}.zip has been been created! Please check you downloads."
+            });
+
         }
 
         private async Task GenerateClientJson()
@@ -89,6 +95,7 @@ private async Task GenerateClientJson()
                 var generator = new Generator.ClientGenerator(options.Namespace, options.ClientName, options.IncludeSubscriptions, EnumGeneratorStrategy.FailIfMissing, options.Nullable);
                 var entries = generator.Generate(options.Schema);
                 await SaveEntriesAsync(entries);
+
             }
             catch (Exception ex)
             {

src/Linq2GraphQL.Generator/ClientGenerator.cs

@@ -31,6 +31,19 @@ public ClientGenerator(string namespaceName, string clientName, bool includeSubs
 
         private void AddFile(string directory, string fileName, string content)
         {
+            var infoText = $@"
+//---------------------------------------------------------------------
+// This code was automatically generated by Linq2GraphQL
+// Please don't edit this file
+// Github:https://github.com/linq2graphql/linq2graphql.client
+// Url: https://linq2graphql.com
+// Generation Date: {DateTimeOffset.Now.ToString("F")}
+//---------------------------------------------------------------------
+
+";
+
+            content = infoText + content;
+
             entries.Add(new FileEntry { Content = content, DirectoryName = directory, FileName = fileName });
         }
 
@@ -125,9 +138,18 @@ public List<FileEntry> Generate(string schemaJson)
                 AddFile("Inputs", classType.FileName, classText);
             }
 
-            Console.WriteLine("Generate InputFactory...");
-            var inputFactoryText = new InputFactoryClassTemplate(inputs, namespaceName).TransformText();
-            AddFile("Inputs", "InputFactory.cs", inputFactoryText);
+            if (GeneratorSettings.Current.Nullable)
+            {
+                Console.WriteLine("No InputFactory for a Nullable client ");
+            }
+            else
+            {
+                Console.WriteLine("Generate InputFactory...");
+                var inputFactoryText = new InputFactoryClassTemplate(inputs, namespaceName).TransformText();
+                AddFile("Inputs", "InputFactory.cs", inputFactoryText);
+            }
+
+
 
             Console.WriteLine("Generate Enums...");
             foreach (var enumType in schema.GetEnums())
@@ -155,7 +177,7 @@ public List<FileEntry> Generate(string schemaJson)
             }
 
 
-                Console.WriteLine("Generate Client...");
+            Console.WriteLine("Generate Client...");
             var templateText = new ClientTemplate(namespaceName, clientName, queryType, mutationType, subscriptionType)
                 .TransformText();
             var fileName = clientName + ".cs";

src/Linq2GraphQL.Generator/Templates/Class/InputClassTemplate.cs

@@ -68,7 +68,7 @@ public virtual string TransformText()
             this.Write("\")]\r\n\tpublic ");
 
             #line 19 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(coreType.CSharpTypeDefinition));
+            this.Write(this.ToStringHelper.ToStringWithCulture(GetPropertyDefinition(field)));
 
             #line default
             #line hidden

src/Linq2GraphQL.Generator/Templates/Class/InputClassTemplate.tt

@@ -16,7 +16,7 @@ public partial class <#= classType.Name #> : GraphInputBase
         var coreType = field.CoreType;
 #>
 	[JsonPropertyName("<#= field.Name #>")]
-	public <#= coreType.CSharpTypeDefinition #> <#= field.CSharpName #> 
+	public <#= GetPropertyDefinition(field) #> <#= field.CSharpName #> 
 	{
 		get => GetValue<<#= coreType.CSharpTypeDefinition #>>("<#= field.Name #>");
     	set => SetValue("<#= field.Name #>", value);

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

@@ -12,4 +12,15 @@ public InputClassTemplate(GraphqlType classType, string namespaceName)
     }
 
     public bool IsInput => classType.Kind == TypeKind.InputObject;
+
+    public string GetPropertyDefinition(Field field)
+    {
+        if (!GeneratorSettings.Current.Nullable || !field.CoreType.OuterNoneNull)
+        {
+            return field.CoreType.CSharpTypeDefinition;
+        }
+
+        return "required " + field.CoreType.CSharpTypeDefinition;
+
+    }
 }

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

@@ -1,3 +1,12 @@
+
+//---------------------------------------------------------------------
+// This code was automatically generated by Linq2GraphQL
+// Please don't edit this file
+// Github:https://github.com/linq2graphql/linq2graphql.client
+// Url: https://linq2graphql.com
+// Generation Date: den 8 september 2024 17:02:30
+//---------------------------------------------------------------------
+
 using System.Collections.Generic;
 using System;
 using Linq2GraphQL.Client;

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

@@ -1,3 +1,12 @@
+
+//---------------------------------------------------------------------
+// This code was automatically generated by Linq2GraphQL
+// Please don't edit this file
+// Github:https://github.com/linq2graphql/linq2graphql.client
+// Url: https://linq2graphql.com
+// Generation Date: den 8 september 2024 17:02:30
+//---------------------------------------------------------------------
+
 using System.Collections.Generic;
 using System;
 using Linq2GraphQL.Client;

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

@@ -1,3 +1,12 @@
+
+//---------------------------------------------------------------------
+// This code was automatically generated by Linq2GraphQL
+// Please don't edit this file
+// Github:https://github.com/linq2graphql/linq2graphql.client
+// Url: https://linq2graphql.com
+// Generation Date: den 8 september 2024 17:02:30
+//---------------------------------------------------------------------
+
 using Linq2GraphQL.Client;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;

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

@@ -1,3 +1,12 @@
+
+//---------------------------------------------------------------------
+// This code was automatically generated by Linq2GraphQL
+// Please don't edit this file
+// Github:https://github.com/linq2graphql/linq2graphql.client
+// Url: https://linq2graphql.com
+// Generation Date: den 8 september 2024 17:02:30
+//---------------------------------------------------------------------
+
 using Linq2GraphQL.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;

test/Linq2GraphQL.TestClientNullable/Generated/Enums/AddressType.cs

@@ -1,3 +1,12 @@
+
+//---------------------------------------------------------------------
+// This code was automatically generated by Linq2GraphQL
+// Please don't edit this file
+// Github:https://github.com/linq2graphql/linq2graphql.client
+// Url: https://linq2graphql.com
+// Generation Date: den 8 september 2024 17:02:30
+//---------------------------------------------------------------------
+
 using Linq2GraphQL.Client;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;

test/Linq2GraphQL.TestClientNullable/Generated/Enums/CustomerStatus.cs

@@ -1,3 +1,12 @@
+
+//---------------------------------------------------------------------
+// This code was automatically generated by Linq2GraphQL
+// Please don't edit this file
+// Github:https://github.com/linq2graphql/linq2graphql.client
+// Url: https://linq2graphql.com
+// Generation Date: den 8 september 2024 17:02:30
+//---------------------------------------------------------------------
+
 using Linq2GraphQL.Client;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;

test/Linq2GraphQL.TestClientNullable/Generated/Inputs/AddressInput.cs

@@ -1,3 +1,12 @@
+
+//---------------------------------------------------------------------
+// This code was automatically generated by Linq2GraphQL
+// Please don't edit this file
+// Github:https://github.com/linq2graphql/linq2graphql.client
+// Url: https://linq2graphql.com
+// Generation Date: den 8 september 2024 17:02:30
+//---------------------------------------------------------------------
+
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
@@ -9,21 +18,21 @@ namespace Linq2GraphQL.TestClientNullable;
 public partial class AddressInput : GraphInputBase
 {
 	[JsonPropertyName("name")]
-	public string Name 
+	public required string Name 
 	{
 		get => GetValue<string>("name");
     	set => SetValue("name", value);
 	}
 
 	[JsonPropertyName("street")]
-	public string Street 
+	public required string Street 
 	{
 		get => GetValue<string>("street");
     	set => SetValue("street", value);
 	}
 
 	[JsonPropertyName("postalCode")]
-	public string PostalCode 
+	public required string PostalCode 
 	{
 		get => GetValue<string>("postalCode");
     	set => SetValue("postalCode", value);

test/Linq2GraphQL.TestClientNullable/Generated/Inputs/CustomerInput.cs

@@ -1,3 +1,12 @@
+
+//---------------------------------------------------------------------
+// This code was automatically generated by Linq2GraphQL
+// Please don't edit this file
+// Github:https://github.com/linq2graphql/linq2graphql.client
+// Url: https://linq2graphql.com
+// Generation Date: den 8 september 2024 17:02:30
+//---------------------------------------------------------------------
+
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
@@ -9,28 +18,28 @@ namespace Linq2GraphQL.TestClientNullable;
 public partial class CustomerInput : GraphInputBase
 {
 	[JsonPropertyName("customerId")]
-	public Guid CustomerId 
+	public required Guid CustomerId 
 	{
 		get => GetValue<Guid>("customerId");
     	set => SetValue("customerId", value);
 	}
 
 	[JsonPropertyName("customerName")]
-	public string CustomerName 
+	public required string CustomerName 
 	{
 		get => GetValue<string>("customerName");
     	set => SetValue("customerName", value);
 	}
 
 	[JsonPropertyName("status")]
-	public CustomerStatus Status 
+	public required CustomerStatus Status 
 	{
 		get => GetValue<CustomerStatus>("status");
     	set => SetValue("status", value);
 	}
 
 	[JsonPropertyName("orders")]
-	public List<OrderInput> Orders 
+	public required List<OrderInput> Orders 
 	{
 		get => GetValue<List<OrderInput>>("orders");
     	set => SetValue("orders", value);