@kubb/plugin-zod 5.2.0-canary.20260922T120902 → 5.2.1

package/dist/index.cjs

@@ -745,31 +745,61 @@ function mapSchemaItems(node, transform) {
 }
 //#endregion
 //#region src/components/Zod.tsx
-function Zod({ name, node, printer, inferTypeName, cyclic }) {
+function Zod({ name, node, printer, inferTypeName, typeGuards, isName, assertName, mini, cyclic }) {
 	const output = printer.print(node);
 	if (!output) return;
 	const needsAnnotation = cyclic && node.type !== "object";
-	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_jsx_jsx_runtime.jsx)(kubb_jsx.Const, {
-			export: true,
+	const targetType = inferTypeName ?? `z.infer<typeof ${name}>`;
+	const shouldGenerateIs = isName && (typeof typeGuards === "object" ? typeGuards.is ?? true : Boolean(typeGuards));
+	const shouldGenerateAssert = assertName && (typeof typeGuards === "object" ? typeGuards.assert ?? true : Boolean(typeGuards));
+	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,
-			type: needsAnnotation ? "z.ZodType" : void 0,
-			children: output
-		})
-	}), inferTypeName && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
-		name: inferTypeName,
-		isExportable: true,
-		isIndexable: true,
-		isTypeOnly: true,
-		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Type, {
-			export: true,
+			isExportable: true,
+			isIndexable: true,
+			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_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 			name: inferTypeName,
-			children: `z.infer<typeof ${name}>`
+			isExportable: true,
+			isIndexable: true,
+			isTypeOnly: true,
+			children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Type, {
+				export: true,
+				name: inferTypeName,
+				children: `z.infer<typeof ${name}>`
+			})
+		}),
+		shouldGenerateIs && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
+			name: isName,
+			isExportable: true,
+			isIndexable: true,
+			children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Const, {
+				export: true,
+				name: isName,
+				JSDoc: { comments: [`Type guard for {@link ${name}}`] },
+				children: mini ? `(data: unknown): data is ${targetType} => z.validate(${name}, data)` : `(data: unknown): data is ${targetType} => ${name}.validate(data)`
+			})
+		}),
+		shouldGenerateAssert && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
+			name: assertName,
+			isExportable: true,
+			isIndexable: true,
+			children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
+				export: true,
+				name: assertName,
+				params: "data: unknown",
+				returnType: `asserts data is ${targetType}`,
+				JSDoc: { comments: [`Asserter for {@link ${name}}`, "@throws {z.ZodError} If data is invalid"] },
+				children: mini ? `if (!z.validate(${name}, data)) {\n  z.parse(${name}, data)\n}` : `if (!${name}.validate(data)) {\n  ${name}.parse(data)\n}`
+			})
 		})
-	})] });
+	] });
 }
 //#endregion
 //#region src/constants.ts
@@ -1044,8 +1074,20 @@ function buildGroupedParamsSchema({ params, optional }) {
 }
 //#endregion
 //#region src/printers/printerZod.ts
