@trpc/react-query 11.0.0-next-beta.206 → 11.0.0-next-beta.208

package/dist/shared/proxy/utilsProxy.js

@@ -0,0 +1,89 @@
+'use strict';
+
+var client = require('@trpc/client');
+var core = require('@trpc/core');
+var context = require('../../internals/context.js');
+var getQueryKey = require('../../internals/getQueryKey.js');
+
+const getQueryType = (utilName)=>{
+    switch(utilName){
+        case 'fetch':
+        case 'ensureData':
+        case 'prefetch':
+        case 'getData':
+        case 'setData':
+            return 'query';
+        case 'fetchInfinite':
+        case 'prefetchInfinite':
+        case 'getInfiniteData':
+        case 'setInfiniteData':
+            return 'infinite';
+        case 'cancel':
+        case 'invalidate':
+        case 'refetch':
+        case 'reset':
+            return 'any';
+    }
+};
+/**
+ * @internal
+ */ function createRecursiveUtilsProxy(context, key) {
+    return core.createRecursiveProxy((opts)=>{
+        const path = [
+            key,
+            ...opts.path
+        ];
+        const utilName = path.pop();
+        const args = [
+            ...opts.args
+        ];
+        const input = args.shift(); // args can now be spread when input removed
+        const queryType = getQueryType(utilName);
+        const queryKey = getQueryKey.getQueryKeyInternal(path, input, queryType);
+        const contextMap = {
+            fetch: ()=>context.fetchQuery(queryKey, ...args),
+            fetchInfinite: ()=>context.fetchInfiniteQuery(queryKey, args[0]),
+            prefetch: ()=>context.prefetchQuery(queryKey, ...args),
+            prefetchInfinite: ()=>context.prefetchInfiniteQuery(queryKey, args[0]),
+            ensureData: ()=>context.ensureQueryData(queryKey, ...args),
+            invalidate: ()=>context.invalidateQueries(queryKey, ...args),
+            reset: ()=>context.resetQueries(queryKey, ...args),
+            refetch: ()=>context.refetchQueries(queryKey, ...args),
+            cancel: ()=>context.cancelQuery(queryKey, ...args),
+            setData: ()=>{
+                context.setQueryData(queryKey, args[0], args[1]);
+            },
+            setInfiniteData: ()=>{
+                context.setInfiniteQueryData(queryKey, args[0], args[1]);
+            },
+            getData: ()=>context.getQueryData(queryKey),
+            getInfiniteData: ()=>context.getInfiniteQueryData(queryKey)
+        };
+        return contextMap[utilName]();
+    });
+}
+/**
+ * @internal
+ */ function createReactQueryUtils(context$1) {
+    return core.createFlatProxy((key)=>{
+        const contextName = key;
+        if (contextName === 'client') {
+            return client.createTRPCClientProxy(context$1.client);
+        }
+        if (context.contextProps.includes(contextName)) {
+            return context$1[contextName];
+        }
+        return createRecursiveUtilsProxy(context$1, key);
+    });
+}
+/**
+ * @internal
+ */ function createQueryUtilsProxy(context) {
+    return core.createFlatProxy((key)=>{
+        return createRecursiveUtilsProxy(context, key);
+    });
+}
+
+exports.createQueryUtilsProxy = createQueryUtilsProxy;
+exports.createReactQueryUtils = createReactQueryUtils;
+exports.getQueryType = getQueryType;

package/dist/{utilsProxy-12979321.mjs → shared/proxy/utilsProxy.mjs}

@@ -1,67 +1,7 @@
 import { createTRPCClientProxy } from '@trpc/client';
 import { createFlatProxy, createRecursiveProxy } from '@trpc/core';
-import * as React from 'react';
-
-/**
- * To allow easy interactions with groups of related queries, such as
- * invalidating all queries of a router, we use an array as the path when
- * storing in tanstack query.
- **/ function getQueryKeyInternal(path, input, type) {
-    // Construct a query key that is easy to destructure and flexible for
-    // partial selecting etc.
-    // https://github.com/trpc/trpc/issues/3128
-    // some parts of the path may be dot-separated, split them up
-    const splitPath = path.flatMap((part)=>part.split('.'));
-    if (!input && (!type || type === 'any')) {
-        // for `utils.invalidate()` to match all queries (including vanilla react-query)
-        // we don't want nested array if path is empty, i.e. `[]` instead of `[[]]`
-        return splitPath.length ? [
-            splitPath
-        ] : [];
-    }
-    if (type === 'infinite' && input && typeof input === 'object' && 'cursor' in input) {
-        const { cursor: _ , ...inputWithoutCursor } = input;
-        return [
-            splitPath,
-            {
-                input: inputWithoutCursor,
-                type: 'infinite'
-            }
-        ];
-    }
-    return [
-        splitPath,
-        {
-            ...typeof input !== 'undefined' && {
-                input: input
-            },
-            ...type && type !== 'any' && {
-                type: type
-            }
-        }
-    ];
-}
-/**
- * Method to extract the query key for a procedure
- * @param procedureOrRouter - procedure or AnyRouter
- * @param input - input to procedureOrRouter
- * @param type - defaults to `any`
- * @link https://trpc.io/docs/v11/getQueryKey
- */ function getQueryKey(..._params) {
-    const [procedureOrRouter, input, type] = _params;
-    // @ts-expect-error - we don't expose _def on the type layer
-    const path = procedureOrRouter._def().path;
-    const queryKey = getQueryKeyInternal(path, input, type ?? 'any');
-    return queryKey;
-}
-
-const contextProps = [
-    'client',
-    'ssrContext',
-    'ssrState',
-    'abortOnUnmount'
-];
-const TRPCContext = React.createContext?.(null);
+import { contextProps } from '../../internals/context.mjs';
+import { getQueryKeyInternal } from '../../internals/getQueryKey.mjs';
 
 const getQueryType = (utilName)=>{
     switch(utilName){
@@ -142,4 +82,4 @@ const getQueryType = (utilName)=>{
     });
 }
 
