@kubb/plugin-zod 5.0.0-beta.80 → 5.0.0-beta.81

package/dist/index.cjs

@@ -420,6 +420,46 @@ function collectCodecRefNames(node) {
 	return _kubb_core.ast.collect(node, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? (0, _kubb_ast_utils.extractRefName)(n.ref) ?? void 0 : void 0 });
 }
 /**
+* Whether the node is a plain inline object whose shape can be lifted into an `.extend({ … })`
+* argument. A catchall, `patternProperties`, or a nullable/optional wrapper cannot, so those stay
+* on `.and(…)`.
+*/
+function isPlainInlineObject(node) {
+	return node.type === "object" && !node.nullable && !node.optional && !node.nullish && node.additionalProperties === void 0 && !node.patternProperties;
+}
+/**
+* Whether a node renders as a bare Zod object — one that accepts `.extend(…)` and can be a
+* `z.discriminatedUnion` option. Covers object nodes, `$ref`s that resolve to (or are still
+* unresolved) objects, single-member unions of an object, and object-composable `allOf`.
+*
+* `cyclicSchemas` bounds the recursion: a ref into a cycle renders as `z.lazy(…)`, not an object.
+*/
+function isObjectSchemaNode(node, cyclicSchemas) {
+	if (node.nullable || node.optional || node.nullish) return false;
+	if (node.type === "object") return true;
+	if (node.type === "ref") {
+		const refName = (node.ref ? (0, _kubb_ast_utils.extractRefName)(node.ref) : void 0) ?? node.name;
+		if (refName && cyclicSchemas?.has(refName)) return false;
+		const resolved = (0, _kubb_ast_utils.syncSchemaRef)(node);
+		return resolved.type === "ref" || isObjectSchemaNode(resolved, cyclicSchemas);
+	}
+	if (node.type === "union") {
+		const members = node.members ?? [];
+		return members.length === 1 && isObjectSchemaNode(members[0], cyclicSchemas);
+	}
+	return isObjectComposableIntersection(node, cyclicSchemas);
+}
+/**
+* Whether an `allOf` is a pure object composition — an object base plus inline object members whose
+* shapes merge with `.extend(…)`. These stay a Zod object instead of a `ZodIntersection`, which
+* `z.discriminatedUnion` rejects.
+*/
+function isObjectComposableIntersection(node, cyclicSchemas) {
+	if (node.type !== "intersection") return false;
+	const [first, ...rest] = node.members ?? [];
+	return !!first && isObjectSchemaNode(first, cyclicSchemas) && rest.every(isPlainInlineObject);
+}
+/**
 * Format a default value as a code-level literal.
 * Objects become `{}`, primitives become their string representation, strings are quoted.
 */
