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

package/dist/index.cjs

@@ -9,10 +9,9 @@ var __name = (target, value) => __defProp(target, "name", {
 	configurable: true
 });
 //#endregion
-let _kubb_core = require("@kubb/core");
-let _kubb_renderer_jsx = require("@kubb/renderer-jsx");
-let _kubb_renderer_jsx_jsx_runtime = require("@kubb/renderer-jsx/jsx-runtime");
-let _kubb_ast_utils = require("@kubb/ast/utils");
+let kubb_kit = require("kubb/kit");
+let kubb_jsx = require("kubb/jsx");
+let kubb_jsx_jsx_runtime = require("kubb/jsx/jsx-runtime");
 //#region ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
@@ -318,22 +317,22 @@ function Zod({ name, node, printer, inferTypeName, cyclic }) {
 	const output = printer.print(node);
 	if (!output) return;
 	const needsAnnotation = cyclic && node.type !== "object";
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
 		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Const, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Const, {
 			export: true,
 			name,
 			type: needsAnnotation ? "z.ZodType" : void 0,
 			children: output
 		})
-	}), inferTypeName && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	}), inferTypeName && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name: inferTypeName,
 		isExportable: true,
 		isIndexable: true,
 		isTypeOnly: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Type, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Type, {
 			export: true,
 			name: inferTypeName,
 			children: `z.infer<typeof ${name}>`
@@ -396,12 +395,12 @@ function containsCodec(node, seen = /* @__PURE__ */ new Set()) {
 	if (hasCodec(node)) return true;
 	if (node.type === "ref") {
 		if (!node.ref) return false;
-		const refName = (0, _kubb_ast_utils.extractRefName)(node.ref);
+		const refName = kubb_kit.ast.extractRefName(node.ref);
 		if (refName) {
 			if (seen.has(refName)) return false;
 			seen.add(refName);
 		}
-		const resolved = (0, _kubb_ast_utils.syncSchemaRef)(node);
+		const resolved = kubb_kit.ast.syncSchemaRef(node);
 		if (resolved.type === "ref") return false;
 		return containsCodec(resolved, seen);
 	}
@@ -417,14 +416,54 @@ function containsCodec(node, seen = /* @__PURE__ */ new Set()) {
 * them to their input (encode) variant.
 */
 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 });
+	return kubb_kit.ast.collect(node, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? kubb_kit.ast.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 ? kubb_kit.ast.extractRefName(node.ref) : void 0) ?? node.name;
+		if (refName && cyclicSchemas?.has(refName)) return false;
+		const resolved = kubb_kit.ast.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.
 */
 function formatDefault(value) {
-	if (typeof value === "string") return (0, _kubb_ast_utils.stringify)(value);
+	if (typeof value === "string") return kubb_kit.ast.stringify(value);
 	if (typeof value === "object" && value !== null) return "{}";
 	return String(value ?? "");
 }
@@ -439,13 +478,13 @@ function formatDefault(value) {
 */
 function defaultLiteral(node, value) {
 	if (value === null) return null;
-	if (node && _kubb_core.ast.narrowSchema(node, "bigint")) {
+	if (node && kubb_kit.ast.narrowSchema(node, "bigint")) {
 		if (typeof value === "bigint") return `BigInt(${value})`;
 		if (typeof value === "number" && Number.isInteger(value)) return `BigInt(${value})`;
 		return null;
 	}
-	if (node && _kubb_core.ast.narrowSchema(node, "array")) return Array.isArray(value) ? JSON.stringify(value) : null;
-	const enumNode = node ? _kubb_core.ast.narrowSchema(node, "enum") : void 0;
+	if (node && kubb_kit.ast.narrowSchema(node, "array")) return Array.isArray(value) ? JSON.stringify(value) : null;
+	const enumNode = node ? kubb_kit.ast.narrowSchema(node, "enum") : void 0;
 	if (enumNode) {
 		const values = enumNode.namedEnumValues?.map((member) => member.value) ?? enumNode.enumValues ?? [];
 		if (values.length) {
@@ -460,7 +499,7 @@ function defaultLiteral(node, value) {
 * Strings are quoted; numbers and booleans are emitted raw.
 */
 function formatLiteral(v) {
-	if (typeof v === "string") return (0, _kubb_ast_utils.stringify)(v);
+	if (typeof v === "string") return kubb_kit.ast.stringify(v);
 	return String(v);
 }
 /**
@@ -502,7 +541,8 @@ function patternKeySchemaMini({ patterns, regexType }) {
 	})}))`;
 }
 function patternKeySource({ patterns, regexType }) {
-	return (0, _kubb_ast_utils.toRegExpString)(patterns.length === 1 ? patterns[0] : patterns.map((pattern) => `(${pattern})`).join("|"), regexFunc(regexType));
+	const source = patterns.length === 1 ? patterns[0] : patterns.map((pattern) => `(${pattern})`).join("|");
+	return kubb_kit.ast.toRegExpString(source, regexFunc(regexType));
 }
 /**
 * Build `.min()` / `.max()` / `.gt()` / `.lt()` constraint chains for numbers
@@ -525,7 +565,7 @@ function lengthConstraints({ min, max, pattern, regexType }) {
 	return [
 		min !== void 0 ? `.min(${min})` : "",
 		max !== void 0 ? `.max(${max})` : "",
-		pattern !== void 0 ? `.regex(${(0, _kubb_ast_utils.toRegExpString)(pattern, regexFunc(regexType))})` : ""
+		pattern !== void 0 ? `.regex(${kubb_kit.ast.toRegExpString(pattern, regexFunc(regexType))})` : ""
 	].join("");
 }
 /**
@@ -547,7 +587,7 @@ function lengthChecksMini({ min, max, pattern, regexType }) {
 	const checks = [];
 	if (min !== void 0) checks.push(`z.minLength(${min})`);
 	if (max !== void 0) checks.push(`z.maxLength(${max})`);
-	if (pattern !== void 0) checks.push(`z.regex(${(0, _kubb_ast_utils.toRegExpString)(pattern, regexFunc(regexType))})`);
+	if (pattern !== void 0) checks.push(`z.regex(${kubb_kit.ast.toRegExpString(pattern, regexFunc(regexType))})`);
 	return checks.length ? `.check(${checks.join(", ")})` : "";
 }
 /**
@@ -563,7 +603,7 @@ function applyModifiers({ value, schema, nullable, optional, nullish, defaultVal
 	})();
 	const literal = defaultValue !== void 0 ? defaultLiteral(schema, defaultValue) : null;
 	const withDefault = literal !== null ? `${withModifier}.default(${literal})` : withModifier;
-	const withDescription = description ? `${withDefault}.describe(${(0, _kubb_ast_utils.stringify)(description)})` : withDefault;
+	const withDescription = description ? `${withDefault}.describe(${kubb_kit.ast.stringify(description)})` : withDefault;
 	return examples?.length ? `${withDescription}.meta({ examples: [${examples.map(formatDefault).join(", ")}] })` : withDescription;
 }
 function modifierDepth(schema) {
@@ -581,7 +621,7 @@ function modifierDepth(schema) {
 * objects need no unwrap because the printer adds their modifiers after `.omit()`.
 */
 function omitUnwrapChain(node) {
-	const ref = _kubb_core.ast.narrowSchema(node, "ref");
+	const ref = kubb_kit.ast.narrowSchema(node, "ref");
 	if (!ref) return "";
 	const target = ref.schema ?? ref;
 	const depth = modifierDepth(target) + (target.default !== void 0 ? 1 : 0);
@@ -606,9 +646,9 @@ function strictOneOfMember$1(member, node, cyclicSchemas) {
 	if (node.type === "object" && node.additionalProperties === void 0) return `${member}.strict()`;
 	if (node.type === "ref") {
 		if (member.startsWith("z.lazy(")) return member;
-		const refName = (node.ref ? (0, _kubb_ast_utils.extractRefName)(node.ref) : void 0) ?? node.name;
+		const refName = (node.ref ? kubb_kit.ast.extractRefName(node.ref) : void 0) ?? node.name;
 		if (refName && cyclicSchemas?.has(refName)) return member;
-		const schema = (0, _kubb_ast_utils.syncSchemaRef)(node);
+		const schema = kubb_kit.ast.syncSchemaRef(node);
 		if (schema.nullable || schema.optional || node.nullable || node.optional) return member;
 		if (schema.type === "object" && (schema.additionalProperties === void 0 || schema.additionalProperties === false)) return `${member}.strict()`;
 	}
@@ -617,16 +657,52 @@ function strictOneOfMember$1(member, node, cyclicSchemas) {
 __name(strictOneOfMember$1, "strictOneOfMember");
 function getMemberConstraint({ member, regexType }) {
 	if (member.primitive === "string") return lengthConstraints({
-		..._kubb_core.ast.narrowSchema(member, "string") ?? {},
+		...kubb_kit.ast.narrowSchema(member, "string") ?? {},
 		regexType
 	}) || void 0;
-	if (member.primitive === "number" || member.primitive === "integer") return numberConstraints(_kubb_core.ast.narrowSchema(member, "number") ?? _kubb_core.ast.narrowSchema(member, "integer") ?? {}) || void 0;
+	if (member.primitive === "number" || member.primitive === "integer") return numberConstraints(kubb_kit.ast.narrowSchema(member, "number") ?? kubb_kit.ast.narrowSchema(member, "integer") ?? {}) || void 0;
 	if (member.primitive === "array") return lengthConstraints({
-		..._kubb_core.ast.narrowSchema(member, "array") ?? {},
+		...kubb_kit.ast.narrowSchema(member, "array") ?? {},
 		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_kit.ast.narrowSchema(node, "object");
+	if (!objectNode) return "{}";
+	const isCyclic = (schema) => ctx.options.cyclicSchemas != null && kubb_kit.ast.containsCircularRef(schema, { circularSchemas: ctx.options.cyclicSchemas });
+	const entries = kubb_kit.ast.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_kit.ast.factory.createSchema({ type: "unknown" }));
+		if (hasSelfRef) ctx.options.cyclicSchemas = savedCyclicSchemas;
+		return baseOutput;
+	}).map(({ name: propName, property, output: baseOutput }) => {
+		const { schema } = property;
+		const meta = kubb_kit.ast.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) ? kubb_kit.ast.lazyGetter({
+			name: propName,
+			body: value
+		}) : `${kubb_kit.ast.objectKey(propName)}: ${value}`;
+	});
+	return kubb_kit.ast.buildObject(entries);
+}
+/**
 * Zod v4 printer built with `definePrinter`.
 *
 * Converts a `SchemaNode` AST into a Zod v4 code string using the chainable API
@@ -638,7 +714,7 @@ function getMemberConstraint({ member, regexType }) {
 * const code = printer.print(stringNode) // "z.string()"
 * ```
 */
-const printerZod = _kubb_core.ast.createPrinter((options) => {
+const printerZod = kubb_kit.ast.createPrinter((options) => {
 	const cyclicSchemaNames = options.cyclicSchemas;
 	return {
 		name: "zod",
@@ -667,7 +743,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) {
@@ -713,56 +792,26 @@ const printerZod = _kubb_core.ast.createPrinter((options) => {
 			},
 			ref(node) {
 				if (!node.name) return null;
-				const refName = node.ref ? this.options.nameMapping?.get(node.ref) ?? (0, _kubb_ast_utils.extractRefName)(node.ref) ?? node.name : node.name;
+				const refName = node.ref ? this.options.nameMapping?.get(node.ref) ?? kubb_kit.ast.extractRefName(node.ref) ?? node.name : node.name;
 				const useInputVariant = node.ref != null && this.options.direction === "input" && containsCodec(node);
 				const resolvedName = node.ref ? useInputVariant ? this.options.resolver?.resolveInputSchemaName(refName) ?? refName : this.options.resolver?.default(refName, "function") ?? refName : node.name;
 				if (node.ref && this.options.cyclicSchemas?.has(refName)) return `z.lazy(() => ${resolvedName})`;
 				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) {
 						const catchallType = this.transform(node.additionalProperties);
 						return catchallType ? `${objectBase}.catchall(${catchallType})` : objectBase;
 					}
-					if (node.additionalProperties === true) return `${objectBase}.catchall(${this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }))})`;
+					if (node.additionalProperties === true) return `${objectBase}.catchall(${this.transform(kubb_kit.ast.factory.createSchema({ type: "unknown" }))})`;
 					if (node.additionalProperties === false && patterns.length === 0) return `${objectBase}.strict()`;
 					if (patterns.length > 0) {
 						const values = patterns.map(([, valueSchema]) => {
-							const valueType = this.transform(valueSchema) ?? this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }));
+							const valueType = this.transform(valueSchema) ?? this.transform(kubb_kit.ast.factory.createSchema({ type: "unknown" }));
 							return valueSchema.nullable ? `${valueType}.nullable()` : valueType;
 						});
 						const distinct = [...new Set(values)];
@@ -777,23 +826,24 @@ const printerZod = _kubb_core.ast.createPrinter((options) => {
 				})();
 			},
 			array(node) {
-				const base = `z.array(${(0, _kubb_ast_utils.mapSchemaItems)(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean).join(", ") || this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }))})${lengthConstraints({
+				const base = `z.array(${kubb_kit.ast.mapSchemaItems(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean).join(", ") || this.transform(kubb_kit.ast.factory.createSchema({ type: "unknown" }))})${lengthConstraints({
 					...node,
 					regexType: this.options.regexType
 				})}`;
 				return node.unique ? `${base}.refine(items => new Set(items).size === items.length, { message: "Array entries must be unique" })` : base;
 			},
 			tuple(node) {
-				return `z.tuple(${(0, _kubb_ast_utils.buildList)((0, _kubb_ast_utils.mapSchemaItems)(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean))})`;
+				const items = kubb_kit.ast.mapSchemaItems(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean);
+				return `z.tuple(${kubb_kit.ast.buildList(items)})`;
 			},
 			union(node) {
 				const nodeMembers = node.members ?? [];
-				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);
+				const members = kubb_kit.ast.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");
-				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)})`;
+				const allDiscriminable = nodeMembers.every((m) => isObjectSchemaNode(m, cyclicSchemaNames));
+				if (node.discriminatorPropertyName && allDiscriminable) return `z.discriminatedUnion(${kubb_kit.ast.stringify(node.discriminatorPropertyName)}, ${kubb_kit.ast.buildList(members)})`;
+				return `z.union(${kubb_kit.ast.buildList(members)})`;
 			},
 			intersection(node) {
 				const members = node.members ?? [];
@@ -802,6 +852,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,14 +862,14 @@ 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);
 			if (!transformed) return null;
-			const meta = (0, _kubb_ast_utils.syncSchemaRef)(node);
+			const meta = kubb_kit.ast.syncSchemaRef(node);
 			return applyModifiers({
 				value: (() => {
 					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
@@ -847,17 +898,50 @@ function strictOneOfMember(member, node) {
 }
 function getMemberConstraintMini({ member, regexType }) {
 	if (member.primitive === "string") return lengthChecksMini({
-		..._kubb_core.ast.narrowSchema(member, "string") ?? {},
+		...kubb_kit.ast.narrowSchema(member, "string") ?? {},
 		regexType
 	}) || void 0;
-	if (member.primitive === "number" || member.primitive === "integer") return numberChecksMini(_kubb_core.ast.narrowSchema(member, "number") ?? _kubb_core.ast.narrowSchema(member, "integer") ?? {}) || void 0;
+	if (member.primitive === "number" || member.primitive === "integer") return numberChecksMini(kubb_kit.ast.narrowSchema(member, "number") ?? kubb_kit.ast.narrowSchema(member, "integer") ?? {}) || void 0;
 	if (member.primitive === "array") return lengthChecksMini({
-		..._kubb_core.ast.narrowSchema(member, "array") ?? {},
+		...kubb_kit.ast.narrowSchema(member, "array") ?? {},
 		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_kit.ast.narrowSchema(node, "object");
+	if (!objectNode) return "{}";
+	const isCyclic = (schema) => ctx.options.cyclicSchemas != null && kubb_kit.ast.containsCircularRef(schema, { circularSchemas: ctx.options.cyclicSchemas });
+	const entries = kubb_kit.ast.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_kit.ast.factory.createSchema({ type: "unknown" }));
+		if (hasSelfRef) ctx.options.cyclicSchemas = savedCyclicSchemas;
+		return baseOutput;
+	}).map(({ name: propName, property, output: baseOutput }) => {
+		const { schema } = property;
+		const meta = kubb_kit.ast.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) ? kubb_kit.ast.lazyGetter({
+			name: propName,
+			body: value
+		}) : `${kubb_kit.ast.objectKey(propName)}: ${value}`;
+	});
+	return kubb_kit.ast.buildObject(entries);
+}
+/**
+* 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.
@@ -868,7 +952,8 @@ function getMemberConstraintMini({ member, regexType }) {
 * const code = printer.print(optionalStringNode) // "z.optional(z.string())"
 * ```
 */
-const printerZodMini = _kubb_core.ast.createPrinter((options) => {
+const printerZodMini = kubb_kit.ast.createPrinter((options) => {
+	const cyclicSchemaNames = options.cyclicSchemas;
 	return {
 		name: "zod-mini",
 		options,
@@ -937,50 +1022,24 @@ const printerZodMini = _kubb_core.ast.createPrinter((options) => {
 			},
 			ref(node) {
 				if (!node.name) return null;
-				const refName = node.ref ? this.options.nameMapping?.get(node.ref) ?? (0, _kubb_ast_utils.extractRefName)(node.ref) ?? node.name : node.name;
+				const refName = node.ref ? this.options.nameMapping?.get(node.ref) ?? kubb_kit.ast.extractRefName(node.ref) ?? node.name : node.name;
 				const resolvedName = node.ref ? this.options.resolver?.default(refName, "function") ?? refName : node.name;
 				if (node.ref && this.options.cyclicSchemas?.has(refName)) return `z.lazy(() => ${resolvedName})`;
 				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);
 					return catchallType ? `z.catchall(${objectBase}, ${catchallType})` : objectBase;
 				}
-				if (node.additionalProperties === true) return `z.catchall(${objectBase}, ${this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }))})`;
+				if (node.additionalProperties === true) return `z.catchall(${objectBase}, ${this.transform(kubb_kit.ast.factory.createSchema({ type: "unknown" }))})`;
 				if (node.additionalProperties === false && patterns.length === 0) return objectBase.replace(/^z\.object\(/, "z.strictObject(");
 				if (patterns.length > 0) {
 					const values = patterns.map(([, valueSchema]) => {
-						const valueType = this.transform(valueSchema) ?? this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }));
+						const valueType = this.transform(valueSchema) ?? this.transform(kubb_kit.ast.factory.createSchema({ type: "unknown" }));
 						return valueSchema.nullable ? `z.nullable(${valueType})` : valueType;
 					});
 					const distinct = [...new Set(values)];
@@ -994,23 +1053,24 @@ const printerZodMini = _kubb_core.ast.createPrinter((options) => {
 				return objectBase;
 			},
 			array(node) {
-				const base = `z.array(${(0, _kubb_ast_utils.mapSchemaItems)(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean).join(", ") || this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }))})${lengthChecksMini({
+				const base = `z.array(${kubb_kit.ast.mapSchemaItems(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean).join(", ") || this.transform(kubb_kit.ast.factory.createSchema({ type: "unknown" }))})${lengthChecksMini({
 					...node,
 					regexType: this.options.regexType
 				})}`;
 				return node.unique ? `${base}.refine(items => new Set(items).size === items.length, { message: "Array entries must be unique" })` : base;
 			},
 			tuple(node) {
-				return `z.tuple(${(0, _kubb_ast_utils.buildList)((0, _kubb_ast_utils.mapSchemaItems)(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean))})`;
+				const items = kubb_kit.ast.mapSchemaItems(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean);
+				return `z.tuple(${kubb_kit.ast.buildList(items)})`;
 			},
 			union(node) {
 				const nodeMembers = node.members ?? [];
-				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);
+				const members = kubb_kit.ast.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");
-				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)})`;
+				const allDiscriminable = nodeMembers.every((m) => isObjectSchemaNode(m, cyclicSchemaNames));
+				if (node.discriminatorPropertyName && allDiscriminable) return `z.discriminatedUnion(${kubb_kit.ast.stringify(node.discriminatorPropertyName)}, ${kubb_kit.ast.buildList(members)})`;
+				return `z.union(${kubb_kit.ast.buildList(members)})`;
 			},
 			intersection(node) {
 				const members = node.members ?? [];
@@ -1019,6 +1079,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,14 +1089,14 @@ 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);
 			if (!transformed) return null;
-			const meta = (0, _kubb_ast_utils.syncSchemaRef)(node);
+			const meta = kubb_kit.ast.syncSchemaRef(node);
 			return applyMiniModifiers({
 				value: (() => {
 					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
@@ -1060,12 +1121,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 +1148,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 +1158,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 +1166,8 @@ function getMiniPrinter(resolver, params) {
 	zodMiniPrinterCache.set(resolver, {
 		printer: p,
 		guidType: params.guidType,
-		regexType: params.regexType
+		regexType: params.regexType,
+		nodes: params.nodes
 	});
 	return p;
 }
@@ -1114,12 +1177,12 @@ function getMiniPrinter(resolver, params) {
 * When `mini: true`, schemas use the Zod Mini functional API instead of
 * chainable methods.
 */
-const zodGenerator = (0, _kubb_core.defineGenerator)({
+const zodGenerator = (0, kubb_kit.defineGenerator)({
 	name: "zod",
-	renderer: _kubb_renderer_jsx.jsxRenderer,
+	renderer: kubb_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 +1236,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 			guidType,
 			regexType,
 			dateType,
-			wrapOutput,
 			cyclicSchemas,
 			nameMapping,
 			nodes: printer?.nodes
@@ -1181,12 +1243,11 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 		const schemaPrinter = mini ? getMiniPrinter(resolver, {
 			guidType,
 			regexType,
-			wrapOutput,
 			cyclicSchemas,
 			nameMapping,
 			nodes: printer?.nodes
 		}) : stdPrinters.output;
-		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
+		return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx.File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
@@ -1207,12 +1268,12 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: isZodImport ? "z" : ["z"],
 					path: importPath,
 					isNameSpace: isZodImport
 				}),
-				imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				imports.map((imp) => /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					root: meta.file.path,
 					path: imp.path,
 					name: imp.name
@@ -1221,14 +1282,14 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 					imp.path,
 					imp.name
 				].join("-"))),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Zod, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(Zod, {
 					name: meta.name,
 					node,
 					printer: schemaPrinter,
 					inferTypeName,
 					cyclic: cyclicSchemas.has(node.name)
 				}),
-				hasCodec && stdPrinters && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Zod, {
+				hasCodec && stdPrinters && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(Zod, {
 					name: resolver.resolveInputSchemaName(node.name),
 					node,
 					printer: stdPrinters.input,
@@ -1239,9 +1300,9 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 		});
 	},
 	operation(node, ctx) {
-		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
+		if (!kubb_kit.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 +1336,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 			const schemaPrinter = mini ? keysToOmit?.length ? printerZodMini({
 				guidType,
 				regexType,
-				wrapOutput,
 				resolver,
 				keysToOmit,
 				cyclicSchemas,
@@ -1284,7 +1344,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 			}) : getMiniPrinter(resolver, {
 				guidType,
 				regexType,
-				wrapOutput,
 				cyclicSchemas,
 				nameMapping,
 				nodes: printer?.nodes
@@ -1293,7 +1352,6 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				guidType,
 				regexType,
 				dateType,
-				wrapOutput,
 				resolver,
 				keysToOmit,
 				cyclicSchemas,
@@ -1305,12 +1363,11 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				guidType,
 				regexType,
 				dateType,
-				wrapOutput,
 				cyclicSchemas,
 				nameMapping,
 				nodes: printer?.nodes
 			})[direction];
-			return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+			return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx_jsx_runtime.Fragment, { children: [imports.map((imp) => /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 				root: meta.file.path,
 				path: imp.path,
 				name: imp.name
@@ -1318,7 +1375,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				name,
 				imp.path,
 				imp.name
-			].join("-"))), /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Zod, {
+			].join("-"))), /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(Zod, {
 				name,
 				node: schema,
 				printer: schemaPrinter,
@@ -1328,14 +1385,14 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 		}
 		function buildContentTypeVariants(entries, baseName, decorate, direction) {
 			const variants = resolveContentTypeVariants(entries, baseName);
-			const unionSchema = _kubb_core.ast.factory.createSchema({
+			const unionSchema = kubb_kit.ast.factory.createSchema({
 				type: "union",
-				members: variants.map((variant) => _kubb_core.ast.factory.createSchema({
+				members: variants.map((variant) => kubb_kit.ast.factory.createSchema({
 					type: "ref",
 					name: variant.name
 				}))
 			});
-			return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [variants.map((variant) => renderSchemaEntry({
+			return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx_jsx_runtime.Fragment, { children: [variants.map((variant) => renderSchemaEntry({
 				schema: decorate ? decorate(variant.schema) : variant.schema,
 				name: variant.name,
 				keysToOmit: variant.keysToOmit,
@@ -1369,16 +1426,16 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				name: resolver.resolveSchemaName(schemaName),
 				path: ""
 			})).flatMap((imp) => Array.isArray(imp.name) ? imp.name : [imp.name]) : []))).has(responseUnionName)) return null;
-			const members = successResponsesWithSchema.map((res) => _kubb_core.ast.factory.createSchema({
+			const members = successResponsesWithSchema.map((res) => kubb_kit.ast.factory.createSchema({
 				type: "ref",
 				name: resolver.resolveResponseStatusName(node, res.statusCode)
 			}));
 			if (members.length === 0) return renderSchemaEntry({
-				schema: _kubb_core.ast.factory.createSchema({ type: "unknown" }),
+				schema: kubb_kit.ast.factory.createSchema({ type: "unknown" }),
 				name: responseUnionName
 			});
 			return renderSchemaEntry({
-				schema: members.length === 1 ? members[0] : _kubb_core.ast.factory.createSchema({
+				schema: members.length === 1 ? members[0] : kubb_kit.ast.factory.createSchema({
 					type: "union",
 					members
 				}),
@@ -1392,12 +1449,12 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				name: resolver.resolveSchemaName(schemaName),
 				path: ""
 			})).flatMap((imp) => Array.isArray(imp.name) ? imp.name : [imp.name]) : []))).has(errorUnionName)) return null;
-			const members = errorResponsesWithSchema.map((res) => _kubb_core.ast.factory.createSchema({
+			const members = errorResponsesWithSchema.map((res) => kubb_kit.ast.factory.createSchema({
 				type: "ref",
 				name: resolver.resolveResponseStatusName(node, res.statusCode)
 			}));
 			return renderSchemaEntry({
-				schema: members.length === 1 ? members[0] : _kubb_core.ast.factory.createSchema({
+				schema: members.length === 1 ? members[0] : kubb_kit.ast.factory.createSchema({
 					type: "union",
 					members
 				}),
@@ -1425,7 +1482,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				description: node.requestBody.description ?? schema.description
 			}), "input");
 		})();
-		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
+		return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx.File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
@@ -1446,7 +1503,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: isZodImport ? "z" : ["z"],
 					path: importPath,
 					isNameSpace: isZodImport
@@ -1477,7 +1534,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 * resolverZod.resolveSchemaTypeName('pet')     // 'PetSchemaType'
 * ```
 */
-const resolverZod = (0, _kubb_core.defineResolver)(() => {
+const resolverZod = (0, kubb_kit.defineResolver)(() => {
 	return {
 		name: "default",
 		pluginName: "plugin-zod",
@@ -1548,7 +1605,7 @@ const pluginZodName = "plugin-zod";
 *
 * @example
 * ```ts
-* import { defineConfig } from 'kubb'
+* import { defineConfig } from 'kubb/config'
 * import { pluginTs } from '@kubb/plugin-ts'
 * import { pluginZod } from '@kubb/plugin-zod'
 *
@@ -1559,17 +1616,17 @@ const pluginZodName = "plugin-zod";
 *     pluginTs(),
 *     pluginZod({
 *       output: { path: './zod' },
-*       typed: true,
+*       inferred: true,
 *     }),
 *   ],
 * })
 * ```
 */
-const pluginZod = (0, _kubb_core.definePlugin)((options) => {
+const pluginZod = (0, kubb_kit.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 +1638,12 @@ const pluginZod = (0, _kubb_core.definePlugin)((options) => {
 				include,
 				override,
 				group: groupConfig,
-				typed,
 				importPath,
 				coercion,
 				inferred,
 				guidType,
 				regexType,
 				mini,
-				wrapOutput,
 				printer
 			});
 			ctx.setResolver(userResolver ? {