feat(zod): generate z.discriminatedUnion() for oneOf/anyOf with discriminator mapping

Agent-Logs-Url: https://github.com/hey-api/openapi-ts/sessions/355f99e2-8a8e-4191-a822-7de8f991a49c

Author: Copilot

packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v3/default/zod.gen.ts

@@ -423,13 +423,9 @@ export const zModelSquare = z.object({
 /**
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
-export const zCompositionWithOneOfDiscriminator = z.union([
-    z.object({
-        kind: z.literal('circle')
-    }).and(zModelCircle),
-    z.object({
-        kind: z.literal('square')
-    }).and(zModelSquare)
+export const zCompositionWithOneOfDiscriminator = z.discriminatedUnion('kind', [
+    zModelCircle.extend({ kind: z.literal('circle') }),
+    zModelSquare.extend({ kind: z.literal('square') })
 ]);
 
 /**

packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/default/zod.gen.ts

@@ -423,13 +423,9 @@ export const zModelSquare = z.object({
 /**
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
-export const zCompositionWithOneOfDiscriminator = z.union([
-    z.object({
-        kind: z.literal('circle')
-    }).and(zModelCircle),
-    z.object({
-        kind: z.literal('square')
-    }).and(zModelSquare)
+export const zCompositionWithOneOfDiscriminator = z.discriminatedUnion('kind', [
+    zModelCircle.extend({ kind: z.literal('circle') }),
+    zModelSquare.extend({ kind: z.literal('square') })
 ]);
 
 /**

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/discriminator-all-of/zod.gen.ts

@@ -0,0 +1,62 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import * as z from 'zod/v4-mini';
+
+export const zFoo = z.object({
+    id: z.string()
+});
+
+export const zBar = z.intersection(zFoo, z.object({
+    bar: z.optional(z.string()),
+    id: z.literal('Bar')
+}));
+
+export const zBaz = z.intersection(zFoo, z.object({
+    baz: z.optional(z.string()),
+    id: z.literal('Baz')
+}));
+
+export const zQux = z.intersection(zFoo, z.object({
+    qux: z.optional(z.boolean()),
+    id: z.literal('Qux')
+}));
+
+export const zFooMapped = z.object({
+    id: z.string()
+});
+
+export const zBarMapped = z.intersection(zFooMapped, z.object({
+    bar: z.optional(z.string()),
+    id: z.literal('bar')
+}));
+
+export const zBazMapped = z.intersection(zFooMapped, z.object({
+    baz: z.optional(z.string()),
+    id: z.literal('baz')
+}));
+
+export const zQuxMapped = z.intersection(zFooMapped, z.object({
+    qux: z.optional(z.boolean()),
+    id: z.literal('QuxMapped')
+}));
+
+export const zBarUnion = z.object({
+    id: z.optional(z.string()),
+    bar: z.optional(z.string())
+});
+
+export const zBazUnion = z.object({
+    id: z.optional(z.string()),
+    baz: z.optional(z.string())
+});
+
+export const zFooUnion = z.union([
+    z.intersection(z.object({
+        id: z.literal('bar')
+    }), zBarUnion),
+    z.intersection(z.object({
+        id: z.literal('baz')
+    }), zBazUnion)
+]);
+
+export const zQuxExtend = zFooUnion;

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/discriminator-any-of/zod.gen.ts

@@ -0,0 +1,37 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import * as z from 'zod/v4-mini';
+
+export const zQuux = z.enum(['Bar', 'Baz']);
+
+export const zQux = z.object({
+    id: z.string(),
+    type: zQuux
+});
+
+export const zBaz = zQux;
+
+export const zBar = zQux;
+
+export const zFoo = z.union([
+    z.intersection(z.object({
+        type: z.optional(z.literal('Bar'))
+    }), zBar),
+    z.intersection(z.object({
+        type: z.optional(z.literal('Baz'))
+    }), zBaz)
+]);
+
+export const zSpæcial = zQux;
+
+export const zQuuz = z.union([
+    z.intersection(z.object({
+        type: z.optional(z.literal('bar'))
+    }), zBar),
+    z.intersection(z.object({
+        type: z.optional(z.literal('baz'))
+    }), zBaz),
+    z.intersection(z.object({
+        type: z.optional(z.literal('non-ascii'))
+    }), zSpæcial)
+]);

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/discriminator-one-of/zod.gen.ts

@@ -0,0 +1,37 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import * as z from 'zod/v4-mini';
+
+export const zQuux = z.enum(['Bar', 'Baz']);
+
+export const zQux = z.object({
+    id: z.string(),
+    type: zQuux
+});
+
+export const zBaz = zQux;
+
+export const zBar = zQux;
+
+export const zFoo = z.union([
+    z.intersection(z.object({
+        type: z.literal('Bar')
+    }), zBar),
+    z.intersection(z.object({
+        type: z.literal('Baz')
+    }), zBaz)
+]);
+
+export const zSpæcial = zQux;
+
+export const zQuuz = z.union([
+    z.intersection(z.object({
+        type: z.literal('bar')
+    }), zBar),
+    z.intersection(z.object({
+        type: z.literal('baz')
+    }), zBaz),
+    z.intersection(z.object({
+        type: z.literal('non-ascii')
+    }), zSpæcial)
+]);

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/default/zod.gen.ts

@@ -423,13 +423,9 @@ export const zModelSquare = z.object({
 /**
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
-export const zCompositionWithOneOfDiscriminator = z.union([
-    z.object({
-        kind: z.literal('circle')
-    }).and(zModelCircle),
-    z.object({
-        kind: z.literal('square')
-    }).and(zModelSquare)
+export const zCompositionWithOneOfDiscriminator = z.discriminatedUnion('kind', [
+    zModelCircle.extend({ kind: z.literal('circle') }),
+    zModelSquare.extend({ kind: z.literal('square') })
 ]);
 
 /**

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/discriminator-all-of/zod.gen.ts

@@ -0,0 +1,58 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { z } from 'zod';
+
+export const zFoo = z.object({
+    id: z.string()
+});
+
+export const zBar = zFoo.and(z.object({
+    bar: z.string().optional(),
+    id: z.literal('Bar')
+}));
+
+export const zBaz = zFoo.and(z.object({
+    baz: z.string().optional(),
+    id: z.literal('Baz')
+}));
+
+export const zQux = zFoo.and(z.object({
+    qux: z.boolean().optional(),
+    id: z.literal('Qux')
+}));
+
+export const zFooMapped = z.object({
+    id: z.string()
+});
+
+export const zBarMapped = zFooMapped.and(z.object({
+    bar: z.string().optional(),
+    id: z.literal('bar')
+}));
+
+export const zBazMapped = zFooMapped.and(z.object({
+    baz: z.string().optional(),
+    id: z.literal('baz')
+}));
+
+export const zQuxMapped = zFooMapped.and(z.object({
+    qux: z.boolean().optional(),
+    id: z.literal('QuxMapped')
+}));
+
+export const zBarUnion = z.object({
+    id: z.string().optional(),
+    bar: z.string().optional()
+});
+
+export const zBazUnion = z.object({
+    id: z.string().optional(),
+    baz: z.string().optional()
+});
+
+export const zFooUnion = z.discriminatedUnion('id', [
+    zBarUnion.extend({ id: z.literal('bar') }),
+    zBazUnion.extend({ id: z.literal('baz') })
+]);
+
+export const zQuxExtend = zFooUnion;

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/discriminator-any-of/zod.gen.ts

@@ -0,0 +1,27 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { z } from 'zod';
+
+export const zQuux = z.enum(['Bar', 'Baz']);
+
+export const zQux = z.object({
+    id: z.string(),
+    type: zQuux
+});
+
+export const zBaz = zQux;
+
+export const zBar = zQux;
+
+export const zFoo = z.discriminatedUnion('type', [
+    zBar.extend({ type: z.literal('Bar') }),
+    zBaz.extend({ type: z.literal('Baz') })
+]);
+
+export const zSpæcial = zQux;
+
+export const zQuuz = z.discriminatedUnion('type', [
+    zBar.extend({ type: z.literal('bar') }),
+    zBaz.extend({ type: z.literal('baz') }),
+    zSpæcial.extend({ type: z.literal('non-ascii') })
+]);

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v3/discriminator-one-of/zod.gen.ts

@@ -0,0 +1,27 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { z } from 'zod';
+
+export const zQuux = z.enum(['Bar', 'Baz']);
+
+export const zQux = z.object({
+    id: z.string(),
+    type: zQuux
+});
+
+export const zBaz = zQux;
+
+export const zBar = zQux;
+
+export const zFoo = z.discriminatedUnion('type', [
+    zBar.extend({ type: z.literal('Bar') }),
+    zBaz.extend({ type: z.literal('Baz') })
+]);
+
+export const zSpæcial = zQux;
+
+export const zQuuz = z.discriminatedUnion('type', [
+    zBar.extend({ type: z.literal('bar') }),
+    zBaz.extend({ type: z.literal('baz') }),
+    zSpæcial.extend({ type: z.literal('non-ascii') })
+]);

packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/default/zod.gen.ts

@@ -423,13 +423,9 @@ export const zModelSquare = z.object({
 /**
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
-export const zCompositionWithOneOfDiscriminator = z.union([
-    z.object({
-        kind: z.literal('circle')
-    }).and(zModelCircle),
-    z.object({
-        kind: z.literal('square')
-    }).and(zModelSquare)
+export const zCompositionWithOneOfDiscriminator = z.discriminatedUnion('kind', [
+    zModelCircle.extend({ kind: z.literal('circle') }),
+    zModelSquare.extend({ kind: z.literal('square') })
 ]);
 
 /**