Improve typescript-fetch code generation for oneOf cases without discriminator (#18702)

odiak · web-flow · commit 57dceae4ad22 · 2024-05-18T11:11:34.000+02:00
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache
@@ -31,7 +31,11 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
     }
 {{/discriminator}}
 {{^discriminator}}
-    return {{#oneOf}}{{{.}}}FromJSONTyped(json, true){{^-last}} || {{/-last}}{{/oneOf}};
+    {{#oneOf}}
+    if (instanceOf{{{.}}}(json)) {
+        return {{{.}}}FromJSONTyped(json, true);
+    }
+    {{/oneOf}}
 {{/discriminator}}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,11 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole`
`31`	`31`	`}`
`32`	`32`	`{{/discriminator}}`
`33`	`33`	`{{^discriminator}}`
`34`		`- return {{#oneOf}}{{{.}}}FromJSONTyped(json, true){{^-last}} \|\| {{/-last}}{{/oneOf}};`
	`34`	`+ {{#oneOf}}`
	`35`	`+ if (instanceOf{{{.}}}(json)) {`
	`36`	`+ return {{{.}}}FromJSONTyped(json, true);`
	`37`	`+ }`
	`38`	`+ {{/oneOf}}`
`35`	`39`	`{{/discriminator}}`
`36`	`40`	`}`
`37`	`41`