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

package/dist/{components-CDmg-RPi.js → components-BVmVgpLX.js}

@@ -310,38 +310,31 @@ var URLPath = class {
 	}
 };
 //#endregion
-//#region ../../internals/tanstack-query/src/components/MutationKey.tsx
-const declarationPrinter$10 = functionPrinter({ mode: "declaration" });
-const mutationKeyTransformer = ({ node, casing }) => {
-	return [`{ url: '${new URLPath(node.path, { casing }).toURLPath()}' }`];
-};
-function MutationKey({ name, paramsCasing, node, transformer }) {
-	const paramsNode = ast.createFunctionParameters({ params: [] });
-	const paramsSignature = declarationPrinter$10.print(paramsNode) ?? "";
-	const keys = (transformer ?? mutationKeyTransformer)({
-		node,
-		casing: paramsCasing
-	});
-	return /* @__PURE__ */ 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__ */ 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) ?? [];
@@ -439,14 +432,41 @@ function resolveOperationTypeNames(node, resolver, options = {}) {
 	return result;
 }
 //#endregion
+//#region ../../internals/tanstack-query/src/components/MutationKey.tsx
+const declarationPrinter$10 = 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 = ast.createFunctionParameters({ params: [] });
+	const paramsSignature = declarationPrinter$10.print(paramsNode) ?? "";
+	const keys = (transformer ?? mutationKeyTransformer)({
+		node,
+		casing: paramsCasing
+	});
+	return /* @__PURE__ */ jsx(File.Source, {
+		name,
+		isExportable: true,
+		isIndexable: true,
+		children: /* @__PURE__ */ 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;
 }
 /**
@@ -574,7 +594,12 @@ function buildQueryKeyParams(node, options) {
 	params.push(...buildGroupParam("params", node, queryParams, queryGroupType, resolver));
 	return 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;
@@ -583,12 +608,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) ? ast.createFunctionParameter({
+					name: child.name,
+					type: child.type,
+					rest: child.rest,
+					optional: true
+				}) : child)
+			};
+		}
+		const fp = param;
+		return nameSet.has(fp.name) ? ast.createFunctionParameter({
+			name: fp.name,
+			type: fp.type,
+			rest: fp.rest,
+			optional: true
+		}) : fp;
+	});
+	return 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 = 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;
@@ -602,11 +682,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,
@@ -654,28 +735,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__ */ jsx(File.Source, {
 		name,
 		isExportable: true,
@@ -755,6 +837,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,
@@ -762,14 +845,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__ */ jsx(File.Source, {
 		name,
@@ -823,22 +906,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) {
@@ -1120,6 +1203,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,
@@ -1127,13 +1211,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__ */ jsx(File.Source, {
 		name,
@@ -1305,8 +1389,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) {
@@ -1338,7 +1420,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}
@@ -1360,7 +1441,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})
@@ -1466,6 +1546,6 @@ function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 	});
 }
 //#endregion
-export { mutationKeyTransformer as _, Mutation as a, InfiniteQuery as c, queryKeyTransformer as d, resolveOperationOverrides as f, MutationKey as g, resolveOperationTypeNames as h, Query as i, QueryOptions as l, getOperationParameters as m, SuspenseInfiniteQueryOptions as n, MutationOptions as o, resolveZodSchemaNames as p, SuspenseInfiniteQuery as r, InfiniteQueryOptions as s, SuspenseQuery as t, QueryKey as u, camelCase as v };
+export { operationFileEntry as _, Mutation as a, InfiniteQuery as c, queryKeyTransformer as d, resolveOperationOverrides as f, getOperationParameters as g, mutationKeyTransformer as h, Query as i, QueryOptions as l, MutationKey as m, SuspenseInfiniteQueryOptions as n, MutationOptions as o, resolveZodSchemaNames as p, SuspenseInfiniteQuery as r, InfiniteQueryOptions as s, SuspenseQuery as t, QueryKey as u, resolveOperationTypeNames as v, camelCase as y };
 
-//# sourceMappingURL=components-CDmg-RPi.js.map
+//# sourceMappingURL=components-BVmVgpLX.js.map