@trpc/react-query 10.32.0 → 10.33.1

package/dist/shared/index.mjs

@@ -1,4 +1,4 @@
-export { T as TRPCContext, h as contextProps, c as createHooksInternal, b as createReactProxyDecoration, a as createReactQueryUtilsProxy, f as createRootHooks, e as createUseQueriesProxy, d as getClientArgs } from '../createHooksInternal-a6562110.mjs';
+export { T as TRPCContext, h as contextProps, c as createHooksInternal, b as createReactProxyDecoration, a as createReactQueryUtilsProxy, f as createRootHooks, e as createUseQueriesProxy, d as getClientArgs } from '../createHooksInternal-7ba6fd69.mjs';
 export { g as getQueryClient } from '../queryClient-4d766c0c.mjs';
 import '@trpc/server/shared';
 import '../getArrayQueryKey-86134f8b.mjs';

package/dist/shared/proxy/useQueriesProxy.d.ts

@@ -7,7 +7,7 @@ type GetQueryOptions<TProcedure extends AnyProcedure, TPath extends string> = <T
  * @internal
  */
 export type UseQueriesProcedureRecord<TRouter extends AnyRouter, TPath extends string = ''> = {
-    [TKey in keyof Filter<TRouter['_def']['record'], AnyRouter | AnyQueryProcedure>]: TRouter['_def']['record'][TKey] extends AnyRouter ? UseQueriesProcedureRecord<TRouter['_def']['record'][TKey], `${TPath}${TKey & string}.`> : GetQueryOptions<TRouter['_def']['record'][TKey], `${TPath}${TKey & string}`>;
+    [TKey in keyof Filter<TRouter['_def']['record'], AnyQueryProcedure | AnyRouter>]: TRouter['_def']['record'][TKey] extends AnyRouter ? UseQueriesProcedureRecord<TRouter['_def']['record'][TKey], `${TPath}${TKey & string}.`> : GetQueryOptions<TRouter['_def']['record'][TKey], `${TPath}${TKey & string}`>;
 };
 /**
  * Create proxy for `useQueries` options

package/dist/shared/proxy/useQueriesProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQueriesProxy.d.ts","sourceRoot":"","sources":["../../../src/shared/proxy/useQueriesProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,mBAAmB,EACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAEL,+BAA+B,EAChC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAE3E,KAAK,eAAe,CAAC,UAAU,SAAS,YAAY,EAAE,KAAK,SAAS,MAAM,IAAI,CAC5E,KAAK,GAAG,+BAA+B,CAAC,UAAU,CAAC,EAEnD,KAAK,EAAE,mBAAmB,CAAC,UAAU,CAAC,EACtC,IAAI,CAAC,EAAE,6BAA6B,CAClC,KAAK,EACL,mBAAmB,CAAC,UAAU,CAAC,EAC/B,+BAA+B,CAAC,UAAU,CAAC,EAC3C,KAAK,EACL,eAAe,CAAC,UAAU,CAAC,CAC5B,KACE,6BAA6B,CAChC,KAAK,EACL,mBAAmB,CAAC,UAAU,CAAC,EAC/B,+BAA+B,CAAC,UAAU,CAAC,EAC3C,KAAK,EACL,eAAe,CAAC,UAAU,CAAC,CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,CACnC,OAAO,SAAS,SAAS,EACzB,KAAK,SAAS,MAAM,GAAG,EAAE,IACvB;KACD,IAAI,IAAI,MAAM,MAAM,CACnB,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB,SAAS,GAAG,iBAAiB,CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GACjD,yBAAyB,CACvB,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAC/B,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,GAAG,CAC5B,GACD,eAAe,CACb,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAC/B,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,EAAE,CAC3B;CACN,CAAC;AAEF;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,0CAkB5B"}
+{"version":3,"file":"useQueriesProxy.d.ts","sourceRoot":"","sources":["../../../src/shared/proxy/useQueriesProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,mBAAmB,EACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAEL,+BAA+B,EAChC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAE3E,KAAK,eAAe,CAAC,UAAU,SAAS,YAAY,EAAE,KAAK,SAAS,MAAM,IAAI,CAC5E,KAAK,GAAG,+BAA+B,CAAC,UAAU,CAAC,EAEnD,KAAK,EAAE,mBAAmB,CAAC,UAAU,CAAC,EACtC,IAAI,CAAC,EAAE,6BAA6B,CAClC,KAAK,EACL,mBAAmB,CAAC,UAAU,CAAC,EAC/B,+BAA+B,CAAC,UAAU,CAAC,EAC3C,KAAK,EACL,eAAe,CAAC,UAAU,CAAC,CAC5B,KACE,6BAA6B,CAChC,KAAK,EACL,mBAAmB,CAAC,UAAU,CAAC,EAC/B,+BAA+B,CAAC,UAAU,CAAC,EAC3C,KAAK,EACL,eAAe,CAAC,UAAU,CAAC,CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,CACnC,OAAO,SAAS,SAAS,EACzB,KAAK,SAAS,MAAM,GAAG,EAAE,IACvB;KACD,IAAI,IAAI,MAAM,MAAM,CACnB,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB,iBAAiB,GAAG,SAAS,CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GACjD,yBAAyB,CACvB,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAC/B,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,GAAG,CAC5B,GACD,eAAe,CACb,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAC/B,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,EAAE,CAC3B;CACN,CAAC;AAEF;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,0CAkB5B"}

package/dist/shared/proxy/utilsProxy.d.ts

@@ -81,9 +81,9 @@ type DecorateRouter = {
 /**
  * @internal
  */
