@kubb/plugin-client 5.8.0-canary.20261025T193221 → 5.8.0

package/dist/index.js

@@ -4,8 +4,7 @@ import { createFunctionParameter, createFunctionParameters, functionPrinter, plu
 import { pluginZodName } from "@kubb/plugin-zod";
 import { File, Function, jsxRenderer } from "kubb/jsx";
 import { jsx, jsxs } from "kubb/jsx/jsx-runtime";
-//#endregion
-//#region ../../internals/shared/src/operation.ts
+// ../../internals/shared/src/operation.ts
 /**
 * Builds the `ResolverFileParams` every operation generator passes to
 * `resolver.file`: a file named `name`, tagged by the operation's first
@@ -183,6 +182,16 @@ function getOperationParameters(node) {
 	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 hasRequestContentTypeChoice(node) {
+	return (node.requestBody?.content ?? []).filter((entry) => entry.schema).length > 1;
+}
 function getStatusCodeNumber(statusCode) {
 	const code = Number(statusCode);
 	return Number.isNaN(code) ? null : code;
@@ -200,8 +209,7 @@ function getOperationSuccessResponses(node) {
 function getPrimarySuccessResponse(node) {
 	return getOperationSuccessResponses(node)[0] ?? null;
 }
-//#endregion
-//#region ../../internals/utils/src/casing.ts
+// ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
 * Splits on common word boundaries (spaces, hyphens, underscores, dots, slashes, colons)
@@ -250,8 +258,7 @@ function camelCase(text, { prefix = "", suffix = "" } = {}) {
 function pascalCase(text, { prefix = "", suffix = "" } = {}) {
 	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, true);
 }
-//#endregion
-//#region ../../internals/utils/src/reserved.ts
+// ../../internals/utils/src/reserved.ts
 /**
 * JavaScript and Java reserved words.
 * @link https://github.com/jonschlinkert/reserved/blob/master/index.js
@@ -259,6 +266,7 @@ function pascalCase(text, { prefix = "", suffix = "" } = {}) {
 const reservedWords = /* @__PURE__ */ new Set([
 	"abstract",
 	"arguments",
+	"await",
 	"boolean",
 	"break",
 	"byte",
@@ -389,8 +397,29 @@ function ensureValidVarName(name) {
 function isIdentifier(name) {
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
-//#endregion
-//#region ../../internals/shared/src/group.ts
+// ../../internals/shared/src/resolver.ts
+function resolveOperationName(name) {
+	return ensureValidVarName(camelCase(name));
+}
+/**
+* Builds the allocation key for a declaration an operation owns. `scope` names which declaration
+* it is, so two of them never share an allocation even when a custom resolver gives both the same
+* name. Leave `scope` empty for the operation's own declaration.
+*
+* @example
+* ```ts
+* resolver.resolveName({ key: operationKey(node, 'response', 'status', 404), name })
+* ```
+*/
+function operationKey(node, ...scope) {
+	return [
+		"operation",
+		node.method,
+		node.path,
+		...scope.map(String)
+	];
+}
+// ../../internals/shared/src/group.ts
 /**
 * Builds the `group` config a Kubb plugin passes to `ctx.setOptions`, applying the
 * shared default naming so every plugin groups output consistently:
@@ -420,17 +449,14 @@ function createGroupConfig(group) {
 		name: group.name ? group.name : defaultName
 	};
 }
-//#endregion
-//#region kubb-extension.json
+// kubb-extension.json
 var compatibility = {
-	"kubb": ">=5.8.3",
+	"kubb": ">=5.14.6",
 	"node": ">=22.22"
 };
-//#endregion
-//#region package.json
-var version = "5.8.0-canary.20261025T193221";
-//#endregion
-//#region ../../internals/client/src/builders/validatorOptions.ts
+// package.json
+var version = "5.8.0";
+// ../../internals/client/src/builders/validatorOptions.ts
 /**
 * Returns `true` when any direction of the validator uses zod (used for dependency checks).
 */
@@ -473,8 +499,7 @@ function buildZodErrorParse(node, zodResolver) {
 	if (!node.responses.some((res) => !isSuccessStatusCode(res.statusCode) && res.content?.some((entry) => entry.schema))) return null;
 	return zodResolver.response.error?.(node) || null;
 }
-//#endregion
-//#region ../../internals/client/src/builders/security.ts
+// ../../internals/client/src/builders/security.ts
 function serializeAuth(auth) {
 	const parts = [`type: '${auth.type}'`];
 	if (auth.scheme) parts.push(`scheme: '${auth.scheme}'`);
@@ -545,8 +570,7 @@ function buildSecurityMetadata({ security }) {
 	if (!security?.length) return null;
 	return `[${security.map(serializeAuth).join(", ")}]`;
 }
-//#endregion
-//#region ../../internals/client/src/builders/validator.ts
+// ../../internals/client/src/builders/validator.ts
 /**
 * Builds the validator-hook references for one operation. Request body and params validation run before the send.
 * Response validation runs on the success body only. Returns `null` references when the matching
@@ -588,17 +612,16 @@ function buildValidatorLiteral(hooks, keys) {
 	const entries = keys.flatMap((key) => hooks?.[key] ? [`${key}: ${hooks[key]}`] : []);
 	return entries.length ? `validator: { ${entries.join(", ")} }` : null;
 }
-//#endregion
-//#region ../../internals/client/src/builders/contentType.ts
+// ../../internals/client/src/builders/contentType.ts
 /**
-* Builds the `contentType` entry baked into the call config, or `null` for the JSON default.
+* Builds the `contentType` entry baked into the call config, or `null` without a request body.
 *
 * `merge` is `true` when the generated function must destructure `contentType` from `options` and
 * merge it over the baked request default, because the caller can also pick a response content type.
 */
 function buildContentType({ node }) {
 	const { defaultContentType } = getContentTypeInfo(node);
-	const requestContentType = Boolean(node.requestBody?.content?.[0]?.schema) && defaultContentType !== "application/json" ? defaultContentType : null;
+	const requestContentType = Boolean(node.requestBody?.content?.[0]?.schema) ? defaultContentType : null;
 	if (!requestContentType) return {
 		literal: null,
 		merge: false
@@ -609,8 +632,7 @@ function buildContentType({ node }) {
 		literal: merge ? `contentType: { request: '${requestContentType}', ...(typeof contentType === 'string' ? { request: contentType } : contentType) }` : `contentType: { request: '${requestContentType}' }`
 	};
 }
-//#endregion
-//#region ../../internals/client/src/builders/generics.ts
+// ../../internals/client/src/builders/generics.ts
 /**
 * Builds the `RequestResult` generic arguments for one operation: the per-status responses record
 * plus the per-call `ThrowOnError` flag. `SuccessOf` / `ErrorOf` split the record inside the
@@ -641,8 +663,7 @@ function buildResultType({ node, types, returnType }) {
 	if (returnType === "plain") return `Promise<RequestResult<${generics}>>`;
 	return `Unwrappable<RequestResult<${generics}>>`;
 }
-//#endregion
-//#region ../../internals/client/src/builders/returnStatement.ts
+// ../../internals/client/src/builders/returnStatement.ts
 /**
 * Builds the return statement of a generated operation function. With the default
 * `returnType: 'full'` the runtime call already resolves to `{ data, error, request, response }`.
@@ -666,22 +687,22 @@ function buildResultType({ node, types, returnType }) {
 * `return request({ method: 'POST', url: '/pet', ...config }) as Promise<RequestResult<AddPetResponses, ThrowOnError>>`
 */
 function buildReturnStatement({ node, types, callConfig, returnType, throwOnErrorDefault }) {
-	if (returnType === "data") return `return unwrapResult(request(${callConfig}), config.throwOnError ?? ${throwOnErrorDefault}) as ${buildResultType({
+	const request = returnType !== "plain" && hasRequestContentTypeChoice(node) ? `request<${types.response.options(node)}['body']>` : "request";
+	if (returnType === "data") return `return unwrapResult(${request}(${callConfig}), config.throwOnError ?? ${throwOnErrorDefault}) as ${buildResultType({
 		node,
 		types,
 		returnType
 	})}`;
-	if (returnType === "plain") return `return request(${callConfig}) as Promise<RequestResult<${buildRequestResultGenerics({
+	if (returnType === "plain") return `return ${request}(${callConfig}) as Promise<RequestResult<${buildRequestResultGenerics({
 		node,
 		types
 	})}>>`;
-	return `return withUnwrap(request(${callConfig}) as Promise<RequestResult<${buildRequestResultGenerics({
+	return `return withUnwrap(${request}(${callConfig}) as Promise<RequestResult<${buildRequestResultGenerics({
 		node,
 		types
 	})}>>)`;
 }
-//#endregion
-//#region ../../internals/client/src/builders/signature.ts
+// ../../internals/client/src/builders/signature.ts
 const declarationPrinter = functionPrinter({ mode: "declaration" });
 /**
 * Builds the grouped-options signature for one operation: a single `options` object whose `TData`
@@ -709,16 +730,14 @@ function buildGroupedOptionsSignature({ node, types, returnType, throwOnErrorDef
 		generics: [`ThrowOnError extends boolean = ${throwOnErrorDefault}`]
 	};
 }
-//#endregion
-//#region ../../internals/client/src/builders/styles.ts
+// ../../internals/client/src/builders/styles.ts
 /**
-* Renders a parameter name as an object-literal key, quoted when it is not a bare identifier.
-* Path keys are camelCased to match the URL template placeholders. Query, header, and cookie keys
-* keep the spec name, matching the remapped keys the runtime serializes.
+* Renders a parameter name as an object-literal key, quoted when it is not a bare identifier. Every
+* location keeps the spec name: the runtime looks path styles up by the `{name}` placeholder in the
+* URL, and the other locations by the key it serializes.
 */
-function toKey(name, location) {
-	const key = location === "path" ? camelCase(name) : name;
-	return isValidVarName(key) ? key : JSON.stringify(key);
+function toKey(name) {
+	return isValidVarName(name) ? name : JSON.stringify(name);
 }
 /**
 * Serializes one parameter's metadata into a `{ style, explode, allowReserved, contentType }`
@@ -755,8 +774,7 @@ function serializeBodyEncoding(node) {
 }
 /**
 * Builds the per-operation `styles` literal from the operation's parameters, grouped by location.
-* Path entries are keyed by the camelCased name to match the URL template placeholders; query,
-* header, and cookie entries keep the spec name to match the keys the runtime serializes.
+* Entries are keyed by the spec name of the parameter.
 * Only parameters whose source defines `style`, `explode`, `allowReserved`, or `contentType` are
 * emitted, so calls without serialization metadata keep the runtime defaults and existing output
 * is unchanged. A form request body adds a `body` group keyed by property name from its `encoding`.
@@ -779,13 +797,12 @@ function buildStyles({ node }) {
 	for (const parameter of node.parameters) {
 		const literal = serializeParameter(parameter);
 		if (!literal) continue;
-		groups[parameter.in].push(`${toKey(parameter.name, parameter.in)}: ${literal}`);
+		groups[parameter.in].push(`${toKey(parameter.name)}: ${literal}`);
 	}
 	const entries = [...Object.keys(groups).filter((location) => groups[location].length > 0).map((location) => `${location}: { ${groups[location].join(", ")} }`), serializeBodyEncoding(node)].filter(Boolean);
 	return entries.length > 0 ? `{ ${entries.join(", ")} }` : null;
 }
-//#endregion
-//#region ../../internals/client/src/components/Operation.tsx
+// ../../internals/client/src/components/Operation.tsx
 /**
 * Renders one client operation: the grouped `<Name>Request` type and the function that forwards a
 * single `options` object to the resolved client and returns the `Unwrappable<RequestResult>`. The
@@ -862,8 +879,7 @@ function Operation({ name, node, types, zodResolver, validator, returnType, thro
 		})
 	});
 }
-//#endregion
-//#region ../../internals/client/src/resolveOperationTypes.ts
+// ../../internals/client/src/resolveOperationTypes.ts
 /**
 * A `plugin-ts` shaped resolver whose operation type names point at the types `pluginZod({ inferred })`
 * exports next to each schema, so code written against `plugin-ts` names picks up the zod types.
@@ -929,8 +945,7 @@ function resolveOperationTypes(driver, pluginName) {
 		group: pluginZod.options.group ?? void 0
 	};
 }
-//#endregion
-//#region ../../internals/client/src/generators/clientGenerator.tsx
+// ../../internals/client/src/generators/clientGenerator.tsx
 /**
 * Builds the built-in per-operation generator shared by the client plugins (`@kubb/plugin-fetch`,
 * `@kubb/plugin-axios`). Emits one async function per OpenAPI operation using the shared
@@ -957,8 +972,12 @@ function createClientGenerator(name, resolveClientPath) {
 				zodResolver
 			});
 			const importedZodNames = validatorHooks.importedZodNames;
+			const operationName = resolver.name(node.operationId);
 			const meta = {
-				name: resolver.name(node.operationId),
+				name: resolver.resolveName({
+					key: operationKey(node),
+					name: operationName
+				}),
 				file: resolver.file({
 					...operationFileEntry(node, node.operationId),
 					root,
@@ -1073,19 +1092,17 @@ function createClientGenerator(name, resolveClientPath) {
 		}
 	});
 }
-//#endregion
-//#region ../../internals/client/src/macros.ts
+// ../../internals/client/src/macros.ts
 /**
 * Macros the client plugins apply by default, ahead of any user macros. `macroSimplifyUnion`
 * drops union members a broader scalar already covers, keeping the generated response and error
 * unions tidy. A plugin wires them with `ctx.setMacros([...defaultMacros, ...userMacros])`.
 */
 const defaultMacros = [macroSimplifyUnion];
-//#endregion
-//#region ../../internals/client/src/resolver.ts
+// ../../internals/client/src/resolver.ts
 /**
-* Default resolver shared by the client plugins. Functions and files inherit the built-in camelCase
-* `name` and `file`; classes and tag groups use PascalCase.
+* Default resolver shared by the client plugins. Functions use safe camelCase identifiers and
+* files inherit the built-in casing; classes and tag groups use PascalCase.
 *
 * @example
 * ```ts
@@ -1095,6 +1112,7 @@ const defaultMacros = [macroSimplifyUnion];
 */
 const resolverClient = createResolver({
 	pluginName: "plugin-contract-client",
+	name: resolveOperationName,
 	className(name) {
 		return ensureValidVarName(pascalCase(name));
 	},
@@ -1105,16 +1123,14 @@ const resolverClient = createResolver({
 		return ensureValidVarName(camelCase(name));
 	}
 });
-//#endregion
-//#region src/generators/clientGenerator.tsx
+// src/generators/clientGenerator.tsx
 /**
 * Built-in operation generator for `@kubb/plugin-client`. Emits one async function per OpenAPI
 * operation using the shared `Operation` component: a grouped `<Name>Request` type and a function
 * that forwards a single `options` object to the user-provided client module and returns the `RequestResult`.
 */
 const clientGenerator = createClientGenerator("client", (options) => options.importPath);
-//#endregion
-//#region src/plugin.ts
+// src/plugin.ts
 /**
 * Canonical plugin name for `@kubb/plugin-client`.
 */
@@ -1165,7 +1181,6 @@ const pluginClient = defineExtension({
 		};
 	}
 });
-//#endregion
 export { pluginClient as default, pluginClient, pluginClientName };
 
 //# sourceMappingURL=index.js.map