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

package/dist/index.d.ts

@@ -454,7 +454,7 @@ declare const pluginZodName = "plugin-zod";
  * import { pluginZod } from '@kubb/plugin-zod'
  *
  * export default defineConfig({
- *   input: { path: './petStore.yaml' },
+ *   input: './petStore.yaml',
  *   output: { path: './src/gen' },
  *   plugins: [
  *     pluginTs(),

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,
@@ -428,6 +428,24 @@ function getSuccessResponses(responses) {
 	return responses.filter((response) => isSuccessStatusCode(response.statusCode));
 }
 //#endregion
+//#region ../../internals/shared/src/adapter.ts
+/**
+* Narrows the generic `Adapter` from a generator context to the OpenAPI adapter,
+* so OAS-only options (`dateType`, `nameMapping`) and the parsed `document` are typed.
+*
+* Throws when a non-OAS adapter is configured, turning a silently wrong cast into a
+* clear, actionable error at the point of use.
+*
+* @example
+* ```ts
+* const { dateType } = getOasAdapter(ctx.adapter).options
+* ```
+*/
+function getOasAdapter(adapter) {
+	if (adapter.name !== "oas") throw new Error(`Expected the OpenAPI adapter (adapterOas), but received "${adapter.name}". Configure \`adapter: adapterOas()\` in your Kubb config.`);
+	return adapter;
+}
+//#endregion
 //#region ../../internals/shared/src/group.ts
 /**
 * Builds the `group` config a Kubb plugin passes to `ctx.setOptions`, applying the
@@ -1272,16 +1290,14 @@ function getStdPrinters(resolver, params) {
 		output: cached.output,
 		input: cached.input
 	};
-	const base = {
-		...params,
-		resolver
-	};
 	const output = printerZod({
-		...base,
+		...params,
+		resolver,
 		direction: "output"
 	});
 	const input = printerZod({
-		...base,
+		...params,
+		resolver,
 		direction: "input"
 	});
 	zodPrinterCache.set(resolver, {
@@ -1325,7 +1341,7 @@ const zodGenerator = defineGenerator({
 	schema(node, ctx) {
 		const { adapter, config, resolver, root } = ctx;
 		const { output, coercion, guidType, regexType, mini, inferred, importPath, group, printer } = ctx.options;
-		const dateType = adapter.options.dateType;
+		const dateType = getOasAdapter(adapter).options.dateType;
 		if (!node.name) return;
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
 		const cyclicSchemas = new Set(ctx.meta.circularNames);
@@ -1369,7 +1385,7 @@ const zodGenerator = defineGenerator({
 			})
 		};
 		const inferTypeName = inferred ? resolver.schema.typeName(node.name) : null;
-		const nameMapping = adapter.options.nameMapping;
+		const nameMapping = getOasAdapter(adapter).options.nameMapping;
 		const stdPrinters = mini ? null : getStdPrinters(resolver, {
 			coercion,
 			guidType,
@@ -1442,7 +1458,7 @@ const zodGenerator = defineGenerator({
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { adapter, config, resolver, root } = ctx;
 		const { output, coercion, guidType, regexType, mini, inferred, importPath, group, printer } = ctx.options;
-		const dateType = adapter.options.dateType;
+		const dateType = getOasAdapter(adapter).options.dateType;
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
 		const params = caseParams(node.parameters, "camelcase");
 		const meta = { file: resolver.file({
@@ -1455,7 +1471,7 @@ const zodGenerator = defineGenerator({
 			group: group ?? void 0
 		}) };
 		const cyclicSchemas = new Set(ctx.meta.circularNames);
-		const nameMapping = adapter.options.nameMapping;
+		const nameMapping = getOasAdapter(adapter).options.nameMapping;
 		function renderSchemaEntry({ schema, name, keysToOmit, direction = "output" }) {
 			if (!schema) return null;
 			const inferTypeName = inferred ? resolver.schema.type(name) : null;
@@ -1540,6 +1556,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 +1594,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;
@@ -1746,7 +1753,7 @@ const pluginZodName = "plugin-zod";
 * import { pluginZod } from '@kubb/plugin-zod'
 *
 * export default defineConfig({
-*   input: { path: './petStore.yaml' },
+*   input: './petStore.yaml',
 *   output: { path: './src/gen' },
 *   plugins: [
 *     pluginTs(),