- Supporting old NodeJS (no flatMap method)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.2.6",
+    "version": "0.2.7",
     "description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",

src/index.spec.ts

@@ -5,6 +5,8 @@ describe('index', () => {
         OpenAPI.generate({
             input: './test/mock/v2/spec.json',
             output: './test/result/v2/',
+            useOptions: true,
+            useUnionTypes: true,
             write: false,
         });
     });
@@ -13,6 +15,8 @@ describe('index', () => {
         OpenAPI.generate({
             input: './test/mock/v3/spec.json',
             output: './test/result/v3/',
+            useOptions: true,
+            useUnionTypes: true,
             write: false,
         });
     });

src/utils/flatMap.ts

@@ -0,0 +1,11 @@
+/**
+ * Calls a defined callback function on each element of an array.
+ * Then, flattens the result into a new array.
+ */
+export function flatMap<U, T>(array: T[], callback: (value: T, index: number, array: T[]) => U[]): U[] {
+    const result: U[] = [];
+    array.map(callback).forEach(arr => {
+        result.push(...arr);
+    });
+    return result;
+}

src/utils/getExtendedByList.ts

@@ -1,6 +1,7 @@
 import { Client } from '../client/interfaces/Client';
 import { Model } from '../client/interfaces/Model';
 import { unique } from './unique';
+import { flatMap } from './flatMap';
 
 /**
  * Get the full list of models that are extended by the given model.
@@ -17,7 +18,7 @@ export function getExtendedByList(model: Model, client: Client): Model[] {
     });
 
     if (extendedBy.length) {
-        extendedBy.push(...extendedBy.flatMap(ref => getExtendedByList(ref, client)));
+        extendedBy.push(...flatMap(extendedBy, ref => getExtendedByList(ref, client)));
     }
     return extendedBy.filter(unique);
 }

src/utils/getExtendedFromList.ts

@@ -1,6 +1,7 @@
 import { Client } from '../client/interfaces/Client';
 import { Model } from '../client/interfaces/Model';
 import { unique } from './unique';
+import { flatMap } from './flatMap';
 
 /**
  * Get the full list of models that are extended from the given model.
@@ -17,7 +18,7 @@ export function getExtendedFromList(model: Model, client: Client): Model[] {
     });
 
     if (extendedFrom.length) {
-        extendedFrom.push(...extendedFrom.flatMap(ref => getExtendedFromList(ref, client)));
+        extendedFrom.push(...flatMap(extendedFrom, ref => getExtendedFromList(ref, client)));
     }
     return extendedFrom.filter(unique);
 }

src/utils/postProcessServiceOperations.ts

@@ -2,6 +2,7 @@ import { Client } from '../client/interfaces/Client';
 import { Operation } from '../client/interfaces/Operation';
 import { Service } from '../client/interfaces/Service';
 import { postProcessUnionTypes } from './postProcessUnionTypes';
+import { flatMap } from './flatMap';
 
 export function postProcessServiceOperations(service: Service, client: Client, useUnionTypes: boolean = false): Operation[] {
     const names = new Map<string, number>();
@@ -13,8 +14,8 @@ export function postProcessServiceOperations(service: Service, client: Client, u
         // properties of models. These methods will extend the type if needed.
         clone.parameters = clone.parameters.map(parameter => postProcessUnionTypes(parameter, client, useUnionTypes));
         clone.results = clone.results.map(result => postProcessUnionTypes(result, client, useUnionTypes));
-        clone.imports.push(...clone.parameters.flatMap(parameter => parameter.imports));
-        clone.imports.push(...clone.results.flatMap(result => result.imports));
+        clone.imports.push(...flatMap(clone.parameters, parameter => parameter.imports));
+        clone.imports.push(...flatMap(clone.results, result => result.imports));
 
         // Check of the operation name
         const name = clone.name;

test/__snapshots__/index.spec.js.snap

@@ -528,12 +528,14 @@ exports[`generation v2 file(./test/result/v2/models/ArrayWithArray.ts): ./test/r
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a simple array containing an array
  */
-export type ArrayWithArray = Array<Array<ModelWithString>>;"
+export type ArrayWithArray = Array<Array<ModelThatExtends | ModelThatExtendsExtends | ModelWithString>>;"
 `;
 
 exports[`generation v2 file(./test/result/v2/models/ArrayWithBooleans.ts): ./test/result/v2/models/ArrayWithBooleans.ts 1`] = `