-export { TRPCContext as T, createQueryUtilsProxy as a, getQueryKeyInternal as b, createReactQueryUtils as c, getQueryType as d, contextProps as e, getQueryKey as g };
+export { createQueryUtilsProxy, createReactQueryUtils, getQueryType };

package/dist/{queryClient-4d766c0c.mjs → shared/queryClient.mjs}

@@ -4,4 +4,4 @@ import { QueryClient } from '@tanstack/react-query';
  * @internal
  */ const getQueryClient = (config)=>config.queryClient ?? new QueryClient(config.queryClientConfig);
 
-export { getQueryClient as g };
+export { getQueryClient };

package/dist/utils/createUtilityFunctions.js

@@ -0,0 +1,94 @@
+'use strict';
+
+var client = require('@trpc/client');
+var getClientArgs = require('../internals/getClientArgs.js');
+
+/**
+ * Creates a set of utility functions that can be used to interact with `react-query`
+ * @param opts the `TRPCClient` and `QueryClient` to use
+ * @returns a set of utility functions that can be used to interact with `react-query`
+ * @internal
+ */ function createUtilityFunctions(opts) {
+    const { client: client$1 , queryClient  } = opts;
+    const untypedClient = client$1 instanceof client.TRPCUntypedClient ? client$1 : client.getUntypedClient(client$1);
+    return {
+        fetchQuery: (queryKey, opts)=>{
+            return queryClient.fetchQuery({
+                ...opts,
+                queryKey,
+                queryFn: ()=>untypedClient.query(...getClientArgs.getClientArgs(queryKey, opts))
+            });
+        },
+        fetchInfiniteQuery: (queryKey, opts)=>{
+            return queryClient.fetchInfiniteQuery({
+                ...opts,
+                queryKey,
+                queryFn: ({ pageParam  })=>{
+                    return untypedClient.query(...getClientArgs.getClientArgs(queryKey, opts, pageParam));
+                },
+                initialPageParam: opts?.initialCursor ?? null
+            });
+        },
+        prefetchQuery: (queryKey, opts)=>{
+            return queryClient.prefetchQuery({
+                ...opts,
+                queryKey,
+                queryFn: ()=>untypedClient.query(...getClientArgs.getClientArgs(queryKey, opts))
+            });
+        },
+        prefetchInfiniteQuery: (queryKey, opts)=>{
+            return queryClient.prefetchInfiniteQuery({
+                ...opts,
+                queryKey,
+                queryFn: ({ pageParam  })=>{
+                    return untypedClient.query(...getClientArgs.getClientArgs(queryKey, opts, pageParam));
+                },
+                initialPageParam: opts?.initialCursor ?? null
+            });
+        },
+        ensureQueryData: (queryKey, opts)=>{
+            return queryClient.ensureQueryData({
+                ...opts,
+                queryKey,
+                queryFn: ()=>untypedClient.query(...getClientArgs.getClientArgs(queryKey, opts))
+            });
+        },
+        invalidateQueries: (queryKey, filters, options)=>{
+            return queryClient.invalidateQueries({
+                ...filters,
+                queryKey
+            }, options);
+        },
+        resetQueries: (queryKey, filters, options)=>{
+            return queryClient.resetQueries({
+                ...filters,
+                queryKey
+            }, options);
+        },
+        refetchQueries: (queryKey, filters, options)=>{
+            return queryClient.refetchQueries({
+                ...filters,
+                queryKey
+            }, options);
+        },
+        cancelQuery: (queryKey, options)=>{
+            return queryClient.cancelQueries({
+                queryKey
+            }, options);
+        },
+        setQueryData: (queryKey, updater, options)=>{
+            return queryClient.setQueryData(queryKey, updater, options);
+        },
+        getQueryData: (queryKey)=>{
+            return queryClient.getQueryData(queryKey);
+        },
+        setInfiniteQueryData: (queryKey, updater, options)=>{
+            return queryClient.setQueryData(queryKey, updater, options);
+        },
+        getInfiniteQueryData: (queryKey)=>{
+            return queryClient.getQueryData(queryKey);
+        }
+    };
+}
+
+exports.createUtilityFunctions = createUtilityFunctions;

