[typescript-fetch] Fixed issue where unique arrays (sets) of primitiv…

…e values aren't initialized properly (#19521) * Fix for #19520 * Removed redundant Array<any> cast * Fixed modelGeneric.mustache * Updated samples
OpenAPITools · Sep 5, 2024 · 2bc0e5f · 2bc0e5f
1 parent 2f54a2f
commit 2bc0e5f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
@@ -55,6 +55,15 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
         {{/additionalPropertiesType}}
         {{#vars}}
         {{#isPrimitiveType}}
+        {{#isArray}}
+        {{#uniqueItems}}
+        '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}{{#required}}{{#isNullable}}json['{{baseName}}'] == null ? null : {{/isNullable}}{{/required}}new Set(json['{{baseName}}']),
+        {{/uniqueItems}}
+        {{^uniqueItems}}
+        '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}{{#required}}{{#isNullable}}json['{{baseName}}'] == null ? null : {{/isNullable}}{{/required}}json['{{baseName}}'],
+        {{/uniqueItems}}
+        {{/isArray}}
+        {{^isArray}}
         {{#isDateType}}
         '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}json['{{baseName}}'] == null ? null : {{/isNullable}}{{/required}}new Date(json['{{baseName}}'])),
         {{/isDateType}}
@@ -66,6 +75,7 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
         '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}json['{{baseName}}'],
         {{/isDateTimeType}}
         {{/isDateType}}
+        {{/isArray}}
         {{/isPrimitiveType}}
         {{^isPrimitiveType}}
         {{#isArray}}

diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Pet.ts
@@ -106,7 +106,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
         'id': json['id'] == null ? undefined : json['id'],
         'category': json['category'] == null ? undefined : CategoryFromJSON(json['category']),
         'name': json['name'],
-        'photoUrls': json['photoUrls'],
+        'photoUrls': new Set(json['photoUrls']),
         'tags': json['tags'] == null ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
         'status': json['status'] == null ? undefined : json['status'],
     };

diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/Pet.ts
@@ -106,7 +106,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
         'id': json['id'] == null ? undefined : json['id'],
         'category': json['category'] == null ? undefined : CategoryFromJSON(json['category']),
         'name': json['name'],
-        'photoUrls': json['photoUrls'],
+        'photoUrls': new Set(json['photoUrls']),
         'tags': json['tags'] == null ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
         'status': json['status'] == null ? undefined : json['status'],
     };

diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/models/Pet.ts
@@ -107,7 +107,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
         'id': json['id'] == null ? undefined : json['id'],
         'category': json['category'] == null ? undefined : CategoryFromJSON(json['category']),
         'name': json['name'],
-        'photoUrls': json['photoUrls'],
+        'photoUrls': new Set(json['photoUrls']),
         'tags': json['tags'] == null ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
         'status': json['status'] == null ? undefined : json['status'],
     };