@orpc/react 0.14.0 → 0.15.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/procedure-utils.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 { 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';
@@ -24,7 +24,7 @@ export interface ProcedureUtils<TInputSchema extends Schema, TOutputSchema exten
     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;
 }
 export interface CreateProcedureUtilsOptions<TInputSchema extends Schema = undefined, TOutputSchema extends Schema = undefined, TFuncOutput extends SchemaOutput<TOutputSchema> = SchemaOutput<TOutputSchema>> {
-    client: ProcedureClient<TInputSchema, TOutputSchema, 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/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.15.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.15.0",
+    "@orpc/contract": "0.15.0",
+    "@orpc/server": "0.15.0"
   },
   "dependencies": {
-    "@orpc/shared": "0.14.0"
+    "@orpc/shared": "0.15.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'",