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

bin/configs/typescript-fetch-one-of.yaml

@@ -0,0 +1,3 @@
+generatorName: typescript-fetch
+outputDir: samples/client/petstore/typescript-fetch/builds/one-of
+inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-fetch/one-of.yaml

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'

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

@@ -0,0 +1,59 @@
+openapi: 3.0.0
+info:
+  version: 1.0.0
+  title: Enum test
+servers:
+  - url: http://localhost:3000
+paths:
+  /fake/enum-request-ref:
+    get:
+      operationId: fake-enum-request-get-ref
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PatternObject'
+    post:
+      operationId: fake-enum-request-post-ref
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PatternObject'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/PatternObject"
+components:
+  schemas:
+    PatternObject:
+      type: object
+      properties:
+        string:
+          type: string
+        nullable-string:
+          nullable: true
+          type: string
+        number-enum:
+          type: number
+    PatternObjectTwo:
+      type: object
+      properties:
+        boolean:
+          type: boolean
+    PropertyCombinedOneOf:
+      type: "object"
+      properties:
+        combined-string-enum:
+          oneOf:
+            - $ref: '#/components/schemas/PatternObject'
+            - $ref: '#/components/schemas/PatternObjectTwo'
+    ObjectCombinedOneOf:
+      oneOf:
+      - $ref: '#/components/schemas/PatternObject'
+      - $ref: '#/components/schemas/PatternObjectTwo'

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/default-v3.0/models/EnumClass.ts

@@ -23,11 +23,17 @@ export enum EnumClass {
     Xyz = '(xyz)'
 }
 
