@orpc/server 0.0.0-next.a055cad → 0.0.0-next.a2e4a58

package/dist/src/hidden.d.ts

@@ -0,0 +1,6 @@
+import type { ContractRouter, HTTPPath } from '@orpc/contract';
+export declare function setRouterContract<T extends object>(obj: T, contract: ContractRouter<any>): T;
+export declare function getRouterContract(obj: object): ContractRouter<any> | undefined;
+export declare function deepSetLazyRouterPrefix<T extends object>(router: T, prefix: HTTPPath): T;
+export declare function getLazyRouterPrefix(obj: object): HTTPPath | undefined;
+//# sourceMappingURL=hidden.d.ts.map

package/dist/src/implementer-chainable.d.ts

@@ -0,0 +1,14 @@
+import type { Middleware } from './middleware';
+import type { Context, MergeContext, WELL_CONTEXT } from './types';
+import { type ContractProcedure, type ContractRouter } from '@orpc/contract';
+import { ProcedureImplementer } from './procedure-implementer';
+import { RouterImplementer } from './router-implementer';
+export type ChainableImplementer<TContext extends Context, TExtraContext extends Context, TContract extends ContractRouter<any>> = TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap> ? ProcedureImplementer<TContext, TExtraContext, UInputSchema, UOutputSchema, UErrorMap> : {
+    [K in keyof TContract]: TContract[K] extends ContractRouter<any> ? ChainableImplementer<TContext, TExtraContext, TContract[K]> : never;
+} & Omit<RouterImplementer<TContext, TExtraContext, TContract>, '~type' | '~orpc'>;
+export declare function createChainableImplementer<TContext extends Context = WELL_CONTEXT, TExtraContext extends Context = undefined, TContract extends ContractRouter<any> = any>(contract: TContract, options: {
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+}): ChainableImplementer<TContext, TExtraContext, TContract>;
+//# sourceMappingURL=implementer-chainable.d.ts.map

package/dist/src/index.d.ts

@@ -1,17 +1,26 @@
+import type { WELL_CONTEXT } from './types';
 import { Builder } from './builder';
 export * from './builder';
+export * from './config';
+export * from './error';
+export * from './hidden';
+export * from './implementer-chainable';
 export * from './lazy';
+export * from './lazy-decorated';
 export * from './middleware';
+export * from './middleware-decorated';
 export * from './procedure';
 export * from './procedure-builder';
-export * from './procedure-caller';
+export * from './procedure-client';
+export * from './procedure-decorated';
 export * from './procedure-implementer';
+export * from './procedure-utils';
 export * from './router';
 export * from './router-builder';
-export * from './router-caller';
+export * from './router-client';
 export * from './router-implementer';
 export * from './types';
 export * from './utils';
-export * from '@orpc/shared/error';
-export declare const os: Builder<Record<string, unknown> | undefined, undefined>;
+export { isDefinedError, ORPCError, safe, type } from '@orpc/contract';
+export declare const os: Builder<WELL_CONTEXT>;
 //# sourceMappingURL=index.d.ts.map

package/dist/src/lazy-decorated.d.ts

@@ -0,0 +1,7 @@
+import type { Lazy } from './lazy';
+import { type ANY_ROUTER } from './router';
+export type DecoratedLazy<T> = T extends Lazy<infer U> ? DecoratedLazy<U> : Lazy<T> & (T extends ANY_ROUTER ? {
+    [K in keyof T]: DecoratedLazy<T[K]>;
+} : unknown);
+export declare function decorateLazy<T extends Lazy<ANY_ROUTER | undefined>>(lazied: T): DecoratedLazy<T>;
+//# sourceMappingURL=lazy-decorated.d.ts.map

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

@@ -0,0 +1,4 @@
+import type { Lazy } from './lazy';
+import { type ANY_PROCEDURE } from './procedure';
+export declare function createLazyProcedureFormAnyLazy(lazied: Lazy<any>): Lazy<ANY_PROCEDURE>;
+//# sourceMappingURL=lazy-utils.d.ts.map

package/dist/src/lazy.d.ts

@@ -1,23 +1,18 @@
-import type { Procedure } from './procedure';
-import type { ProcedureCaller } from './procedure-caller';
 export declare const LAZY_LOADER_SYMBOL: unique symbol;
 export interface Lazy<T> {
     [LAZY_LOADER_SYMBOL]: () => Promise<{
         default: T;
     }>;
 }
+export type Lazyable<T> = T | Lazy<T>;
 export type ANY_LAZY = Lazy<any>;
-export declare function createLazy<T>(loader: () => Promise<{
+export declare function lazy<T>(loader: () => Promise<{
     default: T;
 }>): Lazy<T>;
-export declare function loadLazy<T>(lazy: Lazy<T>): Promise<{
-    default: T;
-}>;
 export declare function isLazy(item: unknown): item is ANY_LAZY;
+export declare function unlazy<T extends Lazyable<any>>(lazied: T): Promise<{
+    default: T extends Lazy<infer U> ? U : T;
+}>;
 export type FlattenLazy<T> = T extends Lazy<infer U> ? FlattenLazy<U> : Lazy<T>;
-export declare function createFlattenLazy<T>(lazy: Lazy<T>): FlattenLazy<T>;
-export type DecoratedLazy<T> = T extends Lazy<infer U> ? DecoratedLazy<U> : (T extends Procedure<infer UContext, any, any, any, any> ? Lazy<T> & (undefined extends UContext ? ProcedureCaller<T> : unknown) : T extends Record<any, any> ? {
-    [K in keyof T]: DecoratedLazy<T[K]>;
-} /** Notice: this still a lazy, but type not work when I & Lazy<T>, maybe it's a bug, should improve */ : Lazy<T>);
-export declare function decorateLazy<T>(lazy: Lazy<T>): DecoratedLazy<T>;
+export declare function flatLazy<T extends ANY_LAZY>(lazied: T): FlattenLazy<T>;
 //# sourceMappingURL=lazy.d.ts.map

package/dist/src/middleware-decorated.d.ts

@@ -0,0 +1,10 @@
+import type { ContextGuard } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { MapInputMiddleware, Middleware } from './middleware';
+import type { Context, MergeContext } from './types';
+export interface DecoratedMiddleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> extends Middleware<TContext, TExtraContext, TInput, TOutput, TErrorConstructorMap> {
+    concat: (<UExtraContext extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>, UInput>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UInput & TInput, TOutput, TErrorConstructorMap>) => DecoratedMiddleware<TContext, MergeContext<TExtraContext, UExtraContext>, UInput & TInput, TOutput, TErrorConstructorMap>) & (<UExtraContext extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>, UInput = TInput, UMappedInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UMappedInput, TOutput, TErrorConstructorMap>, mapInput: MapInputMiddleware<UInput & TInput, UMappedInput>) => DecoratedMiddleware<TContext, MergeContext<TExtraContext, UExtraContext>, UInput & TInput, TOutput, TErrorConstructorMap>);
+    mapInput: <UInput = unknown>(map: MapInputMiddleware<UInput, TInput>) => DecoratedMiddleware<TContext, TExtraContext, UInput, TOutput, TErrorConstructorMap>;
+}
+export declare function decorateMiddleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>>(middleware: Middleware<TContext, TExtraContext, TInput, TOutput, TErrorConstructorMap>): DecoratedMiddleware<TContext, TExtraContext, TInput, TOutput, TErrorConstructorMap>;
+//# sourceMappingURL=middleware-decorated.d.ts.map

package/dist/src/middleware.d.ts

@@ -1,26 +1,36 @@
 import type { Promisable } from '@orpc/shared';
-import type { Context, MergeContext, Meta } from './types';
+import type { ORPCErrorConstructorMap } from './error';
+import type { ANY_PROCEDURE } from './procedure';
+import type { AbortSignal, Context } from './types';
 export type MiddlewareResult<TExtraContext extends Context, TOutput> = Promisable<{
     output: TOutput;
     context: TExtraContext;
 }>;
-export interface MiddlewareMeta<TOutput> extends Meta {
-    next: <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
+export interface MiddlewareNextFn<TOutput> {
+    <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
         context?: UExtraContext;
     } : {
         context: UExtraContext;
-    }) => MiddlewareResult<UExtraContext, TOutput>;
-    output: <UOutput>(output: UOutput) => MiddlewareResult<undefined, UOutput>;
+    }): MiddlewareResult<UExtraContext, TOutput>;
 }
