@kubb/plugin-react-query 5.0.0-beta.101 → 5.0.0-beta.104

package/dist/index.js

@@ -136,13 +136,24 @@ function buildOperationComments(node, options = {}) {
 	if (!splitLines) return filteredComments;
 	return filteredComments.flatMap((text) => text.split(/\r?\n/).map((line) => line.trim())).filter((comment) => Boolean(comment));
 }
+const operationParameterGroupsByNode = /* @__PURE__ */ new WeakMap();
+/**
+* Groups an operation's parameters by location (`path`/`query`/`header`/`cookie`), deduping each
+* group by name. Every plugin generator visiting the same `OperationNode` shares one AST instance
+* (see `KubbDriver`), so the result is cached per node to avoid re-filtering and re-deduping the
+* same parameters once per plugin.
+*/
 function getOperationParameters(node) {
-	return {
+	const cached = operationParameterGroupsByNode.get(node);
+	if (cached) return cached;
+	const groups = {
 		path: dedupeParams(node.parameters.filter((param) => param.in === "path")),
 		query: dedupeParams(node.parameters.filter((param) => param.in === "query")),
 		header: dedupeParams(node.parameters.filter((param) => param.in === "header")),
 		cookie: dedupeParams(node.parameters.filter((param) => param.in === "cookie"))
 	};
+	operationParameterGroupsByNode.set(node, groups);
+	return groups;
 }
 function getStatusCodeNumber(statusCode) {
 	const code = Number(statusCode);
@@ -1421,22 +1432,28 @@ function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
 const infiniteQueryGenerator = defineGenerator({
 	name: "react-infinite-query",
 	renderer: jsxRenderer,
+	match(node, ctx) {
+		const operationNode = node;
+		if (!ast.isHttpOperationNode(operationNode)) return false;
+		const { query, mutation, infinite, hooks } = ctx.options;
+		const { isQuery, isMutation } = classifyOperation(operationNode, {
+			query,
+			mutation
+		});
+		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
+		if (!isQuery || isMutation || !infiniteOptions || !hooks) return false;
+		const queryParamKeys = getOperationParameters(operationNode).query.map((p) => p.name);
+		return infiniteOptions.queryParam ? queryParamKeys.includes(infiniteOptions.queryParam) || queryParamKeys.includes(`${infiniteOptions.queryParam}?`) : false;
+	},
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, client, group, customOptions, hooks } = ctx.options;
+		const { output, query, infinite, client, group, customOptions } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const { isQuery, isMutation } = classifyOperation(node, {
-			query,
-			mutation
-		});
 		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
-		if (!isQuery || isMutation || !infiniteOptions || !hooks) return null;
-		const normalizeKey = (key) => key.replace(/\?$/, "");
-		const queryParamKeys = getOperationParameters(node).query.map((p) => p.name);
-		if (!(infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false)) return null;
+		if (!infiniteOptions) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -1588,18 +1605,22 @@ const infiniteQueryGenerator = defineGenerator({
 const mutationGenerator = defineGenerator({
 	name: "react-query-mutation",
 	renderer: jsxRenderer,
+	match(node, ctx) {
+		const operationNode = node;
+		if (!ast.isHttpOperationNode(operationNode)) return false;
+		const { query, mutation } = ctx.options;
+		return classifyOperation(operationNode, {
+			query,
+			mutation
+		}).isMutation;
+	},
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, client, group, customOptions, hooks } = ctx.options;
+		const { output, mutation, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		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 },
@@ -1728,18 +1749,23 @@ const mutationGenerator = defineGenerator({
 const queryGenerator = defineGenerator({
 	name: "react-query",
 	renderer: jsxRenderer,
+	match(node, ctx) {
+		const operationNode = node;
+		if (!ast.isHttpOperationNode(operationNode)) return false;
+		const { query, mutation } = ctx.options;
+		const { isQuery, isMutation } = classifyOperation(operationNode, {
+			query,
+			mutation
+		});
+		return isQuery && !isMutation;
+	},
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, client, group, customOptions, hooks } = ctx.options;
+		const { output, query, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const { isQuery, isMutation } = classifyOperation(node, {
-			query,
-			mutation
-		});
-		if (!isQuery || isMutation) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -1873,23 +1899,28 @@ const queryGenerator = defineGenerator({
 const suspenseInfiniteQueryGenerator = defineGenerator({
 	name: "react-suspense-infinite-query",
 	renderer: jsxRenderer,
+	match(node, ctx) {
+		const operationNode = node;
+		if (!ast.isHttpOperationNode(operationNode)) return false;
+		const { query, mutation, infinite, suspense, hooks } = ctx.options;
+		const { isQuery, isMutation } = classifyOperation(operationNode, {
+			query,
+			mutation
+		});
+		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
+		if (!isQuery || isMutation || !suspense || !infiniteOptions || !hooks) return false;
+		const queryParamKeys = getOperationParameters(operationNode).query.map((p) => p.name);
+		return infiniteOptions.queryParam ? queryParamKeys.includes(infiniteOptions.queryParam) || queryParamKeys.includes(`${infiniteOptions.queryParam}?`) : false;
+	},
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, suspense, client, group, customOptions, hooks } = ctx.options;
+		const { output, query, infinite, client, group, customOptions } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const { isQuery, isMutation } = classifyOperation(node, {
-			query,
-			mutation
-		});
-		const isSuspense = !!suspense;
 		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
-		if (!isQuery || isMutation || !isSuspense || !infiniteOptions || !hooks) return null;
-		const normalizeKey = (key) => key.replace(/\?$/, "");
-		const queryParamKeys = getOperationParameters(node).query.map((p) => p.name);
-		if (!(infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false)) return null;
+		if (!infiniteOptions) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -2040,18 +2071,23 @@ const suspenseInfiniteQueryGenerator = defineGenerator({
 const suspenseQueryGenerator = defineGenerator({
 	name: "react-suspense-query",
 	renderer: jsxRenderer,
+	match(node, ctx) {
+		const operationNode = node;
+		if (!ast.isHttpOperationNode(operationNode)) return false;
+		const { query, mutation, suspense, hooks } = ctx.options;
+		const { isQuery, isMutation } = classifyOperation(operationNode, {
+			query,
+			mutation
+		});
+		return isQuery && !isMutation && !!suspense && hooks;
+	},
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, suspense, client, group, customOptions, hooks } = ctx.options;
+		const { output, query, client, group, customOptions } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const { isQuery, isMutation } = classifyOperation(node, {
-			query,
-			mutation
-		});
-		if (!isQuery || isMutation || !!!suspense || !hooks) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },