@kubb/plugin-react-query 5.0.0-beta.30 → 5.0.0-beta.31

package/dist/{components-MPBTffPl.cjs → components-DLUeLMsz.cjs}

@@ -335,38 +335,31 @@ var URLPath = class {
 	}
 };
 //#endregion
-//#region ../../internals/tanstack-query/src/components/MutationKey.tsx
-const declarationPrinter$10 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const mutationKeyTransformer = ({ node, casing }) => {
-	return [`{ url: '${new URLPath(node.path, { casing }).toURLPath()}' }`];
-};
-function MutationKey({ name, paramsCasing, node, transformer }) {
-	const paramsNode = _kubb_core.ast.createFunctionParameters({ params: [] });
-	const paramsSignature = declarationPrinter$10.print(paramsNode) ?? "";
-	const keys = (transformer ?? mutationKeyTransformer)({
-		node,
-		casing: paramsCasing
-	});
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+//#region ../../internals/shared/src/operation.ts
+/**
+* Builds the `ResolverFileParams` every operation generator passes to
+* `resolver.resolveFile`: a file named `name`, tagged by the operation's first
+* tag (or `'default'`), at the operation's path. Centralizes the entry object
+* that was repeated at dozens of call sites across the client and query plugins.
+*
+* @example
+* ```ts
+* resolver.resolveFile(operationFileEntry(node, node.operationId), { root, output, group })
+* ```
+*/
+function operationFileEntry(node, name, extname = ".ts") {
+	return {
 		name,
-		isExportable: true,
-		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function.Arrow, {
-			name,
-			export: true,
-			params: paramsSignature,
-			singleLine: true,
-			children: `[${keys.join(", ")}] as const`
-		})
-	});
+		extname,
+		tag: node.tags[0] ?? "default",
+		path: node.path
+	};
 }
-//#endregion
-//#region ../../internals/shared/src/operation.ts
 function getOperationLink(node, link) {
 	if (!link) return null;
 	if (typeof link === "function") return link(node) ?? null;
 	if (link === "urlPath") return node.path ? `{@link ${new URLPath(node.path).URL}}` : null;
-	return `{@link ${node.path.replaceAll("{", ":").replaceAll("}", "")}}`;
+	return node.path ? `{@link ${node.path.replaceAll("{", ":").replaceAll("}", "")}}` : null;
 }
 function getContentTypeInfo(node) {
 	const contentTypes = node.requestBody?.content?.map((e) => e.contentType) ?? [];
@@ -464,14 +457,41 @@ function resolveOperationTypeNames(node, resolver, options = {}) {
 	return result;
 }
 //#endregion
+//#region ../../internals/tanstack-query/src/components/MutationKey.tsx
+const declarationPrinter$10 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const mutationKeyTransformer = ({ node, casing }) => {
+	if (!node.path) return [];
+	return [`{ url: '${new URLPath(node.path, { casing }).toURLPath()}' }`];
+};
+function MutationKey({ name, paramsCasing, node, transformer }) {
+	const paramsNode = _kubb_core.ast.createFunctionParameters({ params: [] });
+	const paramsSignature = declarationPrinter$10.print(paramsNode) ?? "";
+	const keys = (transformer ?? mutationKeyTransformer)({
+		node,
+		casing: paramsCasing
+	});
+	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+		name,
+		isExportable: true,
+		isIndexable: true,
+		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function.Arrow, {
+			name,
+			export: true,
+			params: paramsSignature,
+			singleLine: true,
+			children: `[${keys.join(", ")}] as const`
+		})
+	});
+}
+//#endregion
 //#region ../../internals/tanstack-query/src/utils.ts
 function matchesPattern(node, ov) {
 	const { type, pattern } = ov;
 	const matches = (value) => typeof pattern === "string" ? value === pattern : pattern.test(value);
 	if (type === "operationId") return matches(node.operationId);
 	if (type === "tag") return node.tags.some((t) => matches(t));
-	if (type === "path") return matches(node.path);
-	if (type === "method") return matches(node.method);
+	if (type === "path") return node.path !== void 0 && matches(node.path);
+	if (type === "method") return node.method !== void 0 && matches(node.method);
 	return false;
 }
 /**
@@ -599,7 +619,12 @@ function buildQueryKeyParams(node, options) {
 	params.push(...buildGroupParam("params", node, queryParams, queryGroupType, resolver));
 	return _kubb_core.ast.createFunctionParameters({ params });
 }
-function buildEnabledCheck(paramsNode) {
+/**
+* Collect the names of the required params (no default) that drive the `enabled`
+* guard. These are exactly the params that should be made optional in the
+* generated signatures so callers can pass `undefined` to reach the disabled state.
+*/
+function getEnabledParamNames(paramsNode) {
 	const required = [];
 	for (const param of paramsNode.params) if ("kind" in param && param.kind === "ParameterGroup") {
 		const group = param;
@@ -608,12 +633,67 @@ function buildEnabledCheck(paramsNode) {
 		const fp = param;
 		if (!fp.optional && fp.default === void 0) required.push(fp.name);
 	}
-	return required.join(" && ");
+	return required;
+}
+/**
+* Return a copy of `paramsNode` with the named params marked optional.
+*
+* Used to align signatures with the `enabled` guard: the guard already disables
+* the query while a param is falsy, so the param should accept `undefined`. The
+* change is type-only — the `queryFn` keeps calling the client with a non-null
+* assertion (see `injectNonNullAssertions`), so the emitted runtime is unchanged.
+*/
+function markParamsOptional(paramsNode, names) {
+	if (names.length === 0) return paramsNode;
+	const nameSet = new Set(names);
+	const params = paramsNode.params.map((param) => {
+		if ("kind" in param && param.kind === "ParameterGroup") {
+			const group = param;
+			return {
+				...group,
+				properties: group.properties.map((child) => nameSet.has(child.name) ? _kubb_core.ast.createFunctionParameter({
+					name: child.name,
+					type: child.type,
+					rest: child.rest,
+					optional: true
+				}) : child)
+			};
+		}
+		const fp = param;
+		return nameSet.has(fp.name) ? _kubb_core.ast.createFunctionParameter({
+			name: fp.name,
+			type: fp.type,
+			rest: fp.rest,
+			optional: true
+		}) : fp;
+	});
+	return _kubb_core.ast.createFunctionParameters({ params });
+}
+/**
+* Add a non-null assertion (`!`) to the named params inside a printed client-call
+* string. Bridges the type gap created by `markParamsOptional` while keeping the
+* runtime identical (the `!` is erased at compile time).
+*
+* Handles destructured shorthand groups (`{ petId }` → `{ petId: petId! }`) and
+* standalone identifiers (`params` → `params!`).
+*/
+function injectNonNullAssertions(callStr, names) {
+	if (names.length === 0) return callStr;
+	const nameSet = new Set(names);
+	let result = callStr.replace(/\{\s*([\w,\s]+)\s*\}(?=\s*,)/g, (match, inner) => {
+		if (inner.includes(":") || inner.includes("...")) return match;
+		const keys = inner.split(",").map((k) => k.trim()).filter(Boolean);
+		if (!keys.some((k) => nameSet.has(k))) return match;
+		return `{ ${keys.map((k) => nameSet.has(k) ? `${k}: ${k}!` : k).join(", ")} }`;
+	});
+	result = result.replace(/(?<![{.:?])\b(\w+)\b(?=\s*,)/g, (match, name) => nameSet.has(name) ? `${name}!` : match);
+	return result;
 }
 //#endregion
 //#region ../../internals/tanstack-query/src/components/QueryKey.tsx
 const declarationPrinter$9 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const queryKeyTransformer = ({ node, casing }) => {
+	if (!node.path) return [];
 	const path = new URLPath(node.path, { casing });
 	const hasQueryParams = getOperationParameters(node).query.length > 0;
 	const hasRequestBody = !!node.requestBody?.content?.[0]?.schema;
@@ -627,11 +707,12 @@ const queryKeyTransformer = ({ node, casing }) => {
 	].filter(Boolean);
 };
 function QueryKey({ name, node, tsResolver, paramsCasing, pathParamsType, typeName, transformer }) {
-	const paramsNode = buildQueryKeyParams(node, {
+	const baseParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
 	});
+	const paramsNode = markParamsOptional(baseParamsNode, getEnabledParamNames(baseParamsNode));
 	const paramsSignature = declarationPrinter$9.print(paramsNode) ?? "";
 	const keys = (transformer ?? queryKeyTransformer)({
 		node,
@@ -679,28 +760,29 @@ function getQueryOptionsParams(node, options) {
 		})]
 	});
 }
