@orpc/react-query 0.36.1 → 0.37.0

package/dist/index.js

@@ -2,17 +2,13 @@
 function buildKey(path, options) {
   const withInput = options?.input !== void 0 ? { input: options?.input } : {};
   const withType = options?.type !== void 0 ? { type: options?.type } : {};
-  return [
-    "__ORPC__",
-    path,
-    {
-      ...withInput,
-      ...withType
-    }
-  ];
+  return [path, {
+    ...withInput,
+    ...withType
+  }];
 }
 
-// src/utils-general.ts
+// src/general-utils.ts
 function createGeneralUtils(path) {
   return {
     key(options) {
@@ -21,37 +17,36 @@ function createGeneralUtils(path) {
   };
 }
 
-// src/utils-procedure.ts
+// src/procedure-utils.ts
 function createProcedureUtils(client, path) {
   return {
-    queryOptions(...[options]) {
-      const input = options?.input;
+    queryOptions(...[{ input, context, ...rest } = {}]) {
       return {
         queryKey: buildKey(path, { type: "query", input }),
-        queryFn: ({ signal }) => client(input, { signal, context: options?.context }),
-        ...options
+        queryFn: ({ signal }) => client(input, { signal, context }),
+        ...rest
       };
     },
-    infiniteOptions(options) {
-      const input = options.input;
+    infiniteOptions({ input, context, ...rest }) {
       return {
-        initialPageParam: void 0,
-        queryKey: buildKey(path, { type: "infinite", input }),
-        queryFn: ({ pageParam, signal }) => client({ ...input, cursor: pageParam }, { signal, context: options.context }),
-        ...options
+        queryKey: buildKey(path, { type: "infinite", input: input(rest.initialPageParam) }),
+        queryFn: ({ pageParam, signal }) => {
+          return client(input(pageParam), { signal, context });
+        },
+        ...rest
       };
     },
-    mutationOptions(...[options]) {
+    mutationOptions(...[{ context, ...rest } = {}]) {
       return {
         mutationKey: buildKey(path, { type: "mutation" }),
-        mutationFn: (input) => client(input, { context: options?.context }),
-        ...options
+        mutationFn: (input) => client(input, { context }),
+        ...rest
       };
     }
   };
 }
 
-// src/utils-router.ts
+// src/router-utils.ts
 function createRouterUtils(client, path = []) {
   const generalUtils = createGeneralUtils(path);
   const procedureUtils = createProcedureUtils(client, path);

package/dist/src/{utils-general.d.ts → general-utils.d.ts}

@@ -7,4 +7,4 @@ export interface GeneralUtils<TInput> {
     key<UType extends KeyType = undefined>(options?: BuildKeyOptions<UType, TInput>): QueryKey;
 }
 export declare function createGeneralUtils<TInput>(path: string[]): GeneralUtils<TInput>;
-//# sourceMappingURL=utils-general.d.ts.map
+//# sourceMappingURL=general-utils.d.ts.map

package/dist/src/index.d.ts

@@ -1,8 +1,8 @@
-import { createRouterUtils } from './utils-router';
+import { createRouterUtils } from './router-utils';
+export * from './general-utils';
 export * from './key';
+export * from './procedure-utils';
+export * from './router-utils';
 export * from './types';
-export * from './utils-general';
-export * from './utils-procedure';
-export * from './utils-router';
 export declare const createORPCReactQueryUtils: typeof createRouterUtils;
 //# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,11 @@
+import type { Client } from '@orpc/contract';
+import type { MaybeOptionalOptions } from '@orpc/shared';
+import type { InfiniteData } from '@tanstack/react-query';
+import type { InfiniteOptionsBase, InfiniteOptionsIn, MutationOptionsBase, MutationOptionsIn, QueryOptionsBase, QueryOptionsIn } from './types';
+export interface ProcedureUtils<TClientContext, TInput, TOutput, TError extends Error> {
+    queryOptions<U, USelectData = TOutput>(...rest: MaybeOptionalOptions<U & QueryOptionsIn<TClientContext, TInput, TOutput, TError, USelectData>>): NoInfer<U & QueryOptionsBase<TOutput, TError>>;
+    infiniteOptions<U, UPageParam, USelectData = InfiniteData<TOutput>>(options: U & InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, USelectData, UPageParam>): NoInfer<U & InfiniteOptionsBase<TOutput, TError, UPageParam>>;
+    mutationOptions<U>(...rest: MaybeOptionalOptions<U & MutationOptionsIn<TClientContext, TInput, TOutput, TError>>): NoInfer<U & MutationOptionsBase<TInput, TOutput, TError>>;
+}
+export declare function createProcedureUtils<TClientContext, TInput, TOutput, TError extends Error>(client: Client<TClientContext, TInput, TOutput, TError>, path: string[]): ProcedureUtils<TClientContext, TInput, TOutput, TError>;
+//# sourceMappingURL=procedure-utils.d.ts.map

package/dist/src/{utils-router.d.ts → router-utils.d.ts}

@@ -1,12 +1,12 @@
 import type { Client, NestedClient } from '@orpc/contract';
-import { type GeneralUtils } from './utils-general';
-import { type ProcedureUtils } from './utils-procedure';
+import { type GeneralUtils } from './general-utils';
+import { type ProcedureUtils } from './procedure-utils';
 export 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>;
 /**
- * @param client - The client create form `@orpc/client`
- * @param path - The base path for query key
+ * @param client - Any kind of oRPC clients: `createRouterClient`, `createORPCClient`, ...
+ * @param path - The base path for query key, when it it will be prefix to all keys
  */
 export declare function createRouterUtils<T extends NestedClient<any>>(client: T, path?: string[]): RouterUtils<T>;
-//# sourceMappingURL=utils-router.d.ts.map
+//# sourceMappingURL=router-utils.d.ts.map

package/dist/src/types.d.ts

@@ -1,14 +1,6 @@
 import type { SetOptional } from '@orpc/shared';
-import type { QueryFunctionContext, QueryKey, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, UseMutationOptions } from '@tanstack/react-query';
-export type InferCursor<T> = T extends {
-    cursor?: any;
-} ? T['cursor'] : never;
-export interface QueryOptionsBase<TOutput, TError extends Error> {
-    queryKey: QueryKey;
-    queryFn(ctx: QueryFunctionContext): Promise<TOutput>;
-    retry?(failureCount: number, error: TError): boolean;
-}
-export type QueryOptionsExtra<TClientContext, TInput, TOutput, TError extends Error, TSelectData> = (undefined extends TInput ? {
+import type { QueryFunctionContext, QueryKey, UseInfiniteQueryOptions, UseMutationOptions, UseQueryOptions } from '@tanstack/react-query';
+export type QueryOptionsIn<TClientContext, TInput, TOutput, TError extends Error, TSelectData> = (undefined extends TInput ? {
     input?: TInput;
 } : {
     input: TInput;
@@ -16,30 +8,32 @@ export type QueryOptionsExtra<TClientContext, TInput, TOutput, TError extends Er
     context?: TClientContext;
 } : {
     context: TClientContext;
-}) & (SetOptional<UndefinedInitialDataOptions<TOutput, TError, TSelectData, QueryKey>, 'queryKey'>);
-export interface InfiniteOptionsBase<TInput, TOutput, TError extends Error> {
+}) & SetOptional<UseQueryOptions<TOutput, TError, TSelectData>, 'queryKey'>;
+export interface QueryOptionsBase<TOutput, TError extends Error> {
     queryKey: QueryKey;
-    queryFn(ctx: QueryFunctionContext<QueryKey, InferCursor<TInput>>): Promise<TOutput>;
+    queryFn(ctx: QueryFunctionContext): Promise<TOutput>;
     retry?(failureCount: number, error: TError): boolean;
-    initialPageParam: undefined;
 }
-export type InfiniteOptionsExtra<TClientContext, TInput, TOutput, TError extends Error, TSelectData> = (undefined extends TInput ? {
-    input?: Omit<TInput, 'cursor'>;
-} : {
-    input: Omit<TInput, 'cursor'>;
-}) & (undefined extends TClientContext ? {
+export type InfiniteOptionsIn<TClientContext, TInput, TOutput, TError extends Error, TSelectData, TPageParam> = {
+    input: (pageParam: TPageParam) => TInput;
+} & (undefined extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
-}) & (SetOptional<UndefinedInitialDataInfiniteOptions<TOutput, TError, TSelectData, QueryKey, InferCursor<TInput>>, 'queryKey' | (undefined extends InferCursor<TInput> ? 'initialPageParam' : never)>);
-export interface MutationOptionsBase<TInput, TOutput, TError extends Error> {
-    mutationKey: QueryKey;
-    mutationFn(input: TInput): Promise<TOutput>;
+}) & SetOptional<UseInfiniteQueryOptions<TOutput, TError, TSelectData, TOutput, QueryKey, TPageParam>, 'queryKey'>;
+export interface InfiniteOptionsBase<TOutput, TError extends Error, TPageParam> {
+    queryKey: QueryKey;
+    queryFn(ctx: QueryFunctionContext<QueryKey, TPageParam>): Promise<TOutput>;
     retry?(failureCount: number, error: TError): boolean;
 }
-export type MutationOptionsExtra<TClientContext, TInput, TOutput, TError extends Error> = (undefined extends TClientContext ? {
+export type MutationOptionsIn<TClientContext, TInput, TOutput, TError extends Error> = (undefined extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
 }) & UseMutationOptions<TOutput, TError, TInput>;
+export interface MutationOptionsBase<TInput, TOutput, TError extends Error> {
+    mutationKey: QueryKey;
+    mutationFn(input: TInput): Promise<TOutput>;
+    retry?(failureCount: number, error: TError): boolean;
+}
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/react-query",
   "type": "module",
-  "version": "0.36.1",
+  "version": "0.37.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,11 +34,11 @@
   "peerDependencies": {
     "@tanstack/react-query": ">=5.59.0",
     "react": ">=18.3.0",
-    "@orpc/client": "0.36.1",
-    "@orpc/contract": "0.36.1"
+    "@orpc/client": "0.37.0",
+    "@orpc/contract": "0.37.0"
   },
   "dependencies": {
-    "@orpc/shared": "0.36.1"
+    "@orpc/shared": "0.37.0"
   },
   "devDependencies": {
     "zod": "^3.24.1"

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

@@ -1,13 +0,0 @@
-import type { Client } from '@orpc/contract';
-import type { IsEqual } from '@orpc/shared';
-import type { InfiniteOptionsBase, InfiniteOptionsExtra, MutationOptionsBase, MutationOptionsExtra, QueryOptionsBase, QueryOptionsExtra } from './types';
-/**
- * Utils at procedure level
- */
-export interface ProcedureUtils<TClientContext, TInput, TOutput, TError extends Error> {
-    queryOptions<U extends QueryOptionsExtra<TClientContext, TInput, TOutput, TError, any>>(...opts: [options: U] | (undefined extends TInput & TClientContext ? [] : never)): IsEqual<U, QueryOptionsExtra<TClientContext, TInput, TOutput, TError, any>> extends true ? QueryOptionsBase<TOutput, TError> : Omit<QueryOptionsBase<TOutput, TError>, keyof U> & U;
-    infiniteOptions<U extends InfiniteOptionsExtra<TClientContext, TInput, TOutput, TError, any>>(options: U): Omit<InfiniteOptionsBase<TInput, TOutput, TError>, keyof U> & U;
-    mutationOptions<U extends MutationOptionsExtra<TClientContext, TInput, TOutput, TError>>(...opt: [options: U] | (undefined extends TClientContext ? [] : never)): IsEqual<U, MutationOptionsExtra<TClientContext, TInput, TOutput, TError>> extends true ? MutationOptionsBase<TInput, TOutput, TError> : Omit<MutationOptionsBase<TInput, TOutput, TError>, keyof U> & U;
-}
-export declare function createProcedureUtils<TClientContext, TInput, TOutput, TError extends Error>(client: Client<TClientContext, TInput, TOutput, TError>, path: string[]): ProcedureUtils<TClientContext, TInput, TOutput, TError>;
-//# sourceMappingURL=utils-procedure.d.ts.map