@orpc/vue-colada 0.0.0-next.e7d7758 → 0.0.0-next.ed15210

package/dist/src/types.d.ts

@@ -8,7 +8,7 @@ export type UseQueryFnContext = Parameters<UseQueryOptions<any>['query']>[0];
 export type InferCursor<T> = T extends {
     cursor?: any;
 } ? T['cursor'] : never;
-export type QueryOptions<TInput, TOutput, TClientContext> = (undefined extends TInput ? {
+export type QueryOptionsExtra<TClientContext, TInput, TOutput, TError extends Error> = (undefined extends TInput ? {
     input?: MaybeDeepRef<TInput>;
 } : {
     input: MaybeDeepRef<TInput>;
@@ -16,10 +16,12 @@ export type QueryOptions<TInput, TOutput, TClientContext> = (undefined extends T
     context?: MaybeDeepRef<TClientContext>;
 } : {
     context: MaybeDeepRef<TClientContext>;
-}) & SetOptional<UseQueryOptions<TOutput>, 'key' | 'query'>;
-export type MutationOptions<TInput, TOutput, TClientContext> = (undefined extends 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>;
 } : {
     context: MaybeDeepRef<TClientContext>;
-}) & SetOptional<UseMutationOptions<TOutput, TInput>, 'mutation'>;
+}) & 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-procedure.d.ts

@@ -1,26 +1,11 @@
-import type { ProcedureClient } from '@orpc/server';
-import type { IsEqual } from '@orpc/shared';
-import type { EntryKey } from '@pinia/colada';
-import type { ComputedRef } from 'vue';
-import type { MutationOptions, QueryOptions, UseQueryFnContext } from './types';
+import type { Client } from '@orpc/contract';
+import type { MutationOptions, MutationOptionsExtra, QueryOptions, QueryOptionsExtra } from './types';
 /**
  * Utils at procedure level
  */
-export interface ProcedureUtils<TInput, TOutput, TClientContext> {
-    queryOptions: <U extends QueryOptions<TInput, TOutput, TClientContext>>(...opt: [options: U] | (undefined extends TInput & TClientContext ? [] : never)) => IsEqual<U, QueryOptions<TInput, TOutput, TClientContext>> extends true ? {
-        key: ComputedRef<EntryKey>;
-        query: (ctx: UseQueryFnContext) => Promise<TOutput>;
-    } : Omit<{
-        key: ComputedRef<EntryKey>;
-        query: (ctx: UseQueryFnContext) => Promise<TOutput>;
-    }, keyof U> & U;
-    mutationOptions: <U extends MutationOptions<TInput, TOutput, TClientContext>>(...opt: [options: U] | (undefined extends TClientContext ? [] : never)) => IsEqual<U, MutationOptions<TInput, TOutput, TClientContext>> extends true ? {
-        key: (input: TInput) => EntryKey;
-        mutation: (input: TInput) => Promise<TOutput>;
-    } : Omit<{
-        key: (input: TInput) => EntryKey;
-        mutation: (input: TInput) => Promise<TOutput>;
-    }, keyof U> & U;
+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<TInput, TOutput, TClientContext>(client: ProcedureClient<TInput, TOutput, TClientContext>, path: string[]): ProcedureUtils<TInput, TOutput, TClientContext>;
+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,12 +1,12 @@
-import type { ProcedureClient, RouterClient } 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 RouterClient<any, any>> = T extends ProcedureClient<infer TInput, infer TOutput, infer TClientContext> ? ProcedureUtils<TInput, TOutput, TClientContext> & GeneralUtils<TInput> : {
-    [K in keyof T]: T[K] extends RouterClient<any, any> ? RouterUtils<T[K]> : never;
+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
  */
-export declare function createRouterUtils<T extends RouterClient<any, any>>(client: 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-colada",
   "type": "module",
-  "version": "0.0.0-next.e7d7758",
+  "version": "0.0.0-next.ed15210",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -35,12 +35,11 @@
   "peerDependencies": {
     "@pinia/colada": ">=0.13.1",
     "vue": ">=3.3.0",
-    "@orpc/client": "0.0.0-next.e7d7758",
-    "@orpc/contract": "0.0.0-next.e7d7758",
-    "@orpc/server": "0.0.0-next.e7d7758"
+    "@orpc/client": "0.0.0-next.ed15210",
+    "@orpc/contract": "0.0.0-next.ed15210"
   },
   "dependencies": {
-    "@orpc/server": "0.0.0-next.e7d7758"
+    "@orpc/server": "0.0.0-next.ed15210"
   },
   "devDependencies": {
     "@pinia/colada": "^0.13.1",