-export interface Middleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput> {
-    (input: TInput, context: TContext, meta: MiddlewareMeta<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
+export interface MiddlewareOutputFn<TOutput> {
+    (output: TOutput): MiddlewareResult<undefined, TOutput>;
 }
+export interface MiddlewareOptions<TContext extends Context, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
+    context: TContext;
+    path: string[];
+    procedure: ANY_PROCEDURE;
+    signal?: AbortSignal;
+    next: MiddlewareNextFn<TOutput>;
+    errors: TErrorConstructorMap;
+}
+export interface Middleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
+    (options: MiddlewareOptions<TContext, TOutput, TErrorConstructorMap>, input: TInput, output: MiddlewareOutputFn<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
+}
+export type ANY_MIDDLEWARE = Middleware<any, any, any, any, any>;
 export interface MapInputMiddleware<TInput, TMappedInput> {
     (input: TInput): TMappedInput;
 }
-export interface DecoratedMiddleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput> extends Middleware<TContext, TExtraContext, TInput, TOutput> {
-    concat: (<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UInput = TInput>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UInput & TInput, TOutput>) => DecoratedMiddleware<TContext, MergeContext<TExtraContext, UExtraContext>, TInput & UInput, TOutput>) & (<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UInput = TInput, UMappedInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UMappedInput, TOutput>, mapInput: MapInputMiddleware<UInput, UMappedInput>) => DecoratedMiddleware<TContext, MergeContext<TExtraContext, UExtraContext>, TInput & UInput, TOutput>);
-    mapInput: <UInput = unknown>(map: MapInputMiddleware<UInput, TInput>) => DecoratedMiddleware<TContext, TExtraContext, UInput, TOutput>;
-}
-export declare function decorateMiddleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput>(middleware: Middleware<TContext, TExtraContext, TInput, TOutput>): DecoratedMiddleware<TContext, TExtraContext, TInput, TOutput>;
+export type ANY_MAP_INPUT_MIDDLEWARE = MapInputMiddleware<any, any>;
+export declare function middlewareOutputFn<TOutput>(output: TOutput): MiddlewareResult<undefined, TOutput>;
 //# sourceMappingURL=middleware.d.ts.map

package/dist/src/procedure-builder-with-input.d.ts

@@ -0,0 +1,34 @@
+import type { ContractProcedure, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, RouteOptions, Schema, SchemaOutput } from '@orpc/contract';
+import type { ContextGuard } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { MapInputMiddleware, Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
+import type { Context, MergeContext } from './types';
+import { DecoratedProcedure } from './procedure-decorated';
+import { ProcedureImplementer } from './procedure-implementer';
+export interface ProcedureBuilderWithInputDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TErrorMap extends ErrorMap> {
+    contract: ContractProcedure<TInputSchema, undefined, TErrorMap>;
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, unknown, ORPCErrorConstructorMap<TErrorMap>>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+}
+/**
+ * `ProcedureBuilderWithInput` is a branch of `ProcedureBuilder` which it has input schema.
+ *
+ * Why?
+ * - prevents override input schema after .input
+ * - allows .use between .input and .output
+ *
+ */
+export declare class ProcedureBuilderWithInput<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TErrorMap extends ErrorMap> {
+    '~type': "ProcedureBuilderWithInput";
+    '~orpc': ProcedureBuilderWithInputDef<TContext, TExtraContext, TInputSchema, TErrorMap>;
+    constructor(def: ProcedureBuilderWithInputDef<TContext, TExtraContext, TInputSchema, TErrorMap>);
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): ProcedureBuilderWithInput<TContext, TExtraContext, TInputSchema, TErrorMap & U>;
+    route(route: RouteOptions): ProcedureBuilderWithInput<TContext, TExtraContext, TInputSchema, TErrorMap>;
+    use<U extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, unknown, ORPCErrorConstructorMap<TErrorMap>>): ProcedureBuilderWithInput<TContext, MergeContext<TExtraContext, U>, TInputSchema, TErrorMap>;
+    use<UExtra extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>, UInput>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, unknown, ORPCErrorConstructorMap<TErrorMap>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureBuilderWithInput<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TErrorMap>;
+    output<U extends Schema>(schema: U, example?: SchemaOutput<U>): ProcedureImplementer<TContext, TExtraContext, TInputSchema, U, TErrorMap>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, undefined, UFuncOutput, TErrorMap>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, undefined, UFuncOutput, TErrorMap>;
+}
+//# sourceMappingURL=procedure-builder-with-input.d.ts.map

package/dist/src/procedure-builder-with-output.d.ts

