fix(NJsonSchema.CodeGeneration.TypeScript): for strict null checking,…

… include explicit '| null' to return type of createInstance (#1287)
RicoSuter · Nov 26, 2020 · 75e55c5 · 75e55c5
1 parent 2ed102c
commit 75e55c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/Class.liquid
@@ -93,7 +93,7 @@
 {% endif -%}
     }
 
-    static fromJS(data: any{% if HandleReferences %}, _mappings?: any{% endif %}): {{ ClassName }} {
+    static fromJS(data: any{% if HandleReferences %}, _mappings?: any{% endif %}): {{ ClassName }}{% if HandleReferences %} | null{% endif %} {
         data = typeof data === 'object' ? data : {};
 {% if HandleReferences -%}
 {%   if HasBaseDiscriminator -%}

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/File.ReferenceHandling.liquid b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/File.ReferenceHandling.liquid
@@ -41,7 +41,7 @@
     return json;
 }
 
-function createInstance<T>(data: any, mappings: any, type: any): T {
+function createInstance<T>(data: any, mappings: any, type: any): T | null {
   if (!mappings)
     mappings = [];
   if (!data)

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/KnockoutClass.liquid b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/KnockoutClass.liquid
@@ -37,7 +37,7 @@
         }
     }
 
-    static fromJS(data: any{% if HandleReferences %}, _mappings?: any{% endif %}): {{ ClassName }} {
+    static fromJS(data: any{% if HandleReferences %}, _mappings?: any{% endif %}): {{ ClassName }}{% if HandleReferences %} | null{% endif %} {
 {% if HandleReferences -%}
 {%   if HasBaseDiscriminator -%}
 {%     for derivedClass in DerivedClasses -%}