Fix bug copying nullable. Fixes #99. (#100)

FacilityApi · Nov 13, 2024 · b2e5385 · b2e5385
1 parent 7cff5c5
commit b2e5385
Show file tree

Hide file tree

Showing 11 changed files with 155 additions and 1 deletion.
diff --git a/src/Facility.CodeGen.CSharp/CSharpGenerator.cs b/src/Facility.CodeGen.CSharp/CSharpGenerator.cs
@@ -910,7 +910,8 @@ private CodeGenFile GenerateHttpMapping(HttpServiceInfo httpServiceInfo, Context
 												foreach (var field in httpMethodInfo.RequestNormalFields)
 												{
 													var fieldName = context.GetFieldPropertyName(field.ServiceField);
-													code.WriteLine($"{fieldName} = (({requestTypeName}?) body)?.{fieldName},");
+													var fieldType = context.GetFieldType(field.ServiceField);
+													code.WriteLine($"{fieldName} = (({requestTypeName}?) body)?.{fieldName}{(fieldType.Kind == ServiceTypeKind.Nullable ? " ?? default" : "")},");
 												}
 											}
 										}

diff --git a/tools/EdgeCases.fsd b/tools/EdgeCases.fsd
@@ -106,4 +106,14 @@ service EdgeCases
 		foo: ExternalData;
 		bar: ExternalEnum;
 	}
+
+	method misc
+	{
+		[http(from: "query")]
+		q: string;
+
+		f: nullable<string>;
+	}:
+	{
+	}
 }
diff --git a/tools/EdgeCases/DelegatingEdgeCases.g.cs b/tools/EdgeCases/DelegatingEdgeCases.g.cs
diff --git a/tools/EdgeCases/EdgeCasesJsonSerializerContext.g.cs b/tools/EdgeCases/EdgeCasesJsonSerializerContext.g.cs
diff --git a/tools/EdgeCases/EdgeCasesMethods.g.cs b/tools/EdgeCases/EdgeCasesMethods.g.cs
diff --git a/tools/EdgeCases/Http/EdgeCasesHttpHandler.g.cs b/tools/EdgeCases/Http/EdgeCasesHttpHandler.g.cs
diff --git a/tools/EdgeCases/Http/EdgeCasesHttpMapping.g.cs b/tools/EdgeCases/Http/EdgeCasesHttpMapping.g.cs
diff --git a/tools/EdgeCases/Http/HttpClientEdgeCases.g.cs b/tools/EdgeCases/Http/HttpClientEdgeCases.g.cs
diff --git a/tools/EdgeCases/IEdgeCases.g.cs b/tools/EdgeCases/IEdgeCases.g.cs
diff --git a/tools/EdgeCases/MiscRequestDto.g.cs b/tools/EdgeCases/MiscRequestDto.g.cs
diff --git a/tools/EdgeCases/MiscResponseDto.g.cs b/tools/EdgeCases/MiscResponseDto.g.cs