@kubb/plugin-fetch 5.0.0-beta.75 → 5.0.0-beta.76

package/dist/index.js

@@ -8,121 +8,6 @@ import { pluginZodName } from "@kubb/plugin-zod";
 import { buildJSDoc } from "@kubb/ast/utils";
 import { macroSimplifyUnion } from "@kubb/ast/macros";
 import { fileURLToPath } from "node:url";
-//#region ../../internals/client/src/builders/parser.ts
-/**
-* Returns `true` when any direction of the parser uses zod (used for dependency checks).
-*/
-function isParserEnabled(parser) {
-	if (!parser) return false;
-	if (parser === "zod") return true;
-	return Boolean(parser.request || parser.response);
-}
-/**
-* Returns `'zod'` when request body parsing is enabled, `null` otherwise. The string shorthand
-* `'zod'` validates the response only, so it does not enable request parsing.
-*/
-function resolveRequestParser(parser) {
-	if (!parser || parser === "zod") return null;
-	return parser.request ?? null;
-}
-/**
-* Returns `'zod'` when query-parameters parsing is enabled, `null` otherwise. Only the object form
-* `{ request: 'zod' }` enables it.
-*/
-function resolveQueryParamsParser(parser) {
-	if (!parser || parser === "zod") return null;
-	return parser.request ?? null;
-}
-/**
-* Returns `'zod'` when response parsing is enabled, `null` otherwise. The string shorthand `'zod'`
-* maps to response parsing.
-*/
-function resolveResponseParser(parser) {
-	if (!parser) return null;
-	if (parser === "zod") return "zod";
-	return parser.response ?? null;
-}
-/**
-* Resolves the zod expression a generated client validates a success response with. Only success
-* (2xx) bodies reach the parse under the throw-on-error contract, so the success-only
-* `<operation>ResponseSchema` is used; error bodies are never zod-parsed.
-*/
-function buildZodResponseParse(node, zodResolver) {
-	const name = zodResolver.resolveResponseName?.(node);
-	return name ? {
-		expression: name,
-		importNames: [name]
-	} : null;
-}
-//#endregion
-//#region ../../internals/client/src/builders/security.ts
-function serializeAuth(auth) {
-	const parts = [`type: '${auth.type}'`];
-	if (auth.scheme) parts.push(`scheme: '${auth.scheme}'`);
-	if (auth.name) parts.push(`name: '${auth.name}'`);
-	if (auth.in) parts.push(`in: '${auth.in}'`);
-	return `{ ${parts.join(", ")} }`;
-}
-/**
-* Maps an OpenAPI security scheme to the inline `Auth` object, or `null` when the runtime cannot
-* place it (an unresolved `$ref`, or an `apiKey` without a name or outside `header` / `query` /
-* `cookie`). `http` schemes other than `basic` are treated as bearer.
-*/
-function resolveSecurityScheme(scheme) {
-	if (!scheme || "$ref" in scheme) return null;
-	if (scheme.type === "apiKey") {
-		if (!scheme.name || scheme.in !== "header" && scheme.in !== "query" && scheme.in !== "cookie") return null;
-		return {
-			type: "apiKey",
-			name: scheme.name,
-			in: scheme.in
-		};
-	}
-	if (scheme.type === "http") return {
-		type: "http",
-		scheme: scheme.scheme?.toLowerCase() === "basic" ? "basic" : "bearer"
-	};
-	if (scheme.type === "oauth2") return { type: "oauth2" };
-	if (scheme.type === "openIdConnect") return { type: "openIdConnect" };
-	return null;
-}
-/**
-* Derives the per-operation security metadata from the OpenAPI document. The operation's own
-* `security` overrides the global `security` (an explicit empty array disables auth), and every
-* referenced scheme is resolved from `components.securitySchemes` into a flat, de-duplicated list of
-* `Auth` objects the runtime walks in order.
-*
-* @example
-* `getOperationSecurity({ document, method: 'POST', path: '/pet' })`
-* `// [{ type: 'http', scheme: 'bearer' }]`
-*/
-function getOperationSecurity({ document, method, path }) {
-	if (!document) return void 0;
-	const requirements = (document.paths?.[path]?.[method.toLowerCase()])?.security ?? document.security;
-	if (!requirements?.length) return void 0;
-	const definitions = document.components?.securitySchemes ?? {};
-	const security = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const requirement of requirements) for (const schemeName of Object.keys(requirement)) {
-		if (seen.has(schemeName)) continue;
-		seen.add(schemeName);
-		const auth = resolveSecurityScheme(definitions[schemeName]);
-		if (auth) security.push(auth);
-	}
-	return security.length ? security : void 0;
-}
-/**
-* Serializes the per-operation security into the literal emitted on each generated call's `security`
-* field. The runtime `resolveAuth` helper walks it, calling the configured `auth` resolver per entry.
-*
-* @example
-* `buildSecurityMetadata({ security: [{ type: 'http', scheme: 'bearer' }] }) // "[{ type: 'http', scheme: 'bearer' }]"`
-*/
-function buildSecurityMetadata({ security }) {
-	if (!security?.length) return null;
-	return `[${security.map(serializeAuth).join(", ")}]`;
-}
-//#endregion
 //#region ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
