@trpc/tanstack-react-query 11.6.1-canary.5 → 11.6.1-canary.6

package/dist/index.cjs

@@ -207,19 +207,36 @@ function createTRPCOptionsResult(value) {
 	const path = value.path.join(".");
 	return { path };
 }
+function isPrefixedQueryKey(queryKey) {
+	return queryKey.length >= 3;
+}
+function readQueryKey(queryKey) {
+	if (isPrefixedQueryKey(queryKey)) return {
+		type: "prefixed",
+		prefix: queryKey[0],
+		path: queryKey[1],
+		args: queryKey[2]
+	};
+	else return {
+		type: "unprefixed",
+		prefix: void 0,
+		path: queryKey[0],
+		args: queryKey[1]
+	};
+}
 /**
 * @internal
 */
 function getClientArgs(queryKey, opts, infiniteParams) {
-	var _queryKey$;
-	const path = queryKey[0];
-	let input = (_queryKey$ = queryKey[1]) === null || _queryKey$ === void 0 ? void 0 : _queryKey$.input;
+	var _queryKeyData$args;
+	const queryKeyData = readQueryKey(queryKey);
+	let input = (_queryKeyData$args = queryKeyData.args) === null || _queryKeyData$args === void 0 ? void 0 : _queryKeyData$args.input;
 	if (infiniteParams) {
-		var _input;
-		input = (0, import_objectSpread2$5.default)((0, import_objectSpread2$5.default)((0, import_objectSpread2$5.default)({}, (_input = input) !== null && _input !== void 0 ? _input : {}), infiniteParams.pageParam !== void 0 ? { cursor: infiniteParams.pageParam } : {}), {}, { direction: infiniteParams.direction });
+		var _queryKeyData$args$in, _queryKeyData$args2;
+		input = (0, import_objectSpread2$5.default)((0, import_objectSpread2$5.default)((0, import_objectSpread2$5.default)({}, (_queryKeyData$args$in = (_queryKeyData$args2 = queryKeyData.args) === null || _queryKeyData$args2 === void 0 ? void 0 : _queryKeyData$args2.input) !== null && _queryKeyData$args$in !== void 0 ? _queryKeyData$args$in : {}), infiniteParams.pageParam !== void 0 ? { cursor: infiniteParams.pageParam } : {}), {}, { direction: infiniteParams.direction });
 	}
 	return [
-		path.join("."),
+		queryKeyData.path.join("."),
 		input,
 		opts === null || opts === void 0 ? void 0 : opts.trpc
 	];
@@ -265,24 +282,30 @@ async function buildQueryFromAsyncIterable(asyncIterable, queryClient, queryKey)
 *
 * @internal
 */
-function getQueryKeyInternal(path, input, type) {
-	const splitPath = path.flatMap((part) => part.split("."));
-	if (!input && (!type || type === "any")) return splitPath.length ? [splitPath] : [];
-	if (type === "infinite" && (0, __trpc_server_unstable_core_do_not_import.isObject)(input) && ("direction" in input || "cursor" in input)) {
-		const { cursor: _, direction: __ } = input, inputWithoutCursorAndDirection = (0, import_objectWithoutProperties.default)(input, _excluded);
-		return [splitPath, {
-			input: inputWithoutCursorAndDirection,
-			type: "infinite"
-		}];
-	}
-	return [splitPath, (0, import_objectSpread2$5.default)((0, import_objectSpread2$5.default)({}, typeof input !== "undefined" && input !== __tanstack_react_query.skipToken && { input }), type && type !== "any" && { type })];
+function getQueryKeyInternal(opts) {
+	const key = (0, __trpc_server_unstable_core_do_not_import.run)(() => {
+		const { input, type } = opts;
+		const splitPath = opts.path.flatMap((part) => part.split("."));
+		if (!input && type === "any") return splitPath.length ? [splitPath] : [];
+		if (type === "infinite" && (0, __trpc_server_unstable_core_do_not_import.isObject)(input) && ("direction" in input || "cursor" in input)) {
+			const { cursor: _, direction: __ } = input, inputWithoutCursorAndDirection = (0, import_objectWithoutProperties.default)(input, _excluded);
+			return [splitPath, {
+				input: inputWithoutCursorAndDirection,
+				type: "infinite"
+			}];
+		}
+		return [splitPath, (0, import_objectSpread2$5.default)((0, import_objectSpread2$5.default)({}, typeof input !== "undefined" && input !== __tanstack_react_query.skipToken && { input }), type && type !== "any" && { type })];
+	});
+	if (opts.prefix) key.unshift([opts.prefix]);
+	return key;
 }
 /**
 * @internal
 */
-function getMutationKeyInternal(path) {
-	const splitPath = path.flatMap((part) => part.split("."));
-	return splitPath.length ? [splitPath] : [];
+function getMutationKeyInternal(opts) {
+	const key = [opts.path.flatMap((part) => part.split("."))];
+	if (opts.prefix) key.unshift([opts.prefix]);
+	return key;
 }
 /**
 * @internal
@@ -324,11 +347,14 @@ function trpcMutationOptions(args) {
 	var _overrides$onSuccess;
 	const { mutate, path, opts, overrides } = args;
 	const queryClient = unwrapLazyArg(args.queryClient);
-	const mutationKey = getMutationKeyInternal(path);
+	const mutationKey = getMutationKeyInternal({
+		path,
+		prefix: opts.keyPrefix
+	});
 	const defaultOpts = queryClient.defaultMutationOptions(queryClient.getMutationDefaults(mutationKey));
 	const mutationSuccessOverride = (_overrides$onSuccess = overrides === null || overrides === void 0 ? void 0 : overrides.onSuccess) !== null && _overrides$onSuccess !== void 0 ? _overrides$onSuccess : (options) => options.originalFn();
 	const mutationFn = async (input) => {
-		const result = await mutate(...getClientArgs([path, { input }], opts));
+		const result = await mutate(...getClientArgs([...mutationKey, { input }], opts));
 		return result;
 	};
 	return (0, import_objectSpread2$3.default)((0, import_objectSpread2$3.default)({}, opts), {}, {
@@ -381,9 +407,9 @@ var import_objectSpread2$1 = __toESM(require_objectSpread2(), 1);
 * @internal
 */
 const trpcSubscriptionOptions = (args) => {
-	var _queryKey$;
+	var _readQueryKey;
 	const { subscribe, path, queryKey, opts = {} } = args;
-	const input = (_queryKey$ = queryKey[1]) === null || _queryKey$ === void 0 ? void 0 : _queryKey$.input;
+	const input = (_readQueryKey = readQueryKey(queryKey)) === null || _readQueryKey === void 0 || (_readQueryKey = _readQueryKey.args) === null || _readQueryKey === void 0 ? void 0 : _readQueryKey.input;
 	const enabled = "enabled" in opts ? !!opts.enabled : input !== __tanstack_react_query.skipToken;
 	const _subscribe = (innerOpts) => {
 		return subscribe(path.join("."), input !== null && input !== void 0 ? input : void 0, innerOpts);
@@ -511,6 +537,7 @@ var import_objectSpread2 = __toESM(require_objectSpread2(), 1);
 * @see https://trpc.io/docs/client/tanstack-react-query/server-components#5-create-a-trpc-caller-for-server-components
 */
 function createTRPCOptionsProxy(opts) {
+	const prefix = opts.keyPrefix;
 	const callIt = (type) => {
 		return (path, input, trpcOpts) => {
 			if ("router" in opts) return Promise.resolve(unwrapLazyArg(opts.ctx)).then((ctx) => (0, __trpc_server.callTRPCProcedure)({
@@ -532,10 +559,18 @@ function createTRPCOptionsProxy(opts) {
 		const contextMap = {
 			"~types": void 0,
 			pathKey: () => {
-				return getQueryKeyInternal(path);
+				return getQueryKeyInternal({
+					path,
+					type: "any",
+					prefix
+				});
 			},
 			pathFilter: () => {
-				return (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, arg1), {}, { queryKey: getQueryKeyInternal(path) });
+				return (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, arg1), {}, { queryKey: getQueryKeyInternal({
+					path,
+					type: "any",
+					prefix
+				}) });
 			},
 			queryOptions: () => {
 				return trpcQueryOptions({
@@ -543,15 +578,30 @@ function createTRPCOptionsProxy(opts) {
 					opts: arg2,
 					path,
 					queryClient: opts.queryClient,
-					queryKey: getQueryKeyInternal(path, arg1, "query"),
+					queryKey: getQueryKeyInternal({
+						path,
+						input: arg1,
+						type: "query",
+						prefix
+					}),
 					query: callIt("query")
 				});
 			},
 			queryKey: () => {
-				return getQueryKeyInternal(path, arg1, "query");
+				return getQueryKeyInternal({
+					path,
+					input: arg1,
+					type: "query",
+					prefix
+				});
 			},
 			queryFilter: () => {
-				return (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, arg2), {}, { queryKey: getQueryKeyInternal(path, arg1, "query") });
+				return (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, arg2), {}, { queryKey: getQueryKeyInternal({
+					path,
+					input: arg1,
+					type: "query",
+					prefix
+				}) });
 			},
 			infiniteQueryOptions: () => {
 				return trpcInfiniteQueryOptions({
@@ -559,15 +609,30 @@ function createTRPCOptionsProxy(opts) {
 					opts: arg2,
 					path,
 					queryClient: opts.queryClient,
-					queryKey: getQueryKeyInternal(path, arg1, "infinite"),
+					queryKey: getQueryKeyInternal({
+						path,
+						input: arg1,
+						type: "infinite",
+						prefix
+					}),
 					query: callIt("query")
 				});
 			},
 			infiniteQueryKey: () => {
-				return getQueryKeyInternal(path, arg1, "infinite");
+				return getQueryKeyInternal({
+					path,
+					input: arg1,
+					type: "infinite",
+					prefix
+				});
 			},
 			infiniteQueryFilter: () => {
-				return (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, arg2), {}, { queryKey: getQueryKeyInternal(path, arg1, "infinite") });
+				return (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, arg2), {}, { queryKey: getQueryKeyInternal({
+					path,
+					input: arg1,
+					type: "infinite",
+					prefix
+				}) });
 			},
 			mutationOptions: () => {
 				var _opts$overrides;
@@ -580,13 +645,21 @@ function createTRPCOptionsProxy(opts) {
 				});
 			},
 			mutationKey: () => {
-				return getMutationKeyInternal(path);
+				return getMutationKeyInternal({
+					path,
+					prefix
+				});
 			},
 			subscriptionOptions: () => {
 				return trpcSubscriptionOptions({
 					opts: arg2,
 					path,
-					queryKey: getQueryKeyInternal(path, arg1, "any"),
+					queryKey: getQueryKeyInternal({
+						path,
+						input: arg1,
+						type: "any",
+						prefix
+					}),
 					subscribe: callIt("subscription")
 				});
 			}
@@ -605,11 +678,16 @@ function createTRPCOptionsProxy(opts) {
 function createTRPCContext() {
 	const TRPCClientContext = react.createContext(null);
 	const TRPCContext = react.createContext(null);
-	function TRPCProvider(props) {
+	const TRPCProvider = (props) => {
 		const value = react.useMemo(() => createTRPCOptionsProxy({
 			client: props.trpcClient,
-			queryClient: props.queryClient
-		}), [props.trpcClient, props.queryClient]);
+			queryClient: props.queryClient,
+			keyPrefix: props.keyPrefix
+		}), [
+			props.trpcClient,
+			props.queryClient,
+			props.keyPrefix
+		]);
 		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TRPCClientContext.Provider, {
 			value: props.trpcClient,
 			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TRPCContext.Provider, {
@@ -617,7 +695,8 @@ function createTRPCContext() {
 				children: props.children
 			})
 		});
-	}
+	};
+	TRPCProvider.displayName = "TRPCProvider";
 	function useTRPC() {
 		const utils = react.useContext(TRPCContext);
 		if (!utils) throw new Error("useTRPC() can only be used inside of a <TRPCProvider>");