@orpc/vue-query 0.0.0 → 0.16.0

package/dist/index.js

@@ -12,15 +12,6 @@ function buildKey(path, options) {
   ];
 }
 
-// src/utils-general.ts
-function createGeneralUtils(path) {
-  return {
-    key(options) {
-      return buildKey(path, options);
-    }
-  };
-}
-
 // src/utils.ts
 import { isRef } from "vue";
 function deepUnref(value) {
@@ -39,22 +30,32 @@ function deepUnref(value) {
   return value;
 }
 
+// src/utils-general.ts
+function createGeneralUtils(path) {
+  return {
+    key(options) {
+      return buildKey(path, deepUnref(options));
+    }
+  };
+}
+
 // src/utils-procedure.ts
+import { computed } from "vue";
 function createProcedureUtils(client, path) {
   return {
     queryOptions(...[options]) {
       const input = options?.input;
       return {
-        queryKey: buildKey(path, { type: "query", input }),
-        queryFn: () => client(deepUnref(input)),
+        queryKey: computed(() => buildKey(path, { type: "query", input: deepUnref(input) })),
+        queryFn: ({ signal }) => client(deepUnref(input), { signal }),
         ...options
       };
     },
     infiniteOptions(options) {
       const input = options.input;
       return {
-        queryKey: buildKey(path, { type: "infinite", input }),
-        queryFn: ({ pageParam }) => client({ ...deepUnref(input), cursor: pageParam }),
+        queryKey: computed(() => buildKey(path, { type: "infinite", input: deepUnref(input) })),
+        queryFn: ({ pageParam, signal }) => client({ ...deepUnref(input), cursor: pageParam }, { signal }),
         ...options
       };
     },

package/dist/src/types.d.ts

@@ -1,7 +1,7 @@
-import type { SetOptional } from '@orpc/shared';
+import type { AnyFunction, SetOptional } from '@orpc/shared';
 import type { DefaultError, MutationObserverOptions, QueryKey, QueryObserverOptions, UseInfiniteQueryOptions } from '@tanstack/vue-query';
 import type { MaybeRef, MaybeRefOrGetter } from 'vue';
-export type MaybeDeepRef<T> = MaybeRef<T extends object ? {
+export type MaybeDeepRef<T> = MaybeRef<T extends AnyFunction ? T : T extends object ? {
     [K in keyof T]: MaybeDeepRef<T[K]>;
 } : T>;
 export type NonUndefinedGuard<T> = T extends undefined ? never : T;

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

@@ -1,10 +1,11 @@
 import type { QueryKey } from '@tanstack/vue-query';
 import type { BuildKeyOptions, KeyType } from './key';
+import type { MaybeDeepRef } from './types';
 /**
  * Utils at any level (procedure or router)
  */
 export interface GeneralUtils<TInput> {
-    key: <UType extends KeyType = undefined>(options?: 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,19 +1,21 @@
+import type { Caller } from '@orpc/server';
 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';
 /**
  * Utils at procedure level
  */
 export interface ProcedureUtils<TInput, TOutput> {
-    queryOptions: <U extends QueryOptions<TInput, TOutput, TOutput>>(...options: [U] | (undefined extends TInput ? [] : never)) => IsEqual<U, QueryOptions<TInput, TOutput, TOutput>> extends true ? {
+    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: QueryKey;
+        queryKey: ComputedRef<QueryKey>;
         queryFn: () => Promise<TOutput>;
     }, keyof U> & U;
     infiniteOptions: <U extends InfiniteOptions<TInput, TOutput, any>>(options: U) => Omit<{
-        queryKey: QueryKey;
+        queryKey: ComputedRef<QueryKey>;
         queryFn: () => Promise<TOutput>;
         initialPageParam: undefined;
     }, keyof U> & U;
@@ -25,5 +27,5 @@ export interface ProcedureUtils<TInput, TOutput> {
         mutationFn: (input: TInput) => Promise<TOutput>;
     }, keyof U> & U;
 }
-export declare function createProcedureUtils<TInput, TOutput>(client: (input: TInput) => Promise<TOutput>, path: string[]): ProcedureUtils<TInput, TOutput>;
+export declare function createProcedureUtils<TInput, TOutput>(client: Caller<TInput, TOutput>, path: string[]): ProcedureUtils<TInput, TOutput>;
 //# sourceMappingURL=utils-procedure.d.ts.map

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

@@ -1,3 +1,4 @@
+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 GeneralUtils } from './utils-general';
@@ -9,6 +10,5 @@ export type RouterUtils<T extends Router<any> | ContractRouter> = {
  * @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: any, // TODO typed
-path?: string[]): RouterUtils<T>;
+export declare function createRouterUtils<T extends Router<any> | ContractRouter>(client: RouterClient<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",
+  "version": "0.16.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,9 +34,9 @@
   "peerDependencies": {
     "@tanstack/vue-query": ">=5.50.0",
     "vue": ">=3.3.0",
-    "@orpc/contract": "0.14.0",
-    "@orpc/client": "0.14.0",
-    "@orpc/server": "0.14.0"
+    "@orpc/contract": "0.16.0",
+    "@orpc/client": "0.16.0",
+    "@orpc/server": "0.16.0"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",