@kubb/plugin-react-query 5.0.0-beta.86 → 5.0.0-beta.87

package/dist/index.js

@@ -132,6 +132,22 @@ const reservedWords = /* @__PURE__ */ new Set([
 */
 function isValidVarName(name) {
 	if (!name || reservedWords.has(name)) return false;
+	return isIdentifier(name);
+}
+/**
+* Returns `true` when `name` is syntactically a valid identifier, ignoring reserved words.
+*
+* Reserved words and globals (`class`, `name`, `Date`, …) are valid as bare object-literal keys
+* even though they are not valid variable names, so use this (not {@link isValidVarName}) when
+* deciding whether an object key needs quoting.
+*
+* @example
+* ```ts
+* isIdentifier('name')   // true
+* isIdentifier('x-total')// false
+* ```
+*/
+function isIdentifier(name) {
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
 //#endregion
@@ -327,8 +343,11 @@ 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) ?? [];
+/**
+* Derives the shared `ContentTypeInfo` shape from a list of content types, tracking whether several
+* are present and the union, default, and form-data flags the client uses to pick one.
+*/
+function buildContentTypeInfo(contentTypes) {
 	const isMultipleContentTypes = contentTypes.length > 1;
 	return {
 		contentTypes,
@@ -338,20 +357,15 @@ function getContentTypeInfo(node) {
 		hasFormData: contentTypes.some((ct) => ct === "multipart/form-data")
 	};
 }
+function getContentTypeInfo(node) {
+	return buildContentTypeInfo(node.requestBody?.content?.map((e) => e.contentType) ?? []);
+}
 /**
 * 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")
-	};
+	return buildContentTypeInfo(getPrimarySuccessResponse(node)?.content?.map((e) => e.contentType) ?? []);
 }
 function buildRequestConfigType(node) {
 	const request = getContentTypeInfo(node);
@@ -938,6 +952,59 @@ function buildResolvedRequestParams(node) {
 	if (names.length === 0) return null;
 	return `{ ${names.map((name) => `${name}: typeof ${name} === 'function' ? ${name}() : ${name}`).join(", ")} }`;
 }
+/**
+* Classifies an operation as a query or a mutation from the resolved `query` / `mutation` method lists.
+* `query: false` still marks the operation as a query so the query-family generators keep matching it,
+* and a method already claimed by `query` never counts as a mutation.
+*/
+function classifyOperation(node, { query, mutation }) {
+	const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
+	const queryMethods = new Set(query ? query.methods : []);
+	return {
+		isQuery,
+		isMutation: mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase())
+	};
+}
+/**
+* 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<...>`.
+*/
+function buildResponseTypes(node, resolver) {
+	const successNames = resolveSuccessNames(node, resolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.response.response(node);
+	const errorNames = resolveErrorNames(node, resolver);
+	return {
+		TData: responseName,
+		TError: `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`
+	};
+}
+function resolveFallbackPageParamType(initialPageParam) {
+	if (typeof initialPageParam === "number") return "number";
+	if (typeof initialPageParam === "boolean") return "boolean";
+	if (typeof initialPageParam !== "string") return "unknown";
+	if (!initialPageParam.includes(" as ")) return "string";
+	return initialPageParam.split(" as ").at(-1) ?? "unknown";
+}
+/**
+* Resolves the `TPageParam` generic for the infinite-query hooks. Prefers the type read from the
+* configured `queryParam` on the operation's query object, and falls back to the type inferred from
+* `initialPageParam` when that parameter type is unavailable. Also returns the query params type name
+* so callers can reuse it when rewriting the paginated request.
+*/
+function resolvePageParamType(node, { resolver, initialPageParam, queryParam }) {
+	const firstQueryParam = getOperationParameters(node, { paramsCasing: "original" }).query[0];
+	const groupName = firstQueryParam ? resolver.param.query(node, firstQueryParam) : null;
+	const queryParamsTypeName = groupName !== (firstQueryParam ? resolver.param.name(node, firstQueryParam) : null) ? groupName : null;
+	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
+	if (!queryParamType) return {
+		queryParamsTypeName,
+		pageParamType: resolveFallbackPageParamType(initialPageParam)
+	};
+	return {
+		queryParamsTypeName,
+		pageParamType: initialPageParam !== void 0 && initialPageParam !== null ? `NonNullable<${queryParamType}>` : queryParamType
+	};
+}
 //#endregion
 //#region src/generators/hookOptionsGenerator.tsx
 /**
@@ -1118,23 +1185,12 @@ function buildInfiniteQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, initialPageParam, queryParam, customOptions }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const responseType = responseName;
-	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
-	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
-		const parts = initialPageParam.split(" as ");
-		return parts[parts.length - 1] ?? "unknown";
-	})() : "string" : typeof initialPageParam === "boolean" ? "boolean" : "unknown";
-	const rawQueryParams = getOperationParameters(node, { paramsCasing: "original" }).query;
-	const queryParamsTypeName = rawQueryParams.length > 0 ? (() => {
-		const groupName = tsResolver.param.query(node, rawQueryParams[0]);
-		return groupName !== tsResolver.param.name(node, rawQueryParams[0]) ? groupName : null;
-	})() : null;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
-	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
+	const { TData: responseType, TError: errorType } = buildResponseTypes(node, tsResolver);
+	const { pageParamType } = resolvePageParamType(node, {
+		resolver: tsResolver,
+		initialPageParam,
+		queryParam
+	});
 	const returnType = "UseInfiniteQueryResult<TData, TError> & { queryKey: TQueryKey }";
 	const generics = [
 		`TQueryFnData = ${responseType}`,
@@ -1188,11 +1244,7 @@ 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.response.response(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = responseName;
-	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
 	const queryKeyParamsCall = callPrinter$4.print(queryKeyParamsNode) ?? "";
 	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
@@ -1227,22 +1279,12 @@ function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
 const declarationPrinter$6 = functionPrinter({ mode: "declaration" });
 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.response.response(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
-	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
-		const parts = initialPageParam.split(" as ");
-		return parts[parts.length - 1] ?? "unknown";
-	})() : "string" : typeof initialPageParam === "boolean" ? "boolean" : "unknown";
-	const rawQueryParams = getOperationParameters(node, { paramsCasing: "original" }).query;
-	const queryParamsTypeName = rawQueryParams.length > 0 ? (() => {
-		const groupName = tsResolver.param.query(node, rawQueryParams[0]);
-		return groupName !== tsResolver.param.name(node, rawQueryParams[0]) ? groupName : null;
-	})() : null;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
-	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
+	const { TData: queryFnDataType, TError: errorType } = buildResponseTypes(node, tsResolver);
+	const { queryParamsTypeName, pageParamType } = resolvePageParamType(node, {
+		resolver: tsResolver,
+		initialPageParam,
+		queryParam
+	});
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
 	const queryKeyParamsCall = callPrinter$3.print(queryKeyParamsNode) ?? "";
 	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
@@ -1325,10 +1367,7 @@ function buildMutationConfigParamsNode(node) {
 	})] });
 }
 function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const TData = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const configParamsNode = buildMutationConfigParamsNode(node);
 	const paramsSignature = declarationPrinter$5.print(configParamsNode) ?? "";
 	const groupedParam = buildGroupedRequestParam(node, { resolver: tsResolver });
@@ -1371,15 +1410,13 @@ function resolveMutationRequestType(node, resolver) {
 }
 function buildMutationParamsNode(node, options) {
 	const { resolver } = options;
-	const successNames = resolveSuccessNames(node, resolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.response.response(node);
-	const errorNames = resolveErrorNames(node, resolver);
+	const { TData, TError } = buildResponseTypes(node, resolver);
 	return createFunctionParameters({ params: [createFunctionParameter({
 		name: "options",
 		type: `{
   mutation?: UseMutationOptions<${[
-			responseName,
-			`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+			TData,
+			TError,
 			resolveMutationRequestType(node, resolver),
 			"TContext"
 		].join(", ")}> & { client?: QueryClient },
@@ -1389,12 +1426,10 @@ function buildMutationParamsNode(node, options) {
 	})] });
 }
 function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName, customOptions }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const generics = [
-		responseName,
-		`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+		TData,
+		TError,
 		resolveMutationRequestType(node, tsResolver),
 		"TContext"
 	].join(", ");
@@ -1434,15 +1469,13 @@ function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName
 const declarationPrinter$3 = functionPrinter({ mode: "declaration" });
 function buildQueryParamsNode(node, options) {
 	const { resolver } = options;
-	const successNames = resolveSuccessNames(node, resolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.response.response(node);
-	const errorNames = resolveErrorNames(node, resolver);
+	const { TData, TError } = buildResponseTypes(node, resolver);
 	const optionsParam = createFunctionParameter({
 		name: "options",
 		type: `{
   query?: Partial<QueryObserverOptions<${[
-			responseName,
-			`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+			TData,
+			TError,
 			"TData",
 			"TQueryData",
 			"TQueryKey"
@@ -1457,11 +1490,8 @@ function buildQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = responseName;
-	const returnType = `UseQueryResult<TData, ${`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`}> & { queryKey: TQueryKey }`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
+	const returnType = `UseQueryResult<TData, ${TError}> & { queryKey: TQueryKey }`;
 	const generics = [
 		`TData = ${TData}`,
 		`TQueryData = ${TData}`,
@@ -1520,23 +1550,12 @@ function buildSuspenseInfiniteQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions, initialPageParam, queryParam }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const responseType = responseName;
-	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
-	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
-		const parts = initialPageParam.split(" as ");
-		return parts[parts.length - 1] ?? "unknown";
-	})() : "string" : typeof initialPageParam === "boolean" ? "boolean" : "unknown";
-	const rawQueryParams = getOperationParameters(node, { paramsCasing: "original" }).query;
-	const queryParamsTypeName = rawQueryParams.length > 0 ? (() => {
-		const groupName = tsResolver.param.query(node, rawQueryParams[0]);
-		return groupName !== tsResolver.param.name(node, rawQueryParams[0]) ? groupName : null;
-	})() : null;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
-	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
+	const { TData: responseType, TError: errorType } = buildResponseTypes(node, tsResolver);
+	const { pageParamType } = resolvePageParamType(node, {
+		resolver: tsResolver,
+		initialPageParam,
+		queryParam
+	});
 	const returnType = "UseSuspenseInfiniteQueryResult<TData, TError> & { queryKey: TQueryKey }";
 	const generics = [
 		`TQueryFnData = ${responseType}`,
@@ -1587,22 +1606,12 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 const declarationPrinter$1 = functionPrinter({ mode: "declaration" });
 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.response.response(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
-	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
-		const parts = initialPageParam.split(" as ");
-		return parts[parts.length - 1] ?? "unknown";
-	})() : "string" : typeof initialPageParam === "boolean" ? "boolean" : "unknown";
-	const rawQueryParams = getOperationParameters(node, { paramsCasing: "original" }).query;
-	const queryParamsTypeName = rawQueryParams.length > 0 ? (() => {
-		const groupName = tsResolver.param.query(node, rawQueryParams[0]);
-		return groupName !== tsResolver.param.name(node, rawQueryParams[0]) ? groupName : null;
-	})() : null;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
-	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
+	const { TData: queryFnDataType, TError: errorType } = buildResponseTypes(node, tsResolver);
+	const { queryParamsTypeName, pageParamType } = resolvePageParamType(node, {
+		resolver: tsResolver,
+		initialPageParam,
+		queryParam
+	});
 	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
 	const queryFnBody = `const { data } = await ${buildClientCall(node, {
@@ -1678,15 +1687,13 @@ return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${que
 const declarationPrinter = functionPrinter({ mode: "declaration" });
 function buildSuspenseQueryParamsNode(node, options) {
 	const { resolver } = options;
-	const successNames = resolveSuccessNames(node, resolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.response.response(node);
-	const errorNames = resolveErrorNames(node, resolver);
+	const { TData, TError } = buildResponseTypes(node, resolver);
 	const optionsParam = createFunctionParameter({
 		name: "options",
 		type: `{
   query?: Partial<UseSuspenseQueryOptions<${[
-			responseName,
-			`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+			TData,
+			TError,
 			"TData",
 			"TQueryKey"
 		].join(", ")}>> & { client?: QueryClient },
@@ -1700,11 +1707,8 @@ function buildSuspenseQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = responseName;
-	const returnType = `UseSuspenseQueryResult<TData, ${`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`}> & { queryKey: TQueryKey }`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
+	const returnType = `UseSuspenseQueryResult<TData, ${TError}> & { queryKey: TQueryKey }`;
 	const generics = [`TData = ${TData}`, `TQueryKey extends QueryKey = ${queryKeyTypeName}`];
 	const resolvedParams = buildResolvedRequestParams(node);
 	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
@@ -1758,16 +1762,15 @@ const infiniteQueryGenerator = defineGenerator({
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
-		const queryMethods = new Set(query ? query.methods : []);
-		const isMutation = mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase());
+		const { isQuery, isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
 		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
 		if (!isQuery || isMutation || !infiniteOptions) return null;
 		const normalizeKey = (key) => key.replace(/\?$/, "");
 		const queryParamKeys = getOperationParameters(node, { paramsCasing: "original" }).query.map((p) => p.name);
-		const hasQueryParam = infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false;
-		const hasCursorParam = !infiniteOptions.cursorParam || true;
-		if (!hasQueryParam || !hasCursorParam) return null;
+		if (!(infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false)) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -1925,9 +1928,11 @@ const mutationGenerator = defineGenerator({
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
-		const queryMethods = new Set(query ? query.methods : []);
-		if (!(mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase()))) return null;
+		const { isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
+		if (!isMutation) return null;
 		const importPath = mutation ? mutation.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -2063,9 +2068,10 @@ const queryGenerator = defineGenerator({
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
-		const queryMethods = new Set(query ? query.methods : []);
-		const isMutation = mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase());
+		const { isQuery, isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
 		if (!isQuery || isMutation) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
@@ -2207,17 +2213,16 @@ const suspenseInfiniteQueryGenerator = defineGenerator({
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
-		const queryMethods = new Set(query ? query.methods : []);
-		const isMutation = mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase());
+		const { isQuery, isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
 		const isSuspense = !!suspense;
 		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
 		if (!isQuery || isMutation || !isSuspense || !infiniteOptions) return null;
 		const normalizeKey = (key) => key.replace(/\?$/, "");
 		const queryParamKeys = getOperationParameters(node, { paramsCasing: "original" }).query.map((p) => p.name);
-		const hasQueryParam = infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false;
-		const hasCursorParam = !infiniteOptions.cursorParam || true;
-		if (!hasQueryParam || !hasCursorParam) return null;
+		if (!(infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false)) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -2375,9 +2380,10 @@ const suspenseQueryGenerator = defineGenerator({
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
-		const queryMethods = new Set(query ? query.methods : []);
-		const isMutation = mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase());
+		const { isQuery, isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
 		if (!isQuery || isMutation || !!!suspense) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
@@ -2663,7 +2669,7 @@ const pluginReactQuery = definePlugin((options) => {
 		mutationGenerator,
 		hookOptionsGenerator,
 		customHookOptionsFileGenerator
-	].filter((generator) => Boolean(generator));
+	];
 	const groupConfig = createGroupConfig(group);
 	return {
 		name: pluginReactQueryName,