fix(#31): anyOf to ts

Author: astahmer

.changeset/ten-beers-travel.md

@@ -0,0 +1,7 @@
+---
+"typed-openapi": minor
+---
+
+fix: anyOf to ts
+
+https://github.com/astahmer/typed-openapi/issues/31

packages/typed-openapi/src/openapi-schema-to-ts.ts

@@ -40,14 +40,15 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
       return t.union(schema.oneOf.map((prop) => openApiSchemaToTs({ schema: prop, ctx, meta })));
     }
 
-    // anyOf = oneOf but with 1 or more = `T extends oneOf ? T | T[] : never`
+    // tl;dr: anyOf = oneOf
+    // oneOf matches exactly one subschema, and anyOf can match one or more subschemas.
+    // https://swagger.io/docs/specification/v3_0/data-models/oneof-anyof-allof-not/
     if (schema.anyOf) {
       if (schema.anyOf.length === 1) {
         return openApiSchemaToTs({ schema: schema.anyOf[0]!, ctx, meta });
       }
 
-      const oneOf = t.union(schema.anyOf.map((prop) => openApiSchemaToTs({ schema: prop, ctx, meta })));
-      return t.union([oneOf, t.array(oneOf)]);
+      return t.union(schema.anyOf.map((prop) => openApiSchemaToTs({ schema: prop, ctx, meta })));
     }
 
     if (schema.allOf) {

packages/typed-openapi/tests/generator-basic-schemas.test.ts

@@ -154,11 +154,11 @@ test("getSchemaBox", async () => {
   expect(await getSchemaBox({ allOf: [{ type: "string" }, { type: "number" }] })).toMatchInlineSnapshot(`"export type _Test = string & number;"`);
 
   expect(await getSchemaBox({ anyOf: [{ type: "string" }, { type: "number" }] })).toMatchInlineSnapshot(
-    `"export type _Test = string | number | Array<string | number>;"`,
+    `"export type _Test = string | number;"`,
   );
 
   // StringAndNumberMaybeMultiple
-  expect(await getSchemaBox({ anyOf: [{ type: "string" }, { type: "number" }] })).toMatchInlineSnapshot(`"export type _Test = string | number | Array<string | number>;"`);
+  expect(await getSchemaBox({ anyOf: [{ type: "string" }, { type: "number" }] })).toMatchInlineSnapshot(`"export type _Test = string | number;"`);
 
   // ObjectWithArrayUnion
   expect(
@@ -168,7 +168,7 @@ test("getSchemaBox", async () => {
         unionOrArrayOfUnion: { anyOf: [{ type: "string" }, { type: "number" }] },
       },
     }),
-  ).toMatchInlineSnapshot(`"export type _Test = Partial<{ unionOrArrayOfUnion: string | number | Array<string | number> }>;"`);
+  ).toMatchInlineSnapshot(`"export type _Test = Partial<{ unionOrArrayOfUnion: string | number }>;"`);
 
   // ObjectWithIntersection
   expect(
@@ -393,7 +393,7 @@ describe("getSchemaBox with context", () => {
       `
       {
         "type": "ref",
-        "value": "Partial<{ user: User | Member, users: Array<User | Member | Array<User | Member>>, basic: number }>",
+        "value": "Partial<{ user: User | Member, users: Array<User | Member>, basic: number }>",
       }
     `,
     );

packages/typed-openapi/tests/generator.test.ts

@@ -691,14 +691,7 @@ describe("generator", () => {
           parameters: {
             query: Partial<{
               searchQuery: string;
-              includeRoles: Array<
-                | "super-admin"
-                | "buyer"
-                | "admin"
-                | "coordinator"
-                | "requestor"
-                | Array<"super-admin" | "buyer" | "admin" | "coordinator" | "requestor">
-              >;
+              includeRoles: Array<"super-admin" | "buyer" | "admin" | "coordinator" | "requestor">;
             }>;
             path: { organizationId: string };
           };

packages/typed-openapi/tests/openapi-schema-to-ts.test.ts

@@ -300,18 +300,18 @@ test("getSchemaBox", () => {
     `
     {
       "type": "union",
-      "value": "string | number | Array<string | number>",
+      "value": "string | number",
     }
   `,
   );
 
   // StringAndNumberMaybeMultiple
   expect(getSchemaBox({ anyOf: [{ type: "string" }, { type: "number" }] })).toMatchInlineSnapshot(`
-      {
-        "type": "union",
-        "value": "string | number | Array<string | number>",
-      }
-    `);
+    {
+      "type": "union",
+      "value": "string | number",
+    }
+  `);
 
   // ObjectWithArrayUnion
   expect(
@@ -324,7 +324,7 @@ test("getSchemaBox", () => {
   ).toMatchInlineSnapshot(`
     {
       "type": "ref",
-      "value": "Partial<{ unionOrArrayOfUnion: string | number | Array<string | number> }>",
+      "value": "Partial<{ unionOrArrayOfUnion: string | number }>",
     }
   `);
 
@@ -610,7 +610,7 @@ describe("getSchemaBox with context", () => {
       `
       {
         "type": "ref",
-        "value": "Partial<{ user: User | Member, users: Array<User | Member | Array<User | Member>>, basic: number }>",
+        "value": "Partial<{ user: User | Member, users: Array<User | Member>, basic: number }>",
       }
     `,
     );