Skip to content

[typescript-fetch] Fix for nullable enums + separate treatment of null and undefined #4315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macjohnny merged 1 commit into from
Nov 8, 2019
Merged

[typescript-fetch] Fix for nullable enums + separate treatment of null and undefined #4315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-fetch/modelEnum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
return json as {{classname}};
}

export function {{classname}}ToJSON(value?: {{classname}}): any {
export function {{classname}}ToJSON(value?: {{classname}} | null): any {
return value as any;
}
16 changes: 8 additions & 8 deletions modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
{{#vars}}
{{#isPrimitiveType}}
{{#isDate}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}new Date(json['{{baseName}}']),
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}({{#isNullable}}json['{{baseName}}'] === null ? null : {{/isNullable}}new Date(json['{{baseName}}'])),
{{/isDate}}
{{#isDateTime}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}new Date(json['{{baseName}}']),
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}({{#isNullable}}json['{{baseName}}'] === null ? null : {{/isNullable}}new Date(json['{{baseName}}'])),
{{/isDateTime}}
{{^isDate}}
{{^isDateTime}}
Expand All @@ -76,10 +76,10 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{#isListContainer}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}(json['{{baseName}}'] as Array<any>).map({{#items}}{{datatype}}{{/items}}FromJSON),
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}({{#isNullable}}json['{{baseName}}'] === null ? null : {{/isNullable}}(json['{{baseName}}'] as Array<any>).map({{#items}}{{datatype}}{{/items}}FromJSON)),
{{/isListContainer}}
{{#isMapContainer}}
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}mapValues(json['{{baseName}}'], {{#items}}{{datatype}}{{/items}}FromJSON),
'{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}({{#isNullable}}json['{{baseName}}'] === null ? null : {{/isNullable}}mapValues(json['{{baseName}}'], {{#items}}{{datatype}}{{/items}}FromJSON)),
{{/isMapContainer}}
{{^isListContainer}}
{{^isMapContainer}}
Expand Down Expand Up @@ -116,14 +116,14 @@ export function {{classname}}ToJSON(value?: {{classname}} | null): any {
{{#vars}}
{{^isReadOnly}}
{{#isPrimitiveType}}
'{{baseName}}': {{#isDate}}{{^required}}value.{{name}} == null ? undefined : {{/required}}value.{{name}}.toISOString().substr(0,10){{/isDate}}{{#isDateTime}}{{^required}}value.{{name}} == null ? undefined : {{/required}}value.{{name}}.toISOString(){{/isDateTime}}{{^isDate}}{{^isDateTime}}value.{{name}}{{/isDateTime}}{{/isDate}},
'{{baseName}}': {{#isDate}}{{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}value.{{name}}.toISOString().substr(0,10)){{/isDate}}{{#isDateTime}}{{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}value.{{name}}.toISOString()){{/isDateTime}}{{^isDate}}{{^isDateTime}}value.{{name}}{{/isDateTime}}{{/isDate}},
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{#isListContainer}}
'{{baseName}}': {{^required}}value.{{name}} == null ? undefined : {{/required}}(value.{{name}} as Array<any>).map({{#items}}{{datatype}}{{/items}}ToJSON),
'{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}(value.{{name}} as Array<any>).map({{#items}}{{datatype}}{{/items}}ToJSON)),
{{/isListContainer}}
{{#isMapContainer}}
'{{baseName}}': {{^required}}value.{{name}} == null ? undefined : {{/required}}mapValues(value.{{name}}, {{#items}}{{datatype}}{{/items}}ToJSON),
'{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}mapValues(value.{{name}}, {{#items}}{{datatype}}{{/items}}ToJSON)),
{{/isMapContainer}}
{{^isListContainer}}
{{^isMapContainer}}
Expand All @@ -134,7 +134,7 @@ export function {{classname}}ToJSON(value?: {{classname}} | null): any {
'{{baseName}}': value.{{name}},
{{/isFreeFormObject}}
{{/isMapContainer}}
{{/isListContainer}}
{{/isListContainer}}
{{/isPrimitiveType}}
{{/isReadOnly}}
{{/vars}}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/default/src/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
'id': !exists(json, 'id') ? undefined : json['id'],
'petId': !exists(json, 'petId') ? undefined : json['petId'],
'quantity': !exists(json, 'quantity') ? undefined : json['quantity'],
'shipDate': !exists(json, 'shipDate') ? undefined : new Date(json['shipDate']),
'shipDate': !exists(json, 'shipDate') ? undefined : (new Date(json['shipDate'])),
'status': !exists(json, 'status') ? undefined : json['status'],
'complete': !exists(json, 'complete') ? undefined : json['complete'],
};
Expand All @@ -88,7 +88,7 @@ export function OrderToJSON(value?: Order | null): any {
'id': value.id,
'petId': value.petId,
'quantity': value.quantity,
'shipDate': value.shipDate == null ? undefined : value.shipDate.toISOString(),
'shipDate': value.shipDate === undefined ? undefined : (value.shipDate.toISOString()),
'status': value.status,
'complete': value.complete,
};
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/default/src/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
'category': !exists(json, 'category') ? undefined : CategoryFromJSON(json['category']),
'name': json['name'],
'photoUrls': json['photoUrls'],
'tags': !exists(json, 'tags') ? undefined : (json['tags'] as Array<any>).map(TagFromJSON),
'tags': !exists(json, 'tags') ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
'status': !exists(json, 'status') ? undefined : json['status'],
};
}
Expand All @@ -100,7 +100,7 @@ export function PetToJSON(value?: Pet | null): any {
'category': CategoryToJSON(value.category),
'name': value.name,
'photoUrls': value.photoUrls,
'tags': value.tags == null ? undefined : (value.tags as Array<any>).map(TagToJSON),
'tags': value.tags === undefined ? undefined : ((value.tags as Array<any>).map(TagToJSON)),
'status': value.status,
};
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
'id': !exists(json, 'id') ? undefined : json['id'],
'petId': !exists(json, 'petId') ? undefined : json['petId'],
'quantity': !exists(json, 'quantity') ? undefined : json['quantity'],
'shipDate': !exists(json, 'shipDate') ? undefined : new Date(json['shipDate']),
'shipDate': !exists(json, 'shipDate') ? undefined : (new Date(json['shipDate'])),
'status': !exists(json, 'status') ? undefined : json['status'],
'complete': !exists(json, 'complete') ? undefined : json['complete'],
};
Expand All @@ -88,7 +88,7 @@ export function OrderToJSON(value?: Order | null): any {
'id': value.id,
'petId': value.petId,
'quantity': value.quantity,
'shipDate': value.shipDate == null ? undefined : value.shipDate.toISOString(),
'shipDate': value.shipDate === undefined ? undefined : (value.shipDate.toISOString()),
'status': value.status,
'complete': value.complete,
};
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
'category': !exists(json, 'category') ? undefined : CategoryFromJSON(json['category']),
'name': json['name'],
'photoUrls': json['photoUrls'],
'tags': !exists(json, 'tags') ? undefined : (json['tags'] as Array<any>).map(TagFromJSON),
'tags': !exists(json, 'tags') ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
'status': !exists(json, 'status') ? undefined : json['status'],
};
}
Expand All @@ -100,7 +100,7 @@ export function PetToJSON(value?: Pet | null): any {
'category': CategoryToJSON(value.category),
'name': value.name,
'photoUrls': value.photoUrls,
'tags': value.tags == null ? undefined : (value.tags as Array<any>).map(TagToJSON),
'tags': value.tags === undefined ? undefined : ((value.tags as Array<any>).map(TagToJSON)),
'status': value.status,
};
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
'id': !exists(json, 'id') ? undefined : json['id'],
'petId': !exists(json, 'petId') ? undefined : json['petId'],
'quantity': !exists(json, 'quantity') ? undefined : json['quantity'],
'shipDate': !exists(json, 'shipDate') ? undefined : new Date(json['shipDate']),
'shipDate': !exists(json, 'shipDate') ? undefined : (new Date(json['shipDate'])),
'status': !exists(json, 'status') ? undefined : json['status'],
'complete': !exists(json, 'complete') ? undefined : json['complete'],
};
Expand All @@ -88,7 +88,7 @@ export function OrderToJSON(value?: Order | null): any {
'id': value.id,
'petId': value.petId,
'quantity': value.quantity,
'shipDate': value.shipDate == null ? undefined : value.shipDate.toISOString(),
'shipDate': value.shipDate === undefined ? undefined : (value.shipDate.toISOString()),
'status': value.status,
'complete': value.complete,
};
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
'category': !exists(json, 'category') ? undefined : CategoryFromJSON(json['category']),
'name': json['name'],
'photoUrls': json['photoUrls'],
'tags': !exists(json, 'tags') ? undefined : (json['tags'] as Array<any>).map(TagFromJSON),
'tags': !exists(json, 'tags') ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
'status': !exists(json, 'status') ? undefined : json['status'],
};
}
Expand All @@ -100,7 +100,7 @@ export function PetToJSON(value?: Pet | null): any {
'category': CategoryToJSON(value.category),
'name': value.name,
'photoUrls': value.photoUrls,
'tags': value.tags == null ? undefined : (value.tags as Array<any>).map(TagToJSON),
'tags': value.tags === undefined ? undefined : ((value.tags as Array<any>).map(TagToJSON)),
'status': value.status,
};
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
'id': !exists(json, 'id') ? undefined : json['id'],
'petId': !exists(json, 'petId') ? undefined : json['petId'],
'quantity': !exists(json, 'quantity') ? undefined : json['quantity'],
'shipDate': !exists(json, 'shipDate') ? undefined : new Date(json['shipDate']),
'shipDate': !exists(json, 'shipDate') ? undefined : (new Date(json['shipDate'])),
'status': !exists(json, 'status') ? undefined : json['status'],
'complete': !exists(json, 'complete') ? undefined : json['complete'],
};
Expand All @@ -88,7 +88,7 @@ export function OrderToJSON(value?: Order | null): any {
'id': value.id,
'petId': value.petId,
'quantity': value.quantity,
'shipDate': value.shipDate == null ? undefined : value.shipDate.toISOString(),
'shipDate': value.shipDate === undefined ? undefined : (value.shipDate.toISOString()),
'status': value.status,
'complete': value.complete,
};
Expand Down
4 changes: 2 additions & 2 deletions ...les/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
'category': !exists(json, 'category') ? undefined : CategoryFromJSON(json['category']),
'name': json['name'],
'photoUrls': json['photoUrls'],
'tags': !exists(json, 'tags') ? undefined : (json['tags'] as Array<any>).map(TagFromJSON),
'tags': !exists(json, 'tags') ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
'status': !exists(json, 'status') ? undefined : json['status'],
};
}
Expand All @@ -100,7 +100,7 @@ export function PetToJSON(value?: Pet | null): any {
'category': CategoryToJSON(value.category),
'name': value.name,
'photoUrls': value.photoUrls,
'tags': value.tags == null ? undefined : (value.tags as Array<any>).map(TagToJSON),
'tags': value.tags === undefined ? undefined : ((value.tags as Array<any>).map(TagToJSON)),
'status': value.status,
};
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
'id': !exists(json, 'id') ? undefined : json['id'],
'petId': !exists(json, 'petId') ? undefined : json['petId'],
'quantity': !exists(json, 'quantity') ? undefined : json['quantity'],
'shipDate': !exists(json, 'shipDate') ? undefined : new Date(json['shipDate']),
'shipDate': !exists(json, 'shipDate') ? undefined : (new Date(json['shipDate'])),
'status': !exists(json, 'status') ? undefined : json['status'],
'complete': !exists(json, 'complete') ? undefined : json['complete'],
};
Expand All @@ -88,7 +88,7 @@ export function OrderToJSON(value?: Order | null): any {
'id': value.id,
'petId': value.petId,
'quantity': value.quantity,
'shipDate': value.shipDate == null ? undefined : value.shipDate.toISOString(),
'shipDate': value.shipDate === undefined ? undefined : (value.shipDate.toISOString()),
'status': value.status,
'complete': value.complete,
};
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
'category': !exists(json, 'category') ? undefined : CategoryFromJSON(json['category']),
'name': json['name'],
'photoUrls': json['photoUrls'],
'tags': !exists(json, 'tags') ? undefined : (json['tags'] as Array<any>).map(TagFromJSON),
'tags': !exists(json, 'tags') ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
'status': !exists(json, 'status') ? undefined : json['status'],
};
}
Expand All @@ -100,7 +100,7 @@ export function PetToJSON(value?: Pet | null): any {
'category': CategoryToJSON(value.category),
'name': value.name,
'photoUrls': value.photoUrls,
'tags': value.tags == null ? undefined : (value.tags as Array<any>).map(TagToJSON),
'tags': value.tags === undefined ? undefined : ((value.tags as Array<any>).map(TagToJSON)),
'status': value.status,
};
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
'id': !exists(json, 'id') ? undefined : json['id'],
'petId': !exists(json, 'petId') ? undefined : json['petId'],
'quantity': !exists(json, 'quantity') ? undefined : json['quantity'],
'shipDate': !exists(json, 'shipDate') ? undefined : new Date(json['shipDate']),
'shipDate': !exists(json, 'shipDate') ? undefined : (new Date(json['shipDate'])),
'status': !exists(json, 'status') ? undefined : json['status'],
'complete': !exists(json, 'complete') ? undefined : json['complete'],
};
Expand All @@ -88,7 +88,7 @@ export function OrderToJSON(value?: Order | null): any {
'id': value.id,
'petId': value.petId,
'quantity': value.quantity,
'shipDate': value.shipDate == null ? undefined : value.shipDate.toISOString(),
'shipDate': value.shipDate === undefined ? undefined : (value.shipDate.toISOString()),
'status': value.status,
'complete': value.complete,
};
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
'category': !exists(json, 'category') ? undefined : CategoryFromJSON(json['category']),
'name': json['name'],
'photoUrls': json['photoUrls'],
'tags': !exists(json, 'tags') ? undefined : (json['tags'] as Array<any>).map(TagFromJSON),
'tags': !exists(json, 'tags') ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
'status': !exists(json, 'status') ? undefined : json['status'],
};
}
Expand All @@ -100,7 +100,7 @@ export function PetToJSON(value?: Pet | null): any {
'category': CategoryToJSON(value.category),
'name': value.name,
'photoUrls': value.photoUrls,
'tags': value.tags == null ? undefined : (value.tags as Array<any>).map(TagToJSON),
'tags': value.tags === undefined ? undefined : ((value.tags as Array<any>).map(TagToJSON)),
'status': value.status,
};
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
'id': !exists(json, 'id') ? undefined : json['id'],
'petId': !exists(json, 'petId') ? undefined : json['petId'],
'quantity': !exists(json, 'quantity') ? undefined : json['quantity'],
'shipDate': !exists(json, 'shipDate') ? undefined : new Date(json['shipDate']),
'shipDate': !exists(json, 'shipDate') ? undefined : (new Date(json['shipDate'])),
'status': !exists(json, 'status') ? undefined : json['status'],
'complete': !exists(json, 'complete') ? undefined : json['complete'],
};
Expand All @@ -88,7 +88,7 @@ export function OrderToJSON(value?: Order | null): any {
'id': value.id,
'petId': value.petId,
'quantity': value.quantity,
'shipDate': value.shipDate == null ? undefined : value.shipDate.toISOString(),
'shipDate': value.shipDate === undefined ? undefined : (value.shipDate.toISOString()),
'status': value.status,
'complete': value.complete,
};
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function PetFromJSONTyped(json: any, ignoreDiscriminator: boolean): Pet {
'category': !exists(json, 'category') ? undefined : CategoryFromJSON(json['category']),
'name': json['name'],
'photoUrls': json['photoUrls'],
'tags': !exists(json, 'tags') ? undefined : (json['tags'] as Array<any>).map(TagFromJSON),
'tags': !exists(json, 'tags') ? undefined : ((json['tags'] as Array<any>).map(TagFromJSON)),
'status': !exists(json, 'status') ? undefined : json['status'],
};
}
Expand All @@ -100,7 +100,7 @@ export function PetToJSON(value?: Pet | null): any {
'category': CategoryToJSON(value.category),
'name': value.name,
'photoUrls': value.photoUrls,
'tags': value.tags == null ? undefined : (value.tags as Array<any>).map(TagToJSON),
'tags': value.tags === undefined ? undefined : ((value.tags as Array<any>).map(TagToJSON)),
'status': value.status,
};
}
Expand Down