@kubb/plugin-zod 5.5.0-canary.20261023T194004 → 5.5.0

package/dist/index.cjs

@@ -1043,14 +1043,15 @@ function modifierDepth(schema) {
 * `.optional()` / `.nullish()` / `.default()` wrappers. `.omit()` lives on the inner `ZodObject`,
 * not on those `ZodNullable` / `ZodOptional` / `ZodDefault` wrappers, so the omit has to unwrap
 * down to the object first. This mirrors plugin-ts emitting `Omit<NonNullable<T>, …>`. Inline
-* objects need no unwrap because the printer adds their modifiers after `.omit()`.
+* objects need no unwrap because the printer adds their modifiers after `.omit()`. Zod Mini has no
+* `.unwrap()`, so its printer passes `._zod.def.innerType` as the `step`.
 */
-function omitUnwrapChain(node) {
+function omitUnwrapChain(node, step = ".unwrap()") {
 	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);
-	return ".unwrap()".repeat(depth);
+	return step.repeat(depth);
 }
 /**
 * Apply nullable / optional / nullish modifiers using the functional `zod/mini` API
@@ -1130,20 +1131,21 @@ function buildObjectShape(ctx, node, modify) {
 	}));
 }
 /**
-* Shared `print` body: transforms the node, applies `keysToOmit` as `.omit(...)`, then `modify` adds the modifiers.
+* Shared `print` body: transforms the node, applies `keysToOmit` as `.omit(...)` (or `z.omit(...)` when `mini`), then `modify` adds the modifiers.
 */
-function printWithOmit(ctx, node, modify) {
+function printWithOmit(ctx, node, modify, mini = false) {
 	const { keysToOmit } = ctx.options;
 	const transformed = ctx.transform(node);
 	if (!transformed) return null;
 	const meta = (0, kubb_kit.syncSchemaRef)(node);
 	return modify((() => {
 		if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
-		const unwrap = omitUnwrapChain(node);
-		const omit = `.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} })`;
+		const unwrap = omitUnwrapChain(node, mini ? "._zod.def.innerType" : ".unwrap()");
+		const mask = `{ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} }`;
+		const omit = (target) => mini ? `z.omit(${target}${unwrap}, ${mask})` : `${target}${unwrap}.omit(${mask})`;
 		const lazyMatch = transformed.match(/^z\.lazy\(\(\)\s*=>\s*(.+)\)$/);
-		if (lazyMatch) return `z.lazy(() => ${lazyMatch[1]}${unwrap}${omit})`;
-		return `${transformed}${unwrap}${omit}`;
+		if (lazyMatch) return `z.lazy(() => ${omit(lazyMatch[1])})`;
+		return omit(transformed);
 	})(), meta);
 }
 //#endregion
@@ -1431,11 +1433,14 @@ const printerZod = kubb_kit.ast.createPrinter((options) => {
 			},
 			union(node) {
 				const nodeMembers = node.members ?? [];
-				const members = mapSchemaMembers(node, (memberNode) => this.transform(node.strategy === "one" ? strictOneOfNode(memberNode) : memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? strictOneOfMember(output, schema, cyclicSchemaNames) : output).filter(Boolean);
+				const isDiscriminated = !!node.discriminatorPropertyName && nodeMembers.every((m) => isObjectSchemaNode(m, cyclicSchemaNames));
+				const isXor = node.strategy === "one" && !isDiscriminated && this.options.oneOfType === "xor";
+				const isStrict = node.strategy === "one" && !isXor;
+				const members = mapSchemaMembers(node, (memberNode) => this.transform(isStrict ? strictOneOfNode(memberNode) : memberNode)).map(({ schema, output }) => output && isStrict ? strictOneOfMember(output, schema, cyclicSchemaNames) : output).filter(Boolean);
 				if (members.length === 0) return "";
 				if (members.length === 1) return members[0];
-				const allDiscriminable = nodeMembers.every((m) => isObjectSchemaNode(m, cyclicSchemaNames));
-				if (node.discriminatorPropertyName && allDiscriminable) return `z.discriminatedUnion(${stringify(node.discriminatorPropertyName)}, ${buildList(members)})`;
+				if (isDiscriminated) return `z.discriminatedUnion(${stringify(node.discriminatorPropertyName)}, ${buildList(members)})`;
+				if (isXor) return `z.xor(${buildList(members)})`;
 				return `z.union(${buildList(members)})`;
 			},
 			intersection(node) {
@@ -1633,11 +1638,14 @@ const printerZodMini = kubb_kit.ast.createPrinter((options) => {
 			},
 			union(node) {
 				const nodeMembers = node.members ?? [];
-				const members = mapSchemaMembers(node, (memberNode) => this.transform(node.strategy === "one" ? strictOneOfNode(memberNode) : memberNode)).map(({ output }) => output).filter(Boolean);
+				const isDiscriminated = !!node.discriminatorPropertyName && nodeMembers.every((m) => isObjectSchemaNode(m, cyclicSchemaNames));
+				const isXor = node.strategy === "one" && !isDiscriminated && this.options.oneOfType === "xor";
+				const isStrict = node.strategy === "one" && !isXor;
+				const members = mapSchemaMembers(node, (memberNode) => this.transform(isStrict ? strictOneOfNode(memberNode) : memberNode)).map(({ output }) => output).filter(Boolean);
 				if (members.length === 0) return "";
 				if (members.length === 1) return members[0];
-				const allDiscriminable = nodeMembers.every((m) => isObjectSchemaNode(m, cyclicSchemaNames));
-				if (node.discriminatorPropertyName && allDiscriminable) return `z.discriminatedUnion(${stringify(node.discriminatorPropertyName)}, ${buildList(members)})`;
+				if (isDiscriminated) return `z.discriminatedUnion(${stringify(node.discriminatorPropertyName)}, ${buildList(members)})`;
+				if (isXor) return `z.xor(${buildList(members)})`;
 				return `z.union(${buildList(members)})`;
 			},
 			intersection(node) {
@@ -1670,7 +1678,7 @@ const printerZodMini = kubb_kit.ast.createPrinter((options) => {
 				optional: meta.optional,
 				nullish: meta.nullish,
 				defaultValue: meta.default
-			}));
+			}), true);
 		}
 	};
 });