@@ -0,0 +1,33 @@
+import type { ContractProcedure, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, RouteOptions, Schema, SchemaInput } from '@orpc/contract';
+import type { ContextGuard } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
+import type { Context, MergeContext } from './types';
+import { DecoratedProcedure } from './procedure-decorated';
+import { ProcedureImplementer } from './procedure-implementer';
+export interface ProcedureBuilderWithOutputDef<TContext extends Context, TExtraContext extends Context, TOutputSchema extends Schema, TErrorMap extends ErrorMap> {
+    contract: ContractProcedure<undefined, TOutputSchema, TErrorMap>;
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, ORPCErrorConstructorMap<TErrorMap>>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+}
+/**
+ * `ProcedureBuilderWithOutput` is a branch of `ProcedureBuilder` which it has output schema.
+ *
+ * Why?
+ * - prevents override output schema after .output
+ * - allows .use between .input and .output
+ *
+ */
+export declare class ProcedureBuilderWithOutput<TContext extends Context, TExtraContext extends Context, TOutputSchema extends Schema, TErrorMap extends ErrorMap> {
+    '~type': "ProcedureBuilderWithOutput";
+    '~orpc': ProcedureBuilderWithOutputDef<TContext, TExtraContext, TOutputSchema, TErrorMap>;
+    constructor(def: ProcedureBuilderWithOutputDef<TContext, TExtraContext, TOutputSchema, TErrorMap>);
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): ProcedureBuilderWithOutput<TContext, TExtraContext, TOutputSchema, TErrorMap & U>;
+    route(route: RouteOptions): ProcedureBuilderWithOutput<TContext, TExtraContext, TOutputSchema, TErrorMap>;
+    use<U extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, unknown, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>>): ProcedureBuilderWithOutput<TContext, MergeContext<TExtraContext, U>, TOutputSchema, TErrorMap>;
+    input<U extends Schema>(schema: U, example?: SchemaInput<U>): ProcedureImplementer<TContext, TExtraContext, U, TOutputSchema, TErrorMap>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TContext, TExtraContext, undefined, TOutputSchema, UFuncOutput, TErrorMap>): DecoratedProcedure<TContext, TExtraContext, undefined, TOutputSchema, UFuncOutput, TErrorMap>;
+}
+//# sourceMappingURL=procedure-builder-with-output.d.ts.map

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

@@ -1,31 +1,27 @@
-import type { MapInputMiddleware, Middleware } from './middleware';
+import type { ContractProcedure, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContextGuard } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
 import type { Context, MergeContext } from './types';
