@orpc/tanstack-query 1.14.6 → 2.0.0-beta.2

package/dist/index.d.ts

@@ -1,14 +1,16 @@
-import { ClientContext, Client, NestedClient } from '@orpc/client';
-import { Promisable, SetOptional, PartialDeep, MaybeOptionalOptions } from '@orpc/shared';
-import { QueryKey, QueryFunctionContext, QueryFunction, SkipToken, QueryObserverOptions, InfiniteQueryObserverOptions, MutationObserverOptions, DataTag, InfiniteData } from '@tanstack/query-core';
+import { ClientContext, Client, AnyNestedClient, InferClientContext, InferClientError, ThrowableError } from '@orpc/client';
+import { AnySchema, ErrorMap, ProcedureContract, InferSchemaInput, InferSchemaOutput, ORPCErrorFromErrorMap, RouterContractClient, RouterContract, ContractCaller } from '@orpc/contract';
+import { JsonifiedValue, JsonifiedClientError, JsonifiedClient } from '@orpc/openapi';
+import { Promisable, PartialDeep, Interceptor, PromiseWithError, MaybeOptionalOptions, OrderablePlugin, Public } from '@orpc/shared';
+import { QueryKey, QueryFunctionContext, QueryFunction, SkipToken, QueryObserverOptions, InfiniteQueryObserverOptions, MutationObserverOptions, DataTag, InfiniteData, MutationFunctionContext } from '@tanstack/query-core';
 
-interface experimental_SerializableStreamedQueryOptions {
+interface SerializableStreamedQueryOptions {
     /**
-     * Determines how data is handled when the query is refetched.
+     * Determines how data is handled when the query is fetched again
      *
-     * - `'reset'`: Clears existing data and sets the query back to a pending state.
-     * - `'append'`: Appends new data chunks to the existing data.
-     * - `'replace'`: Collects all streamed data and replaces the cache once the stream finishes.
+     * - `'reset'`: Clears existing data and returns the query to a pending state.
+     * - `'append'`: Adds new streamed chunks to the existing data.
+     * - `'replace'`: Buffers streamed data and replaces the cache after the stream completes.
      *
      * @default 'reset'
      */
@@ -26,17 +28,17 @@ interface experimental_SerializableStreamedQueryOptions {
  * - Options are serializable
  * - The output is predictable
  */
-declare function experimental_serializableStreamedQuery<TQueryFnData = unknown, TQueryKey extends QueryKey = QueryKey>(queryFn: (context: QueryFunctionContext<TQueryKey>) => Promisable<AsyncIterable<TQueryFnData>>, { refetchMode, maxChunks }?: experimental_SerializableStreamedQueryOptions): QueryFunction<Array<TQueryFnData>, TQueryKey>;
+declare function serializableStreamedQuery<TQueryFnData = unknown, TQueryKey extends QueryKey = QueryKey>(queryFn: (context: QueryFunctionContext<TQueryKey>) => Promisable<AsyncIterable<TQueryFnData>>, { refetchMode, maxChunks }?: SerializableStreamedQueryOptions): QueryFunction<TQueryFnData[], TQueryKey>;
 
-type experimental_StreamedQueryOutput<TOutput> = TOutput extends AsyncIterable<infer U> ? U[] : never;
-type experimental_LiveQueryOutput<TOutput> = TOutput extends AsyncIterable<infer U> ? U : never;
+type InferStreamedQueryOutput<TOutput> = TOutput extends AsyncIterable<infer U> ? U[] : never;
+type InferLiveQueryOutput<TOutput> = TOutput extends AsyncIterable<infer U> ? U : never;
 type OperationType = 'query' | 'streamed' | 'live' | 'infinite' | 'mutation';
 type OperationKeyOptions<TType extends OperationType, TInput> = {
     type?: TType;
     input?: TType extends 'mutation' ? never : PartialDeep<TInput>;
-    fnOptions?: TType extends 'streamed' ? experimental_SerializableStreamedQueryOptions : never;
+    fnOptions?: TType extends 'streamed' ? SerializableStreamedQueryOptions : never;
 };
-type OperationKey<TType extends OperationType, TInput> = [path: readonly string[], options: OperationKeyOptions<TType, TInput>];
+type OperationKey<TType extends OperationType, TInput> = [path: string[], options: OperationKeyOptions<TType, TInput>];
 declare const OPERATION_CONTEXT_SYMBOL: unique symbol;
 interface OperationContext {
     [OPERATION_CONTEXT_SYMBOL]?: {
@@ -48,229 +50,325 @@ type QueryKeyOptions<TInput> = (undefined extends TInput ? {
     input?: TInput | SkipToken;
 } : {
     input: TInput | SkipToken;
-}) & {
-    queryKey?: QueryKey;
+}) | {
+    queryKey: QueryKey;
 };
-type QueryOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData> = QueryKeyOptions<TInput> & (Record<never, never> extends TClientContext ? {
+type QueryOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData, TInitialData> = (undefined extends TInput ? {
+    input?: TInput | SkipToken;
+} : {
+    input: TInput | SkipToken;
+}) & (object extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
-}) & Omit<QueryObserverOptions<TOutput, TError, TSelectData>, 'queryKey'>;
-interface QueryOptionsBase<TOutput, TError> {
-    queryKey: DataTag<QueryKey, TOutput, TError>;
-    queryFn: QueryFunction<TOutput>;
-    throwOnError?: (error: TError) => boolean;
-    retryDelay?: (count: number, error: TError) => number;
-    enabled?: boolean;
-}
-type experimental_StreamedKeyOptions<TInput> = QueryKeyOptions<TInput> & {
-    queryFnOptions?: experimental_SerializableStreamedQueryOptions;
+}) & Omit<QueryObserverOptions<TOutput, TError, TSelectData>, 'queryKey' | '_defaulted' | '_optimisticResults'> & {
+    queryKey?: QueryKey;
+    initialData?: TInitialData;
 };
-type experimental_StreamedOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData> = QueryOptionsIn<TClientContext, TInput, TOutput, TError, TSelectData> & {
-    queryFnOptions?: experimental_SerializableStreamedQueryOptions;
+type QueryOptionsOut<TOutput, TError, TSelectData, TInitialData> = Pick<QueryObserverOptions<TOutput, TError, TSelectData, TOutput, DataTag<QueryKey, TOutput, TError>>, 'queryKey' | 'throwOnError' | 'select' | 'retryDelay'> & (undefined extends TInitialData ? object : {
+    initialData: TInitialData;
+}) & {
+    queryFn: QueryFunction<TOutput, DataTag<QueryKey, TOutput, TError>>;
 };
-interface experimental_StreamedOptionsBase<TOutput, TError> extends QueryOptionsBase<TOutput, TError> {
-}
-type InfiniteOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData, TPageParam> = {
+type StreamedKeyOptions<TInput> = ((undefined extends TInput ? {
+    input?: TInput | SkipToken;
+} : {
+    input: TInput | SkipToken;
+}) & {
+    queryFnOptions?: SerializableStreamedQueryOptions;
+}) | {
+    queryKey: QueryKey;
+};
+type StreamedOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData, TInitialData> = QueryOptionsIn<TClientContext, TInput, TOutput, TError, TSelectData, TInitialData> & {
+    queryFnOptions?: SerializableStreamedQueryOptions;
+};
+type StreamedOptionsOut<TOutput, TError, TSelectData, TInitialData> = QueryOptionsOut<TOutput, TError, TSelectData, TInitialData>;
+type InfiniteKeyOptions<TInput, TPageParam> = Pick<InfiniteOptionsIn<any, TInput, any, any, any, TPageParam, any>, 'input' | 'initialPageParam'> | {
+    queryKey: QueryKey;
+};
+type InfiniteOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData, TPageParam, TInitialData> = {
     input: ((pageParam: TPageParam) => TInput) | SkipToken;
-} & (Record<never, never> extends TClientContext ? {
+    initialData?: TInitialData;
+    queryKey?: QueryKey;
+} & (object extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
-}) & SetOptional<InfiniteQueryObserverOptions<TOutput, TError, TSelectData, QueryKey, TPageParam>, 'queryKey'>;
-interface InfiniteOptionsBase<TOutput, TError, TPageParam> {
-    queryKey: DataTag<QueryKey, InfiniteData<TOutput, TPageParam>, TError>;
-    queryFn: QueryFunction<TOutput, QueryKey, TPageParam>;
-    select?(): InfiniteData<TOutput, TPageParam>;
-    throwOnError?: (error: TError) => boolean;
-    retryDelay?: (count: number, error: TError) => number;
-    enabled?: boolean;
-}
-type MutationOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TMutationContext> = (Record<never, never> extends TClientContext ? {
+}) & Omit<InfiniteQueryObserverOptions<TOutput, TError, TSelectData, QueryKey, TPageParam>, 'queryKey' | '_defaulted' | '_optimisticResults'>;
+type InfiniteOptionsOut<TOutput, TError, TSelectData, TPageParam, TInitialData> = Pick<InfiniteQueryObserverOptions<TOutput, TError, TSelectData, DataTag<QueryKey, InfiniteData<TOutput, TPageParam>, TError>, TPageParam>, 'queryKey' | 'select' | 'throwOnError' | 'retryDelay' | 'initialPageParam' | 'getNextPageParam' | 'getPreviousPageParam'> & (undefined extends TInitialData ? object : {
+    initialData: TInitialData;
+}) & {
+    queryFn: QueryFunction<TOutput, DataTag<QueryKey, InfiniteData<TOutput, TPageParam>, TError>, TPageParam>;
+};
+type MutationKeyOptions = Pick<MutationOptionsIn<any, any, any, any, any>, 'mutationKey'>;
+type MutationOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TMutationContext> = (object extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
-}) & MutationOptions<TInput, TOutput, TError, TMutationContext>;
-type MutationOptions<TInput, TOutput, TError, TMutationContext> = MutationObserverOptions<TOutput, TError, TInput, TMutationContext>;
+}) & MutationOptionsOut<TInput, TOutput, TError, TMutationContext>;
+type MutationOptionsOut<TInput, TOutput, TError, TMutationContext> = MutationObserverOptions<TOutput, TError, TInput, TMutationContext>;
 
+interface ProcedureUtilsQueryInterceptorOptions<TClientContext extends ClientContext, TInput> {
+    path: string[];
+    context: TClientContext & OperationContext;
+    input: TInput | SkipToken;
+    fnContext: QueryFunctionContext;
+}
+type ProcedureUtilsQueryInterceptor<TClientContext extends ClientContext, TInput, TOutput, TError> = Interceptor<ProcedureUtilsQueryInterceptorOptions<TClientContext, TInput>, PromiseWithError<TOutput, TError>>;
+interface ProcedureUtilsStreamedInterceptorOptions<TClientContext extends ClientContext, TInput> extends ProcedureUtilsQueryInterceptorOptions<TClientContext, TInput> {
+}
+type ProcedureUtilsStreamedInterceptor<TClientContext extends ClientContext, TInput, TOutput, TError> = Interceptor<ProcedureUtilsStreamedInterceptorOptions<TClientContext, TInput>, PromiseWithError<InferStreamedQueryOutput<TOutput>, TError>>;
+interface ProcedureUtilsLiveInterceptorOptions<TClientContext extends ClientContext, TInput> extends ProcedureUtilsQueryInterceptorOptions<TClientContext, TInput> {
+}
+type ProcedureUtilsLiveInterceptor<TClientContext extends ClientContext, TInput, TOutput, TError> = Interceptor<ProcedureUtilsLiveInterceptorOptions<TClientContext, TInput>, PromiseWithError<InferLiveQueryOutput<TOutput>, TError>>;
+interface ProcedureUtilsInfiniteInterceptorOptions<TClientContext extends ClientContext, TInput> extends ProcedureUtilsQueryInterceptorOptions<TClientContext, TInput> {
+    fnContext: QueryFunctionContext<QueryKey, any>;
+}
+type ProcedureUtilsInfiniteInterceptor<TClientContext extends ClientContext, TInput, TOutput, TError> = Interceptor<ProcedureUtilsInfiniteInterceptorOptions<TClientContext, TInput>, PromiseWithError<TOutput, TError>>;
+interface ProcedureUtilsMutationInterceptorOptions<TClientContext extends ClientContext, TInput> extends Omit<ProcedureUtilsQueryInterceptorOptions<TClientContext, TInput>, 'input' | 'fnContext'> {
+    input: TInput;
+    fnContext: MutationFunctionContext;
+}
+type ProcedureUtilsMutationInterceptor<TClientContext extends ClientContext, TInput, TOutput, TError> = Interceptor<ProcedureUtilsMutationInterceptorOptions<TClientContext, TInput>, PromiseWithError<TOutput, TError>>;
 /**
- * Utils at any level (procedure or router)
+ * Can be partial options for spread-merged options,
+ * or a function that receives per-call options and returns overridden this.options.
  */
-interface GeneralUtils<TInput> {
+type ProcedureUtilsModifier<T extends object> = Partial<T> | ((options: T) => T);
+interface ProcedureUtilsOptions<TClientContext extends ClientContext, TInput, TOutput, TError> {
     /**
-     * Generate a **partial matching** key for actions like revalidating queries, checking mutation status, etc.
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
+     * Key options modifier for .queryKey and .queryOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
      */
-    key<TType extends OperationType>(options?: OperationKeyOptions<TType, TInput>): OperationKey<TType, TInput>;
+    queryKey?: ProcedureUtilsModifier<QueryKeyOptions<TInput>>;
+    /**
+     * Interceptors that intercept queryFn inside .queryOptions, guaranteed to be executed.
+     */
+    queryInterceptors?: ProcedureUtilsQueryInterceptor<TClientContext, TInput, TOutput, TError>[];
+    /**
+     * Options modifier for .queryOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
+     */
+    queryOptions?: ProcedureUtilsModifier<QueryOptionsIn<TClientContext, TInput, TOutput, TError, unknown, unknown>>;
+    /**
+     * Key options modifier for .streamedKey and .streamedOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
+     */
+    streamedKey?: ProcedureUtilsModifier<StreamedKeyOptions<TInput>>;
+    /**
+     * Interceptors that intercept queryFn inside .streamedOptions, guaranteed to be executed.
+     */
+    streamedInterceptors?: ProcedureUtilsStreamedInterceptor<TClientContext, TInput, TOutput, TError>[];
+    /**
+     * Options modifier for .streamedOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
+     */
+    streamedOptions?: ProcedureUtilsModifier<StreamedOptionsIn<TClientContext, TInput, InferStreamedQueryOutput<TOutput>, TError, unknown, unknown>>;
+    /**
+     * Key options modifier for .liveKey and .liveOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
+     */
+    liveKey?: ProcedureUtilsModifier<QueryKeyOptions<TInput>>;
+    /**
+     * Interceptors that intercept queryFn inside .liveOptions, guaranteed to be executed.
+     */
+    liveInterceptors?: ProcedureUtilsLiveInterceptor<TClientContext, TInput, TOutput, TError>[];
+    /**
+     * Options modifier for .liveOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
+     */
+    liveOptions?: ProcedureUtilsModifier<QueryOptionsIn<TClientContext, TInput, InferLiveQueryOutput<TOutput>, TError, unknown, unknown>>;
+    /**
+     * Key options modifier for .infiniteKey and .infiniteOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
+     */
+    infiniteKey?: ProcedureUtilsModifier<InfiniteKeyOptions<TInput, unknown>>;
+    /**
+     * Interceptors that intercept queryFn inside .infiniteOptions, guaranteed to be executed.
+     */
+    infiniteInterceptors?: ProcedureUtilsInfiniteInterceptor<TClientContext, TInput, TOutput, TError>[];
+    /**
+     * Options modifier for .infiniteOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
+     */
+    infiniteOptions?: ProcedureUtilsModifier<InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, unknown, unknown, unknown>>;
+    /**
+     * Key options modifier for .mutationKey and .mutationOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
+     */
+    mutationKey?: ProcedureUtilsModifier<MutationKeyOptions>;
+    /**
+     * Interceptors that intercept mutationFn inside .mutationOptions, guaranteed to be executed.
+     */
+    mutationInterceptors?: ProcedureUtilsMutationInterceptor<TClientContext, TInput, TOutput, TError>[];
+    /**
+     * Options modifier for .mutationOptions
+     * Can be partial options or a function that receives per-call options and returns override this.options.
+     */
+    mutationOptions?: ProcedureUtilsModifier<MutationOptionsIn<TClientContext, TInput, TOutput, TError, unknown>>;
 }
-declare function createGeneralUtils<TInput>(path: readonly string[]): GeneralUtils<TInput>;
-
-declare function generateOperationKey<TType extends OperationType, TInput>(path: readonly string[], state?: OperationKeyOptions<TType, TInput>): OperationKey<TType, TInput>;
-
-interface ProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError> {
+declare class ProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError> {
+    private readonly path;
+    private readonly options;
     /**
      * Calling corresponding procedure client
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#calling-clients Tanstack Calling Procedure Client Docs}
      */
     call: Client<TClientContext, TInput, TOutput, TError>;
+    constructor(path: string[], client: Client<TClientContext, TInput, TOutput, TError>, options?: ProcedureUtilsOptions<TClientContext, TInput, TOutput, TError>);
     /**
      * Generate a **full matching** key for [Query Options](https://orpc.dev/docs/integrations/tanstack-query#query-options).
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
      */
     queryKey(...rest: MaybeOptionalOptions<QueryKeyOptions<TInput>>): DataTag<QueryKey, TOutput, TError>;
     /**
      * Generate options used for useQuery/useSuspenseQuery/prefetchQuery/...
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-options Tanstack Query Options Utility Docs}
      */
-    queryOptions<U, USelectData = TOutput>(...rest: MaybeOptionalOptions<U & QueryOptionsIn<TClientContext, TInput, TOutput, TError, USelectData>>): NoInfer<U & Omit<QueryOptionsBase<TOutput, TError>, keyof U>>;
+    queryOptions<USelectData = TOutput, UInitialData = undefined>(...rest: MaybeOptionalOptions<QueryOptionsIn<TClientContext, TInput, TOutput, TError, USelectData, UInitialData>>): NoInfer<QueryOptionsOut<TOutput, TError, USelectData, UInitialData>>;
     /**
      * Generate a **full matching** key for [Streamed Query Options](https://orpc.dev/docs/integrations/tanstack-query#streamed-query-options).
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
      */
-    experimental_streamedKey(...rest: MaybeOptionalOptions<experimental_StreamedKeyOptions<TInput>>): DataTag<QueryKey, experimental_StreamedQueryOutput<TOutput>, TError>;
+    streamedKey(...rest: MaybeOptionalOptions<StreamedKeyOptions<TInput>>): DataTag<QueryKey, InferStreamedQueryOutput<TOutput>, TError>;
     /**
      * Configure queries for [Event Iterator](https://orpc.dev/docs/event-iterator).
      * This is built on [TanStack Query streamedQuery](https://tanstack.com/query/latest/docs/reference/streamedQuery)
      * and works with hooks like `useQuery`, `useSuspenseQuery`, or `prefetchQuery`.
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#streamed-query-options Tanstack Streamed Query Options Utility Docs}
      */
-    experimental_streamedOptions<U, USelectData = experimental_StreamedQueryOutput<TOutput>>(...rest: MaybeOptionalOptions<U & experimental_StreamedOptionsIn<TClientContext, TInput, experimental_StreamedQueryOutput<TOutput>, TError, USelectData>>): NoInfer<U & Omit<experimental_StreamedOptionsBase<experimental_StreamedQueryOutput<TOutput>, TError>, keyof U>>;
+    streamedOptions<USelectData = InferStreamedQueryOutput<TOutput>, UInitialData = undefined>(...rest: MaybeOptionalOptions<StreamedOptionsIn<TClientContext, TInput, InferStreamedQueryOutput<TOutput>, TError, USelectData, UInitialData>>): NoInfer<StreamedOptionsOut<InferStreamedQueryOutput<TOutput>, TError, USelectData, UInitialData>>;
     /**
      * Generate a **full matching** key for [Live Query Options](https://orpc.dev/docs/integrations/tanstack-query#live-query-options).
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
      */
-    experimental_liveKey(...rest: MaybeOptionalOptions<QueryKeyOptions<TInput>>): DataTag<QueryKey, experimental_LiveQueryOutput<TOutput>, TError>;
+    liveKey(...rest: MaybeOptionalOptions<QueryKeyOptions<TInput>>): DataTag<QueryKey, InferLiveQueryOutput<TOutput>, TError>;
     /**
      * Configure live queries for [Event Iterator](https://orpc.dev/docs/event-iterator).
      * Unlike `.streamedOptions` which accumulates chunks, live queries replace the entire result with each new chunk received.
      * Works with hooks like `useQuery`, `useSuspenseQuery`, or `prefetchQuery`.
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#live-query-options Tanstack Live Query Options Utility Docs}
      */
-    experimental_liveOptions<U, USelectData = experimental_LiveQueryOutput<TOutput>>(...rest: MaybeOptionalOptions<U & QueryOptionsIn<TClientContext, TInput, experimental_LiveQueryOutput<TOutput>, TError, USelectData>>): NoInfer<U & Omit<QueryOptionsBase<experimental_LiveQueryOutput<TOutput>, TError>, keyof U>>;
+    liveOptions<USelectData = InferLiveQueryOutput<TOutput>, UInitialData = undefined>(...rest: MaybeOptionalOptions<QueryOptionsIn<TClientContext, TInput, InferLiveQueryOutput<TOutput>, TError, USelectData, UInitialData>>): NoInfer<QueryOptionsOut<InferLiveQueryOutput<TOutput>, TError, USelectData, UInitialData>>;
     /**
      * Generate a **full matching** key for [Infinite Query Options](https://orpc.dev/docs/integrations/tanstack-query#infinite-query-options).
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
      */
-    infiniteKey<UPageParam>(options: Pick<InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, InfiniteData<TOutput, UPageParam>, UPageParam>, 'input' | 'initialPageParam' | 'queryKey'>): DataTag<QueryKey, InfiniteData<TOutput, UPageParam>, TError>;
+    infiniteKey<UPageParam>(optionsIn: InfiniteKeyOptions<TInput, UPageParam>): DataTag<QueryKey, InfiniteData<TOutput, UPageParam>, TError>;
     /**
      * Generate options used for useInfiniteQuery/useSuspenseInfiniteQuery/prefetchInfiniteQuery/...
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#infinite-query-options Tanstack Infinite Query Options Utility Docs}
      */
-    infiniteOptions<U, UPageParam, USelectData = InfiniteData<TOutput, UPageParam>>(options: U & InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, USelectData, UPageParam>): NoInfer<U & Omit<InfiniteOptionsBase<TOutput, TError, UPageParam>, keyof U>>;
+    infiniteOptions<UPageParam, USelectData = InfiniteData<TOutput, UPageParam>, UInitialData = undefined>(optionsIn: InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, USelectData, UPageParam, UInitialData>): NoInfer<InfiniteOptionsOut<TOutput, TError, USelectData, UPageParam, UInitialData>>;
     /**
      * Generate a **full matching** key for [Mutation Options](https://orpc.dev/docs/integrations/tanstack-query#mutation-options).
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
      */
-    mutationKey(options?: Pick<MutationOptionsIn<TClientContext, TInput, TOutput, TError, any>, 'mutationKey'>): DataTag<QueryKey, TOutput, TError>;
+    mutationKey(optionsIn?: MutationKeyOptions): DataTag<QueryKey, TOutput, TError>;
     /**
      * Generate options used for useMutation/...
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#mutation-options Tanstack Mutation Options Docs}
      */
-    mutationOptions<UMutationContext>(...rest: MaybeOptionalOptions<MutationOptionsIn<TClientContext, TInput, TOutput, TError, UMutationContext>>): NoInfer<MutationOptions<TInput, TOutput, TError, UMutationContext>>;
+    mutationOptions<UMutationContext>(...rest: MaybeOptionalOptions<MutationOptionsIn<TClientContext, TInput, TOutput, TError, UMutationContext>>): NoInfer<MutationOptionsOut<TInput, TOutput, TError, UMutationContext>>;
 }
-interface experimental_ProcedureUtilsDefaults<TClientContext extends ClientContext, TInput, TOutput, TError> {
+
+interface RouterUtilsPlugin<T extends AnyNestedClient> extends OrderablePlugin {
     /**
-     * Default options for queryKey utility
+     * Initializes the router utils plugin and returns updated router utils options.
+     * Called once per plugin instance during composition.
+     *
+     * This method allows plugins to wrap, extend, or transform router utils options,
+     * such as interceptors or configuration.
      *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
+     * @param options - The current router utils options from previous plugins or base configuration
+     * @returns Transformed router utils options with this plugin's modifications applied
+     *
+     * @example
+     * ```ts
+     * init(options) {
+     *   return {
+     *     ...options,
+     *     mutationInterceptors: [...(options.mutationInterceptors ?? []), myInterceptor]
+     *   }
+     * }
+     * ```
      */
-    queryKey?: Partial<QueryKeyOptions<TInput>>;
+    init?(options: RouterUtilsOptions<T>): RouterUtilsOptions<T>;
     /**
-     * Default options for queryOptions utility
+     * Initializes per-procedure router utils options and returns updated options.
+     * Called once per procedure utils instance during composition.
+     *
+     * This method allows plugins to customize merged procedure-specific defaults,
+     * such as query or mutation options, for the current path.
      *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-options Tanstack Query Options Utility Docs}
+     * @param path - The current procedure path
+     * @param options - The merged procedure utils options for the current procedure
+     * @returns Transformed procedure utils options with this plugin's modifications applied
      */
-    queryOptions?: Partial<QueryOptionsIn<TClientContext, TInput, TOutput, TError, unknown>>;
+    initProcedureOptions?(path: string[], options: ProcedureUtilsOptions<InferClientContext<T>, any, any, InferClientError<T>>): ProcedureUtilsOptions<InferClientContext<T>, any, any, InferClientError<T>>;
+}
+
+declare class SharedRouterUtils<TInput> {
+    private readonly path;
+    constructor(path: string[]);
     /**
-     * Default options for experimental_streamedKey utility
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
+     * Generate a **partial matching** key for actions like revalidating queries, checking mutation status, etc.
      */
-    experimental_streamedKey?: Partial<experimental_StreamedKeyOptions<TInput>>;
+    key<TType extends OperationType>(options?: OperationKeyOptions<TType, TInput>): OperationKey<TType, TInput>;
+}
+type RouterUtils<T extends AnyNestedClient> = T extends Client<infer UClientContext, infer UInput, infer UOutput, infer UError> ? Public<ProcedureUtils<UClientContext, UInput, UOutput, UError>> & Public<SharedRouterUtils<UInput>> : {
+    [K in keyof T]: T[K] extends AnyNestedClient ? RouterUtils<T[K]> : never;
+} & Public<SharedRouterUtils<unknown>>;
+type RouterUtilsScoped<T extends AnyNestedClient> = T extends Client<infer UClientContext, infer UInput, infer UOutput, infer UError> ? ProcedureUtilsOptions<UClientContext, UInput, UOutput, UError> : {
+    [K in keyof T]?: T[K] extends AnyNestedClient ? RouterUtilsScoped<T[K]> : never;
+};
+interface RouterUtilsOptions<T extends AnyNestedClient> {
     /**
-     * Default options for experimental_streamedOptions utility
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#streamed-query-options Tanstack Streamed Query Options Utility Docs}
+     * Base path for all query keys. Use this to avoid conflicts when mounting
+     * multiple router utils instances.
      */
-    experimental_streamedOptions?: Partial<experimental_StreamedOptionsIn<TClientContext, TInput, experimental_StreamedQueryOutput<TOutput>, TError, unknown>>;
+    path?: string[] | undefined;
     /**
-     * Default options for experimental_liveKey utility
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
+     * Interceptors that intercept queryFn inside .queryOptions
      */
-    experimental_liveKey?: Partial<QueryKeyOptions<TInput>>;
+    queryInterceptors?: ProcedureUtilsQueryInterceptor<InferClientContext<T>, unknown, unknown, InferClientError<T>>[];
     /**
-     * Default options for experimental_liveOptions utility
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#live-query-options Tanstack Live Query Options Utility Docs}
+     * Interceptors that intercept queryFn inside .streamedOptions
      */
-    experimental_liveOptions?: Partial<QueryOptionsIn<TClientContext, TInput, experimental_LiveQueryOutput<TOutput>, TError, unknown>>;
+    streamedInterceptors?: ProcedureUtilsStreamedInterceptor<InferClientContext<T>, unknown, unknown, InferClientError<T>>[];
     /**
-     * Default options for infiniteKey utility
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
+     * Interceptors that intercept queryFn inside .liveOptions
      */
-    infiniteKey?: Partial<Pick<InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, InfiniteData<TOutput, unknown>, unknown>, 'input' | 'initialPageParam' | 'queryKey'>>;
+    liveInterceptors?: ProcedureUtilsLiveInterceptor<InferClientContext<T>, unknown, unknown, InferClientError<T>>[];
     /**
-     * Default options for infiniteOptions utility
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#infinite-query-options Tanstack Infinite Query Options Utility Docs}
+     * Interceptors that intercept queryFn inside .infiniteOptions
      */
-    infiniteOptions?: Partial<InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, unknown, unknown>>;
+    infiniteInterceptors?: ProcedureUtilsInfiniteInterceptor<InferClientContext<T>, unknown, unknown, InferClientError<T>>[];
     /**
-     * Default options for mutationKey utility
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#query-mutation-key Tanstack Query/Mutation Key Docs}
+     * Interceptors that intercept mutationFn inside .mutationOptions
      */
-    mutationKey?: Partial<Pick<MutationOptionsIn<TClientContext, TInput, TOutput, TError, any>, 'mutationKey'>>;
+    mutationInterceptors?: ProcedureUtilsMutationInterceptor<InferClientContext<T>, unknown, unknown, InferClientError<T>>[];
     /**
-     * Default options for mutationOptions utility
-     *
-     * @see {@link https://orpc.dev/docs/integrations/tanstack-query#mutation-options Tanstack Mutation Options Docs}
+     * Per-procedure options following the shape of the router.
+     * Allows fine-grained configuration of individual procedure utils
+     * without affecting the rest of the router.
      */
-    mutationOptions?: Partial<MutationOptionsIn<TClientContext, TInput, TOutput, TError, unknown>>;
-}
-/**
- * @todo remove default generic types on v2
- */
-interface CreateProcedureUtilsOptions<TClientContext extends ClientContext = ClientContext, TInput = unknown, TOutput = unknown, TError = unknown> {
-    path: readonly string[];
-    experimental_defaults?: experimental_ProcedureUtilsDefaults<TClientContext, TInput, TOutput, TError>;
-}
-declare function createProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError>(client: Client<TClientContext, TInput, TOutput, TError>, options: CreateProcedureUtilsOptions<TClientContext, TInput, TOutput, TError>): ProcedureUtils<TClientContext, TInput, TOutput, TError>;
-
-type RouterUtils<T extends NestedClient<any>> = T extends Client<infer UClientContext, infer UInput, infer UOutput, infer UError> ? ProcedureUtils<UClientContext, UInput, UOutput, UError> & GeneralUtils<UInput> : {
-    [K in keyof T]: T[K] extends NestedClient<any> ? RouterUtils<T[K]> : never;
-} & GeneralUtils<unknown>;
-type experimental_RouterUtilsDefaults<T extends NestedClient<any>> = T extends Client<infer UClientContext, infer UInput, infer UOutput, infer UError> ? experimental_ProcedureUtilsDefaults<UClientContext, UInput, UOutput, UError> : {
-    [K in keyof T]?: T[K] extends NestedClient<any> ? experimental_RouterUtilsDefaults<T[K]> : never;
-};
-/**
- * @todo remove default generic types on v2
- */
-interface CreateRouterUtilsOptions<T extends NestedClient<any> = NestedClient<any>> {
-    path?: readonly string[];
-    experimental_defaults?: experimental_RouterUtilsDefaults<T>;
+    scoped?: RouterUtilsScoped<T> | undefined;
+    /**
+     * Plugins to extend router utils behavior.
+     */
+    plugins?: RouterUtilsPlugin<T>[] | undefined;
 }
 /**
  * Create a router utils from a client.
  *
  * @info Both client-side and server-side clients are supported.
- * @see {@link https://orpc.dev/docs/integrations/tanstack-query Tanstack Query Integration}
  */
-declare function createRouterUtils<T extends NestedClient<any>>(client: T, options?: CreateRouterUtilsOptions<T>): RouterUtils<T>;
+declare function createRouterUtils<T extends AnyNestedClient>(client: T, options?: NoInfer<RouterUtilsOptions<T>>): RouterUtils<T>;
+
+interface ContractUtilsFactory<TClientContext extends ClientContext> {
+    <TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap>(procedure: ProcedureContract<TInputSchema, TOutputSchema, TErrorMap>): Public<SharedRouterUtils<InferSchemaInput<TInputSchema>>> & Public<ProcedureUtils<TClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | ThrowableError>>;
+}
+interface ContractUtilsFactoryOptions<TClientContext extends ClientContext> extends RouterUtilsOptions<RouterContractClient<RouterContract, TClientContext>> {
+}
+declare function createContractUtilsFactory<TClientContext extends ClientContext>(caller: ContractCaller<TClientContext>, options: ContractUtilsFactoryOptions<TClientContext>): ContractUtilsFactory<TClientContext>;
+interface ContractJsonifiedUtilsFactory<TClientContext extends ClientContext> {
+    <TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap>(procedure: ProcedureContract<TInputSchema, TOutputSchema, TErrorMap>): SharedRouterUtils<InferSchemaInput<TInputSchema>> & ProcedureUtils<TClientContext, InferSchemaInput<TInputSchema>, JsonifiedValue<InferSchemaOutput<TOutputSchema>>, JsonifiedClientError<ORPCErrorFromErrorMap<TErrorMap> | ThrowableError>>;
+}
+interface ContractJsonifiedUtilsFactoryOptions<TClientContext extends ClientContext> extends RouterUtilsOptions<JsonifiedClient<RouterContractClient<RouterContract, TClientContext>>> {
+}
+declare function createContractJsonifiedUtilsFactory<TClientContext extends ClientContext>(caller: ContractCaller<TClientContext>, options: ContractJsonifiedUtilsFactoryOptions<TClientContext>): ContractJsonifiedUtilsFactory<TClientContext>;
+
+declare function generateOperationKey<TType extends OperationType, TInput>(path: string[], state?: OperationKeyOptions<TType, TInput>): OperationKey<TType, TInput>;
 
-export { OPERATION_CONTEXT_SYMBOL, OPERATION_CONTEXT_SYMBOL as TANSTACK_QUERY_OPERATION_CONTEXT_SYMBOL, createGeneralUtils, createProcedureUtils, createRouterUtils, createRouterUtils as createTanstackQueryUtils, experimental_serializableStreamedQuery, generateOperationKey };
-export type { CreateProcedureUtilsOptions, CreateRouterUtilsOptions, GeneralUtils, InfiniteOptionsBase, InfiniteOptionsIn, MutationOptions, MutationOptionsIn, OperationContext, OperationKey, OperationKeyOptions, OperationType, ProcedureUtils, QueryKeyOptions, QueryOptionsBase, QueryOptionsIn, RouterUtils, OperationContext as TanstackQueryOperationContext, experimental_LiveQueryOutput, experimental_ProcedureUtilsDefaults, experimental_RouterUtilsDefaults, experimental_SerializableStreamedQueryOptions, experimental_StreamedKeyOptions, experimental_StreamedOptionsBase, experimental_StreamedOptionsIn, experimental_StreamedQueryOutput };
+export { OPERATION_CONTEXT_SYMBOL, ProcedureUtils, SharedRouterUtils, OPERATION_CONTEXT_SYMBOL as TANSTACK_QUERY_OPERATION_CONTEXT_SYMBOL, createContractJsonifiedUtilsFactory, createContractUtilsFactory, createRouterUtils, createRouterUtils as createTanstackQueryUtils, generateOperationKey, serializableStreamedQuery };
+export type { ContractJsonifiedUtilsFactory, ContractJsonifiedUtilsFactoryOptions, ContractUtilsFactory, ContractUtilsFactoryOptions, InferLiveQueryOutput, InferStreamedQueryOutput, InfiniteKeyOptions, InfiniteOptionsIn, InfiniteOptionsOut, MutationKeyOptions, MutationOptionsIn, MutationOptionsOut, OperationContext, OperationKey, OperationKeyOptions, OperationType, ProcedureUtilsInfiniteInterceptor, ProcedureUtilsInfiniteInterceptorOptions, ProcedureUtilsLiveInterceptor, ProcedureUtilsLiveInterceptorOptions, ProcedureUtilsModifier, ProcedureUtilsMutationInterceptor, ProcedureUtilsMutationInterceptorOptions, ProcedureUtilsOptions, ProcedureUtilsQueryInterceptor, ProcedureUtilsQueryInterceptorOptions, ProcedureUtilsStreamedInterceptor, ProcedureUtilsStreamedInterceptorOptions, QueryKeyOptions, QueryOptionsIn, QueryOptionsOut, RouterUtils, RouterUtilsOptions, RouterUtilsScoped, SerializableStreamedQueryOptions, StreamedKeyOptions, StreamedOptionsIn, StreamedOptionsOut, OperationContext as TanstackQueryOperationContext };