@@ -1684,7 +1692,7 @@ const zodMiniPrinterCache = /* @__PURE__ */ new WeakMap();
 */
 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 && cached.nodes === params.nodes) return {
+	if (cached && cached.coercion === params.coercion && cached.guidType === params.guidType && cached.regexType === params.regexType && cached.oneOfType === params.oneOfType && cached.dateType === params.dateType && cached.nodes === params.nodes) return {
 		decode: cached.decode,
 		encode: cached.encode
 	};
@@ -1704,6 +1712,7 @@ function getStdPrinters(resolver, params) {
 		coercion: params.coercion,
 		guidType: params.guidType,
 		regexType: params.regexType,
+		oneOfType: params.oneOfType,
 		dateType: params.dateType,
 		nodes: params.nodes
 	});
@@ -1714,7 +1723,7 @@ function getStdPrinters(resolver, params) {
 }
 function getMiniPrinter(resolver, params) {
 	const cached = zodMiniPrinterCache.get(resolver);
-	if (cached && cached.coercion === params.coercion && cached.guidType === params.guidType && cached.regexType === params.regexType && cached.nodes === params.nodes) return cached.printer;
+	if (cached && cached.coercion === params.coercion && cached.guidType === params.guidType && cached.regexType === params.regexType && cached.oneOfType === params.oneOfType && cached.nodes === params.nodes) return cached.printer;
 	const p = printerZodMini({
 		...params,
 		resolver
@@ -1724,6 +1733,7 @@ function getMiniPrinter(resolver, params) {
 		coercion: params.coercion,
 		guidType: params.guidType,
 		regexType: params.regexType,
+		oneOfType: params.oneOfType,
 		nodes: params.nodes
 	});
 	return p;
@@ -1739,7 +1749,7 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 	renderer: kubb_jsx.jsxRenderer,
 	schema(node, ctx) {
 		const { adapter, config, resolver, root } = ctx;
-		const { output, coercion, guidType, regexType, compile, mini, inferred, typeGuards, importPath, group, printer } = ctx.options;
+		const { output, coercion, guidType, regexType, oneOfType, compile, mini, inferred, typeGuards, importPath, group, printer } = ctx.options;
 		const dateType = getOasAdapter(adapter).options.dateType;
 		if (!node.name) return;
 		const isZodImport = importPath === "zod" || importPath === "zod/mini";
@@ -1748,6 +1758,7 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 			coercion,
 			guidType,
 			regexType,
+			oneOfType,
 			dateType,
 			resolver,
 			cyclicSchemas,
@@ -1795,6 +1806,7 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 			coercion,
 			guidType,
 			regexType,
+			oneOfType,
 			dateType,
 			cyclicSchemas,
 			nodes: printer?.nodes
@@ -1803,6 +1815,7 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 			coercion,
 			guidType,
 			regexType,
+			oneOfType,
 			cyclicSchemas,
 			nodes: printer?.nodes
 		}) : stdPrinters.decode;
@@ -1871,7 +1884,7 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 	operation(node, ctx) {
 		if (!kubb_kit.ast.isHttpOperationNode(node)) return null;
 		const { adapter, config, resolver, root } = ctx;
-		const { output, coercion, guidType, regexType, compile, mini, inferred, importPath, group, printer } = ctx.options;
+		const { output, coercion, guidType, regexType, oneOfType, compile, mini, inferred, importPath, group, printer } = ctx.options;
 		const dateType = getOasAdapter(adapter).options.dateType;
 		const isZodImport = importPath === "zod" || importPath === "zod/mini";
 		const meta = { file: resolver.file({
@@ -1888,6 +1901,7 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 			coercion,
 			guidType,
 			regexType,
+			oneOfType,
 			dateType,
 			resolver,
 			cyclicSchemas,
@@ -1911,6 +1925,7 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 				coercion,
 				guidType,
 				regexType,
+				oneOfType,
 				resolver,
 				keysToOmit,
 				cyclicSchemas,
@@ -1919,12 +1934,14 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 				coercion,
 				guidType,
 				regexType,
+				oneOfType,
 				cyclicSchemas,
 				nodes: printer?.nodes
 			}) : keysToOmit?.length ? printerZod({
 				coercion,
 				guidType,
 				regexType,
+				oneOfType,
 				dateType,
 				resolver,
 				keysToOmit,
@@ -1935,6 +1952,7 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 				coercion,
 				guidType,
 				regexType,
+				oneOfType,
 				dateType,
 				cyclicSchemas,
 				nodes: printer?.nodes
@@ -2125,7 +2143,7 @@ var compatibility = {
 };
 //#endregion
 //#region package.json
-var version = "5.5.0-canary.20261023T194004";
+var version = "5.5.0";
 //#endregion
 //#region src/resolvers/resolverZod.ts
 /**
@@ -2224,19 +2242,7 @@ const pluginZod = (0, kubb_kit.defineExtension)({
 		const { output = {
 			path: "zod",
 			barrel: { type: "named" }
-		}, group, exclude = [], include, override = [], compile = false, mini = false, guidType = "uuid", regexType = "literal", importPath = mini ? "zod/mini" : "zod", coercion = false, inferred = false, typeGuards = false, printer, resolver: userResolver, macros: userMacros } = options;
-		(0, kubb_kit.assertPluginOption)({
-			plugin: pluginZodName,
-			option: "guidType",
-			value: guidType,
-			allowed: ["uuid", "guid"]
-		});
-		(0, kubb_kit.assertPluginOption)({
-			plugin: pluginZodName,
-			option: "regexType",
-			value: regexType,
-			allowed: ["literal", "constructor"]
-		});
+		}, group, exclude = [], include, override = [], compile = false, mini = false, guidType = "uuid", regexType = "literal", oneOfType = "union", importPath = mini ? "zod/mini" : "zod", coercion = false, inferred = false, typeGuards = false, printer, resolver: userResolver, macros: userMacros } = options;
 		(0, kubb_kit.setResolver)(userResolver ? kubb_kit.Resolver.merge(resolverZod, userResolver) : resolverZod);
 		if (userMacros?.length) (0, kubb_kit.setMacros)(userMacros);
 		(0, kubb_kit.addGenerator)(zodGenerator);
@@ -2251,6 +2257,7 @@ const pluginZod = (0, kubb_kit.defineExtension)({
 			inferred,
 			guidType,
 			regexType,
+			oneOfType,
 			compile,
 			mini,
 			typeGuards,