-import { type ContractProcedure, type RouteOptions, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-import { type DecoratedProcedure, type ProcedureFunc } from './procedure';
-import { ProcedureImplementer } from './procedure-implementer';
-export declare class ProcedureBuilder<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> {
-    zz$pb: {
-        contract: ContractProcedure<TInputSchema, TOutputSchema>;
-        middlewares?: Middleware<any, any, any, any>[];
-    };
-    constructor(zz$pb: {
-        contract: ContractProcedure<TInputSchema, TOutputSchema>;
-        middlewares?: Middleware<any, any, any, any>[];
-    });
-    /**
-     * Self chainable
-     */
-    route(opts: RouteOptions): ProcedureBuilder<TContext, TExtraContext, TInputSchema, TOutputSchema>;
-    input<USchema extends Schema = undefined>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilder<TContext, TExtraContext, USchema, TOutputSchema>;
-    output<USchema extends Schema = undefined>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilder<TContext, TExtraContext, TInputSchema, USchema>;
-    /**
-     * Convert to ProcedureBuilder
-     */
-    use<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtraContext>, TInputSchema, TOutputSchema>;
-    use<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UMappedInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UMappedInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UMappedInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtraContext>, TInputSchema, TOutputSchema>;
-    /**
-     * Convert to Procedure
-     */
-    func<UFuncOutput extends SchemaOutput<TOutputSchema>>(func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
+import { ProcedureBuilderWithInput } from './procedure-builder-with-input';
+import { ProcedureBuilderWithOutput } from './procedure-builder-with-output';
+import { DecoratedProcedure } from './procedure-decorated';
+export interface ProcedureBuilderDef<TContext extends Context, TExtraContext extends Context, TErrorMap extends ErrorMap> {
+    contract: ContractProcedure<undefined, undefined, TErrorMap>;
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, ORPCErrorConstructorMap<TErrorMap>>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+}
+export declare class ProcedureBuilder<TContext extends Context, TExtraContext extends Context, TErrorMap extends ErrorMap> {
+    '~type': "ProcedureBuilder";
+    '~orpc': ProcedureBuilderDef<TContext, TExtraContext, TErrorMap>;
+    constructor(def: ProcedureBuilderDef<TContext, TExtraContext, TErrorMap>);
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): ProcedureBuilder<TContext, TExtraContext, TErrorMap & U>;
+    route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, TErrorMap>;
+    use<U extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, unknown, unknown, ORPCErrorConstructorMap<TErrorMap>>): ProcedureBuilder<TContext, MergeContext<TExtraContext, U>, TErrorMap>;
+    input<U extends Schema>(schema: U, example?: SchemaInput<U>): ProcedureBuilderWithInput<TContext, TExtraContext, U, TErrorMap>;
+    output<U extends Schema>(schema: U, example?: SchemaOutput<U>): ProcedureBuilderWithOutput<TContext, TExtraContext, U, TErrorMap>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TContext, TExtraContext, undefined, undefined, UFuncOutput, TErrorMap>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput, TErrorMap>;
 }
 //# sourceMappingURL=procedure-builder.d.ts.map

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

@@ -0,0 +1,22 @@
+import type { Client, ErrorFromErrorMap, ErrorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Hooks, Value } from '@orpc/shared';
+import type { Lazyable } from './lazy';
+import type { Procedure } from './procedure';
+import type { Context, Meta } from './types';
+export type ProcedureClient<TClientContext, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> = Client<TClientContext, SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
+/**
+ * Options for creating a procedure caller with comprehensive type safety
+ */
+export type CreateProcedureClientOptions<TContext extends Context, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TClientContext> = {
+    /**
+     * This is helpful for logging and analytics.
+     */
+    path?: string[];
+} & ({
+    context: Value<TContext, [clientContext: TClientContext]>;
+} | (undefined extends TContext ? {
+    context?: Value<TContext, [clientContext: TClientContext]>;
+} : never)) & Hooks<unknown, SchemaOutput<TOutputSchema, THandlerOutput>, TContext, Meta>;
+export type CreateProcedureClientRest<TContext extends Context, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TClientContext> = [options: CreateProcedureClientOptions<TContext, TOutputSchema, THandlerOutput, TClientContext>] | (undefined extends TContext ? [] : never);
+export declare function createProcedureClient<TContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TClientContext>(lazyableProcedure: Lazyable<Procedure<TContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>>, ...[options]: CreateProcedureClientRest<TContext, TOutputSchema, THandlerOutput, TClientContext>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+//# sourceMappingURL=procedure-client.d.ts.map

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

@@ -0,0 +1,26 @@
+import type { ClientRest, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContextGuard } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { MapInputMiddleware, Middleware } from './middleware';
+import type { CreateProcedureClientRest, ProcedureClient } from './procedure-client';
+import type { Context, MergeContext } from './types';
+import { Procedure } from './procedure';
+export declare class DecoratedProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> extends Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap> {
+    static decorate<UContext extends Context, UExtraContext extends Context, UInputSchema extends Schema, UOutputSchema extends Schema, UHandlerOutput extends SchemaInput<UOutputSchema>, UErrorMap extends ErrorMap>(procedure: Procedure<UContext, UExtraContext, UInputSchema, UOutputSchema, UHandlerOutput, UErrorMap>): DecoratedProcedure<any, any, any, any, any, any> | DecoratedProcedure<UContext, UExtraContext, UInputSchema, UOutputSchema, UHandlerOutput, UErrorMap>;
+    prefix(prefix: HTTPPath): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    route(route: RouteOptions): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap & U>;
+    use<U extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, THandlerOutput, ORPCErrorConstructorMap<TErrorMap>>): DecoratedProcedure<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    use<UExtra extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, THandlerOutput, ORPCErrorConstructorMap<TErrorMap>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, THandlerOutput>, UInput>): DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    unshiftTag(...tags: string[]): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    unshiftMiddleware(...middlewares: Middleware<TContext, Context & Partial<MergeContext<TContext, TExtraContext>> | undefined, unknown, SchemaOutput<TOutputSchema, THandlerOutput>, ORPCErrorConstructorMap<TErrorMap>>[]): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    /**
+     * Make this procedure callable (works like a function while still being a procedure).
+     */
+    callable<TClientContext>(...rest: CreateProcedureClientRest<TContext, TOutputSchema, THandlerOutput, TClientContext>): Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap> & ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    /**
+     * Make this procedure compatible with server action (the same as .callable, but the type is compatible with server action).
+     */
+    actionable<TClientContext>(...rest: CreateProcedureClientRest<TContext, TOutputSchema, THandlerOutput, TClientContext>): Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap> & ((...rest: ClientRest<TClientContext, SchemaInput<TInputSchema>>) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>);
+}
+//# sourceMappingURL=procedure-decorated.d.ts.map

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

