@orpc/vue-colada 0.36.1 → 0.38.0

package/dist/index.js

@@ -2,62 +2,72 @@
 import { serializeRPCJson } from "@orpc/server/standard";
 function buildKey(path, options) {
   return [
-    "__ORPC__",
     ...path,
     ...options?.input !== void 0 ? [{ input: JSON.stringify(serializeRPCJson(options.input)) }] : []
   ];
 }
 
+// src/general-utils.ts
+function createGeneralUtils(path) {
+  return {
+    key(options) {
+      return buildKey(path, options);
+    }
+  };
+}
+
+// src/procedure-utils.ts
+import { computed } from "vue";
+
+// ../shared/src/object.ts
+function isObject(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || !proto || !proto.constructor;
+}
+
 // src/utils.ts
 import { isRef } from "vue";
-function deepUnref(value) {
+function unrefDeep(value) {
   if (isRef(value)) {
-    return deepUnref(value.value);
+    return unrefDeep(value.value);
   }
   if (Array.isArray(value)) {
-    return value.map(deepUnref);
+    return value.map(unrefDeep);
   }
-  if (value && typeof value === "object") {
+  if (isObject(value)) {
     return Object.keys(value).reduce((acc, key) => {
-      acc[key] = deepUnref(value[key]);
+      acc[key] = unrefDeep(value[key]);
       return acc;
     }, {});
   }
   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";
+// src/procedure-utils.ts
 function createProcedureUtils(client, path) {
   return {
-    queryOptions(...[options]) {
-      const input = options?.input;
+    call: client,
+    queryOptions(...[{ input, context, ...rest } = {}]) {
       return {
-        key: computed(() => buildKey(path, { input: deepUnref(input) })),
-        query: ({ signal }) => client(deepUnref(input), { signal, context: deepUnref(options?.context) }),
-        ...options
+        key: computed(() => buildKey(path, { input: unrefDeep(input) })),
+        query: ({ signal }) => client(unrefDeep(input), { signal, context: unrefDeep(context) }),
+        ...rest
       };
     },
-    mutationOptions(...[options]) {
+    mutationOptions(...[{ context, ...rest } = {}]) {
       return {
         key: (input) => buildKey(path, { input }),
-        mutation: (input, _) => client(input, { context: deepUnref(options?.context) }),
-        ...options
+        mutation: (input) => client(input, { context: unrefDeep(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}

@@ -1,11 +1,7 @@
 import type { EntryKey } from '@pinia/colada';
 import type { BuildKeyOptions } from './key';
-import type { MaybeDeepRef } from './types';
-/**
- * Utils at any level (procedure or router)
- */
 export interface GeneralUtils<TInput> {
-    key(options?: MaybeDeepRef<BuildKeyOptions<TInput>>): EntryKey;
+    key(options?: BuildKeyOptions<TInput>): EntryKey;
 }
 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 createORPCVueColadaUtils: typeof createRouterUtils;
 //# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,10 @@
+import type { Client, ClientContext } from '@orpc/contract';
+import type { MaybeOptionalOptions } from '@orpc/shared';
+import type { MutationOptions, MutationOptionsIn, QueryOptions, QueryOptionsIn } from './types';
+export interface ProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> {
+    call: Client<TClientContext, TInput, TOutput, TError>;
+    queryOptions(...rest: MaybeOptionalOptions<QueryOptionsIn<TClientContext, TInput, TOutput, TError>>): QueryOptions<TOutput, TError>;
+    mutationOptions(...rest: MaybeOptionalOptions<MutationOptionsIn<TClientContext, TInput, TOutput, TError>>): MutationOptions<TInput, TOutput, TError>;
+}
+export declare function createProcedureUtils<TClientContext extends ClientContext, 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,27 +1,25 @@
+import type { ClientContext } from '@orpc/contract';
 import type { AnyFunction, SetOptional } from '@orpc/shared';
 import type { UseMutationOptions, UseQueryOptions } from '@pinia/colada';
 import type { MaybeRef } from 'vue';
-export type MaybeDeepRef<T> = MaybeRef<T extends AnyFunction ? T : T extends object ? {
-    [K in keyof T]: MaybeDeepRef<T[K]>;
+export type MaybeRefDeep<T> = MaybeRef<T extends AnyFunction ? T : T extends object ? {
+    [K in keyof T]: MaybeRefDeep<T[K]>;
 } : T>;
 export type UseQueryFnContext = Parameters<UseQueryOptions<any>['query']>[0];
-export type InferCursor<T> = T extends {
-    cursor?: any;
-} ? T['cursor'] : never;
-export type QueryOptionsExtra<TClientContext, TInput, TOutput, TError extends Error> = (undefined extends TInput ? {
-    input?: MaybeDeepRef<TInput>;
+export type QueryOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> = (undefined extends TInput ? {
+    input?: MaybeRefDeep<TInput>;
 } : {
-    input: MaybeDeepRef<TInput>;
-}) & (undefined extends TClientContext ? {
-    context?: MaybeDeepRef<TClientContext>;
+    input: MaybeRefDeep<TInput>;
+}) & (Record<never, never> extends TClientContext ? {
+    context?: MaybeRefDeep<TClientContext>;
 } : {
-    context: MaybeDeepRef<TClientContext>;
+    context: MaybeRefDeep<TClientContext>;
 }) & SetOptional<UseQueryOptions<TOutput, TError>, 'key' | 'query'>;
 export type QueryOptions<TOutput, TError extends Error> = UseQueryOptions<TOutput, TError>;
-export type MutationOptionsExtra<TClientContext, TInput, TOutput, TError extends Error> = (undefined extends TClientContext ? {
-    context?: MaybeDeepRef<TClientContext>;
+export type MutationOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> = (Record<never, never> extends TClientContext ? {
+    context?: MaybeRefDeep<TClientContext>;
 } : {
-    context: MaybeDeepRef<TClientContext>;
+    context: MaybeRefDeep<TClientContext>;
 }) & SetOptional<UseMutationOptions<TOutput, TInput, TError>, 'mutation'>;
 export type MutationOptions<TInput, TOutput, TError extends Error> = UseMutationOptions<TOutput, TInput, TError>;
 //# sourceMappingURL=types.d.ts.map

package/dist/src/utils.d.ts

@@ -1,7 +1,7 @@
-import type { AnyFunction } from '@orpc/shared';
 import type { Ref } from 'vue';
-export type DeepUnref<T> = T extends Ref<infer U> ? DeepUnref<U> : T extends AnyFunction ? T : T extends object ? {
-    [K in keyof T]: DeepUnref<T[K]>;
+import { type AnyFunction } from '@orpc/shared';
+export type UnrefDeep<T> = T extends Ref<infer U> ? UnrefDeep<U> : T extends AnyFunction ? T : T extends object ? {
+    [K in keyof T]: UnrefDeep<T[K]>;
 } : T;
-export declare function deepUnref<T>(value: T): DeepUnref<T>;
+export declare function unrefDeep<T>(value: T): UnrefDeep<T>;
 //# sourceMappingURL=utils.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/vue-colada",
   "type": "module",
-  "version": "0.36.1",
+  "version": "0.38.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -33,17 +33,15 @@
     "dist"
   ],
   "peerDependencies": {
-    "@pinia/colada": ">=0.13.1",
+    "@pinia/colada": "^0.13.5",
     "vue": ">=3.3.0",
-    "@orpc/client": "0.36.1",
-    "@orpc/contract": "0.36.1"
+    "@orpc/contract": "0.38.0",
+    "@orpc/client": "0.38.0"
   },
   "dependencies": {
-    "@orpc/server": "0.36.1"
+    "@orpc/server": "0.38.0"
   },
   "devDependencies": {
-    "@pinia/colada": "^0.13.1",
-    "@vue/test-utils": "^2.4.6",
     "pinia": "^2.3.0"
   },
   "scripts": {

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

@@ -1,11 +0,0 @@
-import type { Client } from '@orpc/contract';
-import type { MutationOptions, MutationOptionsExtra, QueryOptions, QueryOptionsExtra } from './types';
-/**
- * Utils at procedure level
- */
-export interface ProcedureUtils<TClientContext, TInput, TOutput, TError extends Error> {
-    queryOptions<U extends QueryOptionsExtra<TClientContext, TInput, TOutput, TError>>(...opt: [options: U] | (undefined extends TInput & TClientContext ? [] : never)): QueryOptions<TOutput, TError>;
-    mutationOptions<U extends MutationOptionsExtra<TClientContext, TInput, TOutput, TError>>(...opt: [options: U] | (undefined extends TClientContext ? [] : never)): MutationOptions<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=utils-procedure.d.ts.map