@orpc/server 0.0.0-next.3f6c426 → 0.0.0-next.43889a7

package/dist/src/hidden.d.ts

@@ -1,6 +1,6 @@
 import type { ContractRouter, HTTPPath } from '@orpc/contract';
-export declare function setRouterContract<T extends object>(obj: T, contract: ContractRouter): T;
-export declare function getRouterContract(obj: object): ContractRouter | undefined;
+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

@@ -1,10 +1,16 @@
+import type { Context, TypeCurrentContext, TypeInitialContext } from './context';
 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> = TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema> ? ProcedureImplementer<TContext, TExtraContext, UInputSchema, UOutputSchema> : {
-    [K in keyof TContract]: TContract[K] extends ContractRouter ? 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>(contract: TContract, middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any>[]): ChainableImplementer<TContext, TExtraContext, TContract>;
+export type ChainableImplementer<TInitialContext extends Context, TCurrentContext extends Context, TContract extends ContractRouter<any>> = TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap> ? ProcedureImplementer<TInitialContext, TCurrentContext, UInputSchema, UOutputSchema, UErrorMap> : {
+    [K in keyof TContract]: TContract[K] extends ContractRouter<any> ? ChainableImplementer<TInitialContext, TCurrentContext, TContract[K]> : never;
+} & Omit<RouterImplementer<TInitialContext, TCurrentContext, TContract>, '~type' | '~orpc'>;
+export declare function createChainableImplementer<TInitialContext extends Context, TCurrentContext extends Context, TContract extends ContractRouter<any>>(contract: TContract, options: {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    __currentContext?: TypeCurrentContext<TCurrentContext>;
+    middlewares: Middleware<any, any, any, any, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+}): ChainableImplementer<TInitialContext, TCurrentContext, TContract>;
 //# sourceMappingURL=implementer-chainable.d.ts.map

package/dist/src/index.d.ts

@@ -1,6 +1,8 @@
-import type { WELL_CONTEXT } from './types';
 import { Builder } from './builder';
 export * from './builder';
+export * from './config';
+export * from './context';
+export * from './error';
 export * from './hidden';
 export * from './implementer-chainable';
 export * from './lazy';
@@ -12,13 +14,12 @@ export * from './procedure-builder';
 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-client';
 export * from './router-implementer';
 export * from './types';
-export * from './utils';
-export { configGlobal, fallbackToGlobalConfig } from '@orpc/contract';
-export * from '@orpc/shared/error';
-export declare const os: Builder<WELL_CONTEXT, undefined>;
+export { isDefinedError, ORPCError, safe, type } from '@orpc/contract';
+export declare const os: Builder<import("./context").Context>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,10 +1,8 @@
-import type { SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Lazy } from './lazy';
-import type { Procedure } from './procedure';
-import type { ProcedureClient } from './procedure-client';
+import type { ANY_PROCEDURE } from './procedure';
 import { type ANY_ROUTER } from './router';
-export type DecoratedLazy<T> = T extends Lazy<infer U> ? DecoratedLazy<U> : Lazy<T> & (T extends Procedure<infer UContext, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? undefined extends UContext ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>, unknown> : unknown : {
-    [K in keyof T]: T[K] extends object ? DecoratedLazy<T[K]> : never;
-});
+export type DecoratedLazy<T> = T extends Lazy<infer U> ? DecoratedLazy<U> : Lazy<T> & (T extends ANY_PROCEDURE ? unknown : 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/middleware-decorated.d.ts

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

package/dist/src/middleware.d.ts

@@ -1,23 +1,39 @@
 import type { Promisable } from '@orpc/shared';
-import type { Context, Meta } from './types';
-export type MiddlewareResult<TExtraContext extends Context, TOutput> = Promisable<{
+import type { Context } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { ANY_PROCEDURE } from './procedure';
+import type { AbortSignal } from './types';
+export type MiddlewareResult<TOutContext extends Context, TOutput> = Promisable<{
     output: TOutput;
-    context: TExtraContext;
+    context: TOutContext;
 }>;
-export interface MiddlewareMeta<TOutput> extends Meta {
-    next: <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
-        context?: UExtraContext;
-    } : {
-        context: UExtraContext;
-    }) => MiddlewareResult<UExtraContext, TOutput>;
-    output: <UOutput>(output: UOutput) => MiddlewareResult<undefined, UOutput>;
+export type MiddlewareNextFnOptions<TOutContext extends Context> = Record<never, never> extends TOutContext ? {
+    context?: TOutContext;
+} : {
+    context: TOutContext;
+};
+export type MiddlewareNextFnRest<TOutContext extends Context> = [options: MiddlewareNextFnOptions<TOutContext>] | (Record<never, never> extends TOutContext ? [] : never);
+export interface MiddlewareNextFn<TInContext extends Context, TOutput> {
+    <U extends Context & Partial<TInContext> = Record<never, never>>(...rest: MiddlewareNextFnRest<U>): MiddlewareResult<U, 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<Record<never, never>, TOutput>;
 }
-export type ANY_MIDDLEWARE = Middleware<any, any, any, any>;
+export interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
+    context: TInContext;
+    path: string[];
+    procedure: ANY_PROCEDURE;
+    signal?: AbortSignal;
+    next: MiddlewareNextFn<TInContext, TOutput>;
+    errors: TErrorConstructorMap;
+}
+export interface Middleware<TInContext extends Context, TOutContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
+    (options: MiddlewareOptions<TInContext, TOutput, TErrorConstructorMap>, input: TInput, output: MiddlewareOutputFn<TOutput>): Promisable<MiddlewareResult<TOutContext, TOutput>>;
+}
+export type ANY_MIDDLEWARE = Middleware<any, any, any, any, any>;
 export interface MapInputMiddleware<TInput, TMappedInput> {
     (input: TInput): TMappedInput;
 }
 export type ANY_MAP_INPUT_MIDDLEWARE = MapInputMiddleware<any, any>;
