Skip to content

Commit 03003e4

Browse files
CopilotCopilot
authored
fix(zod): fall back to z.union() when discriminated union members are intersections
When discriminated union members have allOf schemas, they generate ZodIntersection which does not support .extend(). Detect this case by storing isIntersection: true in the symbol meta and fall back to z.union() in tryBuildDiscriminatedUnion. - Add isIntersection field to ZodMeta type - Set isIntersection: true in intersection() handler of all three walkers - Set isIntersection: false in union() handler (manual meta) of all three walkers - Merge ctx.meta with isIntersection flag in processor exportAst calls - Check querySymbol meta for isIntersection in tryBuildDiscriminatedUnion - Add test specs and snapshots for the discriminator-allof-member scenario Agent-Logs-Url: https://github.com/hey-api/openapi-ts/sessions/1c6f992d-8feb-49c9-9cc6-7830259cfe5c
1 parent ba96cc5 commit 03003e4

19 files changed

Lines changed: 407 additions & 3 deletions

File tree

‎packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/discriminator-allof-member/zod.gen.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// This file is auto-generated by @hey-api/openapi-ts
2+
3+
import * as z from 'zod/mini';
4+
5+
export const zUserNotificationDeleteContentBase = z.object({
6+
name: z.string()
7+
});
8+
9+
export const zUserNotificationDeleteContentError = z.intersection(zUserNotificationDeleteContentBase, z.object({
10+
finishedAt: z.iso.datetime(),
11+
error: z.string()
12+
}));
13+
14+
export const zUserNotificationDeleteContentRunning = z.intersection(zUserNotificationDeleteContentBase, z.object({
15+
startedAt: z.iso.datetime()
16+
}));
17+
18+
export const zUserNotificationDeleteContentSuccess = z.intersection(zUserNotificationDeleteContentBase, z.object({
19+
finishedAt: z.iso.datetime()
20+
}));
21+
22+
export const zUserNotificationDeleteContent = z.union([
23+
z.intersection(z.object({
24+
status: z.literal('running')
25+
}), zUserNotificationDeleteContentRunning),
26+
z.intersection(z.object({
27+
status: z.literal('success')
28+
}), zUserNotificationDeleteContentSuccess),
29+
z.intersection(z.object({
30+
status: z.literal('error')
31+
}), zUserNotificationDeleteContentError)
32+
]);
33+
34+
/**
35+
* success
36+
*/
37+
export const zGetNotificationResponse = zUserNotificationDeleteContent;

‎packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v3/discriminator-allof-member/zod.gen.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// This file is auto-generated by @hey-api/openapi-ts
2+
3+
import { z } from 'zod/v3';
4+
5+
export const zUserNotificationDeleteContentBase = z.object({
6+
name: z.string()
7+
});
8+
9+
export const zUserNotificationDeleteContentError = zUserNotificationDeleteContentBase.and(z.object({
10+
finishedAt: z.string().datetime(),
11+
error: z.string()
12+
}));
13+
14+
export const zUserNotificationDeleteContentRunning = zUserNotificationDeleteContentBase.and(z.object({
15+
startedAt: z.string().datetime()
16+
}));
17+
18+
export const zUserNotificationDeleteContentSuccess = zUserNotificationDeleteContentBase.and(z.object({
19+
finishedAt: z.string().datetime()
20+
}));
21+
22+
export const zUserNotificationDeleteContent = z.union([
23+
z.object({
24+
status: z.literal('running')
25+
}).and(zUserNotificationDeleteContentRunning),
26+
z.object({
27+
status: z.literal('success')
28+
}).and(zUserNotificationDeleteContentSuccess),
29+
z.object({
30+
status: z.literal('error')
31+
}).and(zUserNotificationDeleteContentError)
32+
]);
33+
34+
/**
35+
* success
36+
*/
37+
export const zGetNotificationResponse = zUserNotificationDeleteContent;

