@kubb/plugin-zod 5.0.0-beta.74 → 5.0.0-beta.76

package/dist/index.d.ts

@@ -282,6 +282,14 @@ type ResolverZod = Resolver & OperationParamsResolver & {
    * `resolver.resolveResponseName(node) // → 'listPetsResponseSchema'`
    */
   resolveResponseName(this: ResolverZod, node: ast.OperationNode): string;
+  /**
+   * Resolves the name for the union of an operation's error (non-2xx) responses. Generated clients
+   * validate the error body against this on the non-throw path.
+   *
+   * @example Error union names
+   * `resolver.resolveErrorName(node) // → 'listPetsErrorSchema'`
+   */
+  resolveErrorName(this: ResolverZod, node: ast.OperationNode): string;
   /**
    * Resolves the name for an operation's grouped path parameters type.
    *
@@ -355,11 +363,6 @@ type Options = OutputOptions & {
     strings?: boolean;
     numbers?: boolean;
   };
-  /**
-   * Emit an `operations.ts` file with request body, query/path params, and per-status
-   * response schemas grouped by operation.
-   */
-  operations?: boolean;
   /**
    * Validator for `format: uuid` properties.
    * - `'uuid'` — `z.uuid()`. Standard RFC 4122.
@@ -420,7 +423,6 @@ type ResolvedOptions = {
   inferred: NonNullable<Options['inferred']>;
   importPath: NonNullable<Options['importPath']>;
   coercion: NonNullable<Options['coercion']>;
-  operations: NonNullable<Options['operations']>;
   guidType: NonNullable<Options['guidType']>;
   regexType: NonNullable<Options['regexType']>;
   mini: NonNullable<Options['mini']>;

package/dist/index.js

@@ -1,8 +1,8 @@
 import { t as __name } from "./rolldown-runtime-C0LytTxp.js";
 import { ast, defineGenerator, definePlugin, defineResolver } from "@kubb/core";
 import { Const, File, Type, jsxRenderer } from "@kubb/renderer-jsx";
-import { buildList, buildObject, containsCircularRef, extractRefName, lazyGetter, mapSchemaItems, mapSchemaMembers, mapSchemaProperties, objectKey, stringify, stringifyObject, syncSchemaRef, toRegExpString } from "@kubb/ast/utils";
 import { Fragment, jsx, jsxs } from "@kubb/renderer-jsx/jsx-runtime";
+import { buildList, buildObject, containsCircularRef, extractRefName, lazyGetter, mapSchemaItems, mapSchemaMembers, mapSchemaProperties, objectKey, stringify, syncSchemaRef, toRegExpString } from "@kubb/ast/utils";
 //#region ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
@@ -303,80 +303,6 @@ function createGroupConfig(group) {
 	};
 }
 //#endregion
-//#region src/components/Operations.tsx
-function Operations({ name, operations }) {
-	const operationsJSON = operations.reduce((prev, acc) => {
-		prev[`"${acc.node.operationId}"`] = acc.data;
-		return prev;
-	}, {});
-	const pathsJSON = operations.reduce((prev, acc) => {
-		if (!ast.isHttpOperationNode(acc.node)) return prev;
-		prev[`"${acc.node.path}"`] = {
-			...prev[`"${acc.node.path}"`] ?? {},
-			[acc.node.method]: `operations["${acc.node.operationId}"]`
-		};
-		return prev;
-	}, {});
-	return /* @__PURE__ */ jsxs(Fragment, { children: [
-		/* @__PURE__ */ jsx(File.Source, {
-			name: "OperationSchema",
-			isExportable: true,
-			isIndexable: true,
-			children: /* @__PURE__ */ jsx(Type, {
-				name: "OperationSchema",
-				export: true,
-				children: `{
-  readonly request: z.ZodTypeAny | undefined;
-  readonly parameters: {
-        readonly path: z.ZodTypeAny | undefined;
-        readonly query: z.ZodTypeAny | undefined;
-        readonly header: z.ZodTypeAny | undefined;
-  };
-  readonly responses: {
-        readonly [status: number]: z.ZodTypeAny;
-        readonly default: z.ZodTypeAny;
-  };
-  readonly errors: {
-        readonly [status: number]: z.ZodTypeAny;
-  };
-}`
-			})
-		}),
-		/* @__PURE__ */ jsx(File.Source, {
-			name: "OperationsMap",
-			isExportable: true,
-			isIndexable: true,
-			children: /* @__PURE__ */ jsx(Type, {
-				name: "OperationsMap",
-				export: true,
-				children: "Record<string, OperationSchema>"
-			})
-		}),
-		/* @__PURE__ */ jsx(File.Source, {
-			name,
-			isExportable: true,
-			isIndexable: true,
-			children: /* @__PURE__ */ jsx(Const, {
-				export: true,
-				name,
-				asConst: true,
-				children: `{${stringifyObject(operationsJSON)}}`
-			})
-		}),
-		/* @__PURE__ */ jsx(File.Source, {
-			name: "paths",
-			isExportable: true,
-			isIndexable: true,
-			children: /* @__PURE__ */ jsx(Const, {
-				export: true,
-				name: "paths",
-				asConst: true,
-				children: `{${stringifyObject(pathsJSON)}}`
-			})
-		})
-	] });
-}
-//#endregion
 //#region src/components/Zod.tsx
 function Zod({ name, node, printer, inferTypeName }) {
 	const output = printer.print(node);
@@ -482,36 +408,6 @@ function collectCodecRefNames(node) {
 	return ast.collect(node, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? extractRefName(n.ref) ?? void 0 : void 0 });
 }
 /**
-* Collects all resolved schema names for an operation's parameters and responses
-* into a single lookup object, useful for building imports and type references.
-*/
-function buildSchemaNames(node, { params, resolver }) {
-	const pathParam = params.find((p) => p.in === "path");
-	const queryParam = params.find((p) => p.in === "query");
-	const headerParam = params.find((p) => p.in === "header");
-	const responses = {};
-	const errors = {};
-	for (const res of node.responses) {
-		const name = resolver.resolveResponseStatusName(node, res.statusCode);
-		const statusNum = Number(res.statusCode);
-		if (!Number.isNaN(statusNum)) {
-			responses[statusNum] = name;
-			if (statusNum >= 400) errors[statusNum] = name;
-		}
-	}
-	responses["default"] = resolver.resolveResponseName(node);
-	return {
-		request: node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null,
-		parameters: {
-			path: pathParam ? resolver.resolvePathParamsName(node, pathParam) : null,
-			query: queryParam ? resolver.resolveQueryParamsName(node, queryParam) : null,
-			header: headerParam ? resolver.resolveHeaderParamsName(node, headerParam) : null
-		},
-		responses,
-		errors
-	};
-}
-/**
 * Format a default value as a code-level literal.
 * Objects become `{}`, primitives become their string representation, strings are quoted.
 */
