@trpc/react-query 11.0.0-alpha-tmp-workflow-merge.250 → 11.0.0-alpha-tmp-01-26-rootconfigtypes.261

package/src/shared/proxy/useQueriesProxy.ts

@@ -3,13 +3,13 @@ import type { TRPCClientError, TRPCUntypedClient } from '@trpc/client';
 import type {
   AnyProcedure,
   AnyQueryProcedure,
-  AnyRootConfig,
+  AnyRootTypes,
   AnyRouter,
   Filter,
   inferProcedureInput,
   inferTransformedProcedureOutput,
-} from '@trpc/core';
-import { createRecursiveProxy } from '@trpc/core';
+} from '@trpc/server/unstable-core-do-not-import';
+import { createRecursiveProxy } from '@trpc/server/unstable-core-do-not-import';
 import { getQueryKeyInternal } from '../../internals/getQueryKey';
 import type {
   TrpcQueryOptionsForUseQueries,
@@ -18,19 +18,19 @@ import type {
 import type { TRPCUseQueryBaseOptions } from '../hooks/types';
 
 type GetQueryOptions<
-  TConfig extends AnyRootConfig,
+  TRoot extends AnyRootTypes,
   TProcedure extends AnyProcedure,
-> = <TData = inferTransformedProcedureOutput<TConfig, TProcedure>>(
+> = <TData = inferTransformedProcedureOutput<TRoot, TProcedure>>(
   input: inferProcedureInput<TProcedure>,
   opts?: TrpcQueryOptionsForUseQueries<
-    inferTransformedProcedureOutput<TConfig, TProcedure>,
+    inferTransformedProcedureOutput<TRoot, TProcedure>,
     TData,
-    TRPCClientError<TConfig>
+    TRPCClientError<TRoot>
   >,
 ) => TrpcQueryOptionsForUseQueries<
-  inferTransformedProcedureOutput<TConfig, TProcedure>,
+  inferTransformedProcedureOutput<TRoot, TProcedure>,
   TData,
-  TRPCClientError<TConfig>
+  TRPCClientError<TRoot>
 >;
 
 /**
@@ -43,25 +43,25 @@ export type UseQueriesProcedureRecord<TRouter extends AnyRouter> = {
   >]: TRouter['_def']['record'][TKey] extends AnyRouter
     ? UseQueriesProcedureRecord<TRouter['_def']['record'][TKey]>
     : GetQueryOptions<
-        TRouter['_def']['_config'],
+        TRouter['_def']['_config']['$types'],
         TRouter['_def']['record'][TKey]
       >;
 };
 
 type GetSuspenseQueryOptions<
-  TConfig extends AnyRootConfig,
+  TRoot extends AnyRootTypes,
   TProcedure extends AnyProcedure,
-> = <TData = inferTransformedProcedureOutput<TConfig, TProcedure>>(
+> = <TData = inferTransformedProcedureOutput<TRoot, TProcedure>>(
   input: inferProcedureInput<TProcedure>,
   opts?: TrpcQueryOptionsForUseSuspenseQueries<
-    inferTransformedProcedureOutput<TConfig, TProcedure>,
+    inferTransformedProcedureOutput<TRoot, TProcedure>,
     TData,
-    TRPCClientError<TConfig>
+    TRPCClientError<TRoot>
   >,
 ) => TrpcQueryOptionsForUseSuspenseQueries<
-  inferTransformedProcedureOutput<TConfig, TProcedure>,
+  inferTransformedProcedureOutput<TRoot, TProcedure>,
   TData,
-  TRPCClientError<TConfig>
+  TRPCClientError<TRoot>
 >;
 
 /**
@@ -74,7 +74,7 @@ export type UseSuspenseQueriesProcedureRecord<TRouter extends AnyRouter> = {
   >]: TRouter['_def']['record'][TKey] extends AnyRouter
     ? UseSuspenseQueriesProcedureRecord<TRouter['_def']['record'][TKey]>
     : GetSuspenseQueryOptions<
-        TRouter['_def']['_config'],
+        TRouter['_def']['_config']['$types'],
         TRouter['_def']['record'][TKey]
       >;
 };

package/src/shared/proxy/utilsProxy.ts

@@ -14,15 +14,18 @@ import type { TRPCClientError } from '@trpc/client';
 import { createTRPCClientProxy } from '@trpc/client';
 import type {
   AnyQueryProcedure,
-  AnyRootConfig,
+  AnyRootTypes,
   AnyRouter,
   DeepPartial,
   Filter,
   inferProcedureInput,
   inferTransformedProcedureOutput,
   ProtectedIntersection,
-} from '@trpc/core';
-import { createFlatProxy, createRecursiveProxy } from '@trpc/core';
+} from '@trpc/server/unstable-core-do-not-import';
+import {
+  createFlatProxy,
+  createRecursiveProxy,
+} from '@trpc/server/unstable-core-do-not-import';
 import type {
   DecoratedTRPCContextProps,
   TRPCContextState,
@@ -36,7 +39,7 @@ import { getQueryKeyInternal } from '../../internals/getQueryKey';
 import type { ExtractCursorType } from '../hooks/types';
 
 type DecorateProcedure<
-  TConfig extends AnyRootConfig,
+  TRoot extends AnyRootTypes,
   TProcedure extends AnyQueryProcedure,
 > = {
   /**
@@ -45,10 +48,10 @@ type DecorateProcedure<
   fetch(
     input: inferProcedureInput<TProcedure>,
     opts?: TRPCFetchQueryOptions<
-      inferTransformedProcedureOutput<TConfig, TProcedure>,
-      TRPCClientError<TConfig>
+      inferTransformedProcedureOutput<TRoot, TProcedure>,
+      TRPCClientError<TRoot>
     >,
-  ): Promise<inferTransformedProcedureOutput<TConfig, TProcedure>>;
+  ): Promise<inferTransformedProcedureOutput<TRoot, TProcedure>>;
 
   /**
    * @link https://tanstack.com/query/v5/docs/reference/QueryClient#queryclientfetchinfinitequery
@@ -57,12 +60,12 @@ type DecorateProcedure<
     input: inferProcedureInput<TProcedure>,
     opts?: TRPCFetchInfiniteQueryOptions<
       inferProcedureInput<TProcedure>,
-      inferTransformedProcedureOutput<TConfig, TProcedure>,
-      TRPCClientError<TConfig>
+      inferTransformedProcedureOutput<TRoot, TProcedure>,
+      TRPCClientError<TRoot>
     >,
   ): Promise<
     InfiniteData<
-      inferTransformedProcedureOutput<TConfig, TProcedure>,
+      inferTransformedProcedureOutput<TRoot, TProcedure>,
       NonNullable<ExtractCursorType<inferProcedureInput<TProcedure>>> | null
     >
   >;
@@ -73,8 +76,8 @@ type DecorateProcedure<
   prefetch(
     input: inferProcedureInput<TProcedure>,
     opts?: TRPCFetchQueryOptions<
-      inferTransformedProcedureOutput<TConfig, TProcedure>,
-      TRPCClientError<TConfig>
+      inferTransformedProcedureOutput<TRoot, TProcedure>,
+      TRPCClientError<TRoot>
     >,
   ): Promise<void>;
 
@@ -85,8 +88,8 @@ type DecorateProcedure<
     input: inferProcedureInput<TProcedure>,
     opts?: TRPCFetchInfiniteQueryOptions<
       inferProcedureInput<TProcedure>,
-      inferTransformedProcedureOutput<TConfig, TProcedure>,
-      TRPCClientError<TConfig>
+      inferTransformedProcedureOutput<TRoot, TProcedure>,
+      TRPCClientError<TRoot>
     >,
   ): Promise<void>;
 
@@ -96,10 +99,10 @@ type DecorateProcedure<
   ensureData(
     input: inferProcedureInput<TProcedure>,
     opts?: TRPCFetchQueryOptions<
-      inferTransformedProcedureOutput<TConfig, TProcedure>,
-      TRPCClientError<TConfig>
+      inferTransformedProcedureOutput<TRoot, TProcedure>,
+      TRPCClientError<TRoot>
     >,
-  ): Promise<inferTransformedProcedureOutput<TConfig, TProcedure>>;
+  ): Promise<inferTransformedProcedureOutput<TRoot, TProcedure>>;
 
   /**
    * @link https://tanstack.com/query/v5/docs/reference/QueryClient#queryclientinvalidatequeries
@@ -110,7 +113,7 @@ type DecorateProcedure<
       predicate?: (
         query: Query<
           inferProcedureInput<TProcedure>,
-          TRPCClientError<TConfig>,
+          TRPCClientError<TRoot>,
           inferProcedureInput<TProcedure>,
           QueryKeyKnown<
             inferProcedureInput<TProcedure>,
@@ -158,8 +161,8 @@ type DecorateProcedure<
      */
     input: inferProcedureInput<TProcedure>,
     updater: Updater<
-      inferTransformedProcedureOutput<TConfig, TProcedure> | undefined,
-      inferTransformedProcedureOutput<TConfig, TProcedure> | undefined
+      inferTransformedProcedureOutput<TRoot, TProcedure> | undefined,
+      inferTransformedProcedureOutput<TRoot, TProcedure> | undefined
     >,
     options?: SetDataOptions,
   ): void;
@@ -171,12 +174,12 @@ type DecorateProcedure<
     input: inferProcedureInput<TProcedure>,
     updater: Updater<
       | InfiniteData<
-          inferTransformedProcedureOutput<TConfig, TProcedure>,
+          inferTransformedProcedureOutput<TRoot, TProcedure>,
           NonNullable<ExtractCursorType<inferProcedureInput<TProcedure>>> | null
         >
       | undefined,
       | InfiniteData<
-          inferTransformedProcedureOutput<TConfig, TProcedure>,
+          inferTransformedProcedureOutput<TRoot, TProcedure>,
           NonNullable<ExtractCursorType<inferProcedureInput<TProcedure>>> | null
         >
       | undefined
@@ -189,7 +192,7 @@ type DecorateProcedure<
    */
   getData(
     input?: inferProcedureInput<TProcedure>,
-  ): inferTransformedProcedureOutput<TConfig, TProcedure> | undefined;
+  ): inferTransformedProcedureOutput<TRoot, TProcedure> | undefined;
 
   /**
    * @link https://tanstack.com/query/v5/docs/reference/QueryClient#queryclientgetquerydata
@@ -198,7 +201,7 @@ type DecorateProcedure<
     input?: inferProcedureInput<TProcedure>,
   ):
     | InfiniteData<
-        inferTransformedProcedureOutput<TConfig, TProcedure>,
+        inferTransformedProcedureOutput<TRoot, TProcedure>,
         NonNullable<ExtractCursorType<inferProcedureInput<TProcedure>>> | null
       >
     | undefined;
@@ -234,7 +237,7 @@ export type DecoratedProcedureUtilsRecord<TRouter extends AnyRouter> =
           DecorateRouter
       : // utils only apply to queries
         DecorateProcedure<
-          TRouter['_def']['_config'],
+          TRouter['_def']['_config']['$types'],
           TRouter['_def']['record'][TKey]
         >;
   }; // Add functions that should be available at utils root

package/src/shared/types.ts

@@ -1,5 +1,8 @@
 import type { QueryClient } from '@tanstack/react-query';
-import type { AnyRouter, MaybePromise } from '@trpc/core';
+import type {
+  AnyRouter,
+  MaybePromise,
+} from '@trpc/server/unstable-core-do-not-import';
 
 /**
  * @internal

package/src/utils/createUtilityFunctions.ts

@@ -1,7 +1,7 @@
 import type { QueryClient } from '@tanstack/react-query';
 import type { CreateTRPCClient } from '@trpc/client';
 import { getUntypedClient, TRPCUntypedClient } from '@trpc/client';
-import type { AnyRouter } from '@trpc/core';
+import type { AnyRouter } from '@trpc/server/unstable-core-do-not-import';
 import { getClientArgs } from '../internals/getClientArgs';
 import type { TRPCQueryUtils } from '../shared';
 

package/src/utils/inferReactQueryProcedure.ts

@@ -3,11 +3,11 @@ import type {
   AnyMutationProcedure,
   AnyProcedure,
   AnyQueryProcedure,
-  AnyRootConfig,
+  AnyRootTypes,
   AnyRouter,
   inferProcedureInput,
   inferTransformedProcedureOutput,
-} from '@trpc/core';
+} from '@trpc/server/unstable-core-do-not-import';
 import type {
   UseTRPCMutationOptions,
   UseTRPCMutationResult,
@@ -19,14 +19,14 @@ import type {
  * @internal
  */
 export type InferQueryOptions<
-  TConfig extends AnyRootConfig,
+  TRoot extends AnyRootTypes,
   TProcedure extends AnyProcedure,
-  TData = inferTransformedProcedureOutput<TConfig, TProcedure>,
+  TData = inferTransformedProcedureOutput<TRoot, TProcedure>,
 > = Omit<
   UseTRPCQueryOptions<
-    inferTransformedProcedureOutput<TConfig, TProcedure>,
-    inferTransformedProcedureOutput<TConfig, TProcedure>,
-    TRPCClientErrorLike<TConfig>,
+    inferTransformedProcedureOutput<TRoot, TProcedure>,
+    inferTransformedProcedureOutput<TRoot, TProcedure>,
+    TRPCClientErrorLike<TRoot>,
     TData
   >,
   'select'
@@ -36,35 +36,35 @@ export type InferQueryOptions<
  * @internal
  */
 export type InferMutationOptions<
-  TConfig extends AnyRootConfig,
+  TRoot extends AnyRootTypes,
   TProcedure extends AnyProcedure,
 > = UseTRPCMutationOptions<
   inferProcedureInput<TProcedure>,
-  TRPCClientErrorLike<TConfig>,
-  inferTransformedProcedureOutput<TConfig, TProcedure>
+  TRPCClientErrorLike<TRoot>,
+  inferTransformedProcedureOutput<TRoot, TProcedure>
 >;
 
 /**
  * @internal
  */
 export type InferQueryResult<
-  TConfig extends AnyRootConfig,
+  TRoot extends AnyRootTypes,
   TProcedure extends AnyProcedure,
 > = UseTRPCQueryResult<
-  inferTransformedProcedureOutput<TConfig, TProcedure>,
-  TRPCClientErrorLike<TConfig>
+  inferTransformedProcedureOutput<TRoot, TProcedure>,
+  TRPCClientErrorLike<TRoot>
 >;
 
 /**
  * @internal
  */
 export type InferMutationResult<
-  TConfig extends AnyRootConfig,
+  TRoot extends AnyRootTypes,
   TProcedure extends AnyProcedure,
   TContext = unknown,
 > = UseTRPCMutationResult<
-  inferTransformedProcedureOutput<TConfig, TProcedure>,
-  TRPCClientErrorLike<TConfig>,
+  inferTransformedProcedureOutput<TRoot, TProcedure>,
+  TRPCClientErrorLike<TRoot>,
   inferProcedureInput<TProcedure>,
   TContext
 >;
@@ -74,9 +74,15 @@ export type inferReactQueryProcedureOptions<TRouter extends AnyRouter> = {
     ? TRouterOrProcedure extends AnyRouter
       ? inferReactQueryProcedureOptions<TRouterOrProcedure>
       : TRouterOrProcedure extends AnyMutationProcedure
-      ? InferMutationOptions<TRouter['_def']['_config'], TRouterOrProcedure>
+      ? InferMutationOptions<
+          TRouter['_def']['_config']['$types'],
+          TRouterOrProcedure
+        >
       : TRouterOrProcedure extends AnyQueryProcedure
-      ? InferQueryOptions<TRouter['_def']['_config'], TRouterOrProcedure>
+      ? InferQueryOptions<
+          TRouter['_def']['_config']['$types'],
+          TRouterOrProcedure
+        >
       : never
     : never;
 };