From 57b9c2b1911c16216d4d4c6af4f0718c7cd4d9ed Mon Sep 17 00:00:00 2001 From: Dave Smits Date: Fri, 27 Sep 2024 13:30:42 +0200 Subject: [PATCH 1/3] fix --- .../Templates/ConvertToJavaScript.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/ConvertToJavaScript.liquid b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/ConvertToJavaScript.liquid index 7660ce78d..dc181bc64 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/ConvertToJavaScript.liquid +++ b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/ConvertToJavaScript.liquid @@ -5,7 +5,7 @@ if (Array.isArray({{ Value }})) { {{ Variable }} = []; for (let item of {{ Value }}) {%- if IsArrayItemNewableObject -%} - {{ Variable }}.push(item.toJSON()); + {{ Variable }}.push(item?.toJSON()); {%- elsif IsArrayItemDate -%} {{ Variable }}.push({% if UseJsDate %}formatDate(item){% else %}item.{{ DateToStringCode }}{% endif %}); {%- elsif IsArrayItemDateTime -%} From 8729baf3c46cea3f60bde0fed89592d2a255e4db Mon Sep 17 00:00:00 2001 From: Dave Smits Date: Fri, 27 Sep 2024 13:32:01 +0200 Subject: [PATCH 2/3] d --- .../Templates/Class.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid index fbeb5a92c..10bd62744 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid +++ b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid @@ -30,7 +30,7 @@ if (data.hasOwnProperty(property)) (this)[property] = (data)[property]; } -{% endif -%} +{% endif -%} {% if ConvertConstructorInterfaceData -%} {% for property in Properties -%} {% if property.SupportsConstructorConversion -%} From 18f5def7d05c5d4c93d509b77b6456539c4b2ce3 Mon Sep 17 00:00:00 2001 From: Dave Smits Date: Fri, 27 Sep 2024 13:37:41 +0200 Subject: [PATCH 3/3] revert whitespace --- .../Templates/Class.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid index 10bd62744..fbeb5a92c 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid +++ b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid @@ -30,7 +30,7 @@ if (data.hasOwnProperty(property)) (this)[property] = (data)[property]; } -{% endif -%} +{% endif -%} {% if ConvertConstructorInterfaceData -%} {% for property in Properties -%} {% if property.SupportsConstructorConversion -%}