Add support for anyOf/allOf/oneOf when node has explicit primitive type (#919)

* Add support for anyOf/allOf/oneOf for primitives

* Add tests for type string with allOf

* Update format of test examples

Author: michael-gillett

src/utils.ts

@@ -151,6 +151,11 @@ export function nodeType(obj: any): SchemaObjectType {
     return "enum";
   }
 
+  // Treat any node with allOf/ anyOf/ oneOf as object
+  if (obj.hasOwnProperty("allOf") || obj.hasOwnProperty("anyOf") || obj.hasOwnProperty("oneOf")) {
+    return "object";
+  }
+
   // boolean
   if (obj.type === "boolean") {
     return "boolean";
@@ -179,14 +184,7 @@ export function nodeType(obj: any): SchemaObjectType {
   }
 
   // object
-  if (
-    obj.type === "object" ||
-    obj.hasOwnProperty("allOf") ||
-    obj.hasOwnProperty("anyOf") ||
-    obj.hasOwnProperty("oneOf") ||
-    obj.hasOwnProperty("properties") ||
-    obj.hasOwnProperty("additionalProperties")
-  ) {
+  if (obj.type === "object" || obj.hasOwnProperty("properties") || obj.hasOwnProperty("additionalProperties")) {
     return "object";
   }
 

test/v3/expected/all-of-string.additional.ts

@@ -0,0 +1,30 @@
+/**
+ * This file was auto-generated by openapi-typescript.
+ * Do not make direct changes to the file.
+ */
+
+export interface paths {
+  '/test': {
+    get: {
+      responses: {
+        /** A list of types. */
+        200: unknown
+      }
+    }
+  }
+}
+
+export interface components {
+  schemas: {
+    /** @description Object with one property that is a string enum */
+    Example: {
+      status?: components['schemas']['ExampleStatus'] & { [key: string]: unknown }
+    } & { [key: string]: unknown }
+    /** @enum {string} */
+    ExampleStatus: 'ACTIVE' | 'INACTIVE'
+  }
+}
+
+export interface operations {}
+
+export interface external {}

test/v3/expected/all-of-string.exported-type.ts

@@ -0,0 +1,30 @@
+/**
+ * This file was auto-generated by openapi-typescript.
+ * Do not make direct changes to the file.
+ */
+
+export type paths = {
+  '/test': {
+    get: {
+      responses: {
+        /** A list of types. */
+        200: unknown
+      }
+    }
+  }
+}
+
+export type components = {
+  schemas: {
+    /** @description Object with one property that is a string enum */
+    Example: {
+      status?: components['schemas']['ExampleStatus']
+    }
+    /** @enum {string} */
+    ExampleStatus: 'ACTIVE' | 'INACTIVE'
+  }
+}
+
+export type operations = {}
+
+export type external = {}

test/v3/expected/all-of-string.immutable.ts

@@ -0,0 +1,30 @@
+/**
+ * This file was auto-generated by openapi-typescript.
+ * Do not make direct changes to the file.
+ */
+
+export interface paths {
+  readonly '/test': {
+    readonly get: {
+      readonly responses: {
+        /** A list of types. */
+        readonly 200: unknown
+      }
+    }
+  }
+}
+
+export interface components {
+  readonly schemas: {
+    /** @description Object with one property that is a string enum */
+    readonly Example: {
+      readonly status?: components['schemas']['ExampleStatus']
+    }
+    /** @enum {string} */
+    readonly ExampleStatus: 'ACTIVE' | 'INACTIVE'
+  }
+}
+
+export interface operations {}
+
+export interface external {}

test/v3/expected/all-of-string.support-array-length.ts

@@ -0,0 +1,30 @@
+/**
+ * This file was auto-generated by openapi-typescript.
+ * Do not make direct changes to the file.
+ */
+
+export interface paths {
+  '/test': {
+    get: {
+      responses: {
+        /** A list of types. */
+        200: unknown
+      }
+    }
+  }
+}
+
+export interface components {
+  schemas: {
+    /** @description Object with one property that is a string enum */
+    Example: {
+      status?: components['schemas']['ExampleStatus']
+    }
+    /** @enum {string} */
+    ExampleStatus: 'ACTIVE' | 'INACTIVE'
+  }
+}
+
+export interface operations {}
+
+export interface external {}

test/v3/expected/all-of-string.ts

@@ -0,0 +1,30 @@
+/**
+ * This file was auto-generated by openapi-typescript.
+ * Do not make direct changes to the file.
+ */
+
+export interface paths {
+  '/test': {
+    get: {
+      responses: {
+        /** A list of types. */
+        200: unknown
+      }
+    }
+  }
+}
+
+export interface components {
+  schemas: {
+    /** @description Object with one property that is a string enum */
+    Example: {
+      status?: components['schemas']['ExampleStatus']
+    }
+    /** @enum {string} */
+    ExampleStatus: 'ACTIVE' | 'INACTIVE'
+  }
+}
+
+export interface operations {}
+
+export interface external {}

test/v3/specs/all-of-string.yaml

@@ -0,0 +1,25 @@
+openapi: 3.0
+paths:
+  /test:
+    get:
+      tags:
+        - test
+      summary: "Just a test path"
+      responses:
+        200:
+          description: A list of types.
+components:
+  schemas:
+    Example:
+      description: Object with one property that is a string enum
+      type: object
+      properties:
+        status:
+          type: string
+          allOf:
+            - $ref: '#/components/schemas/ExampleStatus'
+    ExampleStatus:
+      type: string
+      enum:
+        - ACTIVE
+        - INACTIVE