Skip to content

[typescript-fetch] Fix oneOf with mixed array types causing TypeScript compile error #23500

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

Open
jasperpatterson wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −5
Open

[typescript-fetch] Fix oneOf with mixed array types causing TypeScript compile error #23500

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
22 changes: 19 additions & 3 deletions modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
}
{{#-last}}
}
return json;
}
{{/-last}}
{{/oneOfArrays}}
Expand Down Expand Up @@ -105,6 +104,15 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
{{/isString}}
{{/items}}
{{/isArray}}
{{/oneOfPrimitives}}
{{#oneOfArrays}}
{{#-last}}
if (Array.isArray(json)) {
return json;
}
{{/-last}}
{{/oneOfArrays}}
{{#oneOfPrimitives}}
{{^isArray}}
{{#isDateType}}
if (!(isNaN(new Date(json).getTime()))) {
Expand Down Expand Up @@ -178,7 +186,6 @@ export function {{classname}}ToJSONTyped(value?: {{classname}} | null, ignoreDis
}
{{#-last}}
}
return value;
}
{{/-last}}
{{/oneOfArrays}}
Expand All @@ -187,7 +194,7 @@ export function {{classname}}ToJSONTyped(value?: {{classname}} | null, ignoreDis
{{#items}}
{{#isDateType}}
if (Array.isArray(value)) {
if (value.every(item => item instanceof Date) {
if (value.every(item => item instanceof Date)) {
return value.map(value => value.toISOString().substring(0,10));
}
}
Expand Down Expand Up @@ -222,6 +229,15 @@ export function {{classname}}ToJSONTyped(value?: {{classname}} | null, ignoreDis
{{/isString}}
{{/items}}
{{/isArray}}
{{/oneOfPrimitives}}
{{#oneOfArrays}}
{{#-last}}
if (Array.isArray(value)) {
return value;
}
{{/-last}}
{{/oneOfArrays}}
{{#oneOfPrimitives}}
{{^isArray}}
{{#isDateType}}
if (value instanceof Date) {
Expand Down
8 changes: 6 additions & 2 deletions samples/client/petstore/typescript-fetch/builds/oneOf/models/TestArrayResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ export function TestArrayResponseFromJSONTyped(json: any, ignoreDiscriminator: b
return json.map(value => TestBFromJSONTyped(value, true));
}
}
return json;
}
if (Array.isArray(json)) {
if (json.every(item => typeof item === 'string')) {
return json;
}
}
if (Array.isArray(json)) {
return json;
}
return {} as any;
}

Expand All @@ -78,13 +80,15 @@ export function TestArrayResponseToJSONTyped(value?: TestArrayResponse | null, i
return value.map(value => TestBToJSON(value as TestB));
}
}
return value;
}
if (Array.isArray(value)) {
if (value.every(item => typeof item === 'string')) {
return value;
}
}
if (Array.isArray(value)) {
return value;
}
return {};
}