@@ -1,22 +1,22 @@
-import type { ContractProcedure, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
-import type { DecoratedLazy } from './lazy';
-import type { DecoratedProcedure, Procedure, ProcedureFunc } from './procedure';
+import type { ContractProcedure, ErrorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContextGuard } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { MapInputMiddleware, Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
 import type { Context, MergeContext } from './types';
-import { type MapInputMiddleware, type Middleware } from './middleware';
-export declare class ProcedureImplementer<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> {
-    zz$pi: {
-        contract: ContractProcedure<TInputSchema, TOutputSchema>;
-        middlewares?: Middleware<any, any, any, any>[];
-    };
-    constructor(zz$pi: {
-        contract: ContractProcedure<TInputSchema, TOutputSchema>;
-        middlewares?: Middleware<any, any, any, any>[];
-    });
-    use<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtraContext>, TInputSchema, TOutputSchema>;
-    use<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UMappedInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UMappedInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UMappedInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtraContext>, TInputSchema, TOutputSchema>;
-    func<UFuncOutput extends SchemaOutput<TOutputSchema>>(func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
-    lazy<U extends Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, SchemaOutput<TOutputSchema>>>(loader: () => Promise<{
-        default: U;
-    }>): DecoratedLazy<U>;
+import { DecoratedProcedure } from './procedure-decorated';
+export type ProcedureImplementerDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap> = {
+    contract: ContractProcedure<TInputSchema, TOutputSchema, TErrorMap>;
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, unknown, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+};
+export declare class ProcedureImplementer<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap> {
+    '~type': "ProcedureImplementer";
+    '~orpc': ProcedureImplementerDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TErrorMap>;
+    constructor(def: ProcedureImplementerDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TErrorMap>);
+    use<U extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema, TErrorMap>;
+    use<UExtra extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>, UInput>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema, TErrorMap>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap>;
 }
 //# sourceMappingURL=procedure-implementer.d.ts.map

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

@@ -0,0 +1,17 @@
+import type { ClientPromiseResult, ErrorFromErrorMap, ErrorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Lazyable } from './lazy';
+import type { Procedure } from './procedure';
+import type { Context } from './types';
+import { type CreateProcedureClientRest } from './procedure-client';
+/**
+ * Directly call a procedure without creating a client.
+ *
+ * @example
+ * ```ts
+ * const output = await call(getting, 'input')
+ * const output = await call(getting, 'input', { context: { db: 'postgres' } })
+ * ```
+ *
+ */
+export declare function call<TContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap>(procedure: Lazyable<Procedure<TContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>>, input: SchemaInput<TInputSchema>, ...rest: CreateProcedureClientRest<TContext, TOutputSchema, THandlerOutput, unknown>): ClientPromiseResult<SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
+//# sourceMappingURL=procedure-utils.d.ts.map

package/dist/src/procedure.d.ts

@@ -1,32 +1,45 @@
+import type { ContractProcedure, ErrorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
+import type { ORPCErrorConstructorMap } from './error';
 import type { Lazy } from './lazy';
-import type { ProcedureCaller } from './procedure-caller';
-import type { Context, MergeContext, Meta } from './types';
-import { type ContractProcedure, type HTTPPath, type RouteOptions, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-import { type MapInputMiddleware, type Middleware } from './middleware';
-export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> {
-    zz$p: {
-        middlewares?: Middleware<any, any, any, any>[];
-        contract: ContractProcedure<TInputSchema, TOutputSchema>;
-        func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    };
-    constructor(zz$p: {
-        middlewares?: Middleware<any, any, any, any>[];
-        contract: ContractProcedure<TInputSchema, TOutputSchema>;
-        func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    });
+import type { Middleware } from './middleware';
+import type { AbortSignal, Context, MergeContext } from './types';
+export interface ProcedureHandlerOptions<TContext extends Context, TExtraContext extends Context, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
+    context: MergeContext<TContext, TExtraContext>;
+    input: TInput;
+    path: string[];
+    procedure: ANY_PROCEDURE;
+    signal?: AbortSignal;
+    errors: TErrorConstructorMap;
 }
-export type ANY_PROCEDURE = Procedure<any, any, any, any, any>;
-export type WELL_DEFINED_PROCEDURE = Procedure<Context, Context, Schema, Schema, unknown>;
-export type ANY_LAZY_PROCEDURE = Lazy<ANY_PROCEDURE>;
-export type DecoratedProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> = Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput> & {
-    prefix: (prefix: HTTPPath) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    route: (opts: RouteOptions) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    use: (<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, TFuncOutput>>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtraContext>, TInputSchema, TOutputSchema, TFuncOutput>) & (<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UMappedInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UMappedInput, SchemaInput<TOutputSchema, TFuncOutput>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, TFuncOutput>, UMappedInput>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtraContext>, TInputSchema, TOutputSchema, TFuncOutput>);
-} & (undefined extends TContext ? ProcedureCaller<Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>> : unknown);
-export interface ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TOutput extends SchemaOutput<TOutputSchema>> {
-    (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, TOutput>>;
+export interface ProcedureHandler<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> {
+    (opt: ProcedureHandlerOptions<TContext, TExtraContext, SchemaOutput<TInputSchema>, ORPCErrorConstructorMap<TErrorMap>>): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
+}
+/**
+ * Why is `ErrorConstructorMap` passed to `middlewares` as `any`?
+ * Why is `ErrorMap` passed to `ProcedureHandler` as `any`?
+ *
+ * Passing `ErrorMap/ErrorConstructorMap` directly to `Middleware/ProcedureHandler`
+ * causes unexpected errors in the router (the root cause is unclear, but it occurs consistently).
+ * To avoid these issues, `any` is used as a workaround.
+ *
+ * This approach is still functional because `ProcedureDef` can infer the `ErrorMap` from `ContractProcedure`.
+ * The only downside is that direct access to them requires careful type checking to ensure safety.
+ */
+export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> {
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, unknown, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+    contract: ContractProcedure<TInputSchema, TOutputSchema, TErrorMap>;
+    handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, any>;
 }
-export declare function decorateProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>>(procedure: Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> {
+    '~type': "Procedure";
+    '~orpc': ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    constructor(def: ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>);
+}
+export type ANY_PROCEDURE = Procedure<any, any, any, any, any, any>;
+export type WELL_PROCEDURE = Procedure<Context, Context, Schema, Schema, unknown, any>;
+export type ANY_LAZY_PROCEDURE = Lazy<ANY_PROCEDURE>;
 export declare function isProcedure(item: unknown): item is ANY_PROCEDURE;
 //# sourceMappingURL=procedure.d.ts.map

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

@@ -1,27 +1,33 @@
-import type { DecoratedLazy } from './lazy';
-import type { HandledRouter, Router } from './router';
+import type { ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, StrictErrorMap } from '@orpc/contract';
+import type { ContextGuard } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { FlattenLazy, Lazy } from './lazy';
+import type { Middleware } from './middleware';
+import type { Procedure } from './procedure';
+import type { ANY_ROUTER, Router } from './router';
 import type { Context, MergeContext } from './types';
-import { type HTTPPath } from '@orpc/contract';
-import { type MapInputMiddleware, type Middleware } from './middleware';
-export declare const LAZY_ROUTER_PREFIX_SYMBOL: unique symbol;
-export declare class RouterBuilder<TContext extends Context, TExtraContext extends Context> {
-    zz$rb: {
-        prefix?: HTTPPath;
-        tags?: string[];
-        middlewares?: Middleware<any, any, any, any>[];
-    };
-    constructor(zz$rb: {
-        prefix?: HTTPPath;
-        tags?: string[];
-        middlewares?: Middleware<any, any, any, any>[];
-    });
-    prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext>;
-    tags(...tags: string[]): RouterBuilder<TContext, TExtraContext>;
-    use<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, unknown, unknown>): RouterBuilder<TContext, MergeContext<TExtraContext, UExtraContext>>;
-    use<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UMappedInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UMappedInput, unknown>, mapInput: MapInputMiddleware<unknown, UMappedInput>): RouterBuilder<TContext, MergeContext<TExtraContext, UExtraContext>>;
-    router<URouter extends Router<TContext>>(router: URouter): HandledRouter<URouter>;
-    lazy<U extends Router<TContext>>(loader: () => Promise<{
+import { type DecoratedLazy } from './lazy-decorated';
+import { DecoratedProcedure } from './procedure-decorated';
+export type AdaptedRouter<TContext extends Context, TRouter extends ANY_ROUTER, TErrorMapExtra extends ErrorMap> = TRouter extends Lazy<infer U extends ANY_ROUTER> ? DecoratedLazy<AdaptedRouter<TContext, U, TErrorMapExtra>> : TRouter extends Procedure<any, infer UExtraContext, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap> ? DecoratedProcedure<TContext, UExtraContext, UInputSchema, UOutputSchema, UFuncOutput, UErrorMap & TErrorMapExtra> : {
+    [K in keyof TRouter]: TRouter[K] extends ANY_ROUTER ? AdaptedRouter<TContext, TRouter[K], TErrorMapExtra> : never;
+};
+export type RouterBuilderDef<TContext extends Context, TExtraContext extends Context, TErrorMap extends ErrorMap> = {
+    prefix?: HTTPPath;
+    tags?: readonly string[];
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, ORPCErrorConstructorMap<TErrorMap>>[];
+    errorMap: TErrorMap;
+};
+export declare class RouterBuilder<TContext extends Context, TExtraContext extends Context, TErrorMap extends ErrorMap> {
+    '~type': "RouterBuilder";
+    '~orpc': RouterBuilderDef<TContext, TExtraContext, TErrorMap>;
+    constructor(def: RouterBuilderDef<TContext, TExtraContext, TErrorMap>);
+    prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext, TErrorMap>;
+    tag(...tags: string[]): RouterBuilder<TContext, TExtraContext, TErrorMap>;
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): RouterBuilder<TContext, TExtraContext, TErrorMap & U>;
+    use<U extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, unknown, unknown, Record<never, never>>): RouterBuilder<TContext, MergeContext<TExtraContext, U>, TErrorMap>;
+    router<U extends Router<MergeContext<TContext, TExtraContext>, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(router: U): AdaptedRouter<TContext, U, TErrorMap>;
+    lazy<U extends Router<MergeContext<TContext, TExtraContext>, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(loader: () => Promise<{
         default: U;
-    }>): DecoratedLazy<U>;
+    }>): AdaptedRouter<TContext, FlattenLazy<U>, TErrorMap>;
 }
 //# sourceMappingURL=router-builder.d.ts.map

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

@@ -0,0 +1,26 @@
+import type { Hooks, Value } from '@orpc/shared';
+import type { Lazy } from './lazy';
+import type { Procedure } from './procedure';
+import type { CreateProcedureClientRest, ProcedureClient } from './procedure-client';
+import type { Meta } from './types';
+import { type ANY_ROUTER, type Router } from './router';
+/**
+ * FIXME: separate RouterClient and ContractRouterClient, don't mix them
+ */
+export type RouterClient<TRouter extends ANY_ROUTER, TClientContext> = TRouter extends Lazy<infer U extends ANY_ROUTER> ? RouterClient<U, TClientContext> : TRouter extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap> ? ProcedureClient<TClientContext, UInputSchema, UOutputSchema, UFuncOutput, UErrorMap> : {
+    [K in keyof TRouter]: TRouter[K] extends ANY_ROUTER ? RouterClient<TRouter[K], TClientContext> : never;
+};
+export type CreateRouterClientOptions<TRouter extends ANY_ROUTER> = {
+    /**
+     * This is helpful for logging and analytics.
+     *
+     * @internal
+     */
+    path?: string[];
+} & (TRouter extends Router<infer UContext, any> ? undefined extends UContext ? {
+    context?: Value<UContext>;
+} : {
+    context: Value<UContext>;
+} : never) & Hooks<unknown, unknown, TRouter extends Router<infer UContext, any> ? UContext : never, Meta>;
+export declare function createRouterClient<TRouter extends ANY_ROUTER, TClientContext>(router: TRouter | Lazy<undefined>, ...rest: CreateProcedureClientRest<TRouter extends Router<infer UContext, any> ? UContext : never, undefined, unknown, TClientContext>): RouterClient<TRouter, TClientContext>;
+//# sourceMappingURL=router-client.d.ts.map