@kubb/plugin-ts 5.0.0-beta.99 → 5.0.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { n as __name, t as __exportAll } from "./rolldown-runtime-CNktS9qV.js";
 import { parserTs } from "@kubb/parser-ts";
 import { File, jsxRenderer } from "kubb/jsx";
-import { Resolver, ast, createResolver, defineGenerator, definePlugin } from "kubb/kit";
+import { Resolver, ast, createResolver, defineGenerator, definePlugin, isStringType, syncSchemaRef } from "kubb/kit";
 import ts from "typescript";
 import { Fragment, jsx, jsxs } from "kubb/jsx/jsx-runtime";
 //#region ../../internals/utils/src/casing.ts
@@ -817,7 +817,7 @@ function buildTupleNode(node, print) {
 */
 function buildPropertyType(schema, baseType, optionalType, optional) {
 	const addsUndefined = OPTIONAL_ADDS_UNDEFINED.has(optionalType);
-	const meta = ast.syncSchemaRef(schema);
+	const meta = syncSchemaRef(schema);
 	let type = baseType;
 	if (meta.nullable) type = createUnionDeclaration({ nodes: [type, keywordTypeNodes.null] });
 	if ((optional || meta.nullish || meta.optional) && addsUndefined) type = createUnionDeclaration({ nodes: [type, keywordTypeNodes.undefined] });
@@ -978,16 +978,81 @@ function resolveContentTypeVariants(entries, baseName) {
 		};
 	});
 }
