@orpc/vue-query 0.0.0-next.ee0aeaf → 0.0.0-next.f56d2b3

package/dist/index.js

@@ -47,22 +47,25 @@ function createProcedureUtils(client, path) {
       const input = options?.input;
       return {
         queryKey: computed(() => buildKey(path, { type: "query", input: deepUnref(input) })),
-        queryFn: ({ signal }) => client(deepUnref(input), { signal }),
+        queryFn: ({ signal }) => client(deepUnref(input), { signal, context: deepUnref(options?.context) }),
         ...options
       };
     },
     infiniteOptions(options) {
       const input = options.input;
       return {
+        initialPageParam: void 0,
         queryKey: computed(() => buildKey(path, { type: "infinite", input: deepUnref(input) })),
-        queryFn: ({ pageParam, signal }) => client({ ...deepUnref(input), cursor: pageParam }, { signal }),
+        queryFn: ({ pageParam, signal }) => {
+          return client({ ...deepUnref(input), cursor: pageParam }, { signal, context: deepUnref(options.context) });
+        },
         ...options
       };
     },
-    mutationOptions(options) {
+    mutationOptions(...[options]) {
       return {
         mutationKey: buildKey(path, { type: "mutation" }),
-        mutationFn: (input) => client(input),
+        mutationFn: (input) => client(input, { context: deepUnref(options?.context) }),
         ...options
       };
     }

package/dist/src/types.d.ts

@@ -1,6 +1,6 @@
 import type { AnyFunction, SetOptional } from '@orpc/shared';
-import type { DefaultError, MutationObserverOptions, QueryKey, QueryObserverOptions, UseInfiniteQueryOptions } from '@tanstack/vue-query';
-import type { MaybeRef, MaybeRefOrGetter } from 'vue';
+import type { MutationObserverOptions, QueryFunctionContext, QueryKey, QueryObserverOptions, UseInfiniteQueryOptions } from '@tanstack/vue-query';
+import type { ComputedRef, MaybeRef, MaybeRefOrGetter } from 'vue';
 export type MaybeDeepRef<T> = MaybeRef<T extends AnyFunction ? T : T extends object ? {
     [K in keyof T]: MaybeDeepRef<T[K]>;
 } : T>;
@@ -8,24 +8,52 @@ export type NonUndefinedGuard<T> = T extends undefined ? never : T;
 export type InferCursor<T> = T extends {
     cursor?: any;
 } ? T['cursor'] : never;
-export type QueryOptions<TInput, TOutput, TSelectData> = (undefined extends TInput ? {
+export type QueryOptionsExtra<TClientContext, TInput, TOutput, TError extends Error, TSelectData> = (undefined extends TInput ? {
     input?: MaybeDeepRef<TInput>;
 } : {
     input: MaybeDeepRef<TInput>;
+}) & (undefined extends TClientContext ? {
+    context?: MaybeDeepRef<TClientContext>;
+} : {
+    context: MaybeDeepRef<TClientContext>;
 }) & SetOptional<{
-    [P in keyof QueryObserverOptions<TOutput, DefaultError, TSelectData, TOutput, QueryKey>]: P extends 'enabled' ? MaybeRefOrGetter<QueryObserverOptions<TOutput, DefaultError, TSelectData, TOutput, QueryKey>[P]> : MaybeDeepRef<QueryObserverOptions<TOutput, DefaultError, TSelectData, TOutput, QueryKey>[P]>;
+    [P in keyof QueryObserverOptions<TOutput, TError, TSelectData, TOutput, QueryKey>]: P extends 'enabled' ? MaybeRefOrGetter<QueryObserverOptions<TOutput, TError, TSelectData, TOutput, QueryKey>[P]> : MaybeDeepRef<QueryObserverOptions<TOutput, TError, TSelectData, TOutput, QueryKey>[P]>;
 }, 'queryKey'> & {
     shallow?: MaybeRef<boolean>;
     initialData?: NonUndefinedGuard<TOutput> | (() => NonUndefinedGuard<TOutput>) | undefined;
 };
-export type InfiniteOptions<TInput, TOutput, TSelectData> = (undefined extends TInput ? {
+export interface QueryOptionsBase<TOutput, TError extends Error> {
+    queryKey: ComputedRef<QueryKey>;
+    queryFn(ctx: QueryFunctionContext): Promise<TOutput>;
+    retry?(failureCount: number, error: TError): boolean;
+}
+export type InfiniteOptionsExtra<TClientContext, TInput, TOutput, TError extends Error, TSelectData> = (undefined extends TInput ? {
     input?: MaybeDeepRef<Omit<TInput, 'cursor'>>;
 } : {
     input: MaybeDeepRef<Omit<TInput, 'cursor'>>;
-}) & SetOptional<UseInfiniteQueryOptions<TOutput, DefaultError, TSelectData, TOutput, QueryKey, InferCursor<TInput>>, 'queryKey' | (undefined extends InferCursor<TInput> ? 'initialPageParam' : never)>;
-export type MutationOptions<TInput, TOutput> = {
-    [P in keyof MutationObserverOptions<TOutput, DefaultError, TInput, unknown>]: MaybeDeepRef<MutationObserverOptions<TOutput, DefaultError, TInput, unknown>[P]>;
+}) & (undefined extends TClientContext ? {
+    context?: MaybeDeepRef<TClientContext>;
+} : {
+    context: MaybeDeepRef<TClientContext>;
+}) & SetOptional<UseInfiniteQueryOptions<TOutput, TError, TSelectData, TOutput, QueryKey, InferCursor<TInput>>, 'queryKey' | (undefined extends InferCursor<TInput> ? 'initialPageParam' : never)>;
+export interface InfiniteOptionsBase<TInput, TOutput, TError extends Error> {
+    queryKey: ComputedRef<QueryKey>;
+    queryFn(ctx: QueryFunctionContext<QueryKey, InferCursor<TInput>>): Promise<TOutput>;
+    initialPageParam: undefined;
+    retry?(failureCount: number, error: TError): boolean;
+}
+export type MutationOptionsExtra<TClientContext, TInput, TOutput, TError extends Error> = (undefined extends TClientContext ? {
+    context?: MaybeDeepRef<TClientContext>;
+} : {
+    context: MaybeDeepRef<TClientContext>;
+}) & {
+    [P in keyof MutationObserverOptions<TOutput, TError, TInput, unknown>]: MaybeDeepRef<MutationObserverOptions<TOutput, TError, TInput, unknown>[P]>;
 } & {
     shallow?: MaybeRef<boolean>;
 };
+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/dist/src/utils-general.d.ts

@@ -5,7 +5,7 @@ import type { MaybeDeepRef } from './types';
  * Utils at any level (procedure or router)
  */
 export interface GeneralUtils<TInput> {
-    key: <UType extends KeyType = undefined>(options?: MaybeDeepRef<BuildKeyOptions<UType, TInput>>) => QueryKey;
+    key<UType extends KeyType = undefined>(options?: MaybeDeepRef<BuildKeyOptions<UType, TInput>>): QueryKey;
 }
 export declare function createGeneralUtils<TInput>(path: string[]): GeneralUtils<TInput>;
 //# sourceMappingURL=utils-general.d.ts.map

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

@@ -1,31 +1,13 @@
-import type { Caller } from '@orpc/server';
+import type { Client } from '@orpc/contract';
 import type { IsEqual } from '@orpc/shared';
-import type { QueryKey } from '@tanstack/vue-query';
-import type { ComputedRef } from 'vue';
-import type { InfiniteOptions, MutationOptions, QueryOptions } from './types';
+import type { InfiniteOptionsBase, InfiniteOptionsExtra, MutationOptionsBase, MutationOptionsExtra, QueryOptionsBase, QueryOptionsExtra } from './types';
 /**
  * Utils at procedure level
  */
-export interface ProcedureUtils<TInput, TOutput> {
-    queryOptions: <U extends QueryOptions<TInput, TOutput, any>>(...options: [U] | (undefined extends TInput ? [] : never)) => IsEqual<U, QueryOptions<TInput, TOutput, any>> extends true ? {
-        queryKey: QueryKey;
-        queryFn: () => Promise<TOutput>;
-    } : Omit<{
-        queryKey: ComputedRef<QueryKey>;
-        queryFn: () => Promise<TOutput>;
-    }, keyof U> & U;
-    infiniteOptions: <U extends InfiniteOptions<TInput, TOutput, any>>(options: U) => Omit<{
-        queryKey: ComputedRef<QueryKey>;
-        queryFn: () => Promise<TOutput>;
-        initialPageParam: undefined;
-    }, keyof U> & U;
-    mutationOptions: <U extends MutationOptions<TInput, TOutput>>(options?: U) => IsEqual<U, MutationOptions<TInput, TOutput>> extends true ? {
-        mutationKey: QueryKey;
-        mutationFn: (input: TInput) => Promise<TOutput>;
-    } : Omit<{
-        mutationKey: QueryKey;
-        mutationFn: (input: TInput) => Promise<TOutput>;
-    }, keyof U> & U;
+export interface ProcedureUtils<TClientContext, TInput, TOutput, TError extends Error> {
+    queryOptions<U extends QueryOptionsExtra<TClientContext, TInput, TOutput, TError, any>>(...opt: [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<TInput, TOutput>(client: Caller<TInput, TOutput>, path: string[]): ProcedureUtils<TInput, TOutput>;
+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

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

@@ -1,14 +1,12 @@
-import type { RouterClient } from '@orpc/client';
-import type { ContractProcedure, ContractRouter, SchemaInput, SchemaOutput } from '@orpc/contract';
-import type { Lazy, Procedure, Router } from '@orpc/server';
+import type { Client, NestedClient } from '@orpc/contract';
 import { type GeneralUtils } from './utils-general';
 import { type ProcedureUtils } from './utils-procedure';
-export type RouterUtils<T extends Router<any> | ContractRouter> = {
-    [K in keyof T]: T[K] extends ContractProcedure<infer UInputSchema, infer UOutputSchema> | Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> | Lazy<Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput>> ? ProcedureUtils<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>> & GeneralUtils<SchemaInput<UInputSchema>> : T[K] extends Router<any> | ContractRouter ? RouterUtils<T[K]> : never;
+export type RouterUtils<T extends NestedClient<any>> = T extends Client<infer TClientContext, infer UInput, infer UOutput, infer UError> ? ProcedureUtils<TClientContext, 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
  */
-export declare function createRouterUtils<T extends Router<any> | ContractRouter>(client: RouterClient<T>, path?: string[]): RouterUtils<T>;
+export declare function createRouterUtils<T extends NestedClient<any>>(client: T, path?: string[]): RouterUtils<T>;
 //# sourceMappingURL=utils-router.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/vue-query",
   "type": "module",
-  "version": "0.0.0-next.ee0aeaf",
+  "version": "0.0.0-next.f56d2b3",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,9 +34,8 @@
   "peerDependencies": {
     "@tanstack/vue-query": ">=5.50.0",
     "vue": ">=3.3.0",
-    "@orpc/client": "0.0.0-next.ee0aeaf",
-    "@orpc/server": "0.0.0-next.ee0aeaf",
-    "@orpc/contract": "0.0.0-next.ee0aeaf"
+    "@orpc/client": "0.0.0-next.f56d2b3",
+    "@orpc/contract": "0.0.0-next.f56d2b3"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",