fix: schema with properties and oneOf properties (#491)

Author: gr2m

src/transform/schema.ts

@@ -77,8 +77,14 @@ export function transformSchemaObj(node: any): string {
       break;
     }
     case "object": {
+      const isAnyOfOrOneOfOrAllOf = "anyOf" in node || "oneOf" in node || "allOf" in node;
+
       // if empty object, then return generic map type
-      if ((!node.properties || !Object.keys(node.properties).length) && !node.allOf && !node.additionalProperties) {
+      if (
+        !isAnyOfOrOneOfOrAllOf &&
+        (!node.properties || !Object.keys(node.properties).length) &&
+        !node.additionalProperties
+      ) {
         output += `{ [key: string]: any }`;
         break;
       }
@@ -104,10 +110,14 @@ export function transformSchemaObj(node: any): string {
       }
 
       output += tsIntersectionOf([
-        ...(node.allOf ? (node.allOf as any[]).map(transformSchemaObj) : []), // append allOf first
+        // append allOf/anyOf/oneOf first
+        ...(node.allOf ? (node.allOf as any[]).map(transformSchemaObj) : []),
+        ...(node.anyOf ? [transformAnyOf(node.anyOf)] : []),
+        ...(node.oneOf ? [transformOneOf(node.oneOf)] : []),
         ...(properties ? [`{\n${properties}\n}`] : []), // then properties (line breaks are important!)
         ...(additionalProperties ? [additionalProperties] : []), // then additional properties
       ]);
+
       break;
     }
 
@@ -119,16 +129,6 @@ export function transformSchemaObj(node: any): string {
       }
       break;
     }
-
-    case "anyOf": {
-      output += transformAnyOf(node.anyOf);
-      break;
-    }
-
-    case "oneOf": {
-      output += transformOneOf(node.oneOf);
-      break;
-    }
   }
 
   // close nullable

src/utils.ts

@@ -55,16 +55,6 @@ export function nodeType(obj: any): SchemaObjectType | undefined {
     return "number";
   }
 
-  // anyOf
-  if (Array.isArray(obj.anyOf)) {
-    return "anyOf";
-  }
-
-  // oneOf
-  if (Array.isArray(obj.oneOf)) {
-    return "oneOf";
-  }
-
   // array
   if (obj.type === "array" || obj.items) {
     return "array";

tests/schema.test.ts

@@ -213,6 +213,57 @@ describe("SchemaObject", () => {
         })
       ).toBe(`{ [key: string]: (string) | (number) | (boolean); }`);
     });
+
+    // https://www.jsonschemavalidator.net/s/fOyR2UtQ
+    it("properties + oneOf", () => {
+      expect(
+        transform({
+          properties: {
+            a: {
+              type: "string",
+            },
+          },
+          oneOf: [
+            { properties: { b: { type: "string" } }, required: ["b"] },
+            { properties: { c: { type: "string" } }, required: ["c"] },
+          ],
+        })
+      ).toBe(`(({
+"b": string;
+
+}) | ({
+"c": string;
+
+})) & ({
+"a"?: string;
+
+})`);
+    });
+
+    it("properties + anyOf", () => {
+      expect(
+        transform({
+          properties: {
+            a: {
+              type: "string",
+            },
+          },
+          anyOf: [
+            { properties: { b: { type: "string" } }, required: ["b"] },
+            { properties: { c: { type: "string" } }, required: ["c"] },
+          ],
+        })
+      ).toBe(`((Partial<{
+"b": string;
+
+}>) & (Partial<{
+"c": string;
+
+}>)) & ({
+"a"?: string;
+
+})`);
+    });
   });
 
   describe("comments", () => {