[typescript-fetch] correct oneOf model to or not concat when handling enums

modules/openapi-generator/src/main/resources/typescript-fetch/modelEnum.mustache

@@ -1,10 +1,16 @@
 {{>modelEnumInterfaces}}
 
-export function {{classname}}FromJSON(json: any): {{classname}} {
+export function {{classname}}FromJSON(json: any): {{classname}} | null {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    if(!Object.values({{classname}}).includes(json as {{classname}})) {
+        return null;
+    }
     return {{classname}}FromJSONTyped(json, false);
 }
 
-export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boolean): {{classname}} {
+export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boolean): {{classname}} | null {
     return json as {{classname}};
 }
 

modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache

@@ -31,7 +31,7 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
     }
 {{/discriminator}}
 {{^discriminator}}
-    return { {{#oneOf}}...{{{.}}}FromJSONTyped(json, true){{^-last}}, {{/-last}}{{/oneOf}} };
+    return {{#oneOf}}{{{.}}}FromJSONTyped(json, true){{^-last}} || {{/-last}}{{/oneOf}};
 {{/discriminator}}
 }
 
@@ -53,6 +53,6 @@ export function {{classname}}ToJSON(value?: {{classname}} | null): any {
     }
 {{/discriminator}}
 {{^discriminator}}
-    return { {{#oneOf}}...{{{.}}}ToJSON(value){{^-last}}, {{/-last}}{{/oneOf}} };
+    return {{#oneOf}}{{{.}}}ToJSON(value as {{{.}}}){{^-last}} ?? {{/-last}}{{/oneOf}};
 {{/discriminator}}
 }

modules/openapi-generator/src/test/resources/3_0/typescript-fetch/enum.yaml

@@ -206,12 +206,35 @@ components:
         - one
         - two
         - three
+    StringEnumTwo:
+      type: string
+      enum:
+        - twoone
+        - twotwo
+        - twothree
+    StringOneOf:
+      type: string
+      oneOf:
+        - $ref: "#/components/schemas/StringEnum"
+        - $ref: "#/components/schemas/StringEnumTwo"
     NumberEnum:
       type: number
       enum:
+        - 0
         - 1
         - 2
         - 3
+    NumberEnumTwo:
+      type: number
+      enum:
+        - 4
+        - 5
+        - 6
+    NumberOneOf:
+      type: number
+      oneOf:
+        - $ref: "#/components/schemas/NumberEnum"
+        - $ref: "#/components/schemas/NumberEnumTwo"
     EnumPatternObject:
       type: object
       properties:
@@ -227,3 +250,15 @@ components:
           nullable: true
           allOf:
             - $ref: "#/components/schemas/NumberEnum"
+    ObjectOneOfEnum:
+      type: "object"
+      properties:
+        combined-string-enum:
+          oneOf: 
+            - $ref: '#/components/schemas/StringEnum'
+            - $ref: '#/components/schemas/StringEnumTwo'
+    ObjectCombinedEnum:
+      type: "object"
+      properties:
+        combined-string-enum:
+          $ref: '#/components/schemas/StringOneOf'

samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Capitalization.ts

@@ -51,6 +51,7 @@ export interface Capitalization {
     sCAETHFlowPoints?: string;
     /**
      * Name of the pet
+
      * @type {string}
      * @memberof Capitalization
      */

samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/FILES

@@ -5,6 +5,10 @@ models/EnumPatternObject.ts
 models/InlineObject.ts
 models/InlineResponse200.ts
 models/NumberEnum.ts
+models/ObjectCombinedEnum.ts
+models/ObjectOneOfEnum.ts
 models/StringEnum.ts
+models/StringEnumTwo.ts
+models/StringOneOf.ts
 models/index.ts
 runtime.ts

samples/client/petstore/typescript-fetch/builds/enum/models/ObjectCombinedEnum.ts

@@ -0,0 +1,64 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Enum test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+import {
+    StringOneOf,
+    StringOneOfFromJSON,
+    StringOneOfFromJSONTyped,
+    StringOneOfToJSON,
+} from './';
+
+/**
+ * 
+ * @export
+ * @interface ObjectCombinedEnum
+ */
+export interface ObjectCombinedEnum {
+    /**
+     * 
+     * @type {StringOneOf}
+     * @memberof ObjectCombinedEnum
+     */
+    combinedStringEnum?: StringOneOf;
+}
+
+export function ObjectCombinedEnumFromJSON(json: any): ObjectCombinedEnum {
+    return ObjectCombinedEnumFromJSONTyped(json, false);
+}
+
+export function ObjectCombinedEnumFromJSONTyped(json: any, ignoreDiscriminator: boolean): ObjectCombinedEnum {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+
+        'combinedStringEnum': !exists(json, 'combined-string-enum') ? undefined : StringOneOfFromJSON(json['combined-string-enum']),
+    };
+}
+
+export function ObjectCombinedEnumToJSON(value?: ObjectCombinedEnum | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+
+        'combined-string-enum': StringOneOfToJSON(value.combinedStringEnum),
+    };
+}
+
+

samples/client/petstore/typescript-fetch/builds/enum/models/ObjectOneOfEnum.ts

@@ -0,0 +1,68 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Enum test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+import {
+    StringEnum,
+    StringEnumFromJSON,
+    StringEnumFromJSONTyped,
+    StringEnumToJSON,
+    StringEnumTwo,
+    StringEnumTwoFromJSON,
+    StringEnumTwoFromJSONTyped,
+    StringEnumTwoToJSON,
+} from './';
+
+/**
+ * 
+ * @export
+ * @interface ObjectOneOfEnum
+ */
+export interface ObjectOneOfEnum {
+    /**
+     * 
+     * @type {StringEnum | StringEnumTwo}
+     * @memberof ObjectOneOfEnum
+     */
+    combinedStringEnum?: StringEnum | StringEnumTwo;
+}
+
+export function ObjectOneOfEnumFromJSON(json: any): ObjectOneOfEnum {
+    return ObjectOneOfEnumFromJSONTyped(json, false);
+}
+
+export function ObjectOneOfEnumFromJSONTyped(json: any, ignoreDiscriminator: boolean): ObjectOneOfEnum {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+
+        'combinedStringEnum': !exists(json, 'combined-string-enum') ? undefined : StringEnum | StringEnumTwoFromJSON(json['combined-string-enum']),
+    };
+}
+
+export function ObjectOneOfEnumToJSON(value?: ObjectOneOfEnum | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+
+        'combined-string-enum': StringEnum | StringEnumTwoToJSON(value.combinedStringEnum),
+    };
+}
+
+

samples/client/petstore/typescript-fetch/builds/enum/models/StringEnumTwo.ts

@@ -0,0 +1,37 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Enum test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+export enum StringEnumTwo {
+    Twoone = 'twoone',
+    Twotwo = 'twotwo',
+    Twothree = 'twothree'
+}
+
+export function StringEnumTwoFromJSON(json: any): StringEnumTwo {
+    return StringEnumTwoFromJSONTyped(json, false);
+}
+
+export function StringEnumTwoFromJSONTyped(json: any, ignoreDiscriminator: boolean): StringEnumTwo {
+    return json as StringEnumTwo;
+}
+
+export function StringEnumTwoToJSON(value?: StringEnumTwo | null): any {
+    return value as any;
+}
+

samples/client/petstore/typescript-fetch/builds/enum/models/StringOneOf.ts

@@ -0,0 +1,51 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Enum test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import {
+    StringEnum,
+    StringEnumTwo,
+    StringEnumFromJSONTyped,
+    StringEnumToJSON,
+    StringEnumTwoFromJSONTyped,
+    StringEnumTwoToJSON,
+} from './';
+
+/**
+ * @type StringOneOf
+ * 
+ * @export
+ */
+export type StringOneOf = StringEnum | StringEnumTwo;
+
+export function StringOneOfFromJSON(json: any): StringOneOf {
+    return StringOneOfFromJSONTyped(json, false);
+}
+
+export function StringOneOfFromJSONTyped(json: any, ignoreDiscriminator: boolean): StringOneOf {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return StringEnumFromJSONTyped(json, true) || StringEnumTwoFromJSONTyped(json, true);
+}
+
+export function StringOneOfToJSON(value?: StringOneOf | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return StringEnumToJSON(value as StringEnum) || StringEnumTwoToJSON(value as StringEnumTwo);
+}
+

samples/client/petstore/typescript-fetch/builds/enum/models/index.ts

@@ -2,4 +2,8 @@ export * from './EnumPatternObject';
 export * from './InlineObject';
 export * from './InlineResponse200';
 export * from './NumberEnum';
+export * from './ObjectCombinedEnum';
+export * from './ObjectOneOfEnum';
 export * from './StringEnum';
+export * from './StringEnumTwo';
+export * from './StringOneOf';