‎packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/discriminator-allof-member/zod.gen.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// This file is auto-generated by @hey-api/openapi-ts
2+
3+
import * as z from 'zod';
4+
5+
export const zUserNotificationDeleteContentBase = z.object({
6+
name: z.string()
7+
});
8+
9+
export const zUserNotificationDeleteContentError = zUserNotificationDeleteContentBase.and(z.object({
10+
finishedAt: z.iso.datetime(),
11+
error: z.string()
12+
}));
13+
14+
export const zUserNotificationDeleteContentRunning = zUserNotificationDeleteContentBase.and(z.object({
15+
startedAt: z.iso.datetime()
16+
}));
17+
18+
export const zUserNotificationDeleteContentSuccess = zUserNotificationDeleteContentBase.and(z.object({
19+
finishedAt: z.iso.datetime()
20+
}));
21+
22+
export const zUserNotificationDeleteContent = z.union([
23+
z.object({
24+
status: z.literal('running')
25+
}).and(zUserNotificationDeleteContentRunning),
26+
z.object({
27+
status: z.literal('success')
28+
}).and(zUserNotificationDeleteContentSuccess),
29+
z.object({
30+
status: z.literal('error')
31+
}).and(zUserNotificationDeleteContentError)
32+
]);
33+
34+
/**
35+
* success
36+
*/
37+
export const zGetNotificationResponse = zUserNotificationDeleteContent;

‎packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/discriminator-allof-member/zod.gen.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// This file is auto-generated by @hey-api/openapi-ts
2+
3+
import * as z from 'zod/mini';
4+
5+
export const zUserNotificationDeleteContentBase = z.object({
6+
name: z.string()
7+
});
8+
9+
export const zUserNotificationDeleteContentError = z.intersection(zUserNotificationDeleteContentBase, z.object({
10+
finishedAt: z.iso.datetime(),
11+
error: z.string()
12+
}));
13+
14+
export const zUserNotificationDeleteContentRunning = z.intersection(zUserNotificationDeleteContentBase, z.object({
15+
startedAt: z.iso.datetime()
16+
}));
17+
18+
export const zUserNotificationDeleteContentSuccess = z.intersection(zUserNotificationDeleteContentBase, z.object({
19+
finishedAt: z.iso.datetime()
20+
}));
21+
22+
export const zUserNotificationDeleteContent = z.union([
23+
z.intersection(z.object({
24+
status: z.literal('running')
25+
}), zUserNotificationDeleteContentRunning),
26+
z.intersection(z.object({
27+
status: z.literal('success')
28+
}), zUserNotificationDeleteContentSuccess),
29+
z.intersection(z.object({
30+
status: z.literal('error')
31+
}), zUserNotificationDeleteContentError)
32+
]);
33+
34+
/**
35+
* success
36+
*/
37+
export const zGetNotificationResponse = zUserNotificationDeleteContent;

‎packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v3/discriminator-allof-member/zod.gen.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// This file is auto-generated by @hey-api/openapi-ts
2+
3+
import { z } from 'zod/v3';
4+
5+
export const zUserNotificationDeleteContentBase = z.object({
6+
name: z.string()
7+
});
8+
9+
export const zUserNotificationDeleteContentError = zUserNotificationDeleteContentBase.and(z.object({
10+
finishedAt: z.string().datetime(),
11+
error: z.string()
12+
}));
13+
14+
export const zUserNotificationDeleteContentRunning = zUserNotificationDeleteContentBase.and(z.object({
15+
startedAt: z.string().datetime()
16+
}));
17+
18+
export const zUserNotificationDeleteContentSuccess = zUserNotificationDeleteContentBase.and(z.object({
19+
finishedAt: z.string().datetime()
20+
}));
21+
22+
export const zUserNotificationDeleteContent = z.union([
23+
z.object({
24+
status: z.literal('running')
25+
}).and(zUserNotificationDeleteContentRunning),
26+
z.object({
27+
status: z.literal('success')
28+
}).and(zUserNotificationDeleteContentSuccess),
29+
z.object({
30+
status: z.literal('error')
31+
}).and(zUserNotificationDeleteContentError)
32+
]);
33+
34+
/**
35+
* success
36+
*/
37+
export const zGetNotificationResponse = zUserNotificationDeleteContent;

