Add tests for v3

Author: drwpow

.gitignore

@@ -1,6 +1,6 @@
 .cache
 .DS_Store
-./generated/*.ts
+**/generated/*.ts
 coverage
 pkg
 node_modules

bin/cli.js

@@ -45,6 +45,16 @@ const timeStart = process.hrtime();
   // Write to file if specifying output
   if (cli.flags.output) {
     const outputFile = path.resolve(process.cwd(), cli.flags.output);
+
+    // recursively create parent directories if they don’t exist
+    const parentDirs = cli.flags.output.split(path.sep);
+    for (var i = 1; i < parentDirs.length; i++) {
+      const dir = path.resolve(process.cwd(), ...parentDirs.slice(0, i));
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir);
+      }
+    }
+
     fs.writeFileSync(outputFile, result, "utf8");
 
     const timeEnd = process.hrtime(timeStart);

src/types/OpenAPI3.ts

@@ -19,12 +19,14 @@ export type OpenAPI3Type =
   | "object"
   | "string";
 
-export type OpenAPI3Reference = { $ref: string };
+export type OpenAPI3Reference =
+  | { $ref: string }
+  | { anyOf: (OpenAPI3SchemaObject | OpenAPI3Reference)[] }
+  | { oneOf: (OpenAPI3SchemaObject | OpenAPI3Reference)[] };
 
 export interface OpenAPI3SchemaObject {
   additionalProperties?: OpenAPI3SchemaObject | OpenAPI3Reference | boolean;
   allOf?: (OpenAPI3SchemaObject | OpenAPI3Reference)[];
-  anyOf?: (OpenAPI3SchemaObject | OpenAPI3Reference)[];
   description?: string;
   enum?: string[];
   items?: OpenAPI3SchemaObject | OpenAPI3Reference;

src/utils.ts

@@ -50,6 +50,16 @@ export function isObjNode(node: any): boolean {
   );
 }
 
+/**
+ * Return ture if oneOf type
+ */
+export function isOneOfNode(node: any): boolean {
+  if (!isSchemaObj(node)) {
+    return false;
+  }
+  return Array.isArray(node.oneOf);
+}
+
 /**
  * Return true if item is schema object
  */
@@ -58,7 +68,12 @@ export function isSchemaObj(obj: any): boolean {
     return false;
   }
   return (
-    !!obj.type || !!obj.properties || !!obj.allOf || !!obj.additionalProperties
+    !!obj.additionalProperties ||
+    !!obj.allOf ||
+    !!obj.anyOf ||
+    !!obj.oneOf ||
+    !!obj.properties ||
+    !!obj.type
   );
 }
 

src/v2.ts

@@ -47,7 +47,11 @@ export default function generateTypesV2(
     JSON.stringify(schema.definitions),
     (_, node) =>
       node && node["$ref"]
-        ? escape(`definitions['${node.$ref.replace("#/definitions/", "")}']`) // important: use single-quotes here for JSON (you can always change w/ Prettier at the end)
+        ? escape(
+            `definitions['${node.$ref
+              .replace("#/definitions/", "")
+              .replace(/\//g, "']['")}']`
+          ) // important: use single-quotes here for JSON (you can always change w/ Prettier at the end)
         : node // return by default
   );
 

src/v3.ts

@@ -11,6 +11,7 @@ import {
   tsIntersectionOf,
   tsUnionOf,
   unescape,
+  isOneOfNode,
 } from "./utils";
 
 export const PRIMITIVES: { [key: string]: "boolean" | "string" | "number" } = {
@@ -35,26 +36,31 @@ export default function generateTypesV3(
     );
   }
 
-  // 1st pass: expand $refs first to reduce lookups & prevent circular refs
-  const expandedRefs = JSON.parse(
+  // 1st pass: convert anyOf to “any” since this is neither an “Intersection” nor “Union”
+  const anyOf = JSON.parse(
     JSON.stringify(schema.components.schemas),
+    (_, node) => (node && node.anyOf ? escape("any") : node)
+  );
+
+  // 2nd pass: expand $refs first to reduce lookups & prevent circular refs
+  const expandedRefs = JSON.parse(
+    JSON.stringify(anyOf),
     (_, node) =>
       node && node["$ref"]
         ? escape(
-            `components['schemas']['${node.$ref.replace(
-              "#/components/schemas/",
-              ""
-            )}']`
+            `components['${node.$ref
+              .replace("#/components/", "")
+              .replace(/\//g, "']['")}']`
           ) // important: use single-quotes here for JSON (you can always change w/ Prettier at the end)
         : node // return by default
   );
 
-  // 2nd pass: propertyMapper
+  // 3rd pass: propertyMapper
   const propertyMapped = options
     ? propertyMapper(expandedRefs, options.propertyMapper)
     : expandedRefs;
 
-  // 3rd pass: primitives
+  // 4th pass: primitives
   const primitives = JSON.parse(
     JSON.stringify(propertyMapped),
     (_, node: OpenAPI3SchemaObject) => {
@@ -70,7 +76,7 @@ export default function generateTypesV3(
     }
   );
 
-  // 4th pass: objects & arrays
+  // 5th pass: objects & arrays
   const objectsAndArrays = JSON.parse(JSON.stringify(primitives), (_, node) => {
     // object
     if (isObjNode(node)) {
@@ -130,6 +136,11 @@ export default function generateTypesV3(
       return escape(tsArrayOf(node.items));
     }
 
+    // oneOf
+    if (isOneOfNode(node)) {
+      return escape(tsUnionOf(node.oneOf));
+    }
+
     return node; // return by default
   });
 

tests/v2/expected/petstore.ts

@@ -0,0 +1,36 @@
+/**
+ * This file was auto-generated by swagger-to-ts.
+ * Do not make direct changes to the file.
+ */
+
+export interface definitions {
+  Order: {
+    id?: number;
+    petId?: number;
+    quantity?: number;
+    shipDate?: string;
+    status?: "placed" | "approved" | "delivered";
+    complete?: boolean;
+  };
+  Category: { id?: number; name?: string };
+  User: {
+    id?: number;
+    username?: string;
+    firstName?: string;
+    lastName?: string;
+    email?: string;
+    password?: string;
+    phone?: string;
+    userStatus?: number;
+  };
+  Tag: { id?: number; name?: string };
+  Pet: {
+    id?: number;
+    category?: definitions["Category"];
+    name: string;
+    photoUrls: string[];
+    tags?: definitions["Tag"][];
+    status?: "available" | "pending" | "sold";
+  };
+  ApiResponse: { code?: number; type?: string; message?: string };
+}