@@ -348,6 +233,17 @@ var Url = class Url {
 		return path.replace(/\{([^}]+)\}/g, ":$1");
 	}
 	/**
+	* Rewrites OpenAPI placeholder names while keeping the `{...}` braces, so the generated `url`
+	* literal aligns with the grouped `path` request option that the runtime client interpolates by
+	* key.
+	*
+	* @example
+	* Url.toCasedTemplate('/projects/{project_id}', { casing: 'camelcase' }) // '/projects/{projectId}'
+	*/
+	static toCasedTemplate(path, { casing } = {}) {
+		return path.replace(/\{([^}]+)\}/g, (_, name) => `{${transformParam(name, casing)}}`);
+	}
+	/**
 	* Converts an OpenAPI/Swagger path to a TypeScript template literal string.
 	* `prefix` is prepended inside the literal, `replacer` transforms each parameter name,
 	* and `casing` controls parameter identifier casing.
@@ -457,6 +353,17 @@ function getOperationLink(node, link) {
 	if (link === "urlPath") return node.path ? `{@link ${Url.toPath(node.path)}}` : null;
 	return node.path ? `{@link ${node.path.replaceAll("{", ":").replaceAll("}", "")}}` : null;
 }
+function getContentTypeInfo(node) {
+	const contentTypes = node.requestBody?.content?.map((e) => e.contentType) ?? [];
+	const isMultipleContentTypes = contentTypes.length > 1;
+	return {
+		contentTypes,
+		isMultipleContentTypes,
+		contentTypeUnion: isMultipleContentTypes ? contentTypes.map((ct) => JSON.stringify(ct)).join(" | ") : "",
+		defaultContentType: contentTypes[0] ?? "application/json",
+		hasFormData: contentTypes.some((ct) => ct === "multipart/form-data")
+	};
+}
 function buildOperationComments(node, options = {}) {
 	const { link = "pathTemplate", linkPosition = "afterDeprecated", splitLines = false } = options;
 	const linkComment = getOperationLink(node, link);
@@ -483,6 +390,14 @@ function getOperationParameters(node, options = {}) {
 		cookie: params.filter((param) => param.in === "cookie")
 	};
 }
+function getStatusCodeNumber(statusCode) {
+	const code = Number(statusCode);
+	return Number.isNaN(code) ? null : code;
+}
+function isSuccessStatusCode(statusCode) {
+	const code = getStatusCodeNumber(statusCode);
+	return code !== null && code >= 200 && code < 300;
+}
 //#endregion
 //#region ../../internals/shared/src/group.ts
 /**
@@ -515,6 +430,134 @@ function createGroupConfig(group) {
 	};
 }
 //#endregion
+//#region ../../internals/client/src/builders/parser.ts
+/**
+* Returns `true` when any direction of the parser uses zod (used for dependency checks).
+*/
+function isParserEnabled(parser) {
+	if (!parser) return false;
+	if (parser === "zod") return true;
+	return Boolean(parser.request || parser.response);
+}
+/**
+* Returns `'zod'` when request body parsing is enabled, `null` otherwise. The string shorthand
+* `'zod'` validates the response only, so it does not enable request parsing.
+*/
+function resolveRequestParser(parser) {
+	if (!parser || parser === "zod") return null;
+	return parser.request ?? null;
+}
+/**
+* Returns `'zod'` when query-parameters parsing is enabled, `null` otherwise. Only the object form
+* `{ request: 'zod' }` enables it.
+*/
+function resolveQueryParamsParser(parser) {
+	if (!parser || parser === "zod") return null;
+	return parser.request ?? null;
+}
+/**
+* Returns `'zod'` when response parsing is enabled, `null` otherwise. The string shorthand `'zod'`
+* maps to response parsing.
+*/
+function resolveResponseParser(parser) {
+	if (!parser) return null;
+	if (parser === "zod") return "zod";
+	return parser.response ?? null;
+}
+/**
+* Resolves the zod expression a generated client validates a success response with. Only success
+* (2xx) bodies reach the parse under the throw-on-error contract, so the success-only
+* `<operation>ResponseSchema` is used; error bodies are never zod-parsed.
+*/
+function buildZodResponseParse(node, zodResolver) {
+	const name = zodResolver.resolveResponseName?.(node);
+	return name ? {
+		expression: name,
+		importNames: [name]
+	} : null;
+}
+/**
+* Resolves the zod expression a generated client validates an error body with on the non-throw path.
+* Uses the error-only `<operation>ErrorSchema` (the union of non-2xx statuses); returns `null` when the
+* operation documents no error responses with a schema.
+*/
+function buildZodErrorParse(node, zodResolver) {
+	if (!node.responses.some((res) => !isSuccessStatusCode(res.statusCode) && res.content?.some((entry) => entry.schema))) return null;
+	const name = zodResolver.resolveErrorName?.(node);
+	return name ? {
+		expression: name,
+		importNames: [name]
+	} : null;
+}
+//#endregion
+//#region ../../internals/client/src/builders/security.ts
+function serializeAuth(auth) {
+	const parts = [`type: '${auth.type}'`];
+	if (auth.scheme) parts.push(`scheme: '${auth.scheme}'`);
+	if (auth.name) parts.push(`name: '${auth.name}'`);
+	if (auth.in) parts.push(`in: '${auth.in}'`);
+	return `{ ${parts.join(", ")} }`;
+}
+/**
+* Maps an OpenAPI security scheme to the inline `Auth` object, or `null` when the runtime cannot
+* place it (an unresolved `$ref`, or an `apiKey` without a name or outside `header` / `query` /
+* `cookie`). `http` schemes other than `basic` are treated as bearer.
+*/
+function resolveSecurityScheme(scheme) {
+	if (!scheme || "$ref" in scheme) return null;
+	if (scheme.type === "apiKey") {
+		if (!scheme.name || scheme.in !== "header" && scheme.in !== "query" && scheme.in !== "cookie") return null;
+		return {
+			type: "apiKey",
+			name: scheme.name,
+			in: scheme.in
+		};
+	}
+	if (scheme.type === "http") return {
+		type: "http",
+		scheme: scheme.scheme?.toLowerCase() === "basic" ? "basic" : "bearer"
+	};
+	if (scheme.type === "oauth2") return { type: "oauth2" };
+	if (scheme.type === "openIdConnect") return { type: "openIdConnect" };
+	return null;
+}
+/**
+* Derives the per-operation security metadata from the OpenAPI document. The operation's own
+* `security` overrides the global `security` (an explicit empty array disables auth), and every
+* referenced scheme is resolved from `components.securitySchemes` into a flat, de-duplicated list of
+* `Auth` objects the runtime walks in order.
+*
+* @example
+* `getOperationSecurity({ document, method: 'POST', path: '/pet' })`
+* `// [{ type: 'http', scheme: 'bearer' }]`
+*/
+function getOperationSecurity({ document, method, path }) {
+	if (!document) return void 0;
+	const requirements = (document.paths?.[path]?.[method.toLowerCase()])?.security ?? document.security;
+	if (!requirements?.length) return void 0;
+	const definitions = document.components?.securitySchemes ?? {};
+	const security = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const requirement of requirements) for (const schemeName of Object.keys(requirement)) {
+		if (seen.has(schemeName)) continue;
+		seen.add(schemeName);
+		const auth = resolveSecurityScheme(definitions[schemeName]);
+		if (auth) security.push(auth);
+	}
+	return security.length ? security : void 0;
+}
+/**
+* Serializes the per-operation security into the literal emitted on each generated call's `security`
+* field. The runtime `resolveAuth` helper walks it, calling the configured `auth` resolver per entry.
+*
+* @example
+* `buildSecurityMetadata({ security: [{ type: 'http', scheme: 'bearer' }] }) // "[{ type: 'http', scheme: 'bearer' }]"`
+*/
+function buildSecurityMetadata({ security }) {
+	if (!security?.length) return null;
+	return `[${security.map(serializeAuth).join(", ")}]`;
+}
+//#endregion
 //#region ../../internals/client/src/builders/generics.ts
 /**
 * Builds the `RequestResult` generic arguments for one operation: the plugin-ts per-status responses
@@ -588,9 +631,13 @@ function buildParserHooks({ node, parser, zodResolver }) {
 	const responseParse = zodResolver && resolveResponseParser(parser) === "zod" ? buildZodResponseParse(node, zodResolver) : null;
 	const response = responseParse ? `(data: unknown) => ${responseParse.expression}.parse(data)` : null;
 	if (responseParse) importedZodNames.push(...responseParse.importNames);
+	const errorParse = zodResolver && resolveResponseParser(parser) === "zod" ? buildZodErrorParse(node, zodResolver) : null;
+	const error = errorParse ? `(data: unknown) => ${errorParse.expression}.parse(data)` : null;
+	if (errorParse) importedZodNames.push(...errorParse.importNames);
 	return {
 		request,
 		response,
+		error,
 		importedZodNames
 	};
 }
@@ -613,13 +660,20 @@ function Operation({ name, node, tsResolver, zodResolver, parser, security, isEx
 		zodResolver
 	});
 	const securityLiteral = buildSecurityMetadata({ security });
-	const parserEntries = [parsers.request ? `request: ${parsers.request}` : null, parsers.response ? `response: ${parsers.response}` : null].filter(Boolean);
+	const { defaultContentType } = getContentTypeInfo(node);
+	const contentTypeLiteral = Boolean(node.requestBody?.content?.[0]?.schema) && defaultContentType !== "application/json" ? `contentType: '${defaultContentType}'` : null;
+	const parserEntries = [
+		parsers.request ? `request: ${parsers.request}` : null,
+		parsers.response ? `response: ${parsers.response}` : null,
+		parsers.error ? `error: ${parsers.error}` : null
+	].filter(Boolean);
 	const parserLiteral = parserEntries.length ? `parser: { ${parserEntries.join(", ")} }` : null;
 	const callConfig = `{ ${[
 		`method: '${node.method.toUpperCase()}'`,
-		`url: '${node.path}'`,
+		`url: '${Url.toCasedTemplate(node.path, { casing: "camelcase" })}'`,
 		securityLiteral ? `security: ${securityLiteral}` : null,
 		parserLiteral,
+		contentTypeLiteral,
 		"...config"
 	].filter(Boolean).join(", ")} }`;
 	return /* @__PURE__ */ jsx(File.Source, {
@@ -667,7 +721,7 @@ function buildCallConfig({ node, parser, zodResolver, security }) {
 	const securityLiteral = buildSecurityMetadata({ security });
 	return `{ ${[
 		`method: '${node.method.toUpperCase()}'`,
-		`url: '${node.path}'`,
+		`url: '${Url.toCasedTemplate(node.path, { casing: "camelcase" })}'`,
 		securityLiteral ? `security: ${securityLiteral}` : null,
 		parserLiteral,
 		"...config"
@@ -772,6 +826,7 @@ function resolveZodImportNames(node, zodResolver, parser) {
 	const { query: queryParams } = getOperationParameters(node, { paramsCasing: "original" });
 	return [
 		resolveResponseParser(parser) === "zod" ? zodResolver.resolveResponseName?.(node) : null,
+		resolveResponseParser(parser) === "zod" ? buildZodErrorParse(node, zodResolver)?.expression ?? null : null,
 		resolveRequestParser(parser) === "zod" && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null,
 		resolveQueryParamsParser(parser) === "zod" && queryParams.length > 0 ? zodResolver.resolveQueryParamsName?.(node, queryParams[0]) : null
 	].filter((n) => Boolean(n));
@@ -1066,7 +1121,11 @@ const clientGenerator = defineGenerator({
 		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
 		const hasRequestBody = Boolean(node.requestBody?.content?.[0]?.schema);
 		const importedTypeNames = [tsResolver.resolveRequestConfigName(node), tsResolver.resolveResponsesName(node)];
-		const importedZodNames = zodResolver ? [resolveResponseParser(parser) === "zod" ? zodResolver.resolveResponseName?.(node) : null, resolveRequestParser(parser) === "zod" && hasRequestBody ? zodResolver.resolveDataName?.(node) : null].filter((name) => Boolean(name)) : [];
+		const importedZodNames = zodResolver ? [
+			resolveResponseParser(parser) === "zod" ? zodResolver.resolveResponseName?.(node) : null,
+			resolveResponseParser(parser) === "zod" ? buildZodErrorParse(node, zodResolver)?.expression ?? null : null,
+			resolveRequestParser(parser) === "zod" && hasRequestBody ? zodResolver.resolveDataName?.(node) : null
+		].filter((name) => Boolean(name)) : [];
 		const meta = {
 			name: resolver.resolveName(node.operationId),
 			file: resolver.resolveFile(operationFileEntry(node, node.operationId), {