@kubb/plugin-react-query 5.0.0 → 5.0.2

package/dist/index.js

@@ -663,6 +663,24 @@ function resolveOperationOverrides(node, override) {
 	return override.find((ov) => matchesPattern(node, ov))?.options ?? {};
 }
 /**
+* The request groups a query key is built from, matching `buildQueryKeyParams`. Headers are
+* deliberately absent: they do not identify a cache entry, so the key factory takes no parameter
+* for an operation that only carries headers.
+*/
+const queryKeyGroupOrder = [
+	"path",
+	"query",
+	"body"
+];
+/**
+* Whether the generated query key factory declares a parameter, so a call site passes an argument
+* only when one is accepted.
+*/
+function hasQueryKeyParams(node) {
+	const groups = getRequestGroups(node);
+	return queryKeyGroupOrder.some((key) => groups[key]);
+}
+/**
 * Build QueryKey params as the grouped `{ path, query, body }` object (NO headers, NO config),
 * typed from the operation's `Options` minus `url`. The query key transformer reads the
 * grouped `path`/`query`/`body` bindings.
@@ -671,11 +689,7 @@ function buildQueryKeyParams(node, options) {
 	const { resolver } = options;
 	const groupedParam = buildGroupedRequestParam(node, {
 		resolver,
-		keys: [
-			"path",
-			"query",
-			"body"
-		]
+		keys: queryKeyGroupOrder
 	});
 	return createFunctionParameters({ params: groupedParam ? [groupedParam] : [] });
 }
@@ -692,11 +706,7 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 	});
 	const groupedKeyParam = buildGroupedRequestParam(node, {
 		resolver: tsResolver,
-		keys: [
-			"path",
-			"query",
-			"body"
-		],
+		keys: queryKeyGroupOrder,
 		memberTypeWrapper
 	});
 	const queryKeyParamsNode = createFunctionParameters({ params: groupedKeyParam ? [groupedKeyParam] : [] });
@@ -706,12 +716,11 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 		memberTypeWrapper
 	});
 	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
-	const queryFnBody = `const { data } = await ${buildClientCall(node, {
+	const queryFnBody = `return ${buildClientCall(node, {
 		clientName,
 		signal: true,
 		unwrapName
-	})}
-    return data`;
+	})}.unwrap()`;
 	const hasNewParams = nextParam != null || previousParam != null;
 	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
 		if (hasNewParams) {
@@ -1192,7 +1201,7 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		`TPageParam = ${pageParamType}`
 	];
 	const resolvedParams = buildResolvedRequestParams(node);
-	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
+	const queryKeyArgs = resolvedParams && hasQueryKeyParams(node) ? "resolvedParams" : "";
 	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
 	const paramsNode = buildInfiniteQueryParamsNode(node, {
 		resolver: tsResolver,
@@ -1249,11 +1258,10 @@ function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }
 	const groupedParamsNode = createFunctionParameters({ params: groupedParam ? [groupedParam] : [] });
 	const TRequest = hasMutationParams ? tsResolver.response.options(node) : "undefined";
 	const argBindingStr = hasMutationParams ? callPrinter$2.print(groupedParamsNode) ?? "" : "_";
-	const mutationFnBody = `const { data } = await ${buildClientCall(node, {
+	const mutationFnBody = `return ${buildClientCall(node, {
 		clientName,
 		signal: false
-	})}
-          return data`;
+	})}.unwrap()`;
 	return /* @__PURE__ */ jsx(File.Source, {
 		name,
 		isExportable: true,
@@ -1381,7 +1389,7 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`
 	];
 	const resolvedParams = buildResolvedRequestParams(node);
-	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
+	const queryKeyArgs = resolvedParams && hasQueryKeyParams(node) ? "resolvedParams" : "";
 	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
 	const paramsNode = buildQueryParamsNode(node, {
 		resolver: tsResolver,
@@ -1427,11 +1435,10 @@ function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
 	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
 	const paramsNode = buildQueryOptionsParams(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
-	const queryFnBody = `const { data } = await ${buildClientCall(node, {
+	const queryFnBody = `return ${buildClientCall(node, {
 		clientName,
 		signal: true
-	})}
-          return data`;
+	})}.unwrap()`;
 	return /* @__PURE__ */ jsx(File.Source, {
 		name,
 		isExportable: true,