@kubb/plugin-react-query 5.0.0-beta.77 → 5.0.0-beta.80

package/dist/index.js

@@ -64,7 +64,7 @@ function toFilePath(name, caseLast = camelCase) {
 * JavaScript and Java reserved words.
 * @link https://github.com/jonschlinkert/reserved/blob/master/index.js
 */
-const reservedWords = new Set([
+const reservedWords = /* @__PURE__ */ new Set([
 	"abstract",
 	"arguments",
 	"boolean",
@@ -293,6 +293,23 @@ function caseParams(params, casing) {
 	caseParamsCache.set(params, result);
 	return result;
 }
+/**
+* Drops parameters that collapse to the same property identity once camelCased, keeping the first.
+*
+* Some specs declare the same parameter twice under different casings (for example AWS S3 lists both
+* `max-uploads` and `MaxUploads`). Both resolve to one output property, so emitting both would yield
+* an object type with a duplicate member, which TypeScript rejects. De-duplicate by the camelCased
+* identity so the resulting group is collision-free regardless of the names each caller carries.
+*/
+function dedupeByCasedName(params) {
+	const seen = /* @__PURE__ */ new Set();
+	return params.filter((param) => {
+		const key = camelCase(param.name);
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	});
+}
 //#endregion
 //#region ../../internals/shared/src/operation.ts
 /**
@@ -331,11 +348,27 @@ function getContentTypeInfo(node) {
 		hasFormData: contentTypes.some((ct) => ct === "multipart/form-data")
 	};
 }
+/**
+* The request-body counterpart for the primary success response: the content types it documents and
+* whether several are present, so the client can let a caller pick which one to accept.
+*/
+function getResponseContentTypeInfo(node) {
+	const contentTypes = getPrimarySuccessResponse(node)?.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 buildRequestConfigType(node) {
-	const { isMultipleContentTypes, contentTypeUnion } = getContentTypeInfo(node);
+	const request = getContentTypeInfo(node);
+	const response = getResponseContentTypeInfo(node);
 	const configType = `Partial<Omit<RequestConfig, 'path' | 'query' | 'body' | 'headers' | 'url'>>`;
-	const contentTypeProp = isMultipleContentTypes ? `contentType?: ${contentTypeUnion}` : null;
-	return contentTypeProp ? `${configType} & { ${contentTypeProp} }` : configType;
+	const members = [request.isMultipleContentTypes ? `request?: ${request.contentTypeUnion}` : null, response.isMultipleContentTypes ? `response?: ${response.contentTypeUnion}` : null].filter(Boolean);
+	return members.length ? `${configType} & { contentType?: { ${members.join("; ")} } }` : configType;
 }
 /**
 * Builds the `client?:` option type shared by the generated query hooks (`useQuery`,
@@ -397,10 +430,10 @@ function buildOperationComments(node, options = {}) {
 function getOperationParameters(node, options = {}) {
 	const params = caseParams(node.parameters, options.paramsCasing === "original" ? void 0 : "camelcase");
 	return {
-		path: params.filter((param) => param.in === "path"),
-		query: params.filter((param) => param.in === "query"),
-		header: params.filter((param) => param.in === "header"),
-		cookie: params.filter((param) => param.in === "cookie")
+		path: dedupeByCasedName(params.filter((param) => param.in === "path")),
+		query: dedupeByCasedName(params.filter((param) => param.in === "query")),
+		header: dedupeByCasedName(params.filter((param) => param.in === "header")),
+		cookie: dedupeByCasedName(params.filter((param) => param.in === "cookie"))
 	};
 }
 function getStatusCodeNumber(statusCode) {
@@ -415,6 +448,15 @@ function isErrorStatusCode(statusCode) {
 	const code = getStatusCodeNumber(statusCode);
 	return code !== null && code >= 400;
 }
+function getSuccessResponses(responses) {
+	return responses.filter((response) => isSuccessStatusCode(response.statusCode));
+}
+function getOperationSuccessResponses(node) {
+	return getSuccessResponses(node.responses);
+}
+function getPrimarySuccessResponse(node) {
+	return getOperationSuccessResponses(node)[0] ?? null;
+}
 function resolveErrorNames(node, resolver) {
 	return node.responses.filter((response) => isErrorStatusCode(response.statusCode)).map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
 }
@@ -488,14 +530,14 @@ function createGroupConfig(group) {
 	};
 }
 //#endregion
-//#region ../../internals/client/src/builders/parser.ts
+//#region ../../internals/client/src/builders/validatorOptions.ts
 /**
-* Returns `true` when any direction of the parser uses zod (used for dependency checks).
+* Returns `true` when any direction of the validator uses zod (used for dependency checks).
 */
-function isParserEnabled(parser) {
-	if (!parser) return false;
-	if (parser === "zod") return true;
-	return Boolean(parser.request || parser.response);
+function isValidatorEnabled(validator) {
+	if (!validator) return false;
+	if (validator === "zod") return true;
+	return Boolean(validator.request || validator.response);
 }
 //#endregion
 //#region ../../internals/client/src/resolveClient.ts
@@ -623,12 +665,15 @@ function MutationKey({ name, node, transformer }) {
 * The grouped request options, ordered for both the destructured signature and the
 * call passed to the underlying client.
 */
-const requestGroupOrder = [
+const requestGroupOrder$1 = [
 	"path",
 	"query",
 	"body",
 	"headers"
 ];
+function maybeValueOrGetter(type) {
+	return `${type} | (() => ${type})`;
+}
 /**
 * Builds the grouped `{ path, query, body, headers }` parameter that mirrors the client
 * function signature. Only the groups the operation carries are emitted, typed from the
@@ -641,7 +686,7 @@ const requestGroupOrder = [
 * `MaybeRefOrGetter` per group.
 */
 function buildGroupedRequestParam(node, options) {
-	const { resolver, keys = requestGroupOrder, memberTypeWrapper } = options;
+	const { resolver, keys = requestGroupOrder$1, memberTypeWrapper } = options;
 	const { groups, hasRequiredPath, hasRequiredQuery, hasRequiredHeader } = getRequestGroupOptionality(node);
 	const names = keys.filter((key) => groups[key]);
 	if (names.length === 0) return null;
@@ -653,7 +698,7 @@ function buildGroupedRequestParam(node, options) {
 	};
 	const isOptional = names.every((name) => !requiredByGroup[name]);
 	const requestConfigName = resolver.resolveRequestConfigName(node);
-	const omittedKeys = requestGroupOrder.filter((key) => !keys.includes(key));
+	const omittedKeys = requestGroupOrder$1.filter((key) => !keys.includes(key));
 	const requestConfigType = omittedKeys.length > 0 ? `Omit<${requestConfigName}, ${omittedKeys.map((key) => `'${key}'`).join(" | ")}>` : requestConfigName;
 	if (memberTypeWrapper) {
 		const members = names.map((name) => ({
@@ -709,7 +754,7 @@ function buildClientCall(node, options) {
 	const { groups } = getRequestGroupOptionality(node);
 	return `${clientName}({ ${[
 		"...config",
-		...requestGroupOrder.filter((key) => groups[key]),
+		...requestGroupOrder$1.filter((key) => groups[key]),
 		signal ? "signal: config.signal ?? signal" : null,
 		"throwOnError: true"
 	].filter((part) => part !== null).join(", ")} })`;
@@ -936,6 +981,30 @@ const customHookOptionsFileGenerator = defineGenerator({
 	}
 });
 //#endregion
+//#region src/utils.ts
+const requestGroupOrder = [
+	"path",
+	"query",
+	"body",
+	"headers"
+];
+/**
+* Builds the object literal that resolves each request group to a concrete value, unwrapping a getter
+* once before the value reaches the plain `queryKey`/`queryOptions` helpers. A getter must never reach a
+* React Query key, which is hashed structurally. Returns `null` when the operation carries no request group.
+*
+* @example
+* ```ts
+* buildResolvedRequestParams(node) // { path: typeof path === 'function' ? path() : path }
+* ```
+*/
+function buildResolvedRequestParams(node) {
+	const groups = getRequestGroups(node);
+	const names = requestGroupOrder.filter((key) => groups[key]);
+	if (names.length === 0) return null;
+	return `{ ${names.map((name) => `${name}: typeof ${name} === 'function' ? ${name}() : ${name}`).join(", ")} }`;
+}
+//#endregion
 //#region src/generators/hookOptionsGenerator.tsx
 /**
 * Emits the `HookOptions` type used by `customOptions`. Enabled when
@@ -948,8 +1017,8 @@ const hookOptionsGenerator = defineGenerator({
 	renderer: jsxRenderer,
 	operations(nodes, ctx) {
 		const { resolver, config, root } = ctx;
-		const { output, customOptions, query, mutation, suspense, infinite, group, override } = ctx.options;
-		if (!customOptions) return null;
+		const { output, customOptions, query, mutation, suspense, infinite, group, override, hooks } = ctx.options;
+		if (!customOptions || !hooks) return null;
 		const name = resolver.resolveHookOptionsName();
 		const resolvedFile = resolver.resolveFile({
 			name,
@@ -1093,51 +1162,8 @@ const hookOptionsGenerator = defineGenerator({
 	}
 });
 //#endregion
-//#region src/components/QueryOptions.tsx
-const declarationPrinter$8 = functionPrinter({ mode: "declaration" });
-const callPrinter$8 = functionPrinter({ mode: "call" });
-function getQueryOptionsParams(node, options) {
-	return buildQueryOptionsParams(node, options);
-}
-function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = responseName;
-	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$8.print(queryKeyParamsNode) ?? "";
-	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$8.print(paramsNode) ?? "";
-	const queryFnBody = `const { data } = await ${buildClientCall(node, {
-		clientName,
-		signal: true
-	})}
-          return data`;
-	return /* @__PURE__ */ jsx(File.Source, {
-		name,
-		isExportable: true,
-		isIndexable: true,
-		children: /* @__PURE__ */ jsx(Function, {
-			name,
-			export: true,
-			params: paramsSignature,
-			children: `
-      const queryKey = ${queryKeyName}(${queryKeyParamsCall})
-      return queryOptions<${TData}, ${TError}, ${TData}, typeof queryKey>({
-       queryKey,
-       queryFn: async ({ signal }) => {
-          ${queryFnBody}
-       },
-      })
-`
-		})
-	});
-}
-//#endregion
 //#region src/components/InfiniteQuery.tsx
-const declarationPrinter$7 = functionPrinter({ mode: "declaration" });
-const callPrinter$7 = functionPrinter({ mode: "call" });
+const declarationPrinter$8 = functionPrinter({ mode: "declaration" });
 function buildInfiniteQueryParamsNode(node, options) {
 	const { resolver, pageParamGeneric } = options;
 	const optionsParam = createFunctionParameter({
@@ -1148,7 +1174,10 @@ function buildInfiniteQueryParamsNode(node, options) {
 }`,
 		default: "{}"
 	});
-	return createFunctionParameters({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
+	return createFunctionParameters({ params: [buildGroupedRequestParam(node, {
+		resolver,
+		memberTypeWrapper: maybeValueOrGetter
+	}), optionsParam].filter((param) => param !== null) });
 }
 function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, initialPageParam, queryParam, customOptions }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
@@ -1176,15 +1205,14 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`,
 		`TPageParam = ${pageParamType}`
 	];
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$7.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const queryOptionsParamsCall = callPrinter$7.print(queryOptionsParamsNode) ?? "";
+	const resolvedParams = buildResolvedRequestParams(node);
+	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
+	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
 	const paramsNode = buildInfiniteQueryParamsNode(node, {
 		resolver: tsResolver,
 		pageParamGeneric: "TPageParam"
 	});
-	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$8.print(paramsNode) ?? "";
 	return /* @__PURE__ */ jsx(File.Source, {
 		name,
 		isExportable: true,
@@ -1198,11 +1226,11 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       const { client: queryClient, ...resolvedOptions } = queryConfig${resolvedParams ? `\n       const resolvedParams = ${resolvedParams}` : ""}
+       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyArgs})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
        const queryResult = useInfiniteQuery({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient) as ${returnType}
@@ -1215,9 +1243,51 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 	});
 }
 //#endregion
+//#region src/components/QueryOptions.tsx
+const declarationPrinter$7 = functionPrinter({ mode: "declaration" });
+const callPrinter$4 = functionPrinter({ mode: "call" });
+function getQueryOptionsParams(node, options) {
+	return buildQueryOptionsParams(node, options);
+}
+function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
+	const errorNames = resolveErrorNames(node, tsResolver);
+	const TData = responseName;
+	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
+	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
+	const queryKeyParamsCall = callPrinter$4.print(queryKeyParamsNode) ?? "";
+	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
+	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
+	const queryFnBody = `const { data } = await ${buildClientCall(node, {
+		clientName,
+		signal: true
+	})}
+          return data`;
+	return /* @__PURE__ */ jsx(File.Source, {
+		name,
+		isExportable: true,
+		isIndexable: true,
+		children: /* @__PURE__ */ jsx(Function, {
+			name,
+			export: true,
+			params: paramsSignature,
+			children: `
+      const queryKey = ${queryKeyName}(${queryKeyParamsCall})
+      return queryOptions<${TData}, ${TError}, ${TData}, typeof queryKey>({
+       queryKey,
+       queryFn: async ({ signal }) => {
+          ${queryFnBody}
+       },
+      })
+`
+		})
+	});
+}
+//#endregion
 //#region src/components/InfiniteQueryOptions.tsx
 const declarationPrinter$6 = functionPrinter({ mode: "declaration" });
-const callPrinter$6 = functionPrinter({ mode: "call" });
+const callPrinter$3 = functionPrinter({ mode: "call" });
 function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam, nextParam, previousParam, node, tsResolver, queryParam, queryKeyName }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
 	const queryFnDataType = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
@@ -1236,7 +1306,7 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
 	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$6.print(queryKeyParamsNode) ?? "";
+	const queryKeyParamsCall = callPrinter$3.print(queryKeyParamsNode) ?? "";
 	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$6.print(paramsNode) ?? "";
 	const queryFnBody = `const { data } = await ${buildClientCall(node, {
@@ -1308,7 +1378,7 @@ return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${que
 //#endregion
 //#region src/components/MutationOptions.tsx
 const declarationPrinter$5 = functionPrinter({ mode: "declaration" });
-const callPrinter$5 = functionPrinter({ mode: "call" });
+const callPrinter$2 = functionPrinter({ mode: "call" });
 function buildMutationConfigParamsNode(node) {
 	return createFunctionParameters({ params: [createFunctionParameter({
 		name: "config",
@@ -1327,7 +1397,7 @@ function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }
 	const hasMutationParams = groupedParam !== null;
 	const groupedParamsNode = createFunctionParameters({ params: groupedParam ? [groupedParam] : [] });
 	const TRequest = hasMutationParams ? tsResolver.resolveRequestConfigName(node) : "undefined";
-	const argBindingStr = hasMutationParams ? callPrinter$5.print(groupedParamsNode) ?? "" : "_";
+	const argBindingStr = hasMutationParams ? callPrinter$2.print(groupedParamsNode) ?? "" : "_";
 	const mutationFnBody = `const { data } = await ${buildClientCall(node, {
 		clientName,
 		signal: false
@@ -1357,7 +1427,7 @@ function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }
 //#endregion
 //#region src/components/Mutation.tsx
 const declarationPrinter$4 = functionPrinter({ mode: "declaration" });
-const callPrinter$4 = functionPrinter({ mode: "call" });
+const callPrinter$1 = functionPrinter({ mode: "call" });
 function resolveMutationRequestType(node, resolver) {
 	return buildGroupedRequestParam(node, { resolver }) ? resolver.resolveRequestConfigName(node) : "undefined";
 }
@@ -1392,7 +1462,7 @@ function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName
 	].join(", ");
 	const returnType = `UseMutationResult<${generics}>`;
 	const mutationOptionsConfigNode = buildMutationConfigParamsNode(node);
-	const mutationOptionsParamsCall = callPrinter$4.print(mutationOptionsConfigNode) ?? "";
+	const mutationOptionsParamsCall = callPrinter$1.print(mutationOptionsConfigNode) ?? "";
 	const paramsNode = buildMutationParamsNode(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$4.print(paramsNode) ?? "";
 	return /* @__PURE__ */ jsx(File.Source, {
@@ -1424,7 +1494,6 @@ function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName
 //#endregion
 //#region src/components/Query.tsx
 const declarationPrinter$3 = functionPrinter({ mode: "declaration" });
-const callPrinter$3 = functionPrinter({ mode: "call" });
 function buildQueryParamsNode(node, options) {
 	const { resolver } = options;
 	const successNames = resolveSuccessNames(node, resolver);
@@ -1444,7 +1513,10 @@ function buildQueryParamsNode(node, options) {
 }`,
 		default: "{}"
 	});
-	return createFunctionParameters({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
+	return createFunctionParameters({ params: [buildGroupedRequestParam(node, {
+		resolver,
+		memberTypeWrapper: maybeValueOrGetter
+	}), optionsParam].filter((param) => param !== null) });
 }
 function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
@@ -1457,10 +1529,9 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 		`TQueryData = ${TData}`,
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`
 	];
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$3.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const queryOptionsParamsCall = callPrinter$3.print(queryOptionsParamsNode) ?? "";
+	const resolvedParams = buildResolvedRequestParams(node);
+	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
+	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
 	const paramsNode = buildQueryParamsNode(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$3.print(paramsNode) ?? "";
 	return /* @__PURE__ */ jsx(File.Source, {
@@ -1476,11 +1547,11 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       const { client: queryClient, ...resolvedOptions } = queryConfig${resolvedParams ? `\n       const resolvedParams = ${resolvedParams}` : ""}
+       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyArgs})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
        const queryResult = useQuery({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as QueryObserverOptions, queryClient) as ${returnType}
@@ -1495,7 +1566,6 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 //#endregion
 //#region src/components/SuspenseInfiniteQuery.tsx
 const declarationPrinter$2 = functionPrinter({ mode: "declaration" });
-const callPrinter$2 = functionPrinter({ mode: "call" });
 function buildSuspenseInfiniteQueryParamsNode(node, options) {
 	const { resolver, pageParamGeneric } = options;
 	const optionsParam = createFunctionParameter({
@@ -1506,7 +1576,10 @@ function buildSuspenseInfiniteQueryParamsNode(node, options) {
 }`,
 		default: "{}"
 	});
-	return createFunctionParameters({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
+	return createFunctionParameters({ params: [buildGroupedRequestParam(node, {
+		resolver,
+		memberTypeWrapper: maybeValueOrGetter
+	}), optionsParam].filter((param) => param !== null) });
 }
 function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions, initialPageParam, queryParam }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
@@ -1534,10 +1607,9 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`,
 		`TPageParam = ${pageParamType}`
 	];
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$2.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const queryOptionsParamsCall = callPrinter$2.print(queryOptionsParamsNode) ?? "";
+	const resolvedParams = buildResolvedRequestParams(node);
+	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
+	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
 	const paramsNode = buildSuspenseInfiniteQueryParamsNode(node, {
 		resolver: tsResolver,
 		pageParamGeneric: "TPageParam"
@@ -1556,11 +1628,11 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       const { client: queryClient, ...resolvedOptions } = queryConfig${resolvedParams ? `\n       const resolvedParams = ${resolvedParams}` : ""}
+       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyArgs})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
        const queryResult = useSuspenseInfiniteQuery({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as UseSuspenseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient) as ${returnType}
@@ -1575,7 +1647,7 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 //#endregion
 //#region src/components/SuspenseInfiniteQueryOptions.tsx
 const declarationPrinter$1 = functionPrinter({ mode: "declaration" });
-const callPrinter$1 = functionPrinter({ mode: "call" });
+const callPrinter = functionPrinter({ mode: "call" });
 function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam, nextParam, previousParam, node, tsResolver, queryParam, queryKeyName }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
 	const queryFnDataType = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
@@ -1601,7 +1673,7 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 	})}
     return data`;
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$1.print(queryKeyParamsNode) ?? "";
+	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
 	const hasNewParams = nextParam != null || previousParam != null;
 	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
 		if (hasNewParams) {
@@ -1666,7 +1738,6 @@ return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${que
 //#endregion
 //#region src/components/SuspenseQuery.tsx
 const declarationPrinter = functionPrinter({ mode: "declaration" });
-const callPrinter = functionPrinter({ mode: "call" });
 function buildSuspenseQueryParamsNode(node, options) {
 	const { resolver } = options;
 	const successNames = resolveSuccessNames(node, resolver);
@@ -1685,7 +1756,10 @@ function buildSuspenseQueryParamsNode(node, options) {
 }`,
 		default: "{}"
 	});
-	return createFunctionParameters({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
+	return createFunctionParameters({ params: [buildGroupedRequestParam(node, {
+		resolver,
+		memberTypeWrapper: maybeValueOrGetter
+	}), optionsParam].filter((param) => param !== null) });
 }
 function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
@@ -1694,10 +1768,9 @@ function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 	const TData = responseName;
 	const returnType = `UseSuspenseQueryResult<TData, ${`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`}> & { queryKey: TQueryKey }`;
 	const generics = [`TData = ${TData}`, `TQueryKey extends QueryKey = ${queryKeyTypeName}`];
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const queryOptionsParamsCall = callPrinter.print(queryOptionsParamsNode) ?? "";
+	const resolvedParams = buildResolvedRequestParams(node);
+	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
+	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
 	const paramsNode = buildSuspenseQueryParamsNode(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
 	return /* @__PURE__ */ jsx(File.Source, {
@@ -1713,11 +1786,11 @@ function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       const { client: queryClient, ...resolvedOptions } = queryConfig${resolvedParams ? `\n       const resolvedParams = ${resolvedParams}` : ""}
+       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyArgs})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
        const queryResult = useSuspenseQuery({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as UseSuspenseQueryOptions, queryClient) as ${returnType}
@@ -1743,7 +1816,7 @@ const infiniteQueryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, parser, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, infinite, validator, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1793,14 +1866,14 @@ const infiniteQueryGenerator = defineGenerator({
 				includeParams: false
 			})
 		].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(pluginZodName) : null;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(pluginZodName) : null;
 		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
 		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group ?? void 0
 		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -1877,31 +1950,33 @@ const infiniteQueryGenerator = defineGenerator({
 					initialPageParam: infiniteOptions.initialPageParam,
 					queryParam: infiniteOptions.queryParam
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: ["useInfiniteQuery"],
-					path: importPath
-				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: [
-						"QueryKey",
-						"QueryClient",
-						"InfiniteQueryObserverOptions",
-						"UseInfiniteQueryResult"
-					],
-					path: importPath,
-					isTypeOnly: true
-				}),
-				/* @__PURE__ */ jsx(InfiniteQuery, {
-					name: queryName,
-					queryOptionsName,
-					queryKeyName,
-					queryKeyTypeName,
-					node,
-					tsResolver,
-					initialPageParam: infiniteOptions.initialPageParam,
-					queryParam: infiniteOptions.queryParam,
-					customOptions
-				})
+				hooks && /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["useInfiniteQuery"],
+						path: importPath
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: [
+							"QueryKey",
+							"QueryClient",
+							"InfiniteQueryObserverOptions",
+							"UseInfiniteQueryResult"
+						],
+						path: importPath,
+						isTypeOnly: true
+					}),
+					/* @__PURE__ */ jsx(InfiniteQuery, {
+						name: queryName,
+						queryOptionsName,
+						queryKeyName,
+						queryKeyTypeName,
+						node,
+						tsResolver,
+						initialPageParam: infiniteOptions.initialPageParam,
+						queryParam: infiniteOptions.queryParam,
+						customOptions
+					})
+				] })
 			]
 		});
 	}
@@ -1919,7 +1994,7 @@ const mutationGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, parser, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, validator, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1955,14 +2030,14 @@ const mutationGenerator = defineGenerator({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(pluginZodName) : null;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(pluginZodName) : null;
 		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
 		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group ?? void 0
 		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -2027,7 +2102,7 @@ const mutationGenerator = defineGenerator({
 					node,
 					tsResolver
 				}),
-				mutation && /* @__PURE__ */ jsxs(Fragment, { children: [
+				mutation && hooks && /* @__PURE__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsx(File.Import, {
 						name: ["useMutation"],
 						path: importPath
@@ -2068,7 +2143,7 @@ const queryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, parser, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, validator, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -2106,14 +2181,14 @@ const queryGenerator = defineGenerator({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(pluginZodName) : null;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(pluginZodName) : null;
 		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
 		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group ?? void 0
 		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -2180,7 +2255,7 @@ const queryGenerator = defineGenerator({
 					node,
 					tsResolver
 				}),
-				query && /* @__PURE__ */ jsxs(Fragment, { children: [
+				query && hooks && /* @__PURE__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsx(File.Import, {
 						name: ["useQuery"],
 						path: importPath
@@ -2223,7 +2298,7 @@ const suspenseInfiniteQueryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, suspense, parser, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, infinite, suspense, validator, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -2273,14 +2348,14 @@ const suspenseInfiniteQueryGenerator = defineGenerator({
 				includeParams: false
 			})
 		].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(pluginZodName) : null;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(pluginZodName) : null;
 		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
 		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group ?? void 0
 		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -2357,31 +2432,33 @@ const suspenseInfiniteQueryGenerator = defineGenerator({
 					initialPageParam: infiniteOptions.initialPageParam,
 					queryParam: infiniteOptions.queryParam
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: ["useSuspenseInfiniteQuery"],
-					path: importPath
-				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: [
-						"QueryKey",
-						"QueryClient",
-						"UseSuspenseInfiniteQueryOptions",
-						"UseSuspenseInfiniteQueryResult"
-					],
-					path: importPath,
-					isTypeOnly: true
-				}),
-				/* @__PURE__ */ jsx(SuspenseInfiniteQuery, {
-					name: queryName,
-					queryOptionsName,
-					queryKeyName,
-					queryKeyTypeName,
-					node,
-					tsResolver,
-					initialPageParam: infiniteOptions.initialPageParam,
-					queryParam: infiniteOptions.queryParam,
-					customOptions
-				})
+				hooks && /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["useSuspenseInfiniteQuery"],
+						path: importPath
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: [
+							"QueryKey",
+							"QueryClient",
+							"UseSuspenseInfiniteQueryOptions",
+							"UseSuspenseInfiniteQueryResult"
+						],
+						path: importPath,
+						isTypeOnly: true
+					}),
+					/* @__PURE__ */ jsx(SuspenseInfiniteQuery, {
+						name: queryName,
+						queryOptionsName,
+						queryKeyName,
+						queryKeyTypeName,
+						node,
+						tsResolver,
+						initialPageParam: infiniteOptions.initialPageParam,
+						queryParam: infiniteOptions.queryParam,
+						customOptions
+					})
+				] })
 			]
 		});
 	}
@@ -2400,7 +2477,7 @@ const suspenseQueryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, suspense, parser, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, suspense, validator, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -2438,14 +2515,14 @@ const suspenseQueryGenerator = defineGenerator({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isParserEnabled(parser) ? driver.getPlugin(pluginZodName) : null;
+		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(pluginZodName) : null;
 		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
 		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
 			group: pluginZod?.options?.group ?? void 0
 		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, parser);
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -2512,7 +2589,7 @@ const suspenseQueryGenerator = defineGenerator({
 					node,
 					tsResolver
 				}),
-				suspense && /* @__PURE__ */ jsxs(Fragment, { children: [
+				suspense && hooks && /* @__PURE__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsx(File.Import, {
 						name: ["useSuspenseQuery"],
 						path: importPath
@@ -2692,7 +2769,7 @@ const pluginReactQuery = definePlugin((options) => {
 	const { output = {
 		path: "hooks",
 		barrel: { type: "named" }
-	}, group, exclude = [], include, override = [], parser = false, suspense = {}, infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, customOptions, client, resolver: userResolver, macros: userMacros } = options;
+	}, group, exclude = [], include, override = [], validator = false, suspense = {}, infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, customOptions, hooks = false, client, resolver: userResolver, macros: userMacros } = options;
 	const selectedGenerators = [
 		queryGenerator,
 		suspenseQueryGenerator,
@@ -2706,7 +2783,7 @@ const pluginReactQuery = definePlugin((options) => {
 	return {
 		name: pluginReactQueryName,
 		options,
-		dependencies: [pluginTsName, isParserEnabled(parser) ? pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
+		dependencies: [pluginTsName, isValidatorEnabled(validator) ? pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
 		hooks: { "kubb:plugin:setup"(ctx) {
 			const resolver = userResolver ? {
 				...resolverReactQuery,
@@ -2754,7 +2831,8 @@ const pluginReactQuery = definePlugin((options) => {
 					name: "useCustomHookOptions",
 					...customOptions
 				} : null,
-				parser,
+				hooks,
+				validator,
 				group: groupConfig,
 				exclude,
 				include,