-function QueryOptions({ name, clientName, dataReturnType, node, tsResolver, paramsCasing, paramsType, pathParamsType, queryKeyName }) {
+function QueryOptions({ name, clientName, dataReturnType, node, tsResolver, paramsCasing, paramsType, pathParamsType, queryKeyName, suspense }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
 	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const TData = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const paramsNode = getQueryOptionsParams(node, {
-		paramsType,
-		paramsCasing,
-		pathParamsType,
-		resolver: tsResolver
-	});
-	const paramsSignature = declarationPrinter$8.print(paramsNode) ?? "";
-	const clientCallStr = (callPrinter$8.print(paramsNode) ?? "").replace(/\bconfig\b(?=[^,]*$)/, "{ ...config, signal: config.signal ?? signal }");
 	const queryKeyParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$8.print(queryKeyParamsNode) ?? "";
-	const enabledSource = buildEnabledCheck(queryKeyParamsNode);
-	const enabledText = enabledSource ? `enabled: !!(${enabledSource}),` : "";
+	const enabledNames = getEnabledParamNames(queryKeyParamsNode);
+	const optionalNames = suspense ? [] : enabledNames;
+	const enabledText = suspense ? "" : enabledNames.length ? `enabled: !!(${enabledNames.join(" && ")}),` : "";
+	const paramsNode = markParamsOptional(getQueryOptionsParams(node, {
+		paramsType,
+		paramsCasing,
+		pathParamsType,
+		resolver: tsResolver
+	}), optionalNames);
+	const paramsSignature = declarationPrinter$8.print(paramsNode) ?? "";
+	const clientCallStr = injectNonNullAssertions((callPrinter$8.print(paramsNode) ?? "").replace(/\bconfig\b(?=[^,]*$)/, "{ ...config, signal: config.signal ?? signal }"), optionalNames);
 	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -780,6 +862,7 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$7.print(queryKeyParamsNode) ?? "";
+	const enabledNames = getEnabledParamNames(queryKeyParamsNode);
 	const queryOptionsParamsNode = getQueryOptionsParams(node, {
 		paramsType,
 		paramsCasing,
@@ -787,14 +870,14 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		resolver: tsResolver
 	});
 	const queryOptionsParamsCall = callPrinter$7.print(queryOptionsParamsNode) ?? "";
-	const paramsNode = buildInfiniteQueryParamsNode(node, {
+	const paramsNode = markParamsOptional(buildInfiniteQueryParamsNode(node, {
 		paramsType,
 		paramsCasing,
 		pathParamsType,
 		dataReturnType,
 		resolver: tsResolver,
 		pageParamGeneric: "TPageParam"
-	});
+	}), enabledNames);
 	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
 		name,
@@ -848,22 +931,22 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 	})() : null;
 	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
 	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
