@kubb/plugin-react-query 5.1.0-canary.20260907T133428 → 5.2.0-canary.20260907T164903

package/dist/index.cjs

@@ -443,6 +443,9 @@ function resolveContractClient(options) {
 * so several dependents reading the same client plugin for one operation in a single pass
 * (react-query's query/mutation/infinite generators, vue-query, swr, the MCP handler, ...) share
 * one computed result instead of each re-deriving the name and path.
+*
+* `returnType` mirrors the client plugin's own `returnType` option (`'full'` when unset), so a
+* dependent's generated call body can match it instead of assuming the full `RequestResult` shape.
 */
 function resolveClientOperation(options) {
 	const { clientPlugin, driver, node, root, output, cache } = options;
@@ -459,7 +462,8 @@ function resolveClientOperation(options) {
 		return {
 			name: resolver.name(node.operationId),
 			path: file.path,
-			clientPath: node_path.default.resolve(root, ".kubb/client.ts")
+			clientPath: node_path.default.resolve(root, ".kubb/client.ts"),
+			returnType: plugin?.options?.returnType ?? "full"
 		};
 	});
 }
@@ -569,6 +573,24 @@ function buildClientCall(node, options) {
 	].filter((part) => part !== null).join(", ")} })`;
 }
 /**
+* Builds the query/mutation body that resolves a `buildClientCall` expression down to the bare
+* success body. `returnType` mirrors the registered client plugin's own `returnType` option: with
+* `'data'` the call already resolves to the bare body, so it is returned directly; with `'full'`
+* (the default) the call carries `unwrap()`, so the body calls it instead of destructuring `data`
+* off the full result by hand.
+*
+* @example
+* ```ts
+* buildCallResultBody(buildClientCall(node, { clientName: 'getPetById' }))
+* // return getPetById({ ...config, throwOnError: true }).unwrap()
+* ```
+*/
+function buildCallResultBody(call, options = {}) {
+	const { returnType = "full" } = options;
+	if (returnType === "data") return `return await ${call}`;
+	return `return ${call}.unwrap()`;
+}
+/**
 * Builds the `TData` / `TError` type expressions shared by every generated hook, joining the resolved
 * success responses into `TData` and wrapping the error responses in `ResponseErrorConfig<...>`.
 */
@@ -724,7 +746,7 @@ function buildQueryKeyParams(node, options) {
 //#region ../../internals/tanstack-query/src/components/InfiniteQueryOptions.tsx
 const declarationPrinter$7 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const callPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
-function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam, nextParam, previousParam, node, tsResolver, queryParam, queryKeyName, queryKeyType = "typeof queryKey", memberTypeWrapper, unwrapName }) {
+function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam, nextParam, previousParam, node, tsResolver, queryParam, queryKeyName, queryKeyType = "typeof queryKey", memberTypeWrapper, unwrapName, returnType = "full" }) {
 	const { TData: queryFnDataType, TError: errorType } = buildResponseTypes(node, tsResolver);
 	const { queryParamsTypeName, pageParamType } = resolvePageParamType(node, {
 		resolver: tsResolver,
@@ -743,11 +765,11 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 		memberTypeWrapper
 	});
 	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
-	const queryFnBody = `return ${buildClientCall(node, {
+	const queryFnBody = buildCallResultBody(buildClientCall(node, {
 		clientName,
 		signal: true,
 		unwrapName
-	})}.unwrap()`;
+	}), { returnType });
 	const hasNewParams = nextParam != null || previousParam != null;
 	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
 		if (hasNewParams) {
@@ -1276,7 +1298,7 @@ function buildMutationConfigParamsNode(node) {
 		default: "{}"
 	})] });
 }
-function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }) {
+function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName, returnType = "full" }) {
 	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const configParamsNode = buildMutationConfigParamsNode(node);
 	const paramsSignature = declarationPrinter$3.print(configParamsNode) ?? "";
@@ -1285,10 +1307,10 @@ function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }
 	const groupedParamsNode = (0, _kubb_plugin_ts.createFunctionParameters)({ params: groupedParam ? [groupedParam] : [] });
 	const TRequest = hasMutationParams ? tsResolver.response.options(node) : "undefined";
 	const argBindingStr = hasMutationParams ? callPrinter$2.print(groupedParamsNode) ?? "" : "_";
-	const mutationFnBody = `return ${buildClientCall(node, {
+	const mutationFnBody = buildCallResultBody(buildClientCall(node, {
 		clientName,
 		signal: false
-	})}.unwrap()`;
+	}), { returnType });
 	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -1456,16 +1478,16 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 //#region src/components/QueryOptions.tsx
 const declarationPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const callPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
-function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
+function QueryOptions({ name, clientName, node, tsResolver, queryKeyName, returnType = "full" }) {
 	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
 	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
 	const paramsNode = buildQueryOptionsParams(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
-	const queryFnBody = `return ${buildClientCall(node, {
+	const queryFnBody = buildCallResultBody(buildClientCall(node, {
 		clientName,
 		signal: true
-	})}.unwrap()`;
+	}), { returnType });
 	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -1633,7 +1655,8 @@ const infiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 					nextParam: infiniteOptions.nextParam,
 					previousParam: infiniteOptions.previousParam,
 					initialPageParam: infiniteOptions.initialPageParam,
-					queryParam: infiniteOptions.queryParam
+					queryParam: infiniteOptions.queryParam,
+					returnType: contractOp.returnType
 				}),
 				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["useInfiniteQuery"],
@@ -1781,7 +1804,8 @@ const mutationGenerator = (0, kubb_kit.defineGenerator)({
 					clientName: calledClientName,
 					mutationKeyName,
 					node,
-					tsResolver
+					tsResolver,
+					returnType: contractOp.returnType
 				}),
 				mutation && hooks && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
@@ -1932,7 +1956,8 @@ const queryGenerator = (0, kubb_kit.defineGenerator)({
 					clientName: calledClientName,
 					queryKeyName,
 					node,
-					tsResolver
+					tsResolver,
+					returnType: contractOp.returnType
 				}),
 				query && hooks && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
@@ -2105,7 +2130,8 @@ const suspenseInfiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 					nextParam: infiniteOptions.nextParam,
 					previousParam: infiniteOptions.previousParam,
 					initialPageParam: infiniteOptions.initialPageParam,
-					queryParam: infiniteOptions.queryParam
+					queryParam: infiniteOptions.queryParam,
+					returnType: contractOp.returnType
 				}),
 				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["useSuspenseInfiniteQuery"],
@@ -2260,7 +2286,8 @@ const suspenseQueryGenerator = (0, kubb_kit.defineGenerator)({
 					clientName: calledClientName,
 					queryKeyName,
 					node,
-					tsResolver
+					tsResolver,
+					returnType: contractOp.returnType
 				}),
 				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["useSuspenseQuery"],