+export declare function middlewareOutputFn<TOutput>(output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;
 //# sourceMappingURL=middleware.d.ts.map

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

@@ -0,0 +1,35 @@
+import type { ContractProcedure, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, RouteOptions, Schema, SchemaOutput } from '@orpc/contract';
+import type { ConflictContextGuard, Context, TypeCurrentContext, TypeInitialContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { MapInputMiddleware, Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
+import { DecoratedProcedure } from './procedure-decorated';
+import { ProcedureImplementer } from './procedure-implementer';
+export interface ProcedureBuilderWithInputDef<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TErrorMap extends ErrorMap> {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    __currentContext?: TypeCurrentContext<TCurrentContext>;
+    contract: ContractProcedure<TInputSchema, undefined, TErrorMap>;
+    middlewares: Middleware<any, any, any, any, any>[];
+    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<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TErrorMap extends ErrorMap> {
+    '~type': "ProcedureBuilderWithInput";
+    '~orpc': ProcedureBuilderWithInputDef<TInitialContext, TCurrentContext, TInputSchema, TErrorMap>;
+    constructor(def: ProcedureBuilderWithInputDef<TInitialContext, TCurrentContext, TInputSchema, TErrorMap>);
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, TInputSchema, TErrorMap & U>;
+    route(route: RouteOptions): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, TInputSchema, TErrorMap>;
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, SchemaOutput<TInputSchema>, unknown, ORPCErrorConstructorMap<TErrorMap>>): ConflictContextGuard<TCurrentContext & U> & ProcedureBuilderWithInput<TInitialContext, TCurrentContext & U, TInputSchema, TErrorMap>;
+    use<UOutContext extends Context, UInput>(middleware: Middleware<TCurrentContext, UOutContext, UInput, unknown, ORPCErrorConstructorMap<TErrorMap>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ConflictContextGuard<TCurrentContext & UOutContext> & ProcedureBuilderWithInput<TInitialContext, TCurrentContext & UOutContext, TInputSchema, TErrorMap>;
+    output<U extends Schema>(schema: U, example?: SchemaOutput<U>): ProcedureImplementer<TInitialContext, TCurrentContext, TInputSchema, U, TErrorMap>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TCurrentContext, TInputSchema, undefined, UFuncOutput, TErrorMap>): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, undefined, UFuncOutput, TErrorMap>;
+}
+//# sourceMappingURL=procedure-builder-with-input.d.ts.map

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

@@ -0,0 +1,34 @@
+import type { ContractProcedure, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, RouteOptions, Schema, SchemaInput } from '@orpc/contract';
+import type { ConflictContextGuard, Context, TypeCurrentContext, TypeInitialContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
+import { DecoratedProcedure } from './procedure-decorated';
+import { ProcedureImplementer } from './procedure-implementer';
+export interface ProcedureBuilderWithOutputDef<TInitialContext extends Context, TCurrentContext extends Context, TOutputSchema extends Schema, TErrorMap extends ErrorMap> {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    __currentContext?: TypeCurrentContext<TCurrentContext>;
+    contract: ContractProcedure<undefined, TOutputSchema, TErrorMap>;
+    middlewares: Middleware<any, any, any, any, any>[];
+    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<TInitialContext extends Context, TCurrentContext extends Context, TOutputSchema extends Schema, TErrorMap extends ErrorMap> {
+    '~type': "ProcedureBuilderWithOutput";
+    '~orpc': ProcedureBuilderWithOutputDef<TInitialContext, TCurrentContext, TOutputSchema, TErrorMap>;
+    constructor(def: ProcedureBuilderWithOutputDef<TInitialContext, TCurrentContext, TOutputSchema, TErrorMap>);
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, TOutputSchema, TErrorMap & U>;
+    route(route: RouteOptions): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, TOutputSchema, TErrorMap>;
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, unknown, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>>): ConflictContextGuard<TCurrentContext & U> & ProcedureBuilderWithOutput<TInitialContext, TCurrentContext & U, TOutputSchema, TErrorMap>;
+    input<U extends Schema>(schema: U, example?: SchemaInput<U>): ProcedureImplementer<TInitialContext, TCurrentContext, U, TOutputSchema, TErrorMap>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TCurrentContext, undefined, TOutputSchema, UFuncOutput, TErrorMap>): DecoratedProcedure<TInitialContext, TCurrentContext, undefined, TOutputSchema, UFuncOutput, TErrorMap>;
+}
+//# sourceMappingURL=procedure-builder-with-output.d.ts.map

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

@@ -1,22 +1,28 @@
-import type { MapInputMiddleware, Middleware } from './middleware';
-import type { DecoratedProcedure } from './procedure-decorated';
-import type { Context, MergeContext } from './types';
-import { type ContractProcedure, type RouteOptions, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-import { type ProcedureFunc } from './procedure';
-import { ProcedureImplementer } from './procedure-implementer';
-export interface ProcedureBuilderDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> {
-    contract: ContractProcedure<TInputSchema, TOutputSchema>;
-    middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any>[];
+import type { ContractProcedure, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ConflictContextGuard, Context, TypeCurrentContext, TypeInitialContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
+import { ProcedureBuilderWithInput } from './procedure-builder-with-input';
+import { ProcedureBuilderWithOutput } from './procedure-builder-with-output';
+import { DecoratedProcedure } from './procedure-decorated';
+export interface ProcedureBuilderDef<TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    __currentContext?: TypeCurrentContext<TCurrentContext>;
+    contract: ContractProcedure<undefined, undefined, TErrorMap>;
+    middlewares: Middleware<any, any, any, any, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
 }
-export declare class ProcedureBuilder<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> {
+export declare class ProcedureBuilder<TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> {
     '~type': "ProcedureBuilder";
-    '~orpc': ProcedureBuilderDef<TContext, TExtraContext, TInputSchema, TOutputSchema>;
-    constructor(def: ProcedureBuilderDef<TContext, TExtraContext, TInputSchema, TOutputSchema>);
-    route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, TInputSchema, TOutputSchema>;
-    input<U extends Schema = undefined>(schema: U, example?: SchemaInput<U>): ProcedureBuilder<TContext, TExtraContext, U, TOutputSchema>;
-    output<U extends Schema = undefined>(schema: U, example?: SchemaOutput<U>): ProcedureBuilder<TContext, TExtraContext, TInputSchema, U>;
-    use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
-    use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
-    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
+    '~orpc': ProcedureBuilderDef<TInitialContext, TCurrentContext, TErrorMap>;
+    constructor(def: ProcedureBuilderDef<TInitialContext, TCurrentContext, TErrorMap>);
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): ProcedureBuilder<TInitialContext, TCurrentContext, TErrorMap & U>;
+    route(route: RouteOptions): ProcedureBuilder<TInitialContext, TCurrentContext, TErrorMap>;
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, unknown, unknown, ORPCErrorConstructorMap<TErrorMap>>): ConflictContextGuard<TCurrentContext & U> & ProcedureBuilder<TInitialContext, TCurrentContext & U, TErrorMap>;
+    input<U extends Schema>(schema: U, example?: SchemaInput<U>): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, U, TErrorMap>;
+    output<U extends Schema>(schema: U, example?: SchemaOutput<U>): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, U, TErrorMap>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TCurrentContext, undefined, undefined, UFuncOutput, TErrorMap>): DecoratedProcedure<TInitialContext, TCurrentContext, undefined, undefined, UFuncOutput, TErrorMap>;
 }
 //# sourceMappingURL=procedure-builder.d.ts.map

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

@@ -1,34 +1,21 @@
-import type { Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Client, ErrorFromErrorMap, ErrorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Hooks, Value } from '@orpc/shared';
+import type { Context } from './context';
 import type { Lazyable } from './lazy';
 import type { Procedure } from './procedure';
-import type { Context, Meta, WELL_CONTEXT, WithSignal } from './types';
-export type ProcedureClientOptions<TClientContext> = WithSignal & (undefined extends TClientContext ? {
-    context?: TClientContext;
-} : {
-    context: TClientContext;
-});
-export interface ProcedureClient<TInput, TOutput, TClientContext> {
-    (...opts: [input: TInput, options: ProcedureClientOptions<TClientContext>] | (undefined extends TInput & TClientContext ? [] : never) | (undefined extends TClientContext ? [input: TInput] : never)): Promise<TOutput>;
-}
+import type { 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, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> = {
-    procedure: Lazyable<Procedure<TContext, any, TInputSchema, TOutputSchema, THandlerOutput>>;
+export type CreateProcedureClientOptions<TInitialContext extends Context, TCurrentContext extends Schema, THandlerOutput extends SchemaInput<TCurrentContext>, TClientContext> = {
     /**
      * This is helpful for logging and analytics.
-     *
-     * @internal
      */
     path?: string[];
 } & ({
-    /**
-     * The context used when calling the procedure.
-     */
-    context: Value<TContext>;
-} | (undefined extends TContext ? {
-    context?: undefined;
-} : never)) & Hooks<unknown, SchemaOutput<TOutputSchema, THandlerOutput>, TContext, Meta>;
-export declare function createProcedureClient<TContext extends Context = WELL_CONTEXT, TInputSchema extends Schema = undefined, TOutputSchema extends Schema = undefined, THandlerOutput extends SchemaInput<TOutputSchema> = SchemaInput<TOutputSchema>>(options: CreateProcedureClientOptions<TContext, TInputSchema, TOutputSchema, THandlerOutput>): ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, unknown>;
+    context: Value<TInitialContext, [clientContext: TClientContext]>;
+} | (Record<never, never> extends TInitialContext ? Record<never, never> : never)) & Hooks<unknown, SchemaOutput<TCurrentContext, THandlerOutput>, TInitialContext, Meta>;
+export type CreateProcedureClientRest<TInitialContext extends Context, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TClientContext> = [options: CreateProcedureClientOptions<TInitialContext, TOutputSchema, THandlerOutput, TClientContext>] | (Record<never, never> extends TInitialContext ? [] : never);
+export declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>>, ...[options]: CreateProcedureClientRest<TInitialContext, TOutputSchema, THandlerOutput, TClientContext>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
 //# sourceMappingURL=procedure-client.d.ts.map

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

@@ -1,14 +1,25 @@
-import type { HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ClientRest, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ConflictContextGuard, Context } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { MapInputMiddleware, Middleware } from './middleware';
-import type { ProcedureClient } from './procedure-client';
-import type { Context, MergeContext } from './types';
+import type { CreateProcedureClientRest, ProcedureClient } from './procedure-client';
 import { Procedure } from './procedure';
-export type DecoratedProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> = Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput> & {
-    prefix: (prefix: HTTPPath) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
-    route: (route: RouteOptions) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
-    use: (<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, THandlerOutput>>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema, THandlerOutput>) & (<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema, THandlerOutput>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, THandlerOutput>, UInput>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema, THandlerOutput>);
-    unshiftTag: (...tags: string[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
-    unshiftMiddleware: <U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(...middlewares: Middleware<TContext, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, THandlerOutput>>[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
-} & (undefined extends TContext ? ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, unknown> : unknown);
-export declare function decorateProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>>(procedure: Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+export declare class DecoratedProcedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> extends Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap> {
+    static decorate<UInitialContext extends Context, UCurrentContext extends Context, UInputSchema extends Schema, UOutputSchema extends Schema, UHandlerOutput extends SchemaInput<UOutputSchema>, UErrorMap extends ErrorMap>(procedure: Procedure<UInitialContext, UCurrentContext, UInputSchema, UOutputSchema, UHandlerOutput, UErrorMap>): DecoratedProcedure<any, any, any, any, any, any> | DecoratedProcedure<UInitialContext, UCurrentContext, UInputSchema, UOutputSchema, UHandlerOutput, UErrorMap>;
+    prefix(prefix: HTTPPath): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    route(route: RouteOptions): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap & U>;
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, SchemaOutput<TInputSchema>, THandlerOutput, ORPCErrorConstructorMap<TErrorMap>>): ConflictContextGuard<TCurrentContext & U> & DecoratedProcedure<TInitialContext, TCurrentContext & U, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    use<UOutContext extends Context, UInput>(middleware: Middleware<TCurrentContext, UOutContext, UInput, THandlerOutput, ORPCErrorConstructorMap<TErrorMap>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, THandlerOutput>, UInput>): ConflictContextGuard<TCurrentContext & UOutContext> & DecoratedProcedure<TInitialContext, TCurrentContext & UOutContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    unshiftTag(...tags: string[]): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    unshiftMiddleware<U extends Context>(...middlewares: Middleware<TInitialContext, U, unknown, SchemaOutput<TOutputSchema, THandlerOutput>, ORPCErrorConstructorMap<TErrorMap>>[]): ConflictContextGuard<TInitialContext & U> & DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    /**
+     * Make this procedure callable (works like a function while still being a procedure).
+     */
+    callable<TClientContext>(...rest: CreateProcedureClientRest<TInitialContext, TOutputSchema, THandlerOutput, TClientContext>): Procedure<TInitialContext, TCurrentContext, 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<TInitialContext, TOutputSchema, THandlerOutput, TClientContext>): Procedure<TInitialContext, TCurrentContext, 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,18 +1,23 @@
-import type { ContractProcedure, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContractProcedure, ErrorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ConflictContextGuard, Context, TypeCurrentContext, TypeInitialContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { MapInputMiddleware, Middleware } from './middleware';
-import type { ProcedureFunc } from './procedure';
-import type { DecoratedProcedure } from './procedure-decorated';
-import type { Context, MergeContext } from './types';
-export type ProcedureImplementerDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> = {
-    contract: ContractProcedure<TInputSchema, TOutputSchema>;
-    middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>[];
+import type { ProcedureHandler } from './procedure';
+import { DecoratedProcedure } from './procedure-decorated';
+export type ProcedureImplementerDef<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap> = {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    __currentContext?: TypeCurrentContext<TCurrentContext>;
+    contract: ContractProcedure<TInputSchema, TOutputSchema, TErrorMap>;
+    middlewares: Middleware<any, any, any, any, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
 };
-export declare class ProcedureImplementer<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> {
+export declare class ProcedureImplementer<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap> {
     '~type': "ProcedureImplementer";
-    '~orpc': ProcedureImplementerDef<TContext, TExtraContext, TInputSchema, TOutputSchema>;
-    constructor(def: ProcedureImplementerDef<TContext, TExtraContext, TInputSchema, TOutputSchema>);
-    use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
-    use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
-    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
+    '~orpc': ProcedureImplementerDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap>;
+    constructor(def: ProcedureImplementerDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap>);
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>>): ConflictContextGuard<TCurrentContext & U> & ProcedureImplementer<TInitialContext, TCurrentContext & U, TInputSchema, TOutputSchema, TErrorMap>;
+    use<UOutContext extends Context, UInput>(middleware: Middleware<TCurrentContext, UOutContext, UInput, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ConflictContextGuard<TCurrentContext & UOutContext> & ProcedureImplementer<TInitialContext, TCurrentContext & UOutContext, TInputSchema, TOutputSchema, TErrorMap>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap>): DecoratedProcedure<TInitialContext, TCurrentContext, 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 { Context } from './context';
+import type { Lazyable } from './lazy';
+import type { Procedure } from './procedure';
+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<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap>(procedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>>, input: SchemaInput<TInputSchema>, ...rest: CreateProcedureClientRest<TInitialContext, TOutputSchema, THandlerOutput, unknown>): ClientPromiseResult<SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
+//# sourceMappingURL=procedure-utils.d.ts.map

package/dist/src/procedure.d.ts

@@ -1,23 +1,47 @@
+import type { ContractProcedure, ErrorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
+import type { Context, TypeInitialContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
 import type { Lazy } from './lazy';
 import type { Middleware } from './middleware';
-import type { Context, MergeContext, Meta } from './types';
-import { type ContractProcedure, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-export interface ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
-    (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
+import type { AbortSignal } from './types';
+export interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
+    context: TCurrentContext;
+    input: TInput;
+    path: string[];
+    procedure: ANY_PROCEDURE;
+    signal?: AbortSignal;
+    errors: TErrorConstructorMap;
 }
-export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
-    middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, SchemaOutput<TInputSchema>, any>[];
-    contract: ContractProcedure<TInputSchema, TOutputSchema>;
-    handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+export interface ProcedureHandler<TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> {
+    (opt: ProcedureHandlerOptions<TCurrentContext, SchemaOutput<TInputSchema>, ORPCErrorConstructorMap<TErrorMap>>): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
 }
-export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
+/**
+ * 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<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    middlewares: Middleware<any, any, any, any, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+    contract: ContractProcedure<TInputSchema, TOutputSchema, TErrorMap>;
+    handler: ProcedureHandler<TCurrentContext, any, any, THandlerOutput, any>;
+}
+export declare class Procedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> {
     '~type': "Procedure";
-    '~orpc': ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
-    constructor(def: ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>);
+    '~orpc': ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
+    constructor(def: ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>);
 }
-export type ANY_PROCEDURE = Procedure<any, any, any, any, any>;
-export type WELL_PROCEDURE = Procedure<Context, Context, Schema, Schema, unknown>;
+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,29 +1,33 @@
-import type { HTTPPath } from '@orpc/contract';
+import type { ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, StrictErrorMap } from '@orpc/contract';
+import type { ConflictContextGuard, Context, TypeCurrentContext, TypeInitialContext } from './context';
 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 DecoratedLazy } from './lazy-decorated';
-import { type DecoratedProcedure } from './procedure-decorated';
-export type AdaptedRouter<TContext extends Context, TRouter extends ANY_ROUTER> = TRouter extends Lazy<infer U extends ANY_ROUTER> ? DecoratedLazy<AdaptedRouter<TContext, U>> : TRouter extends Procedure<any, infer UExtraContext, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? DecoratedProcedure<TContext, UExtraContext, UInputSchema, UOutputSchema, UFuncOutput> : {
-    [K in keyof TRouter]: TRouter[K] extends ANY_ROUTER ? AdaptedRouter<TContext, TRouter[K]> : never;
+import { DecoratedProcedure } from './procedure-decorated';
+export type AdaptedRouter<TInitialContext extends Context, TRouter extends ANY_ROUTER, TErrorMapExtra extends ErrorMap> = TRouter extends Lazy<infer U extends ANY_ROUTER> ? DecoratedLazy<AdaptedRouter<TInitialContext, U, TErrorMapExtra>> : TRouter extends Procedure<any, infer UCurrentContext, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap> ? DecoratedProcedure<TInitialContext, UCurrentContext, UInputSchema, UOutputSchema, UFuncOutput, UErrorMap & TErrorMapExtra> : {
+    [K in keyof TRouter]: TRouter[K] extends ANY_ROUTER ? AdaptedRouter<TInitialContext, TRouter[K], TErrorMapExtra> : never;
 };
-export type RouterBuilderDef<TContext extends Context, TExtraContext extends Context> = {
+export type RouterBuilderDef<TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> = {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    __currentContext?: TypeCurrentContext<TCurrentContext>;
     prefix?: HTTPPath;
     tags?: readonly string[];
-    middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any>[];
+    middlewares: Middleware<any, any, any, any, any>[];
+    errorMap: TErrorMap;
 };
-export declare class RouterBuilder<TContext extends Context, TExtraContext extends Context> {
+export declare class RouterBuilder<TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> {
     '~type': "RouterBuilder";
-    '~orpc': RouterBuilderDef<TContext, TExtraContext>;
-    constructor(def: RouterBuilderDef<TContext, TExtraContext>);
-    prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext>;
-    tag(...tags: string[]): RouterBuilder<TContext, TExtraContext>;
-    use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, unknown, unknown>): RouterBuilder<TContext, MergeContext<TExtraContext, U>>;
-    router<U extends Router<MergeContext<TContext, TExtraContext>, any>>(router: U): AdaptedRouter<TContext, U>;
-    lazy<U extends Router<MergeContext<TContext, TExtraContext>, any>>(loader: () => Promise<{
+    '~orpc': RouterBuilderDef<TInitialContext, TCurrentContext, TErrorMap>;
+    constructor(def: RouterBuilderDef<TInitialContext, TCurrentContext, TErrorMap>);
+    prefix(prefix: HTTPPath): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap>;
+    tag(...tags: string[]): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap>;
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap & U>;
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, unknown, unknown, Record<never, never>>): ConflictContextGuard<TCurrentContext & U> & RouterBuilder<TInitialContext, TCurrentContext & U, TErrorMap>;
+    router<U extends Router<TCurrentContext, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(router: U): AdaptedRouter<TInitialContext, U, TErrorMap>;
+    lazy<U extends Router<TCurrentContext, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(loader: () => Promise<{
         default: U;
-    }>): AdaptedRouter<TContext, FlattenLazy<U>>;
+    }>): AdaptedRouter<TInitialContext, FlattenLazy<U>, TErrorMap>;
 }
 //# sourceMappingURL=router-builder.d.ts.map

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

@@ -1,15 +1,16 @@
-import type { ContractProcedure, ContractRouter, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Hooks, Value } from '@orpc/shared';
 import type { Lazy } from './lazy';
 import type { Procedure } from './procedure';
-import type { ProcedureClient } from './procedure-client';
+import type { CreateProcedureClientRest, ProcedureClient } from './procedure-client';
 import type { Meta } from './types';
 import { type ANY_ROUTER, type Router } from './router';
-export type RouterClient<TRouter extends ANY_ROUTER | ContractRouter, TClientContext> = TRouter extends Lazy<infer U extends ANY_ROUTER | ContractRouter> ? RouterClient<U, TClientContext> : TRouter extends ContractProcedure<infer UInputSchema, infer UOutputSchema> | Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>, TClientContext> : {
-    [K in keyof TRouter]: TRouter[K] extends ANY_ROUTER | ContractRouter ? RouterClient<TRouter[K], TClientContext> : never;
+/**
+ * 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> = {
-    router: TRouter | Lazy<undefined>;
     /**
      * This is helpful for logging and analytics.
      *
@@ -21,5 +22,5 @@ export type CreateRouterClientOptions<TRouter extends ANY_ROUTER> = {
 } : {
     context: Value<UContext>;
 } : never) & Hooks<unknown, unknown, TRouter extends Router<infer UContext, any> ? UContext : never, Meta>;
-export declare function createRouterClient<TRouter extends ANY_ROUTER>(options: CreateRouterClientOptions<TRouter>): RouterClient<TRouter, unknown>;
+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