@orpc/react 0.14.0 → 0.16.0

package/dist/index.js

@@ -275,7 +275,7 @@ function createProcedureHooks(options) {
       return useQuery(
         {
           queryKey: getQueryKeyFromPath(options.path, { input, type: "query" }),
-          queryFn: () => client(input),
+          queryFn: ({ signal }) => client(input, { signal }),
           ...options_
         },
         context.queryClient
@@ -291,7 +291,7 @@ function createProcedureHooks(options) {
             input,
             type: "infinite"
           }),
-          queryFn: ({ pageParam }) => client({ ...input, cursor: pageParam }),
+          queryFn: ({ pageParam, signal }) => client({ ...input, cursor: pageParam }, { signal }),
           ...rest
         },
         context.queryClient
@@ -303,7 +303,7 @@ function createProcedureHooks(options) {
       return useSuspenseQuery(
         {
           queryKey: getQueryKeyFromPath(options.path, { input, type: "query" }),
-          queryFn: () => client(input),
+          queryFn: ({ signal }) => client(input, { signal }),
           ...options_
         },
         context.queryClient
@@ -319,7 +319,7 @@ function createProcedureHooks(options) {
             input,
             type: "infinite"
           }),
-          queryFn: ({ pageParam }) => client({ ...input, cursor: pageParam }),
+          queryFn: ({ pageParam, signal }) => client({ ...input, cursor: pageParam }, { signal }),
           ...rest
         },
         context.queryClient
@@ -331,7 +331,7 @@ function createProcedureHooks(options) {
       return usePrefetchQuery(
         {
           queryKey: getQueryKeyFromPath(options.path, { input, type: "query" }),
-          queryFn: () => client(input),
+          queryFn: ({ signal }) => client(input, { signal }),
           ...options_
         },
         context.queryClient
@@ -347,7 +347,7 @@ function createProcedureHooks(options) {
             input,
             type: "infinite"
           }),
-          queryFn: ({ pageParam }) => client({ ...input, cursor: pageParam }),
+          queryFn: ({ pageParam, signal }) => client({ ...input, cursor: pageParam }, { signal }),
           ...rest
         },
         context.queryClient
@@ -374,7 +374,7 @@ function createProcedureUtils(options) {
     fetchQuery(input, options_) {
       return options.queryClient.fetchQuery({
         queryKey: getQueryKeyFromPath(options.path, { input, type: "query" }),
-        queryFn: () => options.client(input),
+        queryFn: ({ signal }) => options.client(input, { signal }),
         ...options_
       });
     },
@@ -385,8 +385,8 @@ function createProcedureUtils(options) {
           input,
           type: "infinite"
         }),
-        queryFn: ({ pageParam }) => {
-          return options.client({ ...input, pageParam });
+        queryFn: ({ pageParam, signal }) => {
+          return options.client({ ...input, pageParam }, { signal });
         },
         ...rest
       });
@@ -397,7 +397,7 @@ function createProcedureUtils(options) {
           input,
           type: "query"
         }),
-        queryFn: () => options.client(input),
+        queryFn: ({ signal }) => options.client(input, { signal }),
         ...options_
       });
     },
@@ -408,8 +408,8 @@ function createProcedureUtils(options) {
           input,
           type: "infinite"
         }),
-        queryFn: ({ pageParam }) => {
-          return options.client({ ...input, cursor: pageParam });
+        queryFn: ({ pageParam, signal }) => {
+          return options.client({ ...input, cursor: pageParam }, { signal });
         },
         ...rest
       });
@@ -436,7 +436,7 @@ function createProcedureUtils(options) {
           input,
           type: "query"
         }),
-        queryFn: () => options.client(input),
+        queryFn: ({ signal }) => options.client(input, { signal }),
         ...options_
       });
     },
@@ -447,8 +447,8 @@ function createProcedureUtils(options) {
           input,
           type: "infinite"
         }),
-        queryFn: ({ pageParam }) => {
-          return options.client({ ...input, pageParam });
+        queryFn: ({ pageParam, signal }) => {
+          return options.client({ ...input, pageParam }, { signal });
         },
         ...rest
       });