-export type DecoratedProcedureUtilsRecord<TRouter extends AnyRouter> = {
-    [TKey in keyof Filter<TRouter['_def']['record'], AnyRouter | AnyQueryProcedure>]: TRouter['_def']['record'][TKey] extends AnyRouter ? DecoratedProcedureUtilsRecord<TRouter['_def']['record'][TKey]> & DecorateRouter : DecorateProcedure<TRouter['_def']['record'][TKey]>;
-} & DecorateRouter;
+export type DecoratedProcedureUtilsRecord<TRouter extends AnyRouter> = DecorateRouter & {
+    [TKey in keyof Filter<TRouter['_def']['record'], AnyQueryProcedure | AnyRouter>]: TRouter['_def']['record'][TKey] extends AnyRouter ? DecoratedProcedureUtilsRecord<TRouter['_def']['record'][TKey]> & DecorateRouter : DecorateProcedure<TRouter['_def']['record'][TKey]>;
+};
 export type CreateReactUtilsProxy<TRouter extends AnyRouter, TSSRContext> = ProtectedIntersection<DecoratedProxyTRPCContextProps<TRouter, TSSRContext>, DecoratedProcedureUtilsRecord<TRouter>>;
 /**
  * @internal

package/dist/shared/proxy/utilsProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilsProxy.d.ts","sourceRoot":"","sources":["../../../src/shared/proxy/utilsProxy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utilsProxy.d.ts","sourceRoot":"","sources":["../../../src/shared/proxy/utilsProxy.ts"],"names":[],"mappings":"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"}

package/dist/ssg/ssg.d.ts

@@ -6,10 +6,10 @@ import { CreateServerSideHelpersOptions } from '../server/types';
  * @deprecated use `createServerSideHelpers` instead
  */
 export declare function createSSGHelpers<TRouter extends AnyRouter>(opts: CreateServerSideHelpersOptions<TRouter>): {
-    prefetchQuery: <TPath extends keyof TRouter["_def"]["queries"] & string, TProcedure extends TRouter["_def"]["queries"][TPath]>(path: TPath, ...args: inferHandlerInput<TProcedure>) => Promise<void>;
-    prefetchInfiniteQuery: <TPath_1 extends keyof TRouter["_def"]["queries"] & string, TProcedure_1 extends TRouter["_def"]["queries"][TPath_1]>(path: TPath_1, ...args: inferHandlerInput<TProcedure_1>) => Promise<void>;
-    fetchQuery: <TPath_2 extends keyof TRouter["_def"]["queries"] & string, TProcedure_2 extends TRouter["_def"]["queries"][TPath_2], TOutput extends inferProcedureOutput<TProcedure_2>>(path: TPath_2, ...args: inferHandlerInput<TProcedure_2>) => Promise<TOutput>;
-    fetchInfiniteQuery: <TPath_3 extends keyof TRouter["_def"]["queries"] & string, TProcedure_3 extends TRouter["_def"]["queries"][TPath_3], TOutput_1 extends inferProcedureOutput<TProcedure_3>>(path: TPath_3, ...args: inferHandlerInput<TProcedure_3>) => Promise<InfiniteData<TOutput_1>>;
+    prefetchQuery: <TPath extends string & keyof TRouter["_def"]["queries"], TProcedure extends TRouter["_def"]["queries"][TPath]>(path: TPath, ...args: inferHandlerInput<TProcedure>) => Promise<void>;
+    prefetchInfiniteQuery: <TPath_1 extends string & keyof TRouter["_def"]["queries"], TProcedure_1 extends TRouter["_def"]["queries"][TPath_1]>(path: TPath_1, ...args: inferHandlerInput<TProcedure_1>) => Promise<void>;
+    fetchQuery: <TPath_2 extends string & keyof TRouter["_def"]["queries"], TProcedure_2 extends TRouter["_def"]["queries"][TPath_2], TOutput extends inferProcedureOutput<TProcedure_2>>(path: TPath_2, ...args: inferHandlerInput<TProcedure_2>) => Promise<TOutput>;
+    fetchInfiniteQuery: <TPath_3 extends string & keyof TRouter["_def"]["queries"], TProcedure_3 extends TRouter["_def"]["queries"][TPath_3], TOutput_1 extends inferProcedureOutput<TProcedure_3>>(path: TPath_3, ...args: inferHandlerInput<TProcedure_3>) => Promise<InfiniteData<TOutput_1>>;
     dehydrate: (opts?: DehydrateOptions) => DehydratedState;
     queryClient: import("@tanstack/react-query").QueryClient;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/react-query",
-  "version": "10.32.0",
+  "version": "10.33.1",
   "description": "The tRPC React library",
   "author": "KATT",
   "license": "MIT",
@@ -64,21 +64,21 @@
   },
   "peerDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.32.0",
