Fixes #1524: typescript checking fails on Dictionary<Enum, string> (#…

…1525)
RicoSuter · Jun 2, 2022 · d8df4f3 · d8df4f3
1 parent 71ce421
commit d8df4f3
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/...t.Tests/Snapshots/ClassGenerationTests.Verify_output_style=Class_version=1.8.verified.txt b/...t.Tests/Snapshots/ClassGenerationTests.Verify_output_style=Class_version=1.8.verified.txt
@@ -169,7 +169,7 @@ export class MyClass implements IMyClass {
             data["PrimitiveDictionary"] = {};
             for (let key in this.primitiveDictionary) {
                 if (this.primitiveDictionary.hasOwnProperty(key))
-                    (<any>data["PrimitiveDictionary"])[key] = this.primitiveDictionary[key];
+                    (<any>data["PrimitiveDictionary"])[key] = (<any>this.primitiveDictionary)[key];
             }
         }
         if (Array.isArray(this.dateArray)) {

diff --git a/...t.Tests/Snapshots/ClassGenerationTests.Verify_output_style=Class_version=2.1.verified.txt b/...t.Tests/Snapshots/ClassGenerationTests.Verify_output_style=Class_version=2.1.verified.txt
@@ -169,7 +169,7 @@ export class MyClass implements IMyClass {
             data["PrimitiveDictionary"] = {};
             for (let key in this.primitiveDictionary) {
                 if (this.primitiveDictionary.hasOwnProperty(key))
-                    (<any>data["PrimitiveDictionary"])[key] = this.primitiveDictionary[key];
+                    (<any>data["PrimitiveDictionary"])[key] = (<any>this.primitiveDictionary)[key];
             }
         }
         if (Array.isArray(this.dateArray)) {

diff --git a/...t.Tests/Snapshots/ClassGenerationTests.Verify_output_style=Class_version=2.7.verified.txt b/...t.Tests/Snapshots/ClassGenerationTests.Verify_output_style=Class_version=2.7.verified.txt
@@ -169,7 +169,7 @@ export class MyClass implements IMyClass {
             data["PrimitiveDictionary"] = {};
             for (let key in this.primitiveDictionary) {
                 if (this.primitiveDictionary.hasOwnProperty(key))
-                    (<any>data["PrimitiveDictionary"])[key] = this.primitiveDictionary[key];
+                    (<any>data["PrimitiveDictionary"])[key] = (<any>this.primitiveDictionary)[key];
             }
         }
         if (Array.isArray(this.dateArray)) {

diff --git a/...t.Tests/Snapshots/ClassGenerationTests.Verify_output_style=Class_version=4.3.verified.txt b/...t.Tests/Snapshots/ClassGenerationTests.Verify_output_style=Class_version=4.3.verified.txt
@@ -169,7 +169,7 @@ export class MyClass implements IMyClass {
             data["PrimitiveDictionary"] = {};
             for (let key in this.primitiveDictionary) {
                 if (this.primitiveDictionary.hasOwnProperty(key))
-                    (<any>data["PrimitiveDictionary"])[key] = this.primitiveDictionary[key];
+                    (<any>data["PrimitiveDictionary"])[key] = (<any>this.primitiveDictionary)[key];
             }
         }
         if (Array.isArray(this.dateArray)) {

diff --git a/...Snapshots/ClassGenerationTests.Verify_output_style=KnockoutClass_version=1.8.verified.txt b/...Snapshots/ClassGenerationTests.Verify_output_style=KnockoutClass_version=1.8.verified.txt
@@ -187,7 +187,7 @@ export class MyClass {
             data["PrimitiveDictionary"] = {};
             for (let key in primitiveDictionary_) {
                 if (primitiveDictionary_.hasOwnProperty(key))
-                    (<any>data["PrimitiveDictionary"])[key] = primitiveDictionary_[key];
+                    (<any>data["PrimitiveDictionary"])[key] = (<any>primitiveDictionary_)[key];
             }
         }
 

diff --git a/...Snapshots/ClassGenerationTests.Verify_output_style=KnockoutClass_version=2.1.verified.txt b/...Snapshots/ClassGenerationTests.Verify_output_style=KnockoutClass_version=2.1.verified.txt
@@ -187,7 +187,7 @@ export class MyClass {
             data["PrimitiveDictionary"] = {};
             for (let key in primitiveDictionary_) {
                 if (primitiveDictionary_.hasOwnProperty(key))
-                    (<any>data["PrimitiveDictionary"])[key] = primitiveDictionary_[key];
+                    (<any>data["PrimitiveDictionary"])[key] = (<any>primitiveDictionary_)[key];
             }
         }
 

diff --git a/...Snapshots/ClassGenerationTests.Verify_output_style=KnockoutClass_version=2.7.verified.txt b/...Snapshots/ClassGenerationTests.Verify_output_style=KnockoutClass_version=2.7.verified.txt
@@ -187,7 +187,7 @@ export class MyClass {
             data["PrimitiveDictionary"] = {};
             for (let key in primitiveDictionary_) {
                 if (primitiveDictionary_.hasOwnProperty(key))
-                    (<any>data["PrimitiveDictionary"])[key] = primitiveDictionary_[key];
+                    (<any>data["PrimitiveDictionary"])[key] = (<any>primitiveDictionary_)[key];
             }
         }
 

diff --git a/...Snapshots/ClassGenerationTests.Verify_output_style=KnockoutClass_version=4.3.verified.txt b/...Snapshots/ClassGenerationTests.Verify_output_style=KnockoutClass_version=4.3.verified.txt
@@ -187,7 +187,7 @@ export class MyClass {
             data["PrimitiveDictionary"] = {};
             for (let key in primitiveDictionary_) {
                 if (primitiveDictionary_.hasOwnProperty(key))
-                    (<any>data["PrimitiveDictionary"])[key] = primitiveDictionary_[key];
+                    (<any>data["PrimitiveDictionary"])[key] = (<any>primitiveDictionary_)[key];
             }
         }
 

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/ConvertToJavaScript.liquid b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/ConvertToJavaScript.liquid
@@ -29,7 +29,7 @@ if ({{ Value }}) {
 {%-         if NullValue != "undefined" -%}
             (<any>{{ Variable }})[key] = {{ Value }}[key] !== undefined ? {{ Value }}[key] : <any>{{ NullValue }};
 {%-         else -%}
-            (<any>{{ Variable }})[key] = {{ Value }}[key];
+            (<any>{{ Variable }})[key] = (<any>{{ Value }})[key];
 {%-         endif -%}
 {%-     endif -%}
     }