package/dist/utils/createUtilityFunctions.mjs

@@ -0,0 +1,92 @@
+import { TRPCUntypedClient, getUntypedClient } from '@trpc/client';
+import { getClientArgs } from '../internals/getClientArgs.mjs';
+
+/**
+ * Creates a set of utility functions that can be used to interact with `react-query`
+ * @param opts the `TRPCClient` and `QueryClient` to use
+ * @returns a set of utility functions that can be used to interact with `react-query`
+ * @internal
+ */ function createUtilityFunctions(opts) {
+    const { client , queryClient  } = opts;
+    const untypedClient = client instanceof TRPCUntypedClient ? client : getUntypedClient(client);
+    return {
+        fetchQuery: (queryKey, opts)=>{
+            return queryClient.fetchQuery({
+                ...opts,
+                queryKey,
+                queryFn: ()=>untypedClient.query(...getClientArgs(queryKey, opts))
+            });
+        },
+        fetchInfiniteQuery: (queryKey, opts)=>{
+            return queryClient.fetchInfiniteQuery({
+                ...opts,
+                queryKey,
+                queryFn: ({ pageParam  })=>{
+                    return untypedClient.query(...getClientArgs(queryKey, opts, pageParam));
+                },
+                initialPageParam: opts?.initialCursor ?? null
+            });
+        },
+        prefetchQuery: (queryKey, opts)=>{
+            return queryClient.prefetchQuery({
+                ...opts,
+                queryKey,
+                queryFn: ()=>untypedClient.query(...getClientArgs(queryKey, opts))
+            });
+        },
+        prefetchInfiniteQuery: (queryKey, opts)=>{
+            return queryClient.prefetchInfiniteQuery({
+                ...opts,
+                queryKey,
+                queryFn: ({ pageParam  })=>{
+                    return untypedClient.query(...getClientArgs(queryKey, opts, pageParam));
+                },
+                initialPageParam: opts?.initialCursor ?? null
+            });
+        },
+        ensureQueryData: (queryKey, opts)=>{
+            return queryClient.ensureQueryData({
+                ...opts,
+                queryKey,
+                queryFn: ()=>untypedClient.query(...getClientArgs(queryKey, opts))
+            });
+        },
+        invalidateQueries: (queryKey, filters, options)=>{
+            return queryClient.invalidateQueries({
+                ...filters,
+                queryKey
+            }, options);
+        },
+        resetQueries: (queryKey, filters, options)=>{
+            return queryClient.resetQueries({
+                ...filters,
+                queryKey
+            }, options);
+        },
+        refetchQueries: (queryKey, filters, options)=>{
+            return queryClient.refetchQueries({
+                ...filters,
+                queryKey
+            }, options);
+        },
+        cancelQuery: (queryKey, options)=>{
+            return queryClient.cancelQueries({
+                queryKey
+            }, options);
+        },
+        setQueryData: (queryKey, updater, options)=>{
+            return queryClient.setQueryData(queryKey, updater, options);
+        },
+        getQueryData: (queryKey)=>{
+            return queryClient.getQueryData(queryKey);
+        },
+        setInfiniteQueryData: (queryKey, updater, options)=>{
+            return queryClient.setQueryData(queryKey, updater, options);
+        },
+        getInfiniteQueryData: (queryKey)=>{
+            return queryClient.getQueryData(queryKey);
+        }
+    };
+}
+
+export { createUtilityFunctions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/react-query",
-  "version": "11.0.0-next-beta.206+255803252",
+  "version": "11.0.0-next-beta.208+ce423b8ae",
   "description": "The tRPC React library",
   "author": "KATT",
   "license": "MIT",
@@ -57,17 +57,17 @@
     }
   },
   "dependencies": {
-    "@trpc/core": "11.0.0-next-beta.206+255803252"
+    "@trpc/core": "11.0.0-next-beta.208+ce423b8ae"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.0.0",
-    "@trpc/client": "11.0.0-next-beta.206+255803252",
+    "@trpc/client": "11.0.0-next-beta.208+ce423b8ae",
     "react": ">=18.2.0",
     "react-dom": ">=18.2.0"
   },
   "devDependencies": {
     "@tanstack/react-query": "^5.0.0",
-    "@trpc/client": "11.0.0-next-beta.206+255803252",
+    "@trpc/client": "11.0.0-next-beta.208+ce423b8ae",
     "@types/express": "^4.17.17",
     "@types/node": "^20.10.0",
     "@types/react": "^18.2.33",
@@ -76,7 +76,7 @@
     "next": "^14.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rollup": "^2.79.1",
+    "rollup": "^4.9.5",
     "tsx": "^4.0.0",
     "zod": "^3.0.0"
   },
@@ -86,5 +86,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "2558032520acb8dc9ffe9dfe30ba94bab3f06e36"
+  "gitHead": "ce423b8ae58efdb512748acd8e63d54bcbfd6eec"
 }