-    "@trpc/server": "10.32.0",
+    "@trpc/client": "10.33.1",
+    "@trpc/server": "10.33.1",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
   },
   "devDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.32.0",
-    "@trpc/server": "10.32.0",
+    "@trpc/client": "10.33.1",
+    "@trpc/server": "10.33.1",
     "@types/express": "^4.17.17",
     "@types/node": "^18.16.16",
     "@types/react": "^18.2.8",
     "eslint": "^8.40.0",
     "express": "^4.17.1",
-    "next": "^13.4.3",
+    "next": "^13.4.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rollup": "^2.79.1",
@@ -91,5 +91,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "f8cf27c773b97dedb5eb95ca548cee7acb55c92a"
+  "gitHead": "403be02df05c29a9c3a77256805674baf6b6b125"
 }

package/src/createTRPCReact.tsx

@@ -91,44 +91,7 @@ export type DecorateProcedure<
   _TFlags,
   TPath extends string,
 > = TProcedure extends AnyQueryProcedure
-  ? {
-      /**
-       * Method to extract the query key for a procedure
-       * @param type - defaults to `any`
-       * @see https://trpc.io/docs/client/react/getQueryKey
-       * @deprecated - import `getQueryKey` from `@trpc/react-query` instead
-       */
-      getQueryKey: (
-        input: inferProcedureInput<TProcedure>,
-        type?: QueryType,
-      ) => QueryKey;
-      /**
-       * @see https://trpc.io/docs/client/react/useQuery
-       */
-      useQuery: ProcedureUseQuery<TProcedure, TPath>;
-      /**
-       * @see https://trpc.io/docs/client/react/suspense#usesuspensequery
-       */
-      useSuspenseQuery: <
-        TQueryFnData extends inferTransformedProcedureOutput<TProcedure> = inferTransformedProcedureOutput<TProcedure>,
-        TData = TQueryFnData,
-      >(
-        input: inferProcedureInput<TProcedure>,
-        opts?: Omit<
-          UseTRPCQueryOptions<
-            TPath,
-            inferProcedureInput<TProcedure>,
-            TQueryFnData,
-            TData,
-            TRPCClientErrorLike<TProcedure>
-          >,
-          'enabled' | 'suspense'
-        >,
-      ) => [
-        TData,
-        UseTRPCQuerySuccessResult<TData, TRPCClientErrorLike<TProcedure>>,
-      ];
-    } & (inferProcedureInput<TProcedure> extends { cursor?: any } | void
+  ? (inferProcedureInput<TProcedure> extends { cursor?: any } | void
       ? {
           /**
            * @see https://trpc.io/docs/client/react/suspense#useinfinitesuspensequery
@@ -167,7 +130,44 @@ export type DecorateProcedure<
             >,
           ];
         }
-      : object)
+      : object) & {
+      /**
+       * Method to extract the query key for a procedure
+       * @param type - defaults to `any`
+       * @see https://trpc.io/docs/client/react/getQueryKey
+       * @deprecated - import `getQueryKey` from `@trpc/react-query` instead
+       */
+      getQueryKey: (
+        input: inferProcedureInput<TProcedure>,
+        type?: QueryType,
+      ) => QueryKey;
+      /**
+       * @see https://trpc.io/docs/client/react/useQuery
+       */
+      useQuery: ProcedureUseQuery<TProcedure, TPath>;
+      /**
+       * @see https://trpc.io/docs/client/react/suspense#usesuspensequery
+       */
+      useSuspenseQuery: <
+        TQueryFnData extends inferTransformedProcedureOutput<TProcedure> = inferTransformedProcedureOutput<TProcedure>,
+        TData = TQueryFnData,
+      >(
+        input: inferProcedureInput<TProcedure>,
+        opts?: Omit<
+          UseTRPCQueryOptions<
+            TPath,
+            inferProcedureInput<TProcedure>,
+            TQueryFnData,
+            TData,
+            TRPCClientErrorLike<TProcedure>
+          >,
+          'enabled' | 'suspense'
+        >,
+      ) => [
+        TData,
+        UseTRPCQuerySuccessResult<TData, TRPCClientErrorLike<TProcedure>>,
+      ];
+    }
   : TProcedure extends AnyMutationProcedure
   ? {
       /**
@@ -211,16 +211,16 @@ export type DecoratedProcedureRecord<
   TPath extends string = '',
 > = {
   [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
-    ? {
+    ? DecoratedProcedureRecord<
+        TProcedures[TKey]['_def']['record'],
+        TFlags,
+        `${TPath}${TKey & string}.`
+      > & {
         /**
          * @deprecated - import `getQueryKey` from `@trpc/react-query` instead
          */
         getQueryKey: () => QueryKey;
-      } & DecoratedProcedureRecord<
-        TProcedures[TKey]['_def']['record'],
-        TFlags,
-        `${TPath}${TKey & string}.`
-      >
+      }
     : TProcedures[TKey] extends AnyProcedure
     ? DecorateProcedure<TProcedures[TKey], TFlags, `${TPath}${TKey & string}`>
     : never;

package/src/internals/context.tsx

@@ -33,7 +33,7 @@ export interface TRPCFetchInfiniteQueryOptions<TInput, TError, TOutput>
     TRPCRequestOptions {}
 
 /** @internal */
-export type SSRState = false | 'prepass' | 'mounting' | 'mounted';
+export type SSRState = 'mounted' | 'mounting' | 'prepass' | false;
 
 export interface ProxyTRPCContextProps<TRouter extends AnyRouter, TSSRContext> {
   /**
@@ -92,18 +92,15 @@ type TRPCContextResetQueries<TRouter extends AnyRouter> =
   /**
    * @link https://tanstack.com/query/v4/docs/react/reference/QueryClient#queryclientresetqueries
    */
-  (<
-    TPath extends keyof TRouter['_def']['queries'] & string,
-    TInput extends inferProcedureInput<TRouter['_def']['queries'][TPath]>,
-  >(
-    pathAndInput?: [TPath, TInput?] | TPath,
-    filters?: ResetQueryFilters,
-    options?: ResetOptions,
-  ) => Promise<void>) &
-    /**
-     * @link https://tanstack.com/query/v4/docs/react/reference/QueryClient#queryclientresetqueries
-     */
-    ((filters?: ResetQueryFilters, options?: ResetOptions) => Promise<void>);
+  ((filters?: ResetQueryFilters, options?: ResetOptions) => Promise<void>) &
+    (<
+      TPath extends string & keyof TRouter['_def']['queries'],
+      TInput extends inferProcedureInput<TRouter['_def']['queries'][TPath]>,
+    >(
+      pathAndInput?: TPath | [TPath, TInput?],
+      filters?: ResetQueryFilters,
+      options?: ResetOptions,
+    ) => Promise<void>);
 
 /**
  * @deprecated
@@ -117,7 +114,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/reference/QueryClient#queryclientfetchquery
    */
   fetchQuery: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TProcedure extends TRouter['_def']['queries'][TPath],
     TOutput extends inferTransformedProcedureOutput<TProcedure>,
     TInput extends inferProcedureInput<TProcedure>,
@@ -130,7 +127,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/reference/QueryClient#queryclientfetchinfinitequery
    */
   fetchInfiniteQuery: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TProcedure extends TRouter['_def']['queries'][TPath],
     TOutput extends inferTransformedProcedureOutput<TProcedure>,
     TInput extends inferProcedureInput<TProcedure>,
@@ -147,7 +144,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/react/guides/prefetching
    */
   prefetchQuery: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TProcedure extends TRouter['_def']['queries'][TPath],
     TOutput extends inferTransformedProcedureOutput<TProcedure>,
     TInput extends inferProcedureInput<TProcedure>,
@@ -160,7 +157,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/reference/QueryClient#queryclientprefetchinfinitequery
    */
   prefetchInfiniteQuery: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TProcedure extends TRouter['_def']['queries'][TPath],
     TOutput extends inferTransformedProcedureOutput<TProcedure>,
     TInput extends inferProcedureInput<TProcedure>,
@@ -177,7 +174,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/react/reference/QueryClient#queryclientensurequerydata
    */
   ensureQueryData: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TProcedure extends TRouter['_def']['queries'][TPath],
     TOutput extends inferTransformedProcedureOutput<TProcedure>,
     TInput extends inferProcedureInput<TProcedure>,
@@ -190,10 +187,10 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/react/guides/query-invalidation
    */
   invalidateQueries: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TInput extends inferProcedureInput<TRouter['_def']['queries'][TPath]>,
   >(
-    pathAndInput?: [TPath, TInput?] | TPath,
+    pathAndInput?: TPath | [TPath, TInput?],
     filters?: InvalidateQueryFilters,
     options?: InvalidateOptions,
   ) => Promise<void>;
@@ -207,7 +204,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/react/reference/QueryClient#queryclientrefetchqueries
    */
   refetchQueries<
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TInput extends inferProcedureInput<TRouter['_def']['queries'][TPath]>,
   >(
     pathAndInput: [TPath, TInput?],
@@ -227,7 +224,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/react/guides/query-cancellation
    */
   cancelQuery: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TInput extends inferProcedureInput<TRouter['_def']['queries'][TPath]>,
   >(
     pathAndInput: [TPath, TInput?],
@@ -238,7 +235,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/react/reference/QueryClient#queryclientsetquerydata
    */
   setQueryData: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TInput extends inferProcedureInput<TRouter['_def']['queries'][TPath]>,
     TOutput extends inferTransformedProcedureOutput<
       TRouter['_def']['queries'][TPath]
@@ -253,7 +250,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/react/reference/QueryClient#queryclientgetquerydata
    */
   getQueryData: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TInput extends inferProcedureInput<TRouter['_def']['queries'][TPath]>,
     TOutput extends inferTransformedProcedureOutput<
       TRouter['_def']['queries'][TPath]
@@ -266,7 +263,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/react/reference/QueryClient#queryclientsetquerydata
    */
   setInfiniteQueryData: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TInput extends inferProcedureInput<TRouter['_def']['queries'][TPath]>,
     TOutput extends inferTransformedProcedureOutput<
       TRouter['_def']['queries'][TPath]
@@ -284,7 +281,7 @@ export interface TRPCContextState<
    * @link https://tanstack.com/query/v4/docs/react/reference/QueryClient#queryclientgetquerydata
    */
   getInfiniteQueryData: <
-    TPath extends keyof TRouter['_def']['queries'] & string,
+    TPath extends string & keyof TRouter['_def']['queries'],
     TInput extends inferProcedureInput<TRouter['_def']['queries'][TPath]>,
     TOutput extends inferTransformedProcedureOutput<
       TRouter['_def']['queries'][TPath]

package/src/internals/getArrayQueryKey.ts

@@ -1,6 +1,6 @@
 import { GetQueryProcedureInput } from './getQueryKey';
 
-export type QueryType = 'query' | 'infinite' | 'any';
+export type QueryType = 'any' | 'infinite' | 'query';
 
 export type QueryKey = [
   string[],
@@ -20,7 +20,7 @@ export type QueryKeyKnown<TInput, TType extends Exclude<QueryType, 'any'>> = [
  * https://github.com/trpc/trpc/issues/2611
  **/
 export function getArrayQueryKey(
-  queryKey: string | [string] | [string, ...unknown[]] | unknown[],
+  queryKey: unknown[] | string | [string, ...unknown[]] | [string],
   type: QueryType,
 ): QueryKey {
   const queryKeyArrayed = Array.isArray(queryKey) ? queryKey : [queryKey];

package/src/internals/getQueryKey.ts

@@ -15,7 +15,7 @@ import { DecoratedProcedureRecord, DecorateProcedure } from '../shared';
 export function getQueryKeyInternal(
   path: string,
   input: unknown,
-): [string] | [string, unknown] {
+): [string, unknown] | [string] {
   if (path.length) return input === undefined ? [path] : [path, input];
   return [] as unknown as [string];
 }
@@ -43,8 +43,8 @@ type GetQueryParams<
 
 type GetParams<
   TProcedureOrRouter extends
-    | AnyQueryProcedure
     | AnyMutationProcedure
+    | AnyQueryProcedure
     | AnyRouter,
   TPath extends string,
   TFlags,
@@ -65,8 +65,8 @@ type GetParams<
 
 type GetQueryKeyParams<
   TProcedureOrRouter extends
-    | AnyQueryProcedure
     | AnyMutationProcedure
+    | AnyQueryProcedure
     | AnyRouter,
   TPath extends string,
   TFlags,
@@ -81,8 +81,8 @@ type GetQueryKeyParams<
  */
 export function getQueryKey<
   TProcedureOrRouter extends
-    | AnyQueryProcedure
     | AnyMutationProcedure
+    | AnyQueryProcedure
     | AnyRouter,
   TPath extends string,
   TFlags,

package/src/server/ssgProxy.ts

@@ -52,7 +52,7 @@ type DecorateProcedure<TProcedure extends AnyProcedure> = {
 export type DecoratedProcedureSSGRecord<TRouter extends AnyRouter> = {
   [TKey in keyof Filter<
     TRouter['_def']['record'],
-    AnyRouter | AnyQueryProcedure
+    AnyQueryProcedure | AnyRouter
   >]: TRouter['_def']['record'][TKey] extends AnyRouter
     ? DecoratedProcedureSSGRecord<TRouter['_def']['record'][TKey]>
     : // utils only apply to queries

package/src/server/types.ts

@@ -16,8 +16,6 @@ interface CreateSSGHelpersExternal<TRouter extends AnyRouter> {
   client: inferRouterProxyClient<TRouter>;
 }
 
-export type CreateServerSideHelpersOptions<TRouter extends AnyRouter> = (
-  | CreateSSGHelpersInternal<TRouter>
-  | CreateSSGHelpersExternal<TRouter>
-) &
-  CreateTRPCReactQueryClientConfig;
+export type CreateServerSideHelpersOptions<TRouter extends AnyRouter> =
+  CreateTRPCReactQueryClientConfig &
+    (CreateSSGHelpersExternal<TRouter> | CreateSSGHelpersInternal<TRouter>);

package/src/shared/hooks/createHooksInternal.tsx

@@ -6,7 +6,6 @@ import {
   useQuery as __useQuery,
   DehydratedState,
   hashQueryKey,
-  QueryClient,
   useQueryClient,
 } from '@tanstack/react-query';
 import { createTRPCClient, TRPCClientErrorLike } from '@trpc/client';
@@ -61,9 +60,7 @@ export function createRootHooks<
 
   const Context = (config?.context ??
     TRPCContext) as React.Context<ProviderContext>;
-  const ReactQueryContext = config?.reactQueryContext as React.Context<
-    QueryClient | undefined
-  >;
+  const ReactQueryContext = config?.reactQueryContext;
 
   const createClient: CreateClient<TRouter> = (opts) => {
     return createTRPCClient(opts);
@@ -83,7 +80,7 @@ export function createRootHooks<
           abortOnUnmount,
           queryClient,
           client,
-          ssrContext: ssrContext || null,
+          ssrContext: ssrContext ?? null,
           ssrState,
           fetchQuery: useCallback(
             (pathAndInput, opts) => {
@@ -395,7 +392,7 @@ export function createRootHooks<
     const optsRef = useRef<typeof opts>(opts);
     optsRef.current = opts;
 
-    return useEffect(() => {
+    useEffect(() => {
       if (!enabled) {
         return;
       }

package/src/shared/hooks/deprecated/createHooksInternal.tsx

@@ -6,7 +6,6 @@ import {
   useQuery as __useQuery,
   DehydratedState,
   hashQueryKey,
-  QueryClient,
   useQueryClient,
 } from '@tanstack/react-query';
 import { createTRPCClient, TRPCClientErrorLike } from '@trpc/client';
@@ -95,9 +94,7 @@ function __createHooksInternal<
 
   const Context = (config?.context ??
     TRPCContext) as React.Context<ProviderContext>;
-  const ReactQueryContext = config?.reactQueryContext as React.Context<
-    QueryClient | undefined
-  >;
+  const ReactQueryContext = config?.reactQueryContext;
 
   const createClient: CreateClient<TRouter> = (opts) => {
     return createTRPCClient(opts);
@@ -117,7 +114,7 @@ function __createHooksInternal<
           abortOnUnmount,
           queryClient,
           client,
-          ssrContext: ssrContext || null,
+          ssrContext: ssrContext ?? null,
           ssrState,
           fetchQuery: useCallback(
             (pathAndInput, opts) => {
@@ -303,7 +300,7 @@ function __createHooksInternal<
   }
 
   function useQuery<
-    TPath extends keyof TQueryValues & string,
+    TPath extends string & keyof TQueryValues,
     TQueryFnData = TQueryValues[TPath]['output'],
     TData = TQueryValues[TPath]['output'],
   >(
@@ -359,7 +356,7 @@ function __createHooksInternal<
   }
 
   function useMutation<
-    TPath extends keyof TMutationValues & string,
+    TPath extends string & keyof TMutationValues,
     TContext = unknown,
   >(
     path: TPath | [TPath],
@@ -420,7 +417,7 @@ function __createHooksInternal<
    * ⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠
    */
   function useSubscription<
-    TPath extends keyof TSubscriptions & string,
+    TPath extends string & keyof TSubscriptions,
     TOutput extends inferSubscriptionOutput<TRouter, TPath>,
   >(
     pathAndInput: [
@@ -436,7 +433,7 @@ function __createHooksInternal<
     const queryKey = hashQueryKey(pathAndInput);
     const { client } = useContext();
 
-    return useEffect(() => {
+    useEffect(() => {
       if (!enabled) {
         return;
       }

package/src/shared/hooks/types.ts

@@ -79,7 +79,7 @@ export interface DefinedUseTRPCQueryOptions<
     TError,
     TQueryOptsData
   > {
-  initialData: TQueryOptsData | InitialDataFunction<TQueryOptsData>;
+  initialData: InitialDataFunction<TQueryOptsData> | TQueryOptsData;
 }
 
 export interface TRPCQueryOptions<TPath, TInput, TData, TError>
@@ -137,8 +137,8 @@ export type CreateClient<TRouter extends AnyRouter> = (
 /**
  * @internal
  */
-export type UseTRPCQueryResult<TData, TError> = UseQueryResult<TData, TError> &
-  TRPCHookResult;
+export type UseTRPCQueryResult<TData, TError> = TRPCHookResult &
+  UseQueryResult<TData, TError>;
 
 /**
  * @internal
@@ -158,11 +158,8 @@ export type UseTRPCQuerySuccessResult<TData, TError> =
 /**
  * @internal
  */
-export type UseTRPCInfiniteQueryResult<TData, TError> = UseInfiniteQueryResult<
-  TData,
-  TError
-> &
-  TRPCHookResult;
+export type UseTRPCInfiniteQueryResult<TData, TError> = TRPCHookResult &
+  UseInfiniteQueryResult<TData, TError>;
 
 /**
  * @internal
@@ -174,4 +171,4 @@ export type UseTRPCInfiniteQuerySuccessResult<TData, TError> =
  * @internal
  */
 export type UseTRPCMutationResult<TData, TError, TVariables, TContext> =
-  UseMutationResult<TData, TError, TVariables, TContext> & TRPCHookResult;
+  TRPCHookResult & UseMutationResult<TData, TError, TVariables, TContext>;

package/src/shared/proxy/useQueriesProxy.ts

@@ -42,7 +42,7 @@ export type UseQueriesProcedureRecord<
 > = {
   [TKey in keyof Filter<
     TRouter['_def']['record'],
-    AnyRouter | AnyQueryProcedure
+    AnyQueryProcedure | AnyRouter
   >]: TRouter['_def']['record'][TKey] extends AnyRouter
     ? UseQueriesProcedureRecord<
         TRouter['_def']['record'][TKey],