+const operationParameterGroupsByNode = /* @__PURE__ */ new WeakMap();
+/**
+* Groups an operation's parameters by location (`path`/`query`/`header`/`cookie`), deduping each
+* group by name. Every plugin generator visiting the same `OperationNode` shares one AST instance
+* (see `KubbDriver`), so the result is cached per node to avoid re-filtering and re-deduping the
+* same parameters once per plugin.
+*/
 function getOperationParameters(node) {
-	return {
-		path: dedupeParams(node.parameters.filter((param) => param.in === "path").map((param) => isValidVarName(param.name) ? param : {
-			...param,
-			name: camelCase(param.name)
-		})),
+	const cached = operationParameterGroupsByNode.get(node);
+	if (cached) return cached;
+	const groups = {
+		path: dedupeParams(node.parameters.filter((param) => param.in === "path")),
 		query: dedupeParams(node.parameters.filter((param) => param.in === "query")),
 		header: dedupeParams(node.parameters.filter((param) => param.in === "header")),
 		cookie: dedupeParams(node.parameters.filter((param) => param.in === "cookie"))
 	};
+	operationParameterGroupsByNode.set(node, groups);
+	return groups;
+}
+/**
+* Builds the combined `{ body, path, query, headers }` options object schema for an operation,
+* referencing the already-resolved body and grouped param names. Shared by `@kubb/plugin-ts`'s
+* `Options` type and `@kubb/plugin-zod`'s inferred options schema, so both printers emit the same
+* shape from the same inputs. `primitive: 'object'` is a no-op for the TS printer and tells the Zod
+* printer to emit `z.object(…)` rather than a record.
+*/
+function buildOptionsSchema(node, resolver) {
+	const { path, query, header } = getOperationParameters(node);
+	const hasBody = Boolean(node.requestBody?.content?.[0]?.schema);
+	const createNever = () => ast.factory.createSchema({
+		type: "never",
+		primitive: void 0,
+		optional: true
+	});
+	const groups = [
+		{
+			name: "path",
+			params: path,
+			resolve: resolver.param.path
+		},
+		{
+			name: "query",
+			params: query,
+			resolve: resolver.param.query
+		},
+		{
+			name: "headers",
+			params: header,
+			resolve: resolver.param.headers
+		}
+	];
+	return ast.factory.createSchema({
+		type: "object",
+		primitive: "object",
+		deprecated: node.deprecated,
+		properties: [ast.factory.createProperty({
+			name: "body",
+			required: hasBody,
+			schema: hasBody ? ast.factory.createSchema({
+				type: "ref",
+				name: resolver.response.body(node)
+			}) : createNever()
+		}), ...groups.map(({ name, params, resolve }) => {
+			const required = params.some((param) => param.required);
+			return ast.factory.createProperty({
+				name,
+				required,
+				schema: params.length > 0 ? ast.factory.createSchema({
+					type: "ref",
+					name: resolve.call(resolver.param, node, params[0]),
+					optional: !required
+				}) : createNever()
+			});
+		})]
+	});
 }
 //#endregion
 //#region ../../internals/shared/src/resolver.ts
@@ -1072,7 +1137,7 @@ function createCasedFile(caseLast) {
 * `resolver.imports` would resolve file paths that are then discarded.
 */
 function collectRefNames(schema) {
-	return ast.collect(schema, { schema: (node) => {
+	return ast.collectSync(schema, { schema: (node) => {
 		const refNode = ast.narrowSchema(node, "ref");
 		if (!refNode?.ref) return null;
 		return ast.resolveRefName(refNode);
@@ -1167,12 +1232,12 @@ function formatExample(value) {
 	return (JSON.stringify(value) ?? String(value)).replaceAll("*/", "*\\/");
 }
 function buildPropertyJSDocComments(schema, optional) {
-	const meta = ast.syncSchemaRef(schema);
+	const meta = syncSchemaRef(schema);
 	const isArray = meta?.primitive === "array";
 	const hasDescription = meta && "description" in meta && meta.description;
 	const formatComment = meta && "format" in meta && meta.format ? hasDescription ? [" ", `Format: \`${meta.format}\``] : ["@description", `Format: \`${meta.format}\``] : [];
 	const exampleValues = meta?.examples ?? [];
-	return [
+	const comments = [
 		hasDescription ? `@description ${jsStringEscape(meta.description)}` : null,
 		...formatComment,
 		meta && "deprecated" in meta && meta.deprecated ? "@deprecated" : null,
@@ -1180,9 +1245,10 @@ function buildPropertyJSDocComments(schema, optional) {
 		!isArray && meta && "max" in meta && meta.max !== void 0 ? `@maxLength ${meta.max}` : null,
 		meta && "pattern" in meta && meta.pattern ? `@pattern ${meta.pattern}` : null,
 		meta && "default" in meta && meta.default !== void 0 ? `@default ${"primitive" in meta && meta.primitive === "string" && typeof meta.default === "string" ? stringify(meta.default) : meta.default}` : null,
-		...exampleValues.map((example) => `@example ${formatExample(example)}`),
-		meta && "primitive" in meta && meta.primitive ? [`@type ${meta.primitive}`, optional ?? isSchemaOptional(schema) ? " | undefined" : null].filter(Boolean).join("") : null
+		...exampleValues.map((example) => `@example ${formatExample(example)}`)
 	].filter(Boolean);
+	const typeTag = comments.length && meta && "primitive" in meta && meta.primitive ? [`@type ${meta.primitive}`, optional ?? isSchemaOptional(schema) ? " | undefined" : null].filter(Boolean).join("") : null;
+	return [...comments, typeTag].filter(Boolean);
 }
 /**
 * Builds the object schema for a group of parameters sharing one `in` location (path, query, or
@@ -1202,70 +1268,6 @@ function buildParams({ params }) {
 		}))
 	});
 }
-function buildOptions(node, { resolver }) {
-	const { path: pathParams, query: queryParams, header: headerParams } = getOperationParameters(node);
-	const hasBody = Boolean(node.requestBody?.content?.[0]?.schema);
-	const hasRequiredPath = pathParams.some((param) => param.required);
-	const hasRequiredQuery = queryParams.some((param) => param.required);
-	const hasRequiredHeader = headerParams.some((param) => param.required);
-	return ast.factory.createSchema({
-		type: "object",
-		deprecated: node.deprecated,
-		properties: [
-			ast.factory.createProperty({
-				name: "body",
-				required: hasBody,
-				schema: hasBody ? ast.factory.createSchema({
-					type: "ref",
-					name: resolver.response.body(node)
-				}) : ast.factory.createSchema({
-					type: "never",
-					primitive: void 0,
-					optional: true
-				})
-			}),
-			ast.factory.createProperty({
-				name: "path",
-				required: hasRequiredPath,
-				schema: pathParams.length > 0 ? ast.factory.createSchema({
-					type: "ref",
-					name: resolver.param.path(node, pathParams[0]),
-					optional: !hasRequiredPath
-				}) : ast.factory.createSchema({
-					type: "never",
-					primitive: void 0,
-					optional: true
-				})
-			}),
-			ast.factory.createProperty({
-				name: "query",
-				required: hasRequiredQuery,
-				schema: queryParams.length > 0 ? ast.factory.createSchema({
-					type: "ref",
-					name: resolver.param.query(node, queryParams[0]),
-					optional: !hasRequiredQuery
-				}) : ast.factory.createSchema({
-					type: "never",
-					primitive: void 0,
-					optional: true
-				})
-			}),
-			ast.factory.createProperty({
-				name: "headers",
-				required: hasRequiredHeader,
-				schema: headerParams.length > 0 ? ast.factory.createSchema({
-					type: "ref",
-					name: resolver.param.headers(node, headerParams[0]),
-					optional: !hasRequiredHeader
-				}) : ast.factory.createSchema({
-					type: "never",
-					primitive: void 0,
-					optional: true
-				})
-			})
-		]
-	});
-}
 /**
 * The schema a status occupies in the `<Name>Responses` record. A status that documents several
 * content types becomes a `{ contentType; data }` union so the runtime can surface the negotiated type
@@ -1325,7 +1327,7 @@ function buildResponseUnion(node, { resolver }) {
 //#endregion
 //#region src/components/Type.tsx
 function Type({ name, node, printer, enum: enumOptions, resolver }) {
-	const enumSchemaNodes = ast.collect(node, { schema(n) {
+	const enumSchemaNodes = ast.collectSync(node, { schema(n) {
 		const enumNode = ast.narrowSchema(n, ast.schemaTypes.enum);
 		if (enumNode?.name && !isInlineConstEnum(enumNode, printer.options.enumSchemaNames)) return enumNode;
 	} });
@@ -1430,11 +1432,11 @@ const printerTs = ast.createPrinter((options) => {
 				const hasStringLiteral = members.some((m) => {
 					return ast.narrowSchema(m, ast.schemaTypes.enum)?.primitive === "string";
 				});
-				const hasPlainString = members.some((m) => ast.isStringType(m));
+				const hasPlainString = members.some((m) => isStringType(m));
 				if (hasStringLiteral && hasPlainString) return createUnionDeclaration({
 					withParentheses: true,
 					nodes: members.map((m) => {
-						if (ast.isStringType(m)) return createIntersectionDeclaration({
+						if (isStringType(m)) return createIntersectionDeclaration({
 							nodes: [keywordTypeNodes.string, createTypeLiteralNode([])],
 							withParentheses: true
 						});
@@ -1468,7 +1470,7 @@ const printerTs = ast.createPrinter((options) => {
 					const baseType = output ?? keywordTypeNodes.unknown;
 					const optional = !property.required || !!property.schema.optional || !!property.schema.nullish;
 					const type = buildPropertyType(property.schema, baseType, options.optionalType, optional);
-					const propMeta = ast.syncSchemaRef(property.schema);
+					const propMeta = syncSchemaRef(property.schema);
 					return appendJSDocToNode({
 						node: createPropertySignature({
 							questionToken: optional ? addsQuestionToken : false,
@@ -1489,7 +1491,7 @@ const printerTs = ast.createPrinter((options) => {
 			const { name, syntaxType = "type", description, keysToOmit } = this.options;
 			const transformed = this.transform(node);
 			if (!transformed) return null;
-			const meta = ast.syncSchemaRef(node);
+			const meta = syncSchemaRef(node);
 			if (!name) {
 				const withNullable = meta.nullable ? createUnionDeclaration({ nodes: [transformed, keywordTypeNodes.null] }) : transformed;
 				const result = (meta.nullish || meta.optional) && addsUndefined ? createUnionDeclaration({ nodes: [withNullable, keywordTypeNodes.undefined] }) : withNullable;
@@ -1745,7 +1747,7 @@ const typeGenerator = defineGenerator({
 			});
 		});
 		const optionsType = renderSchemaType({
-			schema: buildOptions(node, { resolver }),
+			schema: buildOptionsSchema(node, resolver),
 			name: resolver.response.options(node)
 		});
 		const responsesType = renderSchemaType({