‎packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/discriminator-allof-member/zod.gen.ts‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// This file is auto-generated by @hey-api/openapi-ts
2+
3+
import * as z from 'zod';
4+
5+
export const zUserNotificationDeleteContentBase = z.object({
6+
name: z.string()
7+
});
8+
9+
export const zUserNotificationDeleteContentError = zUserNotificationDeleteContentBase.and(z.object({
10+
finishedAt: z.iso.datetime(),
11+
error: z.string()
12+
}));
13+
14+
export const zUserNotificationDeleteContentRunning = zUserNotificationDeleteContentBase.and(z.object({
15+
startedAt: z.iso.datetime()
16+
}));
17+
18+
export const zUserNotificationDeleteContentSuccess = zUserNotificationDeleteContentBase.and(z.object({
19+
finishedAt: z.iso.datetime()
20+
}));
21+
22+
export const zUserNotificationDeleteContent = z.union([
23+
z.object({
24+
status: z.literal('running')
25+
}).and(zUserNotificationDeleteContentRunning),
26+
z.object({
27+
status: z.literal('success')
28+
}).and(zUserNotificationDeleteContentSuccess),
29+
z.object({
30+
status: z.literal('error')
31+
}).and(zUserNotificationDeleteContentError)
32+
]);
33+
34+
/**
35+
* success
36+
*/
37+
export const zGetNotificationResponse = zUserNotificationDeleteContent;

‎packages/openapi-ts-tests/zod/v4/test/3.0.x.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ for (const zodVersion of zodVersions) {
3434
}),
3535
description: 'generates circular schemas',
3636
},
37+
{
38+
config: createConfig({
39+
input: 'discriminator-allof-member.yaml',
40+
output: 'discriminator-allof-member',
41+
}),
42+
description:
43+
'falls back to z.union() when discriminated union members have allOf (intersection)',
44+
},
3745
{
3846
config: createConfig({
3947
input: 'enum-null.json',

‎packages/openapi-ts-tests/zod/v4/test/3.1.x.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,14 @@ for (const zodVersion of zodVersions) {
163163
}),
164164
description: 'generates discriminated union for oneOf with discriminator mapping',
165165
},
166+
{
167+
config: createConfig({
168+
input: 'discriminator-allof-member.yaml',
169+
output: 'discriminator-allof-member',
170+
}),
171+
description:
172+
'falls back to z.union() when discriminated union members have allOf (intersection)',
173+
},
166174
{
167175
config: createConfig({
168176
input: 'discriminator-any-of.yaml',

‎packages/openapi-ts/src/plugins/zod/mini/processor.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ export function createProcessor(plugin: ZodPlugin['Instance']): ProcessorResult
5656
}) as ZodFinal;
5757

5858
if (shouldExport) {
59-
exportAst({ ...ctx, final, plugin });
59+
exportAst({
60+
...ctx,
61+
final,
62+
meta: result.meta.isIntersection ? { ...ctx.meta, isIntersection: true } : ctx.meta,
63+
plugin,
64+
});
6065
return;
6166
}
6267

‎packages/openapi-ts/src/plugins/zod/mini/walker.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ export function createVisitor(
152152
default: parentSchema.default,
153153
format: parentSchema.format,
154154
hasLazy: hasAnyLazy,
155+
isIntersection: true,
155156
isLazy: false,
156157
nullable: items.some((i) => i.meta.nullable),
157158
readonly: items.some((i) => i.meta.readonly),
@@ -328,6 +329,7 @@ export function createVisitor(
328329
default: parentSchema.default,
329330
format: parentSchema.format,
330331
hasLazy: hasAnyLazy,
332+
isIntersection: false,
331333
isLazy: false,
332334
nullable: hasNull,
333335
readonly: items.some((i) => i.meta.readonly),

0 commit comments

Comments
 (0)