@kubb/plugin-fetch 5.2.0-canary.20260902T141305 → 5.2.0

package/dist/index.js

@@ -454,17 +454,23 @@ function buildRequestResultGenerics({ node, types }) {
 //#region ../../internals/client/src/builders/returnStatement.ts
 /**
 * Builds the return statement of a generated operation function. The runtime call already resolves
-* to `{ data, error, request, response }`; the generated code forwards that result and casts it to
-* the operation's `RequestResult`, which carries the `throwOnError` discrimination.
+* to `{ data, error, request, response }`. The generated code casts that result to the operation's
+* `RequestResult`, then wraps it with `withUnwrap`, so the caller can `await` it directly or call
+* `.unwrap()` for the bare success body.
+*
+* Cast first, wrap second. That order keeps `withUnwrap`'s generic inferred as `RequestResult`
+* instead of the runtime's own internal result type. Casting an `Unwrappable<A>` straight to
+* `Unwrappable<B>` does not work: the `.then` overload stays pinned to `A`, and `as` rejects that
+* two-generic swap even where `A` and `B` on their own would satisfy it.
 *
 * @example
-* `return request({ method: 'POST', url: '/pet', ...config }) as Promise<RequestResult<AddPetResponses, ThrowOnError>>`
+* `return withUnwrap(request({ method: 'POST', url: '/pet', ...config }) as Promise<RequestResult<AddPetResponses, ThrowOnError>>)`
 */
 function buildReturnStatement({ node, types, callConfig }) {
-	return `return request(${callConfig}) as Promise<RequestResult<${buildRequestResultGenerics({
+	return `return withUnwrap(request(${callConfig}) as Promise<RequestResult<${buildRequestResultGenerics({
 		node,
 		types
-	})}>>`;
+	})}>>)`;
 }
 //#endregion
 //#region ../../internals/client/src/builders/security.ts
@@ -548,10 +554,6 @@ const declarationPrinter = functionPrinter({ mode: "declaration" });
 */
 function buildGroupedOptionsSignature({ node, types }) {
 	const optionsName = types.response.options(node);
-	const resultGenerics = buildRequestResultGenerics({
-		node,
-		types
-	});
 	const { isOptional } = getRequestGroupOptionality(node);
 	return {
 		paramsSignature: declarationPrinter.print(createFunctionParameters({ params: [createFunctionParameter({
@@ -559,7 +561,10 @@ function buildGroupedOptionsSignature({ node, types }) {
 			type: `Options<${optionsName}, ThrowOnError>`,
 			...isOptional ? { default: "{}" } : {}
 		})] })) ?? "",
-		returnType: `Promise<RequestResult<${resultGenerics}>>`,
+		returnType: `Unwrappable<RequestResult<${buildRequestResultGenerics({
+			node,
+			types
+		})}>>`,
 		generics: ["ThrowOnError extends boolean = true"]
 	};
 }
@@ -676,8 +681,9 @@ function buildCallConfig({ node, validator, zodResolver, security }) {
 /**
 * Builds a single instance method for a generated SDK class. The body forwards the single grouped
 * `options` object to the instance's own client (`this.client`, built once in the constructor) and
-* returns the `RequestResult`. A per-call `options.client` still overrides the instance client, so
-* one operation can be routed to a different environment without a new instance.
+* returns the `Unwrappable<RequestResult>`. A per-call `options.client` still overrides the
+* instance client, so one operation can be routed to a different environment without a new
+* instance.
 */
 function buildSdkMethod({ node, name, types, zodResolver, validator, security }) {
 	if (!ast.isHttpOperationNode(node)) return "";
@@ -765,8 +771,9 @@ function buildStyles({ node }) {
 //#region ../../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 `RequestResult`. The type, signature,
-* and call config are built with the AST factory, and only the jsx-renderer emits the source.
+* single `options` object to the resolved client and returns the `Unwrappable<RequestResult>`. The
+* type, signature, and call config are built with the AST factory, and only the jsx-renderer emits
+* the source.
 */
 function Operation({ name, node, types, zodResolver, validator, security, isExportable = true, isIndexable = true }) {
 	if (!ast.isHttpOperationNode(node)) return null;
@@ -918,8 +925,9 @@ function resolveOperationTypes(driver) {
 * 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
 * `Operation` component: a grouped `<Name>Request` type and a function that forwards a single
-* `options` object to the bundled `client` and returns the `RequestResult`. Only the generator
-* `name` differs between plugins; every other resolution, import, and rendering step is identical.
+* `options` object to the bundled `client` and returns the `Unwrappable<RequestResult>`. Only the
+* generator `name` differs between plugins. Every other resolution, import, and rendering step is
+* identical.
 */
 function createClientGenerator(name) {
 	return defineGenerator({
@@ -995,7 +1003,7 @@ function createClientGenerator(name) {
 				}),
 				children: [
 					/* @__PURE__ */ jsx(File.Import, {
-						name: eventStream ? ["client", "toEventStream"] : ["client"],
+						name: eventStream ? ["client", "toEventStream"] : ["client", "withUnwrap"],
 						root: meta.file.path,
 						path: clientPath
 					}),
@@ -1004,7 +1012,11 @@ function createClientGenerator(name) {
 							"Options",
 							"EventStreamResult",
 							"SuccessOf"
-						] : ["Options", "RequestResult"],
+						] : [
+							"Options",
+							"Unwrappable",
+							"RequestResult"
+						],
 						root: meta.file.path,
 						path: clientPath,
 						isTypeOnly: true
@@ -1211,7 +1223,7 @@ function createSdkGenerator() {
 					footer: footer(file),
 					children: [
 						/* @__PURE__ */ jsx(File.Import, {
-							name: ["createClient"],
+							name: ["createClient", "withUnwrap"],
 							root: file.path,
 							path: clientPath
 						}),
@@ -1220,6 +1232,7 @@ function createSdkGenerator() {
 								"ClientConfig",
 								"ClientInstance",
 								"Options",
+								"Unwrappable",
 								"RequestResult"
 							],
 							root: file.path,