-	const paramsNode = getQueryOptionsParams(node, {
-		paramsType,
-		paramsCasing,
-		pathParamsType,
-		resolver: tsResolver
-	});
-	const paramsSignature = declarationPrinter$6.print(paramsNode) ?? "";
-	const clientCallStr = (callPrinter$6.print(paramsNode) ?? "").replace(/\bconfig\b(?=[^,]*$)/, "{ ...config, signal: config.signal ?? signal }");
 	const queryKeyParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$6.print(queryKeyParamsNode) ?? "";
-	const enabledSource = buildEnabledCheck(queryKeyParamsNode);
-	const enabledText = enabledSource ? `enabled: !!(${enabledSource}),` : "";
+	const enabledNames = getEnabledParamNames(queryKeyParamsNode);
+	const enabledText = enabledNames.length ? `enabled: !!(${enabledNames.join(" && ")}),` : "";
+	const paramsNode = markParamsOptional(getQueryOptionsParams(node, {
+		paramsType,
+		paramsCasing,
+		pathParamsType,
+		resolver: tsResolver
+	}), enabledNames);
+	const paramsSignature = declarationPrinter$6.print(paramsNode) ?? "";
+	const clientCallStr = injectNonNullAssertions((callPrinter$6.print(paramsNode) ?? "").replace(/\bconfig\b(?=[^,]*$)/, "{ ...config, signal: config.signal ?? signal }"), enabledNames);
 	const hasNewParams = nextParam != null || previousParam != null;
 	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
 		if (hasNewParams) {
@@ -1145,6 +1228,7 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, paramsT
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$3.print(queryKeyParamsNode) ?? "";
+	const enabledNames = getEnabledParamNames(queryKeyParamsNode);
 	const queryOptionsParamsNode = getQueryOptionsParams(node, {
 		paramsType,
 		paramsCasing,
@@ -1152,13 +1236,13 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, paramsT
 		resolver: tsResolver
 	});
 	const queryOptionsParamsCall = callPrinter$3.print(queryOptionsParamsNode) ?? "";
-	const paramsNode = buildQueryParamsNode(node, {
+	const paramsNode = markParamsOptional(buildQueryParamsNode(node, {
 		paramsType,
 		paramsCasing,
 		pathParamsType,
 		dataReturnType,
 		resolver: tsResolver
-	});
+	}), enabledNames);
 	const paramsSignature = declarationPrinter$3.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
 		name,
@@ -1330,8 +1414,6 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$1.print(queryKeyParamsNode) ?? "";
-	const enabledSource = buildEnabledCheck(queryKeyParamsNode);
-	const enabledText = enabledSource ? `enabled: !!(${enabledSource}),` : "";
 	const hasNewParams = nextParam != null || previousParam != null;
 	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
 		if (hasNewParams) {
@@ -1363,7 +1445,6 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 			children: `
       const queryKey = ${queryKeyName}(${queryKeyParamsCall})
       return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({
-       ${enabledText}
        queryKey,
        queryFn: async ({ signal, pageParam }) => {
           ${infiniteOverrideParams}
@@ -1385,7 +1466,6 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 			children: `
       const queryKey = ${queryKeyName}(${queryKeyParamsCall})
       return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({
-       ${enabledText}
        queryKey,
        queryFn: async ({ signal }) => {
           return ${clientName}(${clientCallStr})
@@ -1587,6 +1667,12 @@ Object.defineProperty(exports, "mutationKeyTransformer", {
 		return mutationKeyTransformer;
 	}
 });
+Object.defineProperty(exports, "operationFileEntry", {
+	enumerable: true,
+	get: function() {
+		return operationFileEntry;
+	}
+});
 Object.defineProperty(exports, "queryKeyTransformer", {
 	enumerable: true,
 	get: function() {
@@ -1612,4 +1698,4 @@ Object.defineProperty(exports, "resolveZodSchemaNames", {
 	}
 });
 
-//# sourceMappingURL=components-MPBTffPl.cjs.map
+//# sourceMappingURL=components-DLUeLMsz.cjs.map