-export function EnumClassFromJSON(json: any): EnumClass {
+export function EnumClassFromJSON(json: any): EnumClass | null {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    if(!Object.values(EnumClass).includes(json as EnumClass)) {
+        return null;
+    }
     return EnumClassFromJSONTyped(json, false);
 }
 
-export function EnumClassFromJSONTyped(json: any, ignoreDiscriminator: boolean): EnumClass {
+export function EnumClassFromJSONTyped(json: any, ignoreDiscriminator: boolean): EnumClass | null {
     return json as EnumClass;
 }
 

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

@@ -23,11 +23,17 @@ export enum OuterEnum {
     Delivered = 'delivered'
 }
 
-export function OuterEnumFromJSON(json: any): OuterEnum {
+export function OuterEnumFromJSON(json: any): OuterEnum | null {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    if(!Object.values(OuterEnum).includes(json as OuterEnum)) {
+        return null;
+    }
     return OuterEnumFromJSONTyped(json, false);
 }
 
-export function OuterEnumFromJSONTyped(json: any, ignoreDiscriminator: boolean): OuterEnum {
+export function OuterEnumFromJSONTyped(json: any, ignoreDiscriminator: boolean): OuterEnum | null {
     return json as OuterEnum;
 }
 

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

@@ -23,11 +23,17 @@ export enum OuterEnumDefaultValue {
     Delivered = 'delivered'
 }
 
-export function OuterEnumDefaultValueFromJSON(json: any): OuterEnumDefaultValue {
+export function OuterEnumDefaultValueFromJSON(json: any): OuterEnumDefaultValue | null {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    if(!Object.values(OuterEnumDefaultValue).includes(json as OuterEnumDefaultValue)) {
+        return null;
+    }
     return OuterEnumDefaultValueFromJSONTyped(json, false);
 }
 
-export function OuterEnumDefaultValueFromJSONTyped(json: any, ignoreDiscriminator: boolean): OuterEnumDefaultValue {
+export function OuterEnumDefaultValueFromJSONTyped(json: any, ignoreDiscriminator: boolean): OuterEnumDefaultValue | null {
     return json as OuterEnumDefaultValue;
 }
 

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

@@ -23,11 +23,17 @@ export enum OuterEnumInteger {
     NUMBER_2 = 2
 }
 
-export function OuterEnumIntegerFromJSON(json: any): OuterEnumInteger {
+export function OuterEnumIntegerFromJSON(json: any): OuterEnumInteger | null {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    if(!Object.values(OuterEnumInteger).includes(json as OuterEnumInteger)) {
+        return null;
+    }
     return OuterEnumIntegerFromJSONTyped(json, false);
 }
 
-export function OuterEnumIntegerFromJSONTyped(json: any, ignoreDiscriminator: boolean): OuterEnumInteger {
+export function OuterEnumIntegerFromJSONTyped(json: any, ignoreDiscriminator: boolean): OuterEnumInteger | null {
     return json as OuterEnumInteger;
 }
 

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

@@ -23,11 +23,17 @@ export enum OuterEnumIntegerDefaultValue {
     NUMBER_2 = 2
 }
 
-export function OuterEnumIntegerDefaultValueFromJSON(json: any): OuterEnumIntegerDefaultValue {
+export function OuterEnumIntegerDefaultValueFromJSON(json: any): OuterEnumIntegerDefaultValue | null {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    if(!Object.values(OuterEnumIntegerDefaultValue).includes(json as OuterEnumIntegerDefaultValue)) {
+        return null;
+    }
     return OuterEnumIntegerDefaultValueFromJSONTyped(json, false);
 }
 
-export function OuterEnumIntegerDefaultValueFromJSONTyped(json: any, ignoreDiscriminator: boolean): OuterEnumIntegerDefaultValue {
+export function OuterEnumIntegerDefaultValueFromJSONTyped(json: any, ignoreDiscriminator: boolean): OuterEnumIntegerDefaultValue | null {
     return json as OuterEnumIntegerDefaultValue;
 }
 

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

@@ -5,6 +5,12 @@ models/EnumPatternObject.ts
 models/InlineObject.ts
 models/InlineResponse200.ts
 models/NumberEnum.ts
+models/NumberEnumTwo.ts
+models/NumberOneOf.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/NumberEnum.ts

@@ -18,16 +18,23 @@
  * @enum {string}
  */
 export enum NumberEnum {
+    NUMBER_0 = 0,
     NUMBER_1 = 1,
     NUMBER_2 = 2,
     NUMBER_3 = 3
 }
 
-export function NumberEnumFromJSON(json: any): NumberEnum {
+export function NumberEnumFromJSON(json: any): NumberEnum | null {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    if(!Object.values(NumberEnum).includes(json as NumberEnum)) {
+        return null;
+    }
     return NumberEnumFromJSONTyped(json, false);
 }
 
-export function NumberEnumFromJSONTyped(json: any, ignoreDiscriminator: boolean): NumberEnum {
+export function NumberEnumFromJSONTyped(json: any, ignoreDiscriminator: boolean): NumberEnum | null {
     return json as NumberEnum;
 }
 

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

@@ -0,0 +1,43 @@
+/* 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 NumberEnumTwo {
+    NUMBER_4 = 4,
+    NUMBER_5 = 5,
+    NUMBER_6 = 6
+}
+
+export function NumberEnumTwoFromJSON(json: any): NumberEnumTwo | null {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    if(!Object.values(NumberEnumTwo).includes(json as NumberEnumTwo)) {
+        return null;
+    }
+    return NumberEnumTwoFromJSONTyped(json, false);
+}
+
+export function NumberEnumTwoFromJSONTyped(json: any, ignoreDiscriminator: boolean): NumberEnumTwo | null {
+    return json as NumberEnumTwo;
+}
+
+export function NumberEnumTwoToJSON(value?: NumberEnumTwo | null): any {
+    return value as any;
+}
+

samples/client/petstore/typescript-fetch/builds/enum/models/NumberOneOf.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 {
+    NumberEnum,
+    NumberEnumTwo,
+    NumberEnumFromJSONTyped,
+    NumberEnumToJSON,
+    NumberEnumTwoFromJSONTyped,
+    NumberEnumTwoToJSON,
+} from './';
+
+/**
+ * @type NumberOneOf
+ * 
+ * @export
+ */
+export type NumberOneOf = NumberEnum | NumberEnumTwo;
+
+export function NumberOneOfFromJSON(json: any): NumberOneOf {
+    return NumberOneOfFromJSONTyped(json, false);
+}
+
+export function NumberOneOfFromJSONTyped(json: any, ignoreDiscriminator: boolean): NumberOneOf {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return NumberEnumFromJSONTyped(json, true) || NumberEnumTwoFromJSONTyped(json, true);
+}
+
+export function NumberOneOfToJSON(value?: NumberOneOf | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return NumberEnumToJSON(value as NumberEnum) ?? NumberEnumTwoToJSON(value as NumberEnumTwo);
+}
+