@@ -624,12 +626,14 @@ exports[`generation v2 file(./test/result/v2/models/DictionaryWithArray.ts): ./t
 /* prettier-ignore */
 
 import { Dictionary } from './Dictionary';
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a complex dictionary
  */
-export type DictionaryWithArray = Dictionary<Array<ModelWithString>>;"
+export type DictionaryWithArray = Dictionary<Array<ModelThatExtends | ModelThatExtendsExtends | ModelWithString>>;"
 `;
 
 exports[`generation v2 file(./test/result/v2/models/DictionaryWithDictionary.ts): ./test/result/v2/models/DictionaryWithDictionary.ts 1`] = `
@@ -791,6 +795,7 @@ exports[`generation v2 file(./test/result/v2/models/ModelThatExtends.ts): ./test
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
@@ -798,7 +803,7 @@ import { ModelWithString } from './ModelWithString';
  */
 export interface ModelThatExtends extends ModelWithString {
     propExtendsA?: string;
-    propExtendsB?: ModelWithString;
+    propExtendsB?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -817,7 +822,7 @@ import { ModelWithString } from './ModelWithString';
  */
 export interface ModelThatExtendsExtends extends ModelWithString, ModelThatExtends {
     propExtendsC?: string;
-    propExtendsD?: ModelWithString;
+    propExtendsD?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -828,13 +833,15 @@ exports[`generation v2 file(./test/result/v2/models/ModelWithArray.ts): ./test/r
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a model with one property containing an array
  */
 export interface ModelWithArray {
-    prop?: Array<ModelWithString>;
+    prop?: Array<ModelThatExtends | ModelThatExtendsExtends | ModelWithString>;
     propWithFile?: Array<File>;
     propWithNumber?: Array<number>;
 }
@@ -899,15 +906,17 @@ exports[`generation v2 file(./test/result/v2/models/ModelWithDuplicateImports.ts
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a model with duplicated imports
  */
 export interface ModelWithDuplicateImports {
-    propA?: ModelWithString;
-    propB?: ModelWithString;
-    propC?: ModelWithString;
+    propA?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
+    propB?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
+    propC?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -918,13 +927,15 @@ exports[`generation v2 file(./test/result/v2/models/ModelWithDuplicateProperties
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a model with duplicated properties
  */
 export interface ModelWithDuplicateProperties {
-    prop?: ModelWithString;
+    prop?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -1115,6 +1126,8 @@ exports[`generation v2 file(./test/result/v2/models/ModelWithProperties.ts): ./t
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
@@ -1126,7 +1139,7 @@ export interface ModelWithProperties {
     string?: string;
     number?: number;
     boolean?: boolean;
-    reference?: ModelWithString;
+    reference?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -1444,7 +1457,7 @@ export const $ModelThatExtends = {
             type: 'string',
         },
         propExtendsB: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -1467,7 +1480,7 @@ export const $ModelThatExtendsExtends = {
             type: 'string',
         },
         propExtendsD: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -1548,13 +1561,13 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithDuplicateImports.
 export const $ModelWithDuplicateImports = {
     properties: {
         propA: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
         propB: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
         propC: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -1569,7 +1582,7 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithDuplicateProperti
 export const $ModelWithDuplicateProperties = {
     properties: {
         prop: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -1768,7 +1781,7 @@ export const $ModelWithProperties = {
             type: 'boolean',
         },
         reference: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -1876,6 +1889,8 @@ exports[`generation v2 file(./test/result/v2/services/ComplexService.ts): ./test
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from '../models/ModelThatExtends';
+import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
@@ -1889,7 +1904,10 @@ export class ComplexService {
      * @result ModelWithString Successful response
      * @throws ApiError
      */
-    public static async complexTypes(
+    public static async complexTypes({
+        parameterObject,
+        parameterReference,
+    }: {
         parameterObject: {
             first?: {
                 second?: {
@@ -1897,8 +1915,8 @@ export class ComplexService {
                 },
             },
         },
-        parameterReference: ModelWithString,
-    ): Promise<Array<ModelWithString>> {
+        parameterReference: ModelThatExtends | ModelThatExtendsExtends | ModelWithString,
+    }): Promise<Array<ModelThatExtends | ModelThatExtendsExtends | ModelWithString>> {
 
         const result = await __request({
             method: 'get',
@@ -1930,6 +1948,8 @@ exports[`generation v2 file(./test/result/v2/services/DefaultsService.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from '../models/ModelThatExtends';
+import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
@@ -1945,15 +1965,21 @@ export class DefaultsService {
      * @param parameterModel This is a simple model
      * @throws ApiError
      */
-    public static async callWithDefaultParameters(
-        parameterString: string = 'Hello World!',
-        parameterNumber: number = 123,
-        parameterBoolean: boolean = true,
-        parameterEnum: ('Success' | 'Warning' | 'Error') = 'Success',
-        parameterModel: ModelWithString = {
+    public static async callWithDefaultParameters({
+        parameterString = 'Hello World!',
+        parameterNumber = 123,
+        parameterBoolean = true,
+        parameterEnum = 'Success',
+        parameterModel = {
             \\"prop\\": \\"Hello World\\"
         },
-    ): Promise<void> {
+    }: {
+        parameterString: string,
+        parameterNumber: number,
+        parameterBoolean: boolean,
+        parameterEnum: ('Success' | 'Warning' | 'Error'),
+        parameterModel: ModelThatExtends | ModelThatExtendsExtends | ModelWithString,
+    }): Promise<void> {
 
         const result = await __request({
             method: 'get',
@@ -2069,12 +2095,17 @@ export class ParametersService {
      * @param parameterBody This is the parameter that is send as request body
      * @throws ApiError
      */
-    public static async callWithParameters(
+    public static async callWithParameters({
+        parameterHeader,
+        parameterQuery,
+        parameterForm,
+        parameterBody,
+    }: {
         parameterHeader: string,
         parameterQuery: string,
         parameterForm: string,
         parameterBody: string,
-    ): Promise<void> {
+    }): Promise<void> {
 
         const result = await __request({
             method: 'get',
@@ -2106,7 +2137,15 @@ export class ParametersService {
      * @param parameterPath3 This is the parameter that goes into the path
      * @throws ApiError
      */
-    public static async callWithWeirdParameterNames(
+    public static async callWithWeirdParameterNames({
+        parameterHeader,
+        parameterQuery,
+        parameterForm,
+        parameterBody,
+        parameterPath1,
+        parameterPath2,
+        parameterPath3,
+    }: {
         parameterHeader: string,
         parameterQuery: string,
         parameterForm: string,
@@ -2114,7 +2153,7 @@ export class ParametersService {
         parameterPath1?: string,
         parameterPath2?: string,
         parameterPath3?: string,
-    ): Promise<void> {
+    }): Promise<void> {
 
         const result = await __request({
             method: 'get',
@@ -2158,7 +2197,7 @@ export class ResponseService {
      * @result ModelWithString Message for default response
      * @throws ApiError
      */
-    public static async callWithResponse(): Promise<ModelWithString> {
+    public static async callWithResponse(): Promise<ModelThatExtends | ModelThatExtendsExtends | ModelWithString> {
 
         const result = await __request({
             method: 'get',
@@ -2174,7 +2213,7 @@ export class ResponseService {
      * @result ModelWithString Message for default response
      * @throws ApiError
      */
-    public static async callWithDuplicateResponses(): Promise<ModelWithString> {
+    public static async callWithDuplicateResponses(): Promise<ModelThatExtends | ModelThatExtendsExtends | ModelWithString> {
 
         const result = await __request({
             method: 'post',
@@ -2200,7 +2239,7 @@ export class ResponseService {
      * @result ModelThatExtendsExtends Message for 202 response
      * @throws ApiError
      */
-    public static async callWithResponses(): Promise<ModelWithString | ModelThatExtends | ModelThatExtendsExtends> {
+    public static async callWithResponses(): Promise<ModelThatExtends | ModelThatExtendsExtends | ModelWithString | ModelThatExtends | ModelThatExtendsExtends | ModelThatExtendsExtends> {
 
         const result = await __request({
             method: 'put',
@@ -2371,16 +2410,25 @@ export class TypesService {
      * @result any Response is a simple object
      * @throws ApiError
      */
-    public static async types(
-        parameterNumber: number = 123,
-        parameterString: string = 'default',
-        parameterBoolean: boolean = true,
-        parameterObject: any = null,
+    public static async types({
+        parameterNumber = 123,
+        parameterString = 'default',
+        parameterBoolean = true,
+        parameterObject = null,
+        parameterArray,
+        parameterDictionary,
+        parameterEnum,
+        id,
+    }: {
+        parameterNumber: number,
+        parameterString: string,
+        parameterBoolean: boolean,
+        parameterObject: any,
         parameterArray: Array<string>,
         parameterDictionary: Dictionary<string>,
         parameterEnum: ('Success' | 'Warning' | 'Error'),
         id?: number,
-    ): Promise<number | string | boolean | any> {
+    }): Promise<number | string | boolean | any> {
 
         const result = await __request({
             method: 'get',
@@ -2938,12 +2986,14 @@ exports[`generation v3 file(./test/result/v3/models/ArrayWithArray.ts): ./test/r
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a simple array containing an array
  */
-export type ArrayWithArray = Array<Array<ModelWithString>>;"
+export type ArrayWithArray = Array<Array<ModelThatExtends | ModelThatExtendsExtends | ModelWithString>>;"
 `;
 
 exports[`generation v3 file(./test/result/v3/models/ArrayWithBooleans.ts): ./test/result/v3/models/ArrayWithBooleans.ts 1`] = `
@@ -3034,12 +3084,14 @@ exports[`generation v3 file(./test/result/v3/models/DictionaryWithArray.ts): ./t
 /* prettier-ignore */
 
 import { Dictionary } from './Dictionary';
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a complex dictionary
  */
-export type DictionaryWithArray = Dictionary<Array<ModelWithString>>;"
+export type DictionaryWithArray = Dictionary<Array<ModelThatExtends | ModelThatExtendsExtends | ModelWithString>>;"
 `;
 
 exports[`generation v3 file(./test/result/v3/models/DictionaryWithDictionary.ts): ./test/result/v3/models/DictionaryWithDictionary.ts 1`] = `
@@ -3201,6 +3253,7 @@ exports[`generation v3 file(./test/result/v3/models/ModelThatExtends.ts): ./test
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
@@ -3208,7 +3261,7 @@ import { ModelWithString } from './ModelWithString';
  */
 export interface ModelThatExtends extends ModelWithString {
     propExtendsA?: string;
-    propExtendsB?: ModelWithString;
+    propExtendsB?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -3227,7 +3280,7 @@ import { ModelWithString } from './ModelWithString';
  */
 export interface ModelThatExtendsExtends extends ModelWithString, ModelThatExtends {
     propExtendsC?: string;
-    propExtendsD?: ModelWithString;
+    propExtendsD?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -3238,6 +3291,8 @@ exports[`generation v3 file(./test/result/v3/models/ModelWithAnyOf.ts): ./test/r
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithArray } from './ModelWithArray';
 import { ModelWithDictionary } from './ModelWithDictionary';
 import { ModelWithEnum } from './ModelWithEnum';
@@ -3247,7 +3302,7 @@ import { ModelWithString } from './ModelWithString';
  * This is a model with one property with a 'any of' relationship
  */
 export interface ModelWithAnyOf {
-    propA?: ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString;
+    propA?: ModelThatExtends | ModelThatExtendsExtends | ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString;
 }
 "
 `;
@@ -3258,13 +3313,15 @@ exports[`generation v3 file(./test/result/v3/models/ModelWithArray.ts): ./test/r
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a model with one property containing an array
  */
 export interface ModelWithArray {
-    prop?: Array<ModelWithString>;
+    prop?: Array<ModelThatExtends | ModelThatExtendsExtends | ModelWithString>;
     propWithFile?: Array<File>;
     propWithNumber?: Array<number>;
 }
@@ -3329,15 +3386,17 @@ exports[`generation v3 file(./test/result/v3/models/ModelWithDuplicateImports.ts
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a model with duplicated imports
  */
 export interface ModelWithDuplicateImports {
-    propA?: ModelWithString;
-    propB?: ModelWithString;
-    propC?: ModelWithString;
+    propA?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
+    propB?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
+    propC?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -3348,13 +3407,15 @@ exports[`generation v3 file(./test/result/v3/models/ModelWithDuplicateProperties
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
  * This is a model with duplicated properties
  */
 export interface ModelWithDuplicateProperties {
-    prop?: ModelWithString;
+    prop?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -3508,6 +3569,8 @@ exports[`generation v3 file(./test/result/v3/models/ModelWithOneOf.ts): ./test/r
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithArray } from './ModelWithArray';
 import { ModelWithDictionary } from './ModelWithDictionary';
 import { ModelWithEnum } from './ModelWithEnum';
@@ -3517,7 +3580,7 @@ import { ModelWithString } from './ModelWithString';
  * This is a model with one property with a 'one of' relationship
  */
 export interface ModelWithOneOf {
-    propA?: ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString;
+    propA?: ModelThatExtends | ModelThatExtendsExtends | ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString;
 }
 "
 `;
@@ -3565,6 +3628,8 @@ exports[`generation v3 file(./test/result/v3/models/ModelWithProperties.ts): ./t
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from './ModelThatExtends';
+import { ModelThatExtendsExtends } from './ModelThatExtendsExtends';
 import { ModelWithString } from './ModelWithString';
 
 /**
@@ -3577,7 +3642,7 @@ export interface ModelWithProperties {
     string?: string;
     number?: number;
     boolean?: boolean;
-    reference?: ModelWithString;
+    reference?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString;
 }
 "
 `;
@@ -3895,7 +3960,7 @@ export const $ModelThatExtends = {
             type: 'string',
         },
         propExtendsB: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -3918,7 +3983,7 @@ export const $ModelThatExtendsExtends = {
             type: 'string',
         },
         propExtendsD: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -3933,7 +3998,7 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithAnyOf.ts): ./test
 export const $ModelWithAnyOf = {
     properties: {
         propA: {
-            type: 'ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString',
         },
     },
 };"
@@ -4014,13 +4079,13 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithDuplicateImports.
 export const $ModelWithDuplicateImports = {
     properties: {
         propA: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
         propB: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
         propC: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -4035,7 +4100,7 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithDuplicateProperti
 export const $ModelWithDuplicateProperties = {
     properties: {
         prop: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -4166,7 +4231,7 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithOneOf.ts): ./test
 export const $ModelWithOneOf = {
     properties: {
         propA: {
-            type: 'ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString',
         },
     },
 };"
@@ -4257,7 +4322,7 @@ export const $ModelWithProperties = {
             type: 'boolean',
         },
         reference: {
-            type: 'ModelWithString',
+            type: 'ModelThatExtends | ModelThatExtendsExtends | ModelWithString',
         },
     },
 };"
@@ -4365,6 +4430,8 @@ exports[`generation v3 file(./test/result/v3/services/ComplexService.ts): ./test
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from '../models/ModelThatExtends';
+import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithArray } from '../models/ModelWithArray';
 import { ModelWithDictionary } from '../models/ModelWithDictionary';
 import { ModelWithEnum } from '../models/ModelWithEnum';
@@ -4381,7 +4448,10 @@ export class ComplexService {
      * @result ModelWithString Successful response
      * @throws ApiError
      */
-    public static async complexTypes(
+    public static async complexTypes({
+        parameterObject,
+        parameterReference,
+    }: {
         parameterObject: {
             first?: {
                 second?: {
@@ -4389,8 +4459,8 @@ export class ComplexService {
                 },
             },
         },
-        parameterReference: ModelWithString,
-    ): Promise<Array<ModelWithString>> {
+        parameterReference: ModelThatExtends | ModelThatExtendsExtends | ModelWithString,
+    }): Promise<Array<ModelThatExtends | ModelThatExtendsExtends | ModelWithString>> {
 
         const result = await __request({
             method: 'get',
@@ -4419,22 +4489,25 @@ export class ComplexService {
      * @result ModelWithString Success
      * @throws ApiError
      */
-    public static async complexParams(
+    public static async complexParams({
+        id,
+        requestBody,
+    }: {
         id: number,
         requestBody?: {
             readonly key: string | null,
             name: string | null,
             enabled?: boolean,
             readonly type: ('Monkey' | 'Horse' | 'Bird'),
-            listOfModels?: Array<ModelWithString> | null,
+            listOfModels?: Array<ModelThatExtends | ModelThatExtendsExtends | ModelWithString> | null,
             listOfStrings?: Array<string> | null,
-            parameters: ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString,
+            parameters: ModelThatExtends | ModelThatExtendsExtends | ModelWithArray | ModelWithDictionary | ModelWithEnum | ModelWithString,
             readonly user?: {
                 readonly id?: number,
                 readonly name?: string | null,
             },
         },
-    ): Promise<ModelWithString> {
+    }): Promise<ModelThatExtends | ModelThatExtendsExtends | ModelWithString> {
 
         const result = await __request({
             method: 'put',
@@ -4456,6 +4529,8 @@ exports[`generation v3 file(./test/result/v3/services/DefaultsService.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from '../models/ModelThatExtends';
+import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
@@ -4471,15 +4546,21 @@ export class DefaultsService {
      * @param parameterModel This is a simple model
      * @throws ApiError
      */
-    public static async callWithDefaultParameters(
-        parameterString: string | null = 'Hello World!',
-        parameterNumber: number | null = 123,
-        parameterBoolean: boolean | null = true,
-        parameterEnum: ('Success' | 'Warning' | 'Error') = 'Success',
-        parameterModel: ModelWithString | null = {
+    public static async callWithDefaultParameters({
+        parameterString = 'Hello World!',
+        parameterNumber = 123,
+        parameterBoolean = true,
+        parameterEnum = 'Success',
+        parameterModel = {
             \\"prop\\": \\"Hello World\\"
         },
-    ): Promise<void> {
+    }: {
+        parameterString: string | null,
+        parameterNumber: number | null,
+        parameterBoolean: boolean | null,
+        parameterEnum: ('Success' | 'Warning' | 'Error'),
+        parameterModel: ModelThatExtends | ModelThatExtendsExtends | ModelWithString | null,
+    }): Promise<void> {
 
         const result = await __request({
             method: 'get',
@@ -4619,6 +4700,8 @@ exports[`generation v3 file(./test/result/v3/services/ParametersService.ts): ./t
 /* eslint-disable */
 /* prettier-ignore */
 
+import { ModelThatExtends } from '../models/ModelThatExtends';
+import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
@@ -4634,13 +4717,19 @@ export class ParametersService {
      * @param requestBody This is the parameter that goes into the body
      * @throws ApiError
      */
-    public static async callWithParameters(
+    public static async callWithParameters({
+        parameterHeader,
+        parameterQuery,
+        parameterForm,
+        parameterCookie,
+        requestBody,
+    }: {
         parameterHeader: string | null,
         parameterQuery: string | null,
         parameterForm: string | null,
         parameterCookie: string | null,
-        requestBody: ModelWithString | null,
-    ): Promise<void> {
+        requestBody: ModelThatExtends | ModelThatExtendsExtends | ModelWithString | null,
+    }): Promise<void> {
 
         const result = await __request({
             method: 'get',
@@ -4676,16 +4765,25 @@ export class ParametersService {
      * @param parameterPath3 This is the parameter that goes into the path
      * @throws ApiError
      */
-    public static async callWithWeirdParameterNames(
+    public static async callWithWeirdParameterNames({
+        parameterHeader,
+        parameterQuery,
+        parameterForm,
+        parameterCookie,
+        requestBody,
+        parameterPath1,
+        parameterPath2,
+        parameterPath3,
+    }: {
         parameterHeader: string | null,
         parameterQuery: string | null,
         parameterForm: string | null,
         parameterCookie: string | null,
-        requestBody: ModelWithString | null,
+        requestBody: ModelThatExtends | ModelThatExtendsExtends | ModelWithString | null,
         parameterPath1?: string,
         parameterPath2?: string,
         parameterPath3?: string,
-    ): Promise<void> {
+    }): Promise<void> {
 
         const result = await __request({
             method: 'get',
@@ -4715,10 +4813,13 @@ export class ParametersService {
      * @param parameter This is an optional parameter
      * @throws ApiError
      */
-    public static async getCallWithOptionalParam(
-        requestBody: ModelWithString,
+    public static async getCallWithOptionalParam({
+        requestBody,
+        parameter,
+    }: {
+        requestBody: ModelThatExtends | ModelThatExtendsExtends | ModelWithString,
         parameter?: string,
-    ): Promise<void> {
+    }): Promise<void> {
 
         const result = await __request({
             method: 'get',
@@ -4739,10 +4840,13 @@ export class ParametersService {
      * @param requestBody This is an optional parameter
      * @throws ApiError
      */
-    public static async postCallWithOptionalParam(
+    public static async postCallWithOptionalParam({
+        parameter,
+        requestBody,
+    }: {
         parameter: string,
-        requestBody?: ModelWithString,
-    ): Promise<void> {
+        requestBody?: ModelThatExtends | ModelThatExtendsExtends | ModelWithString,
+    }): Promise<void> {
 
         const result = await __request({
             method: 'post',
@@ -4780,7 +4884,7 @@ export class ResponseService {
      * @result ModelWithString
      * @throws ApiError
      */
-    public static async callWithResponse(): Promise<ModelWithString> {
+    public static async callWithResponse(): Promise<ModelThatExtends | ModelThatExtendsExtends | ModelWithString> {
 
         const result = await __request({
             method: 'get',
@@ -4796,7 +4900,7 @@ export class ResponseService {
      * @result ModelWithString Message for default response
      * @throws ApiError
      */
-    public static async callWithDuplicateResponses(): Promise<ModelWithString> {
+    public static async callWithDuplicateResponses(): Promise<ModelThatExtends | ModelThatExtendsExtends | ModelWithString> {
 
         const result = await __request({
             method: 'post',
@@ -4822,7 +4926,7 @@ export class ResponseService {
      * @result ModelThatExtendsExtends Message for 202 response
      * @throws ApiError
      */
-    public static async callWithResponses(): Promise<ModelWithString | ModelThatExtends | ModelThatExtendsExtends> {
+    public static async callWithResponses(): Promise<ModelThatExtends | ModelThatExtendsExtends | ModelWithString | ModelThatExtends | ModelThatExtendsExtends | ModelThatExtendsExtends> {
 
         const result = await __request({
             method: 'put',
@@ -4992,16 +5096,25 @@ export class TypesService {
      * @result any Response is a simple object
      * @throws ApiError
      */
-    public static async types(
-        parameterNumber: number = 123,
-        parameterString: string | null = 'default',
-        parameterBoolean: boolean | null = true,
-        parameterObject: any = null,
+    public static async types({
+        parameterNumber = 123,
+        parameterString = 'default',
+        parameterBoolean = true,
+        parameterObject = null,
+        parameterArray,
+        parameterDictionary,
+        parameterEnum,
+        id,
+    }: {
+        parameterNumber: number,
+        parameterString: string | null,
+        parameterBoolean: boolean | null,
+        parameterObject: any,
         parameterArray: Array<string> | null,
         parameterDictionary: any,
         parameterEnum: ('Success' | 'Warning' | 'Error') | null,
         id?: number,
-    ): Promise<number | string | boolean | any> {
+    }): Promise<number | string | boolean | any> {
 
         const result = await __request({
             method: 'get',
@@ -5042,9 +5155,11 @@ export class UploadService {
      * @result boolean
      * @throws ApiError
      */
-    public static async uploadFile(
+    public static async uploadFile({
+        file,
+    }: {
         file: File,
-    ): Promise<boolean> {
+    }): Promise<boolean> {
 
         const result = await __request({
             method: 'post',

test/index.js

@@ -22,8 +22,8 @@ OpenAPI.generate({
     input: './test/mock/v2/spec.json',
     output: './test/result/v2/',
     httpClient: OpenAPI.HttpClient.FETCH,
-    useOptions: false,
-    useUnionTypes: false,
+    useOptions: true,
+    useUnionTypes: true,
     exportSchemas: true,
     exportServices: true,
 });
@@ -32,8 +32,8 @@ OpenAPI.generate({
     input: './test/mock/v3/spec.json',
     output: './test/result/v3/',
     httpClient: OpenAPI.HttpClient.FETCH,
-    useOptions: false,
-    useUnionTypes: false,
+    useOptions: true,
+    useUnionTypes: true,
     exportSchemas: true,
     exportServices: true,
 });

test/index.spec.js

@@ -10,8 +10,8 @@ describe('generation', () => {
             input: './test/mock/v2/spec.json',
             output: './test/result/v2/',
             httpClient: OpenAPI.HttpClient.FETCH,
-            useOptions: false,
-            useUnionTypes: false,
+            useOptions: true,
+            useUnionTypes: true,
             exportSchemas: true,
             exportServices: true,
         });
@@ -31,8 +31,8 @@ describe('generation', () => {
             input: './test/mock/v3/spec.json',
             output: './test/result/v3/',
             httpClient: OpenAPI.HttpClient.FETCH,
-            useOptions: false,
-            useUnionTypes: false,
+            useOptions: true,
+            useUnionTypes: true,
             exportSchemas: true,
             exportServices: true,
         });