@@ -627,6 +667,41 @@ function getMemberConstraint({ member, regexType }) {
 	}) || void 0;
 }
 /**
+* Builds the `{ key: value, … }` shape for an object node, shared by the `z.object(...)` and
+* `.extend(...)` renderings so they stay in lockstep.
+*/
+function buildZodObjectShape(ctx, node) {
+	const objectNode = _kubb_core.ast.narrowSchema(node, "object");
+	if (!objectNode) return "{}";
+	const isCyclic = (schema) => ctx.options.cyclicSchemas != null && (0, _kubb_ast_utils.containsCircularRef)(schema, { circularSchemas: ctx.options.cyclicSchemas });
+	return (0, _kubb_ast_utils.buildObject)((0, _kubb_ast_utils.mapSchemaProperties)(objectNode, (schema) => {
+		const hasSelfRef = isCyclic(schema);
+		const savedCyclicSchemas = ctx.options.cyclicSchemas;
+		if (hasSelfRef) ctx.options.cyclicSchemas = void 0;
+		const baseOutput = ctx.transform(schema) ?? ctx.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }));
+		if (hasSelfRef) ctx.options.cyclicSchemas = savedCyclicSchemas;
+		return baseOutput;
+	}).map(({ name: propName, property, output: baseOutput }) => {
+		const { schema } = property;
+		const meta = (0, _kubb_ast_utils.syncSchemaRef)(schema);
+		const descriptionToApply = schema.type !== "ref" && meta.type === "ref" ? void 0 : meta.description;
+		const value = applyModifiers({
+			value: baseOutput,
+			schema,
+			nullable: meta.nullable,
+			optional: schema.optional || property.required === false,
+			nullish: schema.nullish,
+			defaultValue: meta.default,
+			description: descriptionToApply,
+			examples: meta.examples
+		});
+		return isCyclic(schema) ? (0, _kubb_ast_utils.lazyGetter)({
+			name: propName,
+			body: value
+		}) : `${(0, _kubb_ast_utils.objectKey)(propName)}: ${value}`;
+	}));
+}
+/**
 * Zod v4 printer built with `definePrinter`.
 *
 * Converts a `SchemaNode` AST into a Zod v4 code string using the chainable API
@@ -667,7 +742,10 @@ const printerZod = _kubb_core.ast.createPrinter((options) => {
 			},
 			date(node) {
 				const codec = getCodec(node);
-				if (codec) return this.options.direction === "input" ? codec.encode(node) : codec.decode(node);
+				if (codec) {
+					if (this.options.direction === "input") return codec.encode(node);
+					return shouldCoerce(this.options.coercion, "dates") ? "z.coerce.date()" : codec.decode(node);
+				}
 				return "z.iso.date()";
 			},
 			datetime(node) {
@@ -720,38 +798,8 @@ const printerZod = _kubb_core.ast.createPrinter((options) => {
 				return resolvedName;
 			},
 			object(node) {
-				const isCyclic = (schema) => this.options.cyclicSchemas != null && (0, _kubb_ast_utils.containsCircularRef)(schema, { circularSchemas: this.options.cyclicSchemas });
-				const entries = (0, _kubb_ast_utils.mapSchemaProperties)(node, (schema) => {
-					const hasSelfRef = isCyclic(schema);
-					const savedCyclicSchemas = this.options.cyclicSchemas;
-					if (hasSelfRef) this.options.cyclicSchemas = void 0;
-					const baseOutput = this.transform(schema) ?? this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }));
-					if (hasSelfRef) this.options.cyclicSchemas = savedCyclicSchemas;
-					return baseOutput;
-				}).map(({ name: propName, property, output: baseOutput }) => {
-					const { schema } = property;
-					const meta = (0, _kubb_ast_utils.syncSchemaRef)(schema);
-					const wrappedOutput = this.options.wrapOutput ? this.options.wrapOutput({
-						output: baseOutput,
-						schema
-					}) || baseOutput : baseOutput;
-					const descriptionToApply = schema.type !== "ref" && meta.type === "ref" ? void 0 : meta.description;
-					const value = applyModifiers({
-						value: wrappedOutput,
-						schema,
-						nullable: meta.nullable,
-						optional: schema.optional || property.required === false,
-						nullish: schema.nullish,
-						defaultValue: meta.default,
-						description: descriptionToApply,
-						examples: meta.examples
-					});
-					return isCyclic(schema) ? (0, _kubb_ast_utils.lazyGetter)({
-						name: propName,
-						body: value
-					}) : `${(0, _kubb_ast_utils.objectKey)(propName)}: ${value}`;
-				});
-				const objectBase = `z.object(${(0, _kubb_ast_utils.buildObject)(entries)})`;
+				const entries = node.properties ?? [];
+				const objectBase = `z.object(${buildZodObjectShape(this, node)})`;
 				return (() => {
 					const patterns = node.patternProperties ? Object.entries(node.patternProperties) : [];
 					if (node.additionalProperties && node.additionalProperties !== true) {
@@ -791,7 +839,7 @@ const printerZod = _kubb_core.ast.createPrinter((options) => {
 				const members = (0, _kubb_ast_utils.mapSchemaMembers)(node, (memberNode) => this.transform(memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? strictOneOfMember$1(output, schema, cyclicSchemaNames) : output).filter(Boolean);
 				if (members.length === 0) return "";
 				if (members.length === 1) return members[0];
-				const allDiscriminable = nodeMembers.every((m) => (m.type === "ref" ? (0, _kubb_ast_utils.syncSchemaRef)(m) : m).type !== "intersection");
+				const allDiscriminable = nodeMembers.every((m) => isObjectSchemaNode(m, cyclicSchemaNames));
 				if (node.discriminatorPropertyName && allDiscriminable) return `z.discriminatedUnion(${(0, _kubb_ast_utils.stringify)(node.discriminatorPropertyName)}, ${(0, _kubb_ast_utils.buildList)(members)})`;
 				return `z.union(${(0, _kubb_ast_utils.buildList)(members)})`;
 			},
@@ -802,6 +850,7 @@ const printerZod = _kubb_core.ast.createPrinter((options) => {
 				if (!first) return "";
 				const firstBase = this.transform(first);
 				if (!firstBase) return "";
+				if (rest.length > 0 && isObjectComposableIntersection(node, cyclicSchemaNames)) return rest.reduce((acc, member) => `${acc}.extend(${buildZodObjectShape(this, member)})`, firstBase);
 				return rest.reduce((acc, member) => {
 					const constraint = getMemberConstraint({
 						member,
@@ -811,9 +860,9 @@ const printerZod = _kubb_core.ast.createPrinter((options) => {
 					const transformed = this.transform(member);
 					return transformed ? `${acc}.and(${transformed})` : acc;
 				}, firstBase);
-			},
-			...options.nodes
+			}
 		},
+		overrides: options.nodes,
 		print(node) {
 			const { keysToOmit } = this.options;
 			const transformed = this.transform(node);
@@ -857,7 +906,39 @@ function getMemberConstraintMini({ member, regexType }) {
 	}) || void 0;
 }
 /**
-* Zod v4 **Mini** printer built with `definePrinter`.
+* Builds the `{ key: value, … }` shape for an object node with the functional `zod/mini` modifiers,
+* shared by the `z.object(...)` and `z.extend(...)` renderings so they stay in lockstep.
+*/
+function buildZodMiniObjectShape(ctx, node) {
+	const objectNode = _kubb_core.ast.narrowSchema(node, "object");
+	if (!objectNode) return "{}";
+	const isCyclic = (schema) => ctx.options.cyclicSchemas != null && (0, _kubb_ast_utils.containsCircularRef)(schema, { circularSchemas: ctx.options.cyclicSchemas });
+	return (0, _kubb_ast_utils.buildObject)((0, _kubb_ast_utils.mapSchemaProperties)(objectNode, (schema) => {
+		const hasSelfRef = isCyclic(schema);
+		const savedCyclicSchemas = ctx.options.cyclicSchemas;
+		if (hasSelfRef) ctx.options.cyclicSchemas = void 0;
+		const baseOutput = ctx.transform(schema) ?? ctx.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }));
+		if (hasSelfRef) ctx.options.cyclicSchemas = savedCyclicSchemas;
+		return baseOutput;
+	}).map(({ name: propName, property, output: baseOutput }) => {
+		const { schema } = property;
+		const meta = (0, _kubb_ast_utils.syncSchemaRef)(schema);
+		const value = applyMiniModifiers({
+			value: baseOutput,
+			schema,
+			nullable: meta.nullable,
+			optional: schema.optional || property.required === false,
+			nullish: schema.nullish,
+			defaultValue: meta.default
+		});
+		return isCyclic(schema) ? (0, _kubb_ast_utils.lazyGetter)({
+			name: propName,
+			body: value
+		}) : `${(0, _kubb_ast_utils.objectKey)(propName)}: ${value}`;
+	}));
+}
+/**
+* Zod v4 Mini printer built with `definePrinter`.
 *
 * Converts a `SchemaNode` AST into a Zod v4 code string using the functional API
 * (`z.optional(z.string())`) for improved tree-shaking. See {@link printerZod} for the chainable API.
@@ -869,6 +950,7 @@ function getMemberConstraintMini({ member, regexType }) {
 * ```
 */
 const printerZodMini = _kubb_core.ast.createPrinter((options) => {
+	const cyclicSchemaNames = options.cyclicSchemas;
 	return {
 		name: "zod-mini",
 		options,
@@ -943,34 +1025,8 @@ const printerZodMini = _kubb_core.ast.createPrinter((options) => {
 				return resolvedName;
 			},
 			object(node) {
-				const isCyclic = (schema) => this.options.cyclicSchemas != null && (0, _kubb_ast_utils.containsCircularRef)(schema, { circularSchemas: this.options.cyclicSchemas });
-				const entries = (0, _kubb_ast_utils.mapSchemaProperties)(node, (schema) => {
-					const hasSelfRef = isCyclic(schema);
-					const savedCyclicSchemas = this.options.cyclicSchemas;
-					if (hasSelfRef) this.options.cyclicSchemas = void 0;
-					const baseOutput = this.transform(schema) ?? this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }));
-					if (hasSelfRef) this.options.cyclicSchemas = savedCyclicSchemas;
-					return baseOutput;
-				}).map(({ name: propName, property, output: baseOutput }) => {
-					const { schema } = property;
-					const meta = (0, _kubb_ast_utils.syncSchemaRef)(schema);
-					const value = applyMiniModifiers({
-						value: this.options.wrapOutput ? this.options.wrapOutput({
-							output: baseOutput,
-							schema
-						}) || baseOutput : baseOutput,
-						schema,
-						nullable: meta.nullable,
-						optional: schema.optional || property.required === false,
-						nullish: schema.nullish,
-						defaultValue: meta.default
-					});
-					return isCyclic(schema) ? (0, _kubb_ast_utils.lazyGetter)({
-						name: propName,
-						body: value
-					}) : `${(0, _kubb_ast_utils.objectKey)(propName)}: ${value}`;
-				});
-				const objectBase = `z.object(${(0, _kubb_ast_utils.buildObject)(entries)})`;
+				const entries = node.properties ?? [];
+				const objectBase = `z.object(${buildZodMiniObjectShape(this, node)})`;
 				const patterns = node.patternProperties ? Object.entries(node.patternProperties) : [];
 				if (node.additionalProperties && node.additionalProperties !== true) {
 					const catchallType = this.transform(node.additionalProperties);
@@ -1008,7 +1064,7 @@ const printerZodMini = _kubb_core.ast.createPrinter((options) => {
 				const members = (0, _kubb_ast_utils.mapSchemaMembers)(node, (memberNode) => this.transform(memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? strictOneOfMember(output, schema) : output).filter(Boolean);
 				if (members.length === 0) return "";
 				if (members.length === 1) return members[0];
-				const allDiscriminable = nodeMembers.every((m) => (m.type === "ref" ? (0, _kubb_ast_utils.syncSchemaRef)(m) : m).type !== "intersection");
+				const allDiscriminable = nodeMembers.every((m) => isObjectSchemaNode(m, cyclicSchemaNames));
 				if (node.discriminatorPropertyName && allDiscriminable) return `z.discriminatedUnion(${(0, _kubb_ast_utils.stringify)(node.discriminatorPropertyName)}, ${(0, _kubb_ast_utils.buildList)(members)})`;
 				return `z.union(${(0, _kubb_ast_utils.buildList)(members)})`;
 			},
@@ -1019,6 +1075,7 @@ const printerZodMini = _kubb_core.ast.createPrinter((options) => {
 				if (!first) return "";
 				const firstBase = this.transform(first);
 				if (!firstBase) return "";
+				if (rest.length > 0 && isObjectComposableIntersection(node, cyclicSchemaNames)) return rest.reduce((acc, member) => `z.extend(${acc}, ${buildZodMiniObjectShape(this, member)})`, firstBase);
 				return rest.reduce((acc, member) => {
 					const constraint = getMemberConstraintMini({
 						member,
@@ -1028,9 +1085,9 @@ const printerZodMini = _kubb_core.ast.createPrinter((options) => {
 					const transformed = this.transform(member);
 					return transformed ? `z.intersection(${acc}, ${transformed})` : acc;
 				}, firstBase);
-			},
-			...options.nodes
+			}
 		},
+		overrides: options.nodes,
 		print(node) {
 			const { keysToOmit } = this.options;
 			const transformed = this.transform(node);
@@ -1060,12 +1117,12 @@ const zodPrinterCache = /* @__PURE__ */ new WeakMap();
 const zodMiniPrinterCache = /* @__PURE__ */ new WeakMap();
 /**
 * Returns the cached `output`/`input` direction printers for a resolver, building them on
-* first use. The `input` printer encodes `Date → string` for request bodies; `output` decodes
+* first use. The `input` printer encodes `Date → string` for request bodies, and `output` decodes
 * `string → Date` for responses. Schemas without `dateType: 'date'` fields print identically.
 */
 function getStdPrinters(resolver, params) {
 	const cached = zodPrinterCache.get(resolver);
-	if (cached && cached.coercion === params.coercion && cached.guidType === params.guidType && cached.regexType === params.regexType && cached.dateType === params.dateType) return {
+	if (cached && cached.coercion === params.coercion && cached.guidType === params.guidType && cached.regexType === params.regexType && cached.dateType === params.dateType && cached.nodes === params.nodes) return {
 		output: cached.output,
 		input: cached.input
 	};
@@ -1087,7 +1144,8 @@ function getStdPrinters(resolver, params) {
 		coercion: params.coercion,
 		guidType: params.guidType,
 		regexType: params.regexType,
-		dateType: params.dateType
+		dateType: params.dateType,
+		nodes: params.nodes
 	});
 	return {
 		output,
@@ -1096,7 +1154,7 @@ function getStdPrinters(resolver, params) {
 }
 function getMiniPrinter(resolver, params) {
 	const cached = zodMiniPrinterCache.get(resolver);
-	if (cached && cached.guidType === params.guidType && cached.regexType === params.regexType) return cached.printer;
+	if (cached && cached.guidType === params.guidType && cached.regexType === params.regexType && cached.nodes === params.nodes) return cached.printer;
 	const p = printerZodMini({
 		...params,
 		resolver
@@ -1104,7 +1162,8 @@ function getMiniPrinter(resolver, params) {
 	zodMiniPrinterCache.set(resolver, {
 		printer: p,
 		guidType: params.guidType,
-		regexType: params.regexType
+		regexType: params.regexType,
+		nodes: params.nodes
 	});
 	return p;
 }
@@ -1119,7 +1178,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 	renderer: _kubb_renderer_jsx.jsxRenderer,
 	schema(node, ctx) {
 		const { adapter, config, resolver, root } = ctx;
-		const { output, coercion, guidType, regexType, mini, wrapOutput, inferred, importPath, group, printer } = ctx.options;
+		const { output, coercion, guidType, regexType, mini, inferred, importPath, group, printer } = ctx.options;
 		const dateType = adapter.options.dateType;
 		if (!node.name) return;
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
@@ -1173,7 +1232,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 			guidType,
 			regexType,
 			dateType,
-			wrapOutput,
 			cyclicSchemas,
 			nameMapping,
 			nodes: printer?.nodes
@@ -1181,7 +1239,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 		const schemaPrinter = mini ? getMiniPrinter(resolver, {
 			guidType,
 			regexType,
-			wrapOutput,
 			cyclicSchemas,
 			nameMapping,
 			nodes: printer?.nodes
@@ -1241,7 +1298,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 	operation(node, ctx) {
 		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { adapter, config, resolver, root } = ctx;
-		const { output, coercion, guidType, regexType, mini, wrapOutput, inferred, importPath, group, printer } = ctx.options;
+		const { output, coercion, guidType, regexType, mini, inferred, importPath, group, printer } = ctx.options;
 		const dateType = adapter.options.dateType;
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
 		const params = caseParams(node.parameters, "camelcase");
@@ -1275,7 +1332,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 			const schemaPrinter = mini ? keysToOmit?.length ? printerZodMini({
 				guidType,
 				regexType,
-				wrapOutput,
 				resolver,
 				keysToOmit,
 				cyclicSchemas,
@@ -1284,7 +1340,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 			}) : getMiniPrinter(resolver, {
 				guidType,
 				regexType,
-				wrapOutput,
 				cyclicSchemas,
 				nameMapping,
 				nodes: printer?.nodes
@@ -1293,7 +1348,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				guidType,
 				regexType,
 				dateType,
-				wrapOutput,
 				resolver,
 				keysToOmit,
 				cyclicSchemas,
@@ -1305,7 +1359,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				guidType,
 				regexType,
 				dateType,
-				wrapOutput,
 				cyclicSchemas,
 				nameMapping,
 				nodes: printer?.nodes
@@ -1559,7 +1612,7 @@ const pluginZodName = "plugin-zod";
 *     pluginTs(),
 *     pluginZod({
 *       output: { path: './zod' },
-*       typed: true,
+*       inferred: true,
 *     }),
 *   ],
 * })
@@ -1569,7 +1622,7 @@ const pluginZod = (0, _kubb_core.definePlugin)((options) => {
 	const { output = {
 		path: "zod",
 		barrel: { type: "named" }
-	}, group, exclude = [], include, override = [], typed = false, mini = false, guidType = "uuid", regexType = "literal", importPath = mini ? "zod/mini" : "zod", coercion = false, inferred = false, wrapOutput = void 0, printer, resolver: userResolver, macros: userMacros } = options;
+	}, group, exclude = [], include, override = [], mini = false, guidType = "uuid", regexType = "literal", importPath = mini ? "zod/mini" : "zod", coercion = false, inferred = false, printer, resolver: userResolver, macros: userMacros } = options;
 	const groupConfig = createGroupConfig(group);
 	return {
 		name: pluginZodName,
@@ -1581,14 +1634,12 @@ const pluginZod = (0, _kubb_core.definePlugin)((options) => {
 				include,
 				override,
 				group: groupConfig,
-				typed,
 				importPath,
 				coercion,
 				inferred,
 				guidType,
 				regexType,
 				mini,
-				wrapOutput,
 				printer
 			});
 			ctx.setResolver(userResolver ? {