@kubb/plugin-zod 5.0.0-beta.85 → 5.0.0-beta.86

package/dist/index.js

@@ -141,7 +141,7 @@ const reservedWords = /* @__PURE__ */ new Set([
 */
 function isValidVarName(name) {
 	if (!name || reservedWords.has(name)) return false;
-	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
+	return isIdentifier(name);
 }
 /**
 * Returns `name` when it's a syntactically valid JavaScript variable name,
@@ -1540,6 +1540,27 @@ const zodGenerator = defineGenerator({
 				direction
 			})] });
 		}
+		function buildResponseUnion({ responses, name, fallbackUnknown }) {
+			if (new Set(responses.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? adapter.getImports(entry.schema, (schemaName) => ({
+				name: resolver.name(schemaName),
+				path: ""
+			})).flatMap((imp) => Array.isArray(imp.name) ? imp.name : [imp.name]) : []))).has(name)) return null;
+			const members = responses.map((res) => ast.factory.createSchema({
+				type: "ref",
+				name: resolver.response.status(node, res.statusCode)
+			}));
+			if (fallbackUnknown && members.length === 0) return renderSchemaEntry({
+				schema: ast.factory.createSchema({ type: "unknown" }),
+				name
+			});
+			return renderSchemaEntry({
+				schema: members.length === 1 ? members[0] : ast.factory.createSchema({
+					type: "union",
+					members
+				}),
+				name
+			});
+		}
 		const paramSchemas = params.map((param) => renderSchemaEntry({
 			schema: param.schema,
 			name: resolver.param.name(node, param),
@@ -1557,47 +1578,17 @@ const zodGenerator = defineGenerator({
 		});
 		const responsesWithSchema = node.responses.filter((res) => res.content?.some((entry) => entry.schema));
 		const successResponsesWithSchema = getSuccessResponses(responsesWithSchema);
-		const responseUnionSchema = responsesWithSchema.length > 0 ? (() => {
-			const responseUnionName = resolver.response.response(node);
-			if (new Set(successResponsesWithSchema.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? adapter.getImports(entry.schema, (schemaName) => ({
-				name: resolver.name(schemaName),
-				path: ""
-			})).flatMap((imp) => Array.isArray(imp.name) ? imp.name : [imp.name]) : []))).has(responseUnionName)) return null;
-			const members = successResponsesWithSchema.map((res) => ast.factory.createSchema({
-				type: "ref",
-				name: resolver.response.status(node, res.statusCode)
-			}));
-			if (members.length === 0) return renderSchemaEntry({
-				schema: ast.factory.createSchema({ type: "unknown" }),
-				name: responseUnionName
-			});
-			return renderSchemaEntry({
-				schema: members.length === 1 ? members[0] : ast.factory.createSchema({
-					type: "union",
-					members
-				}),
-				name: responseUnionName
-			});
-		})() : null;
+		const responseUnionSchema = responsesWithSchema.length > 0 ? buildResponseUnion({
+			responses: successResponsesWithSchema,
+			name: resolver.response.response(node),
+			fallbackUnknown: true
+		}) : null;
 		const errorResponsesWithSchema = responsesWithSchema.filter((res) => !isSuccessStatusCode(res.statusCode));
-		const errorUnionSchema = errorResponsesWithSchema.length > 0 ? (() => {
-			const errorUnionName = resolver.response.error(node);
-			if (new Set(errorResponsesWithSchema.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? adapter.getImports(entry.schema, (schemaName) => ({
-				name: resolver.name(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.response.status(node, res.statusCode)
-			}));
-			return renderSchemaEntry({
-				schema: members.length === 1 ? members[0] : ast.factory.createSchema({
-					type: "union",
-					members
-				}),
-				name: errorUnionName
-			});
-		})() : null;
+		const errorUnionSchema = errorResponsesWithSchema.length > 0 ? buildResponseUnion({
+			responses: errorResponsesWithSchema,
+			name: resolver.response.error(node),
+			fallbackUnknown: false
+		}) : null;
 		const requestBodyContent = node.requestBody?.content ?? [];
 		const requestSchema = (() => {
 			if (requestBodyContent.length === 0) return null;