-function strictOneOfMember$1(member, node, cyclicSchemas) {
-	if (node.type === "object" && node.additionalProperties === void 0) return `${member}.strict()`;
+/**
+* A `oneOf` member that is an inline object is exhaustive, so it prints as a strict object.
+* Marking the node lets `object()` build `z.strictObject(...)` itself; appending `.strict()` to the
+* printed member instead would read `.shape` eagerly and run a self-reference's deferred getter
+* inside the temporal dead zone.
+*/
+function strictOneOfNode$1(node) {
+	return node.type === "object" && node.additionalProperties === void 0 ? {
+		...node,
+		additionalProperties: false
+	} : node;
+}
+__name(strictOneOfNode$1, "strictOneOfNode");
+function strictOneOfMember(member, node, cyclicSchemas) {
 	if (node.type === "ref") {
 		if (member.startsWith("z.lazy(")) return member;
 		const refName = kubb_kit.ast.resolveRefName(node);
@@ -1056,7 +1098,6 @@ function strictOneOfMember$1(member, node, cyclicSchemas) {
 	}
 	return member;
 }
-__name(strictOneOfMember$1, "strictOneOfMember");
 function getMemberConstraint({ member, regexType }) {
 	if (member.primitive === "string") return lengthConstraints({
 		...kubb_kit.ast.narrowSchema(member, "string") ?? {},
@@ -1200,6 +1241,32 @@ const scalarNodes = {
 	boolean: () => "z.boolean()",
 	null: () => "z.null()",
 	string(node) {
+		if (!shouldCoerce(this.options.coercion, "strings")) {
+			if (node.format === "byte" || node.format === "base64") return `z.base64()${lengthConstraints({
+				...node,
+				regexType: this.options.regexType
+			})}`;
+			if (node.format === "base64url") return `z.base64url()${lengthConstraints({
+				...node,
+				regexType: this.options.regexType
+			})}`;
+			if (node.format === "jwt") return `z.jwt()${lengthConstraints({
+				...node,
+				regexType: this.options.regexType
+			})}`;
+			if (node.format === "ulid") return `z.ulid()${lengthConstraints({
+				...node,
+				regexType: this.options.regexType
+			})}`;
+			if (node.format === "iban") return `z.iban()${lengthConstraints({
+				...node,
+				regexType: this.options.regexType
+			})}`;
+			if (node.format === "duration") return `z.iso.duration()${lengthConstraints({
+				...node,
+				regexType: this.options.regexType
+			})}`;
+		}
 		const base = shouldCoerce(this.options.coercion, "strings") ? "z.coerce.string()" : "z.string()";
 		const pattern = node.pattern ?? integerFormatPattern(node.format);
 		return `${base}${lengthConstraints({
@@ -1212,6 +1279,10 @@ const scalarNodes = {
 		return `${shouldCoerce(this.options.coercion, "numbers") ? "z.coerce.number()" : "z.number()"}${numberConstraints(node)}`;
 	},
 	integer(node) {
+		if (!shouldCoerce(this.options.coercion, "numbers")) {
+			if (node.format === "int32") return `z.int32()${numberConstraints(node)}`;
+			if (node.format === "uint32") return `z.uint32()${numberConstraints(node)}`;
+		}
 		return `${shouldCoerce(this.options.coercion, "numbers") ? "z.coerce.number().int()" : "z.int()"}${numberConstraints(node)}`;
 	},
 	bigint() {
@@ -1298,15 +1369,16 @@ const printerZod = kubb_kit.ast.createPrinter((options) => {
 			},
 			object(node) {
 				const entries = node.properties ?? [];
-				const objectBase = `z.object(${buildZodObjectShape(this, node)})`;
+				const patterns = node.patternProperties ? Object.entries(node.patternProperties) : [];
+				const isStrict = node.additionalProperties === false && patterns.length === 0;
+				const objectBase = `${isStrict ? "z.strictObject" : "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_kit.ast.factory.createSchema({ type: "unknown" }))})`;
-					if (node.additionalProperties === false && patterns.length === 0) return `${objectBase}.strict()`;
+					if (isStrict) return objectBase;
 					if (patterns.length > 0) {
 						const values = patterns.map(([, valueSchema]) => {
 							const valueType = this.transform(valueSchema) ?? this.transform(kubb_kit.ast.factory.createSchema({ type: "unknown" }));
@@ -1335,7 +1407,7 @@ const printerZod = kubb_kit.ast.createPrinter((options) => {
 			},
 			union(node) {
 				const nodeMembers = node.members ?? [];
-				const members = mapSchemaMembers(node, (memberNode) => this.transform(memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? strictOneOfMember$1(output, schema, cyclicSchemaNames) : output).filter(Boolean);
+				const members = mapSchemaMembers(node, (memberNode) => this.transform(node.strategy === "one" ? strictOneOfNode$1(memberNode) : memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? 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));
@@ -1389,9 +1461,15 @@ const printerZod = kubb_kit.ast.createPrinter((options) => {
 });
 //#endregion
 //#region src/printers/printerZodMini.ts
-function strictOneOfMember(member, node) {
-	if (node.type === "object" && (node.additionalProperties === void 0 || node.additionalProperties === false)) return member.replace(/^z\.object\(/, "z.strictObject(");
-	return member;
+/**
+* A `oneOf` member that is an inline object is exhaustive, so it prints as a strict object.
+* Marking the node lets `object()` build `z.strictObject(...)` itself, with no rewrite afterwards.
+*/
+function strictOneOfNode(node) {
+	return node.type === "object" && node.additionalProperties === void 0 ? {
+		...node,
+		additionalProperties: false
+	} : node;
 }
 function getMemberConstraintMini({ member, regexType }) {
 	if (member.primitive === "string") return lengthChecksMini({
@@ -1461,6 +1539,30 @@ const printerZodMini = kubb_kit.ast.createPrinter((options) => {
 			boolean: () => "z.boolean()",
 			null: () => "z.null()",
 			string(node) {
+				if (node.format === "byte" || node.format === "base64") return `z.base64()${lengthChecksMini({
+					...node,
+					regexType: this.options.regexType
+				})}`;
+				if (node.format === "base64url") return `z.base64url()${lengthChecksMini({
+					...node,
+					regexType: this.options.regexType
+				})}`;
+				if (node.format === "jwt") return `z.jwt()${lengthChecksMini({
+					...node,
+					regexType: this.options.regexType
+				})}`;
+				if (node.format === "ulid") return `z.ulid()${lengthChecksMini({
+					...node,
+					regexType: this.options.regexType
+				})}`;
+				if (node.format === "iban") return `z.iban()${lengthChecksMini({
+					...node,
+					regexType: this.options.regexType
+				})}`;
+				if (node.format === "duration") return `z.iso.duration()${lengthChecksMini({
+					...node,
+					regexType: this.options.regexType
+				})}`;
 				const pattern = node.pattern ?? integerFormatPattern(node.format);
 				return `z.string()${lengthChecksMini({
 					...node,
@@ -1472,6 +1574,8 @@ const printerZodMini = kubb_kit.ast.createPrinter((options) => {
 				return `z.number()${numberChecksMini(node)}`;
 			},
 			integer(node) {
+				if (node.format === "int32") return `z.int32()${numberChecksMini(node)}`;
+				if (node.format === "uint32") return `z.uint32()${numberChecksMini(node)}`;
 				return `z.int()${numberChecksMini(node)}`;
 			},
 			bigint(node) {
@@ -1528,14 +1632,15 @@ const printerZodMini = kubb_kit.ast.createPrinter((options) => {
 			},
 			object(node) {
 				const entries = node.properties ?? [];
-				const objectBase = `z.object(${buildZodMiniObjectShape(this, node)})`;
 				const patterns = node.patternProperties ? Object.entries(node.patternProperties) : [];
+				const isStrict = node.additionalProperties === false && patterns.length === 0;
+				const objectBase = `${isStrict ? "z.strictObject" : "z.object"}(${buildZodMiniObjectShape(this, node)})`;
 				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_kit.ast.factory.createSchema({ type: "unknown" }))})`;
-				if (node.additionalProperties === false && patterns.length === 0) return objectBase.replace(/^z\.object\(/, "z.strictObject(");
+				if (isStrict) return objectBase;
 				if (patterns.length > 0) {
 					const values = patterns.map(([, valueSchema]) => {
 						const valueType = this.transform(valueSchema) ?? this.transform(kubb_kit.ast.factory.createSchema({ type: "unknown" }));
@@ -1563,7 +1668,7 @@ const printerZodMini = kubb_kit.ast.createPrinter((options) => {
 			},
 			union(node) {
 				const nodeMembers = node.members ?? [];
-				const members = mapSchemaMembers(node, (memberNode) => this.transform(memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? strictOneOfMember(output, schema) : output).filter(Boolean);
+				const members = mapSchemaMembers(node, (memberNode) => this.transform(node.strategy === "one" ? 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));
@@ -1677,7 +1782,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, mini, inferred, importPath, group, printer } = ctx.options;
+		const { output, coercion, guidType, regexType, mini, inferred, typeGuards, importPath, group, printer } = ctx.options;
 		const dateType = getOasAdapter(adapter).options.dateType;
 		if (!node.name) return;
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
@@ -1733,6 +1838,8 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 			})
 		};
 		const inferTypeName = inferred ? resolver.schema.typeName(node.name) : null;
+		const isName = typeGuards ? resolver.schema.isName(node.name) : null;
+		const assertName = typeGuards ? resolver.schema.assertName(node.name) : null;
 		const stdPrinters = mini ? null : getStdPrinters(resolver, {
 			coercion,
 			guidType,
@@ -1787,6 +1894,10 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 					node,
 					printer: schemaPrinter,
 					inferTypeName,
+					typeGuards,
+					isName,
+					assertName,
+					mini,
 					cyclic: cyclicSchemas.has(node.name)
 				}),
 				hasDirectionalNode && stdPrinters && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(Zod, {
@@ -1794,6 +1905,10 @@ const zodGenerator = (0, kubb_kit.defineGenerator)({
 					node,
 					printer: stdPrinters.encode,
 					inferTypeName: inferred ? resolver.schema.inputTypeName(node.name) : null,
+					typeGuards,
+					isName: typeGuards ? resolver.schema.isName(resolver.schema.inputName(node.name)) : null,
+					assertName: typeGuards ? resolver.schema.assertName(resolver.schema.inputName(node.name)) : null,
+					mini,
 					cyclic: cyclicSchemas.has(node.name)
 				})
 			]
@@ -2072,6 +2187,12 @@ const resolverZod = (0, kubb_kit.createResolver)({
 		},
 		inputTypeName(name) {
 			return this.schema.typeName(`${name} input`);
+		},
+		isName(name) {
+			return ensureValidVarName(camelCase(name, { prefix: "is" }));
+		},
+		assertName(name) {
+			return ensureValidVarName(camelCase(name, { prefix: "assert" }));
 		}
 	},
 	param: createOperationParamResolver(),
@@ -2122,7 +2243,7 @@ const pluginZod = (0, kubb_kit.definePlugin)((options) => {
 	const { output = {
 		path: "zod",
 		barrel: { type: "named" }
-	}, 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;
+	}, group, exclude = [], include, override = [], mini = false, guidType = "uuid", regexType = "literal", importPath = mini ? "zod/mini" : "zod", coercion = false, inferred = false, typeGuards = false, printer, resolver: userResolver, macros: userMacros } = options;
 	const groupConfig = createGroupConfig(group);
 	return {
 		name: pluginZodName,
@@ -2140,6 +2261,7 @@ const pluginZod = (0, kubb_kit.definePlugin)((options) => {
 				guidType,
 				regexType,
 				mini,
+				typeGuards,
 				printer
 			});
 			ctx.setResolver(userResolver ? kubb_kit.Resolver.merge(resolverZod, userResolver) : resolverZod);