fix: complex types (oneOf, anyOf)

Author: svolkov

src/index.js

@@ -37,6 +37,7 @@ module.exports = {
         fs.writeFileSync(path.resolve(__dirname, output, `./${name}`), sourceFile, _.noop)
         console.log(`✔️  your typescript api file created in "${output}"`)
       }
+
       resolve(sourceFile);
     }).catch(e =>{
       reject(e);

src/routes.js

@@ -46,6 +46,7 @@ const parseRoutes = (routes, parsedSchemas) =>
 
           return acc;
         }, {})
+
       return [
       ...routes,
       ..._.map(requestInfoByMethodsMap, (requestInfo, method) => {

src/schema.js

@@ -40,7 +40,7 @@ const complexTypeGetter = ({description, ...schema}) => parseSchema(schema, null
 const complexSchemaParsers = {
   'oneOf': (schema) => {
     // T1 | T2
-    const combined = _.map(schema.allOf, complexTypeGetter);
+    const combined = _.map(schema.oneOf, complexTypeGetter);
     return combined.join(' | ');
   },
   'allOf': (schema) => {
@@ -50,7 +50,7 @@ const complexSchemaParsers = {
   },
   'anyOf': (schema) => {
     // T1 | T2 | (T1 & T2)
-    const combined = _.map(schema.allOf, complexTypeGetter);
+    const combined = _.map(schema.anyOf, complexTypeGetter);
     return `${combined.join(' | ')}` + (combined.length > 1 ? ` | (${combined.join(' & ')})` : '');
   },
   // TODO

tests/generated/v3.0/anyof-example.ts

@@ -0,0 +1,114 @@
+/* tslint:disable */
+/* eslint-disable */
+
+/*
+* ---------------------------------------------------------------
+* ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+* ##                                                           ##
+* ## AUTHOR: acacode                                           ##
+* ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+* ---------------------------------------------------------------
+*/
+
+
+export interface PetByAge {
+  age?: number;
+  nickname?: string;
+}
+
+export interface PetByType {
+  pet_type?: "Cat" | "Dog";
+  hunts?: boolean;
+}
+
+export type RequestParams = Omit<RequestInit, "body" | "method"> & {
+  secure?: boolean;
+}
+
+type ApiConfig<SecurityDataType> = {
+  baseUrl?: string,
+  baseApiParams?: RequestParams,
+  securityWorker?: (securityData: SecurityDataType) => RequestParams,
+}
+
+
+
+export class Api<SecurityDataType> {
+  
+  public baseUrl = "";
+  public title = "Anyof Example";
+  public version = "1.0.0";
+
+  private securityData: SecurityDataType = (null as any);
+  private securityWorker: ApiConfig<SecurityDataType>["securityWorker"] = (() => {}) as any
+  
+  private baseApiParams: RequestParams = {
+    credentials: 'same-origin',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    redirect: 'follow',
+    referrerPolicy: 'no-referrer',
+  }
+
+  constructor({ baseUrl,baseApiParams,securityWorker, }: ApiConfig<SecurityDataType> = {}) {
+    this.baseUrl = baseUrl || this.baseUrl;
+    this.baseApiParams = baseApiParams || this.baseApiParams;
+    this.securityWorker = securityWorker || this.securityWorker;
+  }
+
+  public setSecurityData = (data: SecurityDataType) => {
+    this.securityData = data
+  }
+
+
+  private mergeRequestOptions(params: RequestParams, securityParams?: RequestParams): RequestParams {
+    return {
+      ...this.baseApiParams,
+      ...params,
+      ...(securityParams || {}),
+      headers: {
+        ...(this.baseApiParams.headers || {}),
+        ...(params.headers || {}),
+        ...((securityParams && securityParams.headers) || {})
+      }
+    }
+  }
+  
+  private safeParseResponse = <T = any>(response: Response): Promise<T> =>
+    response.json()
+      .then(data => data)
+      .catch(e => response.text);
+  
+  public request = <T = any>(
+    path: string,
+    method: string,
+    { secure, ...params }: RequestParams = {},
+    body?: any,
+    secureByDefault?: boolean,
+  ): Promise<T> =>
+    fetch(`${this.baseUrl}${path}`, {
+      // @ts-ignore
+      ...this.mergeRequestOptions(params, (secureByDefault || secure) && this.securityWorker(this.securityData)),
+      method,
+      body: body ? JSON.stringify(body) : null,
+    }).then(async response => {
+      const data = await this.safeParseResponse<T>(response);
+      if (!response.ok) throw data
+      return data
+    })
+
+
+
+  pets = {
+
+
+    /**
+    * @name patch
+    * @request PATCH:/pets
+    */
+    patch: (data: PetByAge | PetByType | (PetByAge & PetByType), params?: RequestParams) =>
+      this.request<any>(`/pets`, "PATCH", params, data),
+  }
+
+}

tests/schemas/v3.0/anyof-example.yaml

@@ -0,0 +1,39 @@
+openapi: "3.0.0"
+info:
+  title: Anyof Example
+  version: 1.0.0
+paths:
+  /pets:
+    patch:
+      requestBody:
+        content:
+          application/json:
+            schema:
+              anyOf:
+                - $ref: '#/components/schemas/PetByAge'
+                - $ref: '#/components/schemas/PetByType'
+      responses:
+        '200':
+          description: Updated
+components:
+  schemas:
+    PetByAge:
+      type: object
+      properties: 
+        age: 
+          type: integer
+        nickname: 
+          type: string
+      required:
+        - age
+          
+    PetByType:
+      type: object
+      properties:
+        pet_type:
+          type: string
+          enum: [Cat, Dog]
+        hunts:
+          type: boolean
+      required: 
+        - pet_type