Support generating required fields as not optional in TS

Michael Baldwin · Michael Baldwin · commit fc0a09f69940 · 2024-08-02T12:32:04.000-07:00
diff --git a/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs b/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
@@ -930,7 +930,7 @@ private static void WriteDto(CodeWriter code, ServiceDtoInfo dtoInfo, ServiceInf
 				{
 					code.WriteLineSkipOnce();
 					WriteJsDoc(code, fieldInfo);
-					code.WriteLine($"{fieldInfo.Name}?: {RenderFieldType(service.GetFieldType(fieldInfo)!)};");
+					code.WriteLine($"{fieldInfo.Name}{(fieldInfo.IsRequired ? "" : "?")}: {RenderFieldType(service.GetFieldType(fieldInfo)!)};");
 				}
 			}
 		}
diff --git a/tests/Facility.CodeGen.JavaScript.UnitTests/JavaScriptGeneratorTests.cs b/tests/Facility.CodeGen.JavaScript.UnitTests/JavaScriptGeneratorTests.cs
@@ -344,8 +344,8 @@ public void GenerateExampleApiTypeScript_DataPropertiesRequired()
 
 			var typesFile = result.Files.Single(f => f.Name == "testApiTypes.ts");
 			Assert.That(typesFile.Text, Does.Contain("export interface IWidget {"));
-			Assert.That(typesFile.Text, Does.Contain("id?: string;"));
-			Assert.That(typesFile.Text, Does.Contain("name?: string;"));
+			Assert.That(typesFile.Text, Does.Contain("id: string;"));
+			Assert.That(typesFile.Text, Does.Contain("name: string;"));
 			Assert.That(typesFile.Text, Does.Contain("price?: number;"));
 			Assert.That(typesFile.Text, Does.Contain("}"));
 		}

Original file line number	Diff line number	Diff line change
`@@ -930,7 +930,7 @@ private static void WriteDto(CodeWriter code, ServiceDtoInfo dtoInfo, ServiceInf`
`930`	`930`	`{`
`931`	`931`	`code.WriteLineSkipOnce();`
`932`	`932`	`WriteJsDoc(code, fieldInfo);`
`933`		`- code.WriteLine($"{fieldInfo.Name}?: {RenderFieldType(service.GetFieldType(fieldInfo)!)};");`
	`933`	`+ code.WriteLine($"{fieldInfo.Name}{(fieldInfo.IsRequired ? "" : "?")}: {RenderFieldType(service.GetFieldType(fieldInfo)!)};");`
`934`	`934`	`}`
`935`	`935`	`}`
`936`	`936`	`}`