@@ -584,7 +584,7 @@ function createUseQueriesBuilder(options) {
   return (input, options_) => {
     return {
       queryKey: getQueryKeyFromPath(options.path, { input, type: "query" }),
-      queryFn: () => options.client(input),
+      queryFn: ({ signal }) => options.client(input, { signal }),
       ...options_
     };
   };

package/dist/src/general-utils.d.ts

@@ -2,17 +2,17 @@ import type { Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { PartialDeep, SetOptional } from '@orpc/shared';
 import type { CancelOptions, DefaultError, InfiniteData, InvalidateOptions, MutationFilters, MutationObserverOptions, OmitKeyof, QueryClient, QueryKey, QueryObserverOptions, RefetchOptions, ResetOptions, SetDataOptions, Updater } from '@tanstack/react-query';
 import type { ORPCInvalidateQueryFilters, ORPCQueryFilters } from './tanstack-query';
-import type { SchemaInputForInfiniteQuery } from './types';
+import type { InferCursor, SchemaInputForInfiniteQuery } from './types';
 export interface GeneralUtils<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> {
     getQueriesData: (filters?: OmitKeyof<ORPCQueryFilters<PartialDeep<SchemaInput<TInputSchema>>>, 'queryType'>) => [QueryKey, SchemaOutput<TOutputSchema, TFuncOutput> | undefined][];
     getInfiniteQueriesData: (filters?: OmitKeyof<ORPCQueryFilters<PartialDeep<SchemaInputForInfiniteQuery<TInputSchema>>>, 'queryType'>) => [
         QueryKey,
-        undefined | InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']>
+        undefined | InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>>
     ][];
     setQueriesData: (filters: OmitKeyof<ORPCQueryFilters<PartialDeep<SchemaInput<TInputSchema>>>, 'queryType'>, updater: Updater<SchemaOutput<TOutputSchema, TFuncOutput> | undefined, SchemaOutput<TOutputSchema, TFuncOutput> | undefined>, options?: SetDataOptions) => [QueryKey, SchemaOutput<TOutputSchema, TFuncOutput> | undefined][];
-    setInfiniteQueriesData: (filters: OmitKeyof<ORPCQueryFilters<PartialDeep<SchemaInputForInfiniteQuery<TInputSchema>>>, 'queryType'>, updater: Updater<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']> | undefined, InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']> | undefined>, options?: SetDataOptions) => [
+    setInfiniteQueriesData: (filters: OmitKeyof<ORPCQueryFilters<PartialDeep<SchemaInputForInfiniteQuery<TInputSchema>>>, 'queryType'>, updater: Updater<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>> | undefined, InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>> | undefined>, options?: SetDataOptions) => [
         QueryKey,
-        undefined | InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']>
+        undefined | InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>>
     ][];
     invalidate: (filters?: ORPCInvalidateQueryFilters<PartialDeep<SchemaInput<TInputSchema>>>, options?: InvalidateOptions) => Promise<void>;
     refetch: (filters?: ORPCQueryFilters<PartialDeep<SchemaInput<TInputSchema>>>, options?: RefetchOptions) => Promise<void>;
@@ -22,9 +22,9 @@ export interface GeneralUtils<TInputSchema extends Schema, TOutputSchema extends
     isFetching: (filters?: ORPCQueryFilters<PartialDeep<SchemaInput<TInputSchema>>>) => number;
     isMutating: (filters?: SetOptional<MutationFilters, 'mutationKey'>) => number;
     getQueryDefaults: (filters?: Pick<ORPCQueryFilters<PartialDeep<SchemaInput<TInputSchema>>>, 'input' | 'queryKey'>) => OmitKeyof<QueryObserverOptions<SchemaOutput<TOutputSchema, TFuncOutput>>, 'queryKey'>;
-    getInfiniteQueryDefaults: (filters?: Pick<ORPCQueryFilters<PartialDeep<SchemaInputForInfiniteQuery<TInputSchema>>>, 'input' | 'queryKey'>) => OmitKeyof<QueryObserverOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>>, QueryKey, SchemaInput<TInputSchema>['cursor']>, 'queryKey'>;
+    getInfiniteQueryDefaults: (filters?: Pick<ORPCQueryFilters<PartialDeep<SchemaInputForInfiniteQuery<TInputSchema>>>, 'input' | 'queryKey'>) => OmitKeyof<QueryObserverOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>>, QueryKey, InferCursor<TInputSchema>>, 'queryKey'>;
     setQueryDefaults: (options: Partial<OmitKeyof<QueryObserverOptions<SchemaOutput<TOutputSchema, TFuncOutput>>, 'queryKey'>>, filters?: Pick<ORPCQueryFilters<PartialDeep<SchemaInput<TInputSchema>>>, 'input' | 'queryKey'>) => void;
-    setInfiniteQueryDefaults: (options: Partial<OmitKeyof<QueryObserverOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>>, QueryKey, SchemaInput<TInputSchema>['cursor']>, 'queryKey'>>, filters?: Pick<ORPCQueryFilters<PartialDeep<SchemaInput<TInputSchema>>>, 'input' | 'queryKey'>) => void;
+    setInfiniteQueryDefaults: (options: Partial<OmitKeyof<QueryObserverOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>>, QueryKey, InferCursor<TInputSchema>>, 'queryKey'>>, filters?: Pick<ORPCQueryFilters<PartialDeep<SchemaInput<TInputSchema>>>, 'input' | 'queryKey'>) => void;
     getMutationDefaults: (filters?: Pick<MutationFilters, 'mutationKey'>) => MutationObserverOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaInput<TInputSchema>>;
     setMutationDefaults: (options: OmitKeyof<MutationObserverOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaInput<TInputSchema>>, 'mutationKey'>, filters?: Pick<MutationFilters, 'mutationKey'>) => void;
 }

package/dist/src/procedure-hooks.d.ts

@@ -1,19 +1,19 @@
 import type { Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
-import type { SchemaInputForInfiniteQuery } from './types';
+import type { InferCursor, SchemaInputForInfiniteQuery } from './types';
 import { type PartialOnUndefinedDeep, type SetOptional } from '@orpc/shared';
 import { type DefaultError, type FetchInfiniteQueryOptions, type FetchQueryOptions, type InfiniteData, type QueryKey, type UseInfiniteQueryOptions, type UseInfiniteQueryResult, type UseMutationOptions, type UseMutationResult, type UseQueryOptions, type UseQueryResult, type UseSuspenseInfiniteQueryOptions, type UseSuspenseInfiniteQueryResult, type UseSuspenseQueryOptions, type UseSuspenseQueryResult } from '@tanstack/react-query';
 import { type ORPCContext } from './react-context';
 export interface ProcedureHooks<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> {
     useQuery: <USelectData = SchemaOutput<TOutputSchema, TFuncOutput>>(input: SchemaInput<TInputSchema>, options?: SetOptional<UseQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, USelectData>, 'queryFn' | 'queryKey'>) => UseQueryResult<USelectData>;
-    useInfiniteQuery: <USelectData = InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']>>(options: PartialOnUndefinedDeep<SetOptional<UseInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, USelectData, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, SchemaInput<TInputSchema>['cursor']>, 'queryFn' | 'queryKey'> & {
+    useInfiniteQuery: <USelectData = InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>>>(options: PartialOnUndefinedDeep<SetOptional<UseInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, USelectData, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, InferCursor<TInputSchema>>, 'queryFn' | 'queryKey'> & {
         input: SchemaInputForInfiniteQuery<TInputSchema>;
     }>) => UseInfiniteQueryResult<USelectData>;
     useSuspenseQuery: <USelectData = SchemaOutput<TOutputSchema, TFuncOutput>>(input: SchemaInput<TInputSchema>, options?: SetOptional<UseSuspenseQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, USelectData>, 'queryFn' | 'queryKey'>) => UseSuspenseQueryResult<USelectData>;
-    useSuspenseInfiniteQuery: <USelectData = InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']>>(options: PartialOnUndefinedDeep<SetOptional<UseSuspenseInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, USelectData, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, SchemaInput<TInputSchema>['cursor']>, 'queryFn' | 'queryKey'> & {
+    useSuspenseInfiniteQuery: <USelectData = InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>>>(options: PartialOnUndefinedDeep<SetOptional<UseSuspenseInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, USelectData, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, InferCursor<TInputSchema>>, 'queryFn' | 'queryKey'> & {
         input: SchemaInputForInfiniteQuery<TInputSchema>;
     }>) => UseSuspenseInfiniteQueryResult<USelectData>;
     usePrefetchQuery: (input: SchemaInput<TInputSchema>, options?: FetchQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>>) => void;
-    usePrefetchInfiniteQuery: (options: PartialOnUndefinedDeep<SetOptional<FetchInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, SchemaInput<TInputSchema>['cursor']>, 'queryKey' | 'queryFn'> & {
+    usePrefetchInfiniteQuery: (options: PartialOnUndefinedDeep<SetOptional<FetchInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, InferCursor<TInputSchema>>, 'queryKey' | 'queryFn'> & {
         input: SchemaInputForInfiniteQuery<TInputSchema>;
     }>) => void;
     useMutation: (options?: SetOptional<UseMutationOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaInput<TInputSchema>>, 'mutationFn' | 'mutationKey'>) => UseMutationResult<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaInput<TInputSchema>>;

package/dist/src/procedure-utils.d.ts

@@ -1,30 +1,30 @@
-import type { ProcedureClient } from '@orpc/client';
 import type { Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Caller } from '@orpc/server';
 import type { PartialOnUndefinedDeep, SetOptional } from '@orpc/shared';
 import type { DefaultError, EnsureInfiniteQueryDataOptions, EnsureQueryDataOptions, FetchInfiniteQueryOptions, FetchQueryOptions, InfiniteData, QueryClient, QueryKey, QueryState, SetDataOptions, Updater } from '@tanstack/react-query';
-import type { SchemaInputForInfiniteQuery } from './types';
+import type { InferCursor, SchemaInputForInfiniteQuery } from './types';
 export interface ProcedureUtils<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> {
     fetchQuery: (input: SchemaInput<TInputSchema>, options?: SetOptional<FetchQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>>, 'queryKey' | 'queryFn'>) => Promise<SchemaOutput<TOutputSchema, TFuncOutput>>;
-    fetchInfiniteQuery: (options: PartialOnUndefinedDeep<SetOptional<FetchInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, SchemaInput<TInputSchema>['cursor']>, 'queryKey' | 'queryFn'> & {
+    fetchInfiniteQuery: (options: PartialOnUndefinedDeep<SetOptional<FetchInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, InferCursor<TInputSchema>>, 'queryKey' | 'queryFn'> & {
         input: SchemaInputForInfiniteQuery<TInputSchema>;
-    }>) => Promise<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']>>;
+    }>) => Promise<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>>>;
     prefetchQuery: (input: SchemaInput<TInputSchema>, options?: SetOptional<FetchQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>>, 'queryKey' | 'queryFn'>) => Promise<void>;
-    prefetchInfiniteQuery: (options: PartialOnUndefinedDeep<SetOptional<FetchInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, SchemaInput<TInputSchema>['cursor']>, 'queryKey' | 'queryFn'> & {
+    prefetchInfiniteQuery: (options: PartialOnUndefinedDeep<SetOptional<FetchInfiniteQueryOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, InferCursor<TInputSchema>>, 'queryKey' | 'queryFn'> & {
         input: SchemaInputForInfiniteQuery<TInputSchema>;
     }>) => Promise<void>;
     getQueryData: (input: SchemaInput<TInputSchema>) => SchemaOutput<TOutputSchema, TFuncOutput> | undefined;
-    getInfiniteQueryData: (input: SchemaInputForInfiniteQuery<TInputSchema>) => InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']> | undefined;
+    getInfiniteQueryData: (input: SchemaInputForInfiniteQuery<TInputSchema>) => InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>> | undefined;
     ensureQueryData: (input: SchemaInput<TInputSchema>, options?: SetOptional<EnsureQueryDataOptions<SchemaOutput<TOutputSchema, TFuncOutput>>, 'queryFn' | 'queryKey'>) => Promise<SchemaOutput<TOutputSchema, TFuncOutput>>;
-    ensureInfiniteQueryData: (options: PartialOnUndefinedDeep<SetOptional<EnsureInfiniteQueryDataOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, SchemaInput<TInputSchema>['cursor']>, 'queryKey' | 'queryFn'> & {
+    ensureInfiniteQueryData: (options: PartialOnUndefinedDeep<SetOptional<EnsureInfiniteQueryDataOptions<SchemaOutput<TOutputSchema, TFuncOutput>, DefaultError, SchemaOutput<TOutputSchema, TFuncOutput>, QueryKey, InferCursor<TInputSchema>>, 'queryKey' | 'queryFn'> & {
         input: SchemaInputForInfiniteQuery<TInputSchema>;
-    }>) => Promise<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']>>;
+    }>) => Promise<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>>>;
     getQueryState: (input: SchemaInput<TInputSchema>) => QueryState<SchemaOutput<TOutputSchema, TFuncOutput>> | undefined;
-    getInfiniteQueryState: (input: SchemaInputForInfiniteQuery<TInputSchema>) => QueryState<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']>> | undefined;
+    getInfiniteQueryState: (input: SchemaInputForInfiniteQuery<TInputSchema>) => QueryState<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>>> | undefined;
     setQueryData: (input: SchemaInput<TInputSchema>, updater: Updater<SchemaOutput<TOutputSchema, TFuncOutput> | undefined, SchemaOutput<TOutputSchema, TFuncOutput> | undefined>, options?: SetDataOptions) => SchemaOutput<TOutputSchema, TFuncOutput> | undefined;
-    setInfiniteQueryData: (input: SchemaInputForInfiniteQuery<TInputSchema>, updater: Updater<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']> | undefined, InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']> | undefined>, options?: SetDataOptions) => InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, SchemaInput<TInputSchema>['cursor']> | undefined;
+    setInfiniteQueryData: (input: SchemaInputForInfiniteQuery<TInputSchema>, updater: Updater<InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>> | undefined, InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>> | undefined>, options?: SetDataOptions) => InfiniteData<SchemaOutput<TOutputSchema, TFuncOutput>, InferCursor<TInputSchema>> | undefined;
 }
-export interface CreateProcedureUtilsOptions<TInputSchema extends Schema = undefined, TOutputSchema extends Schema = undefined, TFuncOutput extends SchemaOutput<TOutputSchema> = SchemaOutput<TOutputSchema>> {
-    client: ProcedureClient<TInputSchema, TOutputSchema, TFuncOutput>;
+export interface CreateProcedureUtilsOptions<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput> {
+    client: Caller<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, TFuncOutput>>;
     queryClient: QueryClient;
     /**
      * The path of procedure on sever

package/dist/src/react-context.d.ts

@@ -1,10 +1,10 @@
-import type { RouterClientWithContractRouter, RouterClientWithRouter } from '@orpc/client';
+import type { RouterClient } from '@orpc/client';
 import type { ContractRouter } from '@orpc/contract';
 import type { Router } from '@orpc/server';
 import type { QueryClient } from '@tanstack/react-query';
 import { type Context } from 'react';
 export interface ORPCContextValue<TRouter extends ContractRouter | Router<any>> {
-    client: TRouter extends ContractRouter ? RouterClientWithContractRouter<TRouter> : TRouter extends Router<any> ? RouterClientWithRouter<TRouter> : never;
+    client: RouterClient<TRouter>;
     queryClient: QueryClient;
 }
 export type ORPCContext<TRouter extends ContractRouter | Router<any>> = Context<ORPCContextValue<TRouter> | undefined>;

package/dist/src/types.d.ts

@@ -1,5 +1,6 @@
 import type { Schema, SchemaInput } from '@orpc/contract';
-export type SchemaInputForInfiniteQuery<TInputSchema extends Schema> = Omit<SchemaInput<TInputSchema>, 'cursor'> & (Record<string | number, any> & {
-    cursor?: never;
-});
+export type SchemaInputForInfiniteQuery<TInputSchema extends Schema> = Omit<SchemaInput<TInputSchema>, 'cursor'>;
+export type InferCursor<TInputSchema extends Schema> = SchemaInput<TInputSchema> extends {
+    cursor?: any;
+} ? SchemaInput<TInputSchema>['cursor'] : never;
 //# sourceMappingURL=types.d.ts.map

package/dist/src/use-queries/builder.d.ts

@@ -1,5 +1,5 @@
-import type { ProcedureClient } from '@orpc/client';
 import type { Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Caller } from '@orpc/server';
 import type { SetOptional } from '@orpc/shared';
 import type { DefaultError, OmitKeyof, QueriesPlaceholderDataFunction, QueryKey, UseQueryOptions } from '@tanstack/react-query';
 type UseQueryOptionsForUseQueries<TQueryFnData, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> = OmitKeyof<UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'placeholderData'> & {
@@ -9,7 +9,7 @@ export interface UseQueriesBuilder<TInputSchema extends Schema, TOutputSchema ex
     (input: SchemaInput<TInputSchema>, options?: SetOptional<UseQueryOptionsForUseQueries<SchemaOutput<TOutputSchema, TFuncOutput>>, 'queryFn' | 'queryKey'>): UseQueryOptionsForUseQueries<SchemaOutput<TOutputSchema, TFuncOutput>>;
 }
 export interface CreateUseQueriesBuilderOptions<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> {
-    client: ProcedureClient<TInputSchema, TOutputSchema, TFuncOutput>;
+    client: Caller<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, TFuncOutput>>;
     /**
      * The path of procedure on server
      */

package/dist/src/use-queries/builders.d.ts

@@ -1,4 +1,4 @@
-import type { RouterClientWithContractRouter, RouterClientWithRouter } from '@orpc/client';
+import type { RouterClient } from '@orpc/client';
 import type { ContractProcedure, ContractRouter, SchemaOutput } from '@orpc/contract';
 import type { Procedure, Router } from '@orpc/server';
 import { type UseQueriesBuilder } from './builder';
@@ -9,7 +9,7 @@ export type UseQueriesBuildersWithRouter<TRouter extends Router<any>> = {
     [K in keyof TRouter]: TRouter[K] extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? UseQueriesBuilder<UInputSchema, UOutputSchema, UFuncOutput> : TRouter[K] extends Router<any> ? UseQueriesBuildersWithRouter<TRouter[K]> : never;
 };
 export interface CreateUseQueriesBuildersOptions<TRouter extends Router<any> | ContractRouter> {
-    client: TRouter extends Router<any> ? RouterClientWithRouter<TRouter> : TRouter extends ContractRouter ? RouterClientWithContractRouter<TRouter> : never;
+    client: RouterClient<TRouter>;
     /**
      * The path of router on server
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/react",
   "type": "module",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -29,17 +29,17 @@
     "dist"
   ],
   "peerDependencies": {
-    "@tanstack/react-query": ">=5.59.0",
+    "@tanstack/react-query": ">=5.55.0",
     "react": ">=18.3.0",
-    "@orpc/client": "0.14.0",
-    "@orpc/server": "0.14.0",
-    "@orpc/contract": "0.14.0"
+    "@orpc/client": "0.16.0",
+    "@orpc/server": "0.16.0",
+    "@orpc/contract": "0.16.0"
   },
   "dependencies": {
-    "@orpc/shared": "0.14.0"
+    "@orpc/shared": "0.16.0"
   },
   "devDependencies": {
-    "zod": "^3.23.8"
+    "zod": "^3.24.1"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",