@kubb/plugin-zod 5.0.0-beta.75 → 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.
    *

package/dist/index.js

@@ -432,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.
 */
@@ -621,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;
@@ -649,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;
 				})();
 			},
@@ -824,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;
@@ -848,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({
@@ -1227,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;
@@ -1277,6 +1355,7 @@ const zodGenerator = defineGenerator({
 				paramSchemas,
 				responseSchemas,
 				responseUnionSchema,
+				errorUnionSchema,
 				requestSchema
 			]
 		});
@@ -1340,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);
 		},