Only check result.json when expecting response body

TyMick · TyMick · commit f6dae1469b0e · 2022-10-03T14:19:00.000-07:00
The test in the previous commit succeeds after this change.
diff --git a/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs b/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
@@ -271,39 +271,50 @@ public override CodeGenOutput GenerateOutput(ServiceInfo service)
 								code.WriteLine("const status = result.response.status;");
 								var responseValueType = $"I{capMethodName}Response";
 								code.WriteLine("let value" + IfTypeScript($": {responseValueType} | null") + " = null;");
-								using (code.Block("if (result.json) {", "}"))
+								var validResponses = httpMethodInfo.ValidResponses;
+								var elsePrefix = "";
+								foreach (var validResponse in validResponses)
 								{
-									var validResponses = httpMethodInfo.ValidResponses;
-									var elsePrefix = "";
-									foreach (var validResponse in validResponses)
-									{
-										var statusCodeAsString = ((int) validResponse.StatusCode).ToString(CultureInfo.InvariantCulture);
-										code.WriteLine($"{elsePrefix}if (status === {statusCodeAsString}) {{");
-										elsePrefix = "else ";
+									var statusCodeAsString = ((int) validResponse.StatusCode).ToString(CultureInfo.InvariantCulture);
+									code.WriteLine($"{elsePrefix}if (status === {statusCodeAsString}) {{");
+									elsePrefix = "else ";
 
-										using (code.Indent())
+									using (code.Indent())
+									{
+										var bodyField = validResponse.BodyField;
+										if (bodyField != null)
 										{
-											var bodyField = validResponse.BodyField;
-											if (bodyField != null)
-											{
-												var responseBodyFieldName = bodyField.ServiceField.Name;
+											var responseBodyFieldName = bodyField.ServiceField.Name;
 
-												var bodyFieldType = service.GetFieldType(bodyField.ServiceField)!;
-												if (bodyFieldType.Kind == ServiceTypeKind.Boolean)
-													code.WriteLine($"value = {{ {responseBodyFieldName}: true }};");
-												else
+											var bodyFieldType = service.GetFieldType(bodyField.ServiceField)!;
+											if (bodyFieldType.Kind == ServiceTypeKind.Boolean)
+											{
+												code.WriteLine($"value = {{ {responseBodyFieldName}: true }};");
+											}
+											else
+											{
+												using (code.Block("if (result.json) {", "}"))
+												{
 													code.WriteLine($"value = {{ {responseBodyFieldName}: result.json }}" + IfTypeScript($" as {responseValueType}") + ";");
+												}
+											}
+										}
+										else
+										{
+											if (validResponse.NormalFields!.Count == 0)
+											{
+												code.WriteLine("value = {};");
 											}
 											else
 											{
-												if (validResponse.NormalFields!.Count == 0)
-													code.WriteLine("value = {};");
-												else
+												using (code.Block("if (result.json) {", "}"))
+												{
 													code.WriteLine("value = result.json" + IfTypeScript($" as {responseValueType} | null") + ";");
+												}
 											}
 										}
-										code.WriteLine("}");
 									}
+									code.WriteLine("}");
 								}
 
 								using (code.Block("if (!value) {", "}"))
diff --git a/tests/Facility.CodeGen.JavaScript.UnitTests/JavaScriptGeneratorTests.cs b/tests/Facility.CodeGen.JavaScript.UnitTests/JavaScriptGeneratorTests.cs
@@ -114,8 +114,8 @@ public void GenerateExampleApiTypeScript_DoesntRequireJsonWhenNoResponseBodyExpe
 			// `createWidget` does expect response body
 			const string expectedCreateWidgetLines = @"
 				let value: ICreateWidgetResponse | null = null;
-				if (result.json) {
-					if (status === 201) {
+				if (status === 201) {
+					if (result.json) {
 						value = { widget: result.json } as ICreateWidgetResponse;
 					}
 				}";