@@ -536,6 +432,28 @@ function regexFunc(regexType) {
 	return regexType === "constructor" ? "RegExp" : null;
 }
 /**
+* Builds a Zod record key schema that enforces the `patternProperties` regexes a plain
+* `.catchall()` would drop. Several patterns combine into one alternation (`(^a)|(^b)`).
+*/
+function patternKeySchema({ patterns, regexType }) {
+	return `z.string().regex(${patternKeySource({
+		patterns,
+		regexType
+	})})`;
+}
+/**
+* `zod/mini` variant of {@link patternKeySchema}, wrapping the regex in `.check(z.regex(...))`.
+*/
+function patternKeySchemaMini({ patterns, regexType }) {
+	return `z.string().check(z.regex(${patternKeySource({
+		patterns,
+		regexType
+	})}))`;
+}
+function patternKeySource({ patterns, regexType }) {
+	return toRegExpString(patterns.length === 1 ? patterns[0] : patterns.map((pattern) => `(${pattern})`).join("|"), regexFunc(regexType));
+}
+/**
 * Build `.min()` / `.max()` / `.gt()` / `.lt()` constraint chains for numbers
 * using the standard chainable Zod v4 API.
 */
@@ -725,7 +643,7 @@ const printerZod = ast.createPrinter((options) => {
 			},
 			object(node) {
 				const isCyclic = (schema) => this.options.cyclicSchemas != null && containsCircularRef(schema, { circularSchemas: this.options.cyclicSchemas });
-				const objectBase = `z.object(${buildObject(mapSchemaProperties(node, (schema) => {
+				const entries = mapSchemaProperties(node, (schema) => {
 					const hasSelfRef = isCyclic(schema);
 					const savedCyclicSchemas = this.options.cyclicSchemas;
 					if (hasSelfRef) this.options.cyclicSchemas = void 0;
@@ -753,14 +671,29 @@ const printerZod = ast.createPrinter((options) => {
 						name: propName,
 						body: value
 					}) : `${objectKey(propName)}: ${value}`;
-				}))})`;
+				});
+				const objectBase = `z.object(${buildObject(entries)})`;
 				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(ast.factory.createSchema({ type: "unknown" }))})`;
-					if (node.additionalProperties === false) return `${objectBase}.strict()`;
+					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(ast.factory.createSchema({ type: "unknown" }));
+							return valueSchema.nullable ? `${valueType}.nullable()` : valueType;
+						});
+						const distinct = [...new Set(values)];
+						const value = distinct.length === 1 ? distinct[0] : `z.union([${distinct.join(", ")}])`;
+						if (entries.length > 0) return `${objectBase}.catchall(${value})`;
+						return `z.record(${patternKeySchema({
+							patterns: patterns.map(([pattern]) => pattern),
+							regexType: this.options.regexType
+						})}, ${value})`;
+					}
 					return objectBase;
 				})();
 			},
@@ -928,7 +861,7 @@ const printerZodMini = ast.createPrinter((options) => {
 			},
 			object(node) {
 				const isCyclic = (schema) => this.options.cyclicSchemas != null && containsCircularRef(schema, { circularSchemas: this.options.cyclicSchemas });
-				return `z.object(${buildObject(mapSchemaProperties(node, (schema) => {
+				const entries = mapSchemaProperties(node, (schema) => {
 					const hasSelfRef = isCyclic(schema);
 					const savedCyclicSchemas = this.options.cyclicSchemas;
 					if (hasSelfRef) this.options.cyclicSchemas = void 0;
@@ -952,7 +885,29 @@ const printerZodMini = ast.createPrinter((options) => {
 						name: propName,
 						body: value
 					}) : `${objectKey(propName)}: ${value}`;
-				}))})`;
+				});
+				const objectBase = `z.object(${buildObject(entries)})`;
+				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(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(ast.factory.createSchema({ type: "unknown" }));
+						return valueSchema.nullable ? `z.nullable(${valueType})` : valueType;
+					});
+					const distinct = [...new Set(values)];
+					const value = distinct.length === 1 ? distinct[0] : `z.union([${distinct.join(", ")}])`;
+					if (entries.length > 0) return `z.catchall(${objectBase}, ${value})`;
+					return `z.record(${patternKeySchemaMini({
+						patterns: patterns.map(([pattern]) => pattern),
+						regexType: this.options.regexType
+					})}, ${value})`;
+				}
+				return objectBase;
 			},
 			array(node) {
 				const base = `z.array(${mapSchemaItems(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean).join(", ") || this.transform(ast.factory.createSchema({ type: "unknown" }))})${lengthChecksMini({
@@ -1331,6 +1286,25 @@ const zodGenerator = defineGenerator({
 				name: responseUnionName
 			});
 		})() : null;
+		const errorResponsesWithSchema = responsesWithSchema.filter((res) => !isSuccessStatusCode(res.statusCode));
+		const errorUnionSchema = errorResponsesWithSchema.length > 0 ? (() => {
+			const errorUnionName = resolver.resolveErrorName(node);
+			if (new Set(errorResponsesWithSchema.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? adapter.getImports(entry.schema, (schemaName) => ({
+				name: resolver.resolveSchemaName(schemaName),
+				path: ""
+			})).flatMap((imp) => Array.isArray(imp.name) ? imp.name : [imp.name]) : []))).has(errorUnionName)) return null;
+			const members = errorResponsesWithSchema.map((res) => ast.factory.createSchema({
+				type: "ref",
+				name: resolver.resolveResponseStatusName(node, res.statusCode)
+			}));
+			return renderSchemaEntry({
+				schema: members.length === 1 ? members[0] : ast.factory.createSchema({
+					type: "union",
+					members
+				}),
+				name: errorUnionName
+			});
+		})() : null;
 		const requestBodyContent = node.requestBody?.content ?? [];
 		const requestSchema = (() => {
 			if (requestBodyContent.length === 0) return null;
@@ -1381,88 +1355,10 @@ const zodGenerator = defineGenerator({
 				paramSchemas,
 				responseSchemas,
 				responseUnionSchema,
+				errorUnionSchema,
 				requestSchema
 			]
 		});
-	},
-	operations(nodes, ctx) {
-		const { config, resolver, root } = ctx;
-		const { output, importPath, group, operations } = ctx.options;
-		if (!operations) return;
-		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
-		const meta = { file: resolver.resolveFile({
-			name: "operations",
-			extname: ".ts"
-		}, {
-			root,
-			output,
-			group: group ?? void 0
-		}) };
-		const transformedOperations = nodes.filter(ast.isHttpOperationNode).map((node) => {
-			return {
-				node,
-				data: buildSchemaNames(node, {
-					params: caseParams(node.parameters, "camelcase"),
-					resolver
-				})
-			};
-		});
-		const imports = transformedOperations.flatMap(({ node, data }) => {
-			const names = [
-				data.request,
-				...Object.values(data.responses),
-				...Object.values(data.parameters)
-			].filter(Boolean);
-			const opFile = resolver.resolveFile({
-				name: node.operationId,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
-				root,
-				output,
-				group: group ?? void 0
-			});
-			return names.map((name) => /* @__PURE__ */ jsx(File.Import, {
-				name: [name],
-				root: meta.file.path,
-				path: opFile.path
-			}, [name, opFile.path].join("-")));
-		});
-		return /* @__PURE__ */ jsxs(File, {
-			baseName: meta.file.baseName,
-			path: meta.file.path,
-			meta: meta.file.meta,
-			banner: resolver.resolveBanner(ctx.meta, {
-				output,
-				config,
-				file: {
-					path: meta.file.path,
-					baseName: meta.file.baseName
-				}
-			}),
-			footer: resolver.resolveFooter(ctx.meta, {
-				output,
-				config,
-				file: {
-					path: meta.file.path,
-					baseName: meta.file.baseName
-				}
-			}),
-			children: [
-				/* @__PURE__ */ jsx(File.Import, {
-					isTypeOnly: true,
-					name: isZodImport ? "z" : ["z"],
-					path: importPath,
-					isNameSpace: isZodImport
-				}),
-				imports,
-				/* @__PURE__ */ jsx(Operations, {
-					name: "operations",
-					operations: transformedOperations
-				})
-			]
-		});
 	}
 });
 //#endregion
@@ -1523,6 +1419,9 @@ const resolverZod = defineResolver(() => {
 		resolveResponseName(node) {
 			return this.resolveSchemaName(`${node.operationId} Response`);
 		},
+		resolveErrorName(node) {
+			return this.resolveSchemaName(`${node.operationId} Error`);
+		},
 		resolvePathParamsName(node, param) {
 			return this.resolveParamName(node, param);
 		},
@@ -1571,7 +1470,7 @@ const pluginZod = definePlugin((options) => {
 	const { output = {
 		path: "zod",
 		barrel: { type: "named" }
-	}, group, exclude = [], include, override = [], typed = false, operations = 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 = [], 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;
 	const groupConfig = createGroupConfig(group);
 	return {
 		name: pluginZodName,
@@ -1586,7 +1485,6 @@ const pluginZod = definePlugin((options) => {
 				typed,
 				importPath,
 				coercion,
-				operations,
 				inferred,
 				guidType,
 				regexType,