[TypeScript] Generate oneOf schemas as type unions (#2647)

* [TypeScript] Generate oneOf schemas as type unions

* [TypeScript] Generate oneOf schemas as type unions

* [TypeScript] Generate oneOf schemas as type unions

update aurelia sample

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java

@@ -166,9 +166,9 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
                     }
                 }
             }
-            if (cm.oneOf.size() > 0) {
+            if (!cm.oneOf.isEmpty()) {
                 // For oneOfs only import $refs within the oneOf
-                TreeSet<String> oneOfRefs = new TreeSet<String>();
+                TreeSet<String> oneOfRefs = new TreeSet<>();
                 for (String im : cm.imports) {
                     if (cm.oneOf.contains(im)) {
                         oneOfRefs.add(im);

modules/openapi-generator/src/main/resources/typescript-angular/model.mustache

@@ -11,6 +11,6 @@ import { {{classname}} } from './{{filename}}';
  * {{{description}}}
  */
 {{/description}}
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#isAlias}}{{>modelAlias}}{{/isAlias}}{{^isAlias}}{{#taggedUnions}}{{>modelTaggedUnion}}{{/taggedUnions}}{{^taggedUnions}}{{>modelGeneric}}{{/taggedUnions}}{{/isAlias}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#isAlias}}{{>modelAlias}}{{/isAlias}}{{^isAlias}}{{#taggedUnions}}{{>modelTaggedUnion}}{{/taggedUnions}}{{^taggedUnions}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{^oneOf}}{{>modelGeneric}}{{/oneOf}}{{/taggedUnions}}{{/isAlias}}{{/isEnum}}
 {{/model}}
 {{/models}}

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

@@ -0,0 +1,14 @@
+{{#hasImports}}
+import {
+    {{#imports}}
+    {{{.}}},
+    {{/imports}}
+} from './';
+
+{{/hasImports}}
+/**
+ * @type {{classname}}{{#description}}
+ * {{{description}}}{{/description}}
+ * @export
+ */
+export type {{classname}} = {{#oneOf}}{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};

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

@@ -0,0 +1,6 @@
+/**
+ * @type {{classname}}{{#description}}
+ * {{{description}}}{{/description}}
+ * @export
+ */
+export type {{classname}} = {{#oneOf}}{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};

modules/openapi-generator/src/main/resources/typescript-aurelia/models.mustache

@@ -1,6 +1,8 @@
 {{>licenseInfo}}
 {{#models}}
 {{#model}}
+{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}
+{{^oneOf}}
 {{#description}}
 /**
  * {{{description}}}
@@ -35,5 +37,6 @@ export type {{{enumName}}} = {{#allowableValues}}{{#values}}'{{{.}}}'{{^-last}}
 {{/isEnum}}
 {{/vars}}
 {{/hasEnums}}
+{{/oneOf}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/typescript-axios/api.mustache

@@ -9,7 +9,7 @@ import globalAxios, { AxiosPromise, AxiosInstance } from 'axios';
 import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base';
 
 {{#models}}
-{{#model}}{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{>modelGeneric}}{{/isEnum}}{{/model}}
+{{#model}}{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{^isEnum}}{{^oneOf}}{{>modelGeneric}}{{/oneOf}}{{/isEnum}}{{/model}}
 {{/models}}
 {{#apiInfo}}{{#apis}}
 {{>apiInner}}

modules/openapi-generator/src/main/resources/typescript-axios/model.mustache

@@ -4,6 +4,6 @@
 {{#withSeparateModelsAndApi}}{{#imports}}
 import { {{class}} } from './{{filename}}';{{/imports}}{{/withSeparateModelsAndApi}}
 {{#models}}{{#model}}
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{>modelGeneric}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{^isEnum}}{{^oneOf}}{{>modelGeneric}}{{/oneOf}}{{/isEnum}}
 {{/model}}{{/models}}
 

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

@@ -0,0 +1,6 @@
+/**
+ * @type {{classname}}{{#description}}
+ * {{{description}}}{{/description}}
+ * @export
+ */
+export type {{classname}} = {{#oneOf}}{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};

modules/openapi-generator/src/main/resources/typescript-inversify/model.mustache

@@ -11,6 +11,6 @@ import { {{classname}} } from './{{filename}}';
  * {{{description}}}
  */
 {{/description}}
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#isAlias}}{{>modelAlias}}{{/isAlias}}{{^isAlias}}{{#taggedUnions}}{{>modelTaggedUnion}}{{/taggedUnions}}{{^taggedUnions}}{{>modelGeneric}}{{/taggedUnions}}{{/isAlias}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#isAlias}}{{>modelAlias}}{{/isAlias}}{{^isAlias}}{{#taggedUnions}}{{>modelTaggedUnion}}{{/taggedUnions}}{{^taggedUnions}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{^oneOf}}{{>modelGeneric}}{{/oneOf}}{{/taggedUnions}}{{/isAlias}}{{/isEnum}}
 {{/model}}
 {{/models}}

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

@@ -0,0 +1,14 @@
+{{#hasImports}}
+import {
+    {{#imports}}
+    {{{.}}},
+    {{/imports}}
+} from './';
+
+{{/hasImports}}
+/**
+ * @type {{classname}}{{#description}}
+ * {{{description}}}{{/description}}
+ * @export
+ */
+export type {{classname}} = {{#oneOf}}{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};

modules/openapi-generator/src/main/resources/typescript-jquery/model.mustache

@@ -8,6 +8,6 @@ import * as models from './models';
  * {{{description}}}
  */
 {{/description}}
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{>modelGeneric}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{^isEnum}}{{^oneOf}}{{>modelGeneric}}{{/oneOf}}{{/isEnum}}
 {{/model}}
 {{/models}}

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

@@ -0,0 +1,6 @@
+/**
+ * @type {{classname}}{{#description}}
+ * {{{description}}}{{/description}}
+ * @export
+ */
+export type {{classname}} = {{#oneOf}}models.{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};

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

@@ -0,0 +1,14 @@
+{{#hasImports}}
+import {
+    {{#imports}}
+    {{{.}}},
+    {{/imports}}
+} from './';
+
+{{/hasImports}}
+/**
+ * @type {{classname}}{{#description}}
+ * {{{description}}}{{/description}}
+ * @export
+ */
+export type {{classname}} = {{#oneOf}}{{{.}}}{{^-last}} | {{/-last}}{{/oneOf}};

modules/openapi-generator/src/main/resources/typescript-rxjs/models.mustache

@@ -2,11 +2,6 @@
 {{>licenseInfo}}
 {{#models}}
 {{#model}}
-{{#isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{#oneOf}}{{#-first}}{{>modelOneOf}}{{/-first}}{{/oneOf}}{{^isEnum}}{{^oneOf}}{{>modelGeneric}}{{/oneOf}}{{/isEnum}}
-{{>modelEnum}}
-{{/isEnum}}
-{{^isEnum}}
-{{>modelGeneric}}
-{{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/test/resources/3_0/oneOf.yaml

@@ -1,64 +1,36 @@
-{
+openapi: 3.0.1
-   "openapi":"3.0.1",
+info:
-   "info":{
+   title: fruity
-      "title":"fruity",
+   version: 0.0.1
-      "version":"0.0.1"
+paths:
-   },
+   /:
-   "paths":{
+      get:
-      "/":{
+         responses:
-         "get":{
+            '200':
-            "responses":{
+               description: desc
-               "200":{
+               content:
-                  "description":"desc",
+                  application/json:
-                  "content":{
+                     schema:
-                     "application/json":{
+                        $ref: '#/components/schemas/fruit'
-                        "schema":{
+components:
-                           "$ref":"#/components/schemas/fruit"
+   schemas:
-                        }
+      fruit:
-                     }
+         title: fruit
-                  }
+         properties:
-               }
+            color:
-            }
+               type: string
-         }
+         oneOf:
-      }
+            - $ref: '#/components/schemas/apple'
-   },
+            - $ref: '#/components/schemas/banana'
-   "components":{
+      apple:
-      "schemas":{
+         title: apple
-         "fruit":{
+         type: object
-            "title":"fruit",
+         properties:
-            "type":"object",
+            kind:
-            "properties":{
+               type: string
-               "color":{
+      banana:
-                  "type":"string"
+         title: banana
-               }
+         type: object
-            },
+         properties:
-            "oneOf":[
+            count:
-               {
+               type: number
-                  "$ref":"#/components/schemas/apple"
-               },
-               {
-                  "$ref":"#/components/schemas/banana"
-               }
-            ]
-         },
-         "apple":{
-            "title":"apple",
-            "type":"object",
-            "properties":{
-               "kind":{
-                  "type":"string"
-               }
-            }
-         },
-         "banana":{
-            "title":"banana",
-            "type":"object",
-            "properties":{
-               "count":{
-                  "type":"number"
-               }
-            }
-         }
-      }
-   }
-}

samples/client/petstore/typescript-aurelia/default/models.ts

@@ -10,6 +10,7 @@
  * Do not edit the class manually.
  */
 
+
 /**
  * Describes the result of uploading an image resource
  */
@@ -19,6 +20,7 @@ export interface ApiResponse {
   message?: string;
 }
 
+
 /**
  * A category for a pet
  */
@@ -27,6 +29,7 @@ export interface Category {
   name?: string;
 }
 
+
 /**
  * An order for a pets from the pet store
  */
@@ -47,6 +50,7 @@ export interface Order {
  */
 export type OrderStatusEnum = 'placed' | 'approved' | 'delivered';
 
+
 /**
  * A pet for sale in the pet store
  */
@@ -67,6 +71,7 @@ export interface Pet {
  */
 export type PetStatusEnum = 'available' | 'pending' | 'sold';
 
+
 /**
  * A tag for a pet
  */
@@ -75,6 +80,7 @@ export interface Tag {
   name?: string;
 }
 
+
 /**
  * A User who is purchasing from the pet store
  */