@orpc/server 0.31.0 → 0.33.0

package/dist/next.js

@@ -4,14 +4,14 @@ import {
   ORPCProcedureMatcher,
   RPCHandler,
   super_json_exports
-} from "./chunk-SXUFCJBY.js";
-import "./chunk-GK2Z6B6W.js";
+} from "./chunk-ESTRJAOX.js";
+import "./chunk-KK4SDLC7.js";
 
 // src/adapters/next/serve.ts
 import { value } from "@orpc/shared";
 function serve(handler, ...[options]) {
   const main = async (req) => {
-    const context = await value(options?.context, req);
+    const context = await value(options?.context ?? {}, req);
     const { matched, response } = await handler.handle(req, { ...options, context });
     if (matched) {
       return response;

package/dist/node.js

@@ -1,7 +1,7 @@
 import {
   RPCHandler
-} from "./chunk-SXUFCJBY.js";
-import "./chunk-GK2Z6B6W.js";
+} from "./chunk-ESTRJAOX.js";
+import "./chunk-KK4SDLC7.js";
 
 // src/adapters/node/request-listener.ts
 function createRequest(req, res) {
@@ -66,14 +66,14 @@ var RPCHandler2 = class {
   constructor(router, options) {
     this.orpcFetchHandler = new RPCHandler(router, options);
   }
-  async handle(req, res, ...[options]) {
+  async handle(req, res, ...rest) {
     const request = createRequest(req, res);
-    const castedOptions = options ?? {};
-    const result = await this.orpcFetchHandler.handle(request, castedOptions);
+    const result = await this.orpcFetchHandler.handle(request, ...rest);
     if (result.matched === false) {
       return { matched: false };
     }
-    await options?.beforeSend?.(result.response, castedOptions.context);
+    const context = rest[0]?.context ?? {};
+    await rest[0]?.beforeSend?.(result.response, context);
     await sendResponse(res, result.response);
     return { matched: true };
   }

package/dist/src/adapters/fetch/orpc-handler.d.ts

@@ -1,6 +1,6 @@
 import type { Hooks } from '@orpc/shared';
+import type { Context } from '../../context';
 import type { Router } from '../../router';
-import type { Context } from '../../types';
 import type { FetchHandler, FetchHandleRest, FetchHandleResult } from './types';
 import { type PublicORPCPayloadCodec } from './orpc-payload-codec';
 import { type PublicORPCProcedureMatcher } from './orpc-procedure-matcher';

package/dist/src/adapters/fetch/orpc-procedure-matcher.d.ts

@@ -1,11 +1,11 @@
-import type { ANY_PROCEDURE } from '../../procedure';
-import { type ANY_ROUTER } from '../../router';
+import type { AnyProcedure } from '../../procedure';
+import type { AnyRouter } from '../../router';
 export declare class ORPCProcedureMatcher {
     private readonly router;
-    constructor(router: ANY_ROUTER);
+    constructor(router: AnyRouter);
     match(pathname: string): Promise<{
         path: string[];
-        procedure: ANY_PROCEDURE;
+        procedure: AnyProcedure;
     } | undefined>;
 }
 export type PublicORPCProcedureMatcher = Pick<ORPCProcedureMatcher, keyof ORPCProcedureMatcher>;

package/dist/src/adapters/fetch/types.d.ts

@@ -1,13 +1,13 @@
 import type { HTTPPath } from '@orpc/contract';
-import type { Context } from '../../types';
+import type { Context } from '../../context';
 export type FetchHandleOptions<T extends Context> = {
     prefix?: HTTPPath;
-} & (undefined extends T ? {
+} & (Record<never, never> extends T ? {
     context?: T;
 } : {
     context: T;
 });
-export type FetchHandleRest<T extends Context> = [options: FetchHandleOptions<T>] | (undefined extends T ? [] : never);
+export type FetchHandleRest<T extends Context> = [options: FetchHandleOptions<T>] | (Record<never, never> extends T ? [] : never);
 export type FetchHandleResult = {
     matched: true;
     response: Response;
@@ -16,6 +16,6 @@ export type FetchHandleResult = {
     response: undefined;
 };
 export interface FetchHandler<T extends Context> {
-    handle: (request: Request, ...rest: FetchHandleRest<T>) => Promise<FetchHandleResult>;
+    handle(request: Request, ...rest: FetchHandleRest<T>): Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/src/adapters/hono/middleware.d.ts

@@ -1,12 +1,12 @@
 import type { Context as HonoContext, MiddlewareHandler } from 'hono';
-import type { Context } from '../../types';
+import type { Context } from '../../context';
 import type { FetchHandleOptions, FetchHandler } from '../fetch';
 import { type Value } from '@orpc/shared';
-export type CreateMiddlewareOptions<T extends Context> = Omit<FetchHandleOptions<T>, 'context'> & (undefined extends T ? {
+export type CreateMiddlewareOptions<T extends Context> = Omit<FetchHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: Value<T, [HonoContext]>;
 } : {
     context: Value<T, [HonoContext]>;
 });
-export type CreateMiddlewareRest<T extends Context> = [options: CreateMiddlewareOptions<T>] | (undefined extends T ? [] : never);
+export type CreateMiddlewareRest<T extends Context> = [options: CreateMiddlewareOptions<T>] | (Record<never, never> extends T ? [] : never);
 export declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: CreateMiddlewareRest<T>): MiddlewareHandler;
 //# sourceMappingURL=middleware.d.ts.map

package/dist/src/adapters/next/serve.d.ts

@@ -1,19 +1,19 @@
 import type { NextRequest } from 'next/server';
-import type { Context } from '../../types';
+import type { Context } from '../../context';
 import type { FetchHandleOptions, FetchHandler } from '../fetch';
 import { type Value } from '@orpc/shared';
-export type ServeOptions<T extends Context> = Omit<FetchHandleOptions<T>, 'context'> & (undefined extends T ? {
+export type ServeOptions<T extends Context> = Omit<FetchHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: Value<T, [NextRequest]>;
 } : {
     context: Value<T, [NextRequest]>;
 });
-export type ServeRest<T extends Context> = [options: ServeOptions<T>] | (undefined extends T ? [] : never);
+export type ServeRest<T extends Context> = [options: ServeOptions<T>] | (Record<never, never> extends T ? [] : never);
 export interface ServeResult {
-    GET: (req: NextRequest) => Promise<Response>;
-    POST: (req: NextRequest) => Promise<Response>;
-    PUT: (req: NextRequest) => Promise<Response>;
-    PATCH: (req: NextRequest) => Promise<Response>;
-    DELETE: (req: NextRequest) => Promise<Response>;
+    GET(req: NextRequest): Promise<Response>;
+    POST(req: NextRequest): Promise<Response>;
+    PUT(req: NextRequest): Promise<Response>;
+    PATCH(req: NextRequest): Promise<Response>;
+    DELETE(req: NextRequest): Promise<Response>;
 }
 export declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: ServeRest<T>): ServeResult;
 //# sourceMappingURL=serve.d.ts.map

package/dist/src/adapters/node/orpc-handler.d.ts

@@ -1,12 +1,12 @@
 import type { ServerResponse } from 'node:http';
+import type { Context } from '../../context';
 import type { Router } from '../../router';
-import type { Context } from '../../types';
 import type { RPCHandlerOptions } from '../fetch/orpc-handler';
 import type { RequestHandler, RequestHandleRest, RequestHandleResult } from './types';
 import { type ExpressableIncomingMessage } from './request-listener';
 export declare class RPCHandler<T extends Context> implements RequestHandler<T> {
     private readonly orpcFetchHandler;
     constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
-    handle(req: ExpressableIncomingMessage, res: ServerResponse, ...[options]: RequestHandleRest<T>): Promise<RequestHandleResult>;
+    handle(req: ExpressableIncomingMessage, res: ServerResponse, ...rest: RequestHandleRest<T>): Promise<RequestHandleResult>;
 }
 //# sourceMappingURL=orpc-handler.d.ts.map

package/dist/src/adapters/node/types.d.ts

@@ -1,22 +1,22 @@
 import type { HTTPPath } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { Context } from '../../types';
+import type { Context } from '../../context';
 export type RequestHandleOptions<T extends Context> = {
     prefix?: HTTPPath;
-    beforeSend?: (response: Response, context: T) => Promisable<void>;
-} & (undefined extends T ? {
+    beforeSend?(response: Response, context: T): Promisable<void>;
+} & (Record<never, never> extends T ? {
     context?: T;
 } : {
     context: T;
 });
-export type RequestHandleRest<T extends Context> = [options: RequestHandleOptions<T>] | (undefined extends T ? [] : never);
+export type RequestHandleRest<T extends Context> = [options: RequestHandleOptions<T>] | (Record<never, never> extends T ? [] : never);
 export type RequestHandleResult = {
     matched: true;
 } | {
     matched: false;
 };
 export interface RequestHandler<T extends Context> {
-    handle: (req: IncomingMessage, res: ServerResponse, ...rest: RequestHandleRest<T>) => Promise<RequestHandleResult>;
+    handle(req: IncomingMessage, res: ServerResponse, ...rest: RequestHandleRest<T>): Promise<RequestHandleResult>;
 }
 //# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1,74 @@
+import type { ContractRouter, ErrorMap, HTTPPath, MergedErrorMap, Meta, ORPCErrorConstructorMap, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { BuilderDef } from './builder';
+import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { FlattenLazy } from './lazy-utils';
+import type { MapInputMiddleware, Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
+import type { DecoratedProcedure } from './procedure-decorated';
+import type { AdaptedRouter, AdaptRouterOptions, Router } from './router';
+export interface BuilderWithMiddlewares<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    '~orpc': BuilderDef<TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'errors'<U extends ErrorMap>(errors: U): BuilderWithMiddlewares<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, MergedErrorMap<TErrorMap, U>, TMeta>;
+    'use'<UOutContext extends Context>(middleware: Middleware<TCurrentContext, UOutContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & BuilderWithMiddlewares<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'meta'(meta: TMeta): BuilderWithMiddlewares<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'route'(route: Route): ProcedureBuilder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'input'<USchema extends Schema>(schema: USchema): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, USchema, TOutputSchema, TErrorMap, TMeta>;
+    'output'<USchema extends Schema>(schema: USchema): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, TInputSchema, USchema, TErrorMap, TMeta>;
+    'handler'<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>;
+    'prefix'(prefix: HTTPPath): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap, TMeta>;
+    'tag'(...tags: string[]): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap, TMeta>;
+    'router'<U extends Router<TCurrentContext, ContractRouter<TMeta>>>(router: U): AdaptedRouter<U, TInitialContext, TErrorMap>;
+    'lazy'<U extends Router<TCurrentContext, ContractRouter<TMeta>>>(loader: () => Promise<{
+        default: U;
+    }>): AdaptedRouter<FlattenLazy<U>, TInitialContext, TErrorMap>;
+}
+export interface ProcedureBuilder<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    '~orpc': BuilderDef<TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'errors'<U extends ErrorMap>(errors: U): ProcedureBuilder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, MergedErrorMap<TErrorMap, U>, TMeta>;
+    'use'<UOutContext extends Context>(middleware: Middleware<TCurrentContext, UOutContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & ProcedureBuilder<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'meta'(meta: TMeta): ProcedureBuilder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'route'(route: Route): ProcedureBuilder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'input'<USchema extends Schema>(schema: USchema): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, USchema, TOutputSchema, TErrorMap, TMeta>;
+    'output'<USchema extends Schema>(schema: USchema): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, TInputSchema, USchema, TErrorMap, TMeta>;
+    'handler'<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>;
+}
+export interface ProcedureBuilderWithInput<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    '~orpc': BuilderDef<TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'errors'<U extends ErrorMap>(errors: U): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, MergedErrorMap<TErrorMap, U>, TMeta>;
+    'use'<UOutContext extends Context>(middleware: Middleware<TCurrentContext, UOutContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & ProcedureBuilderWithInput<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'use'<UOutContext extends Context, UInput>(middleware: Middleware<TCurrentContext, UOutContext, UInput, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & ProcedureBuilderWithInput<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'meta'(meta: TMeta): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'route'(route: Route): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'output'<USchema extends Schema>(schema: USchema): ProcedureBuilderWithInputOutput<TInitialContext, TCurrentContext, TInputSchema, USchema, TErrorMap, TMeta>;
+    'handler'<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>;
+}
+export interface ProcedureBuilderWithOutput<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    '~orpc': BuilderDef<TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'errors'<U extends ErrorMap>(errors: U): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, MergedErrorMap<TErrorMap, U>, TMeta>;
+    'use'<UOutContext extends Context>(middleware: Middleware<TCurrentContext, UOutContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & ProcedureBuilderWithOutput<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'meta'(meta: TMeta): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'route'(route: Route): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'input'<USchema extends Schema>(schema: USchema): ProcedureBuilderWithInputOutput<TInitialContext, TCurrentContext, USchema, TOutputSchema, TErrorMap, TMeta>;
+    'handler'<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>;
+}
+export interface ProcedureBuilderWithInputOutput<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    '~orpc': BuilderDef<TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'errors'<U extends ErrorMap>(errors: U): ProcedureBuilderWithInputOutput<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, MergedErrorMap<TErrorMap, U>, TMeta>;
+    'use'<UOutContext extends Context>(middleware: Middleware<TCurrentContext, UOutContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & ProcedureBuilderWithInputOutput<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'use'<UOutContext extends Context, UInput>(middleware: Middleware<TCurrentContext, UOutContext, UInput, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & ProcedureBuilderWithInputOutput<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'meta'(meta: TMeta): ProcedureBuilderWithInputOutput<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'route'(route: Route): ProcedureBuilderWithInputOutput<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'handler'<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>;
+}
+export interface RouterBuilder<TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    '~orpc': AdaptRouterOptions<TErrorMap>;
+    'errors'<U extends ErrorMap>(errors: U): RouterBuilder<TInitialContext, TCurrentContext, MergedErrorMap<TErrorMap, U>, TMeta>;
+    'use'<UOutContext extends Context>(middleware: Middleware<TCurrentContext, UOutContext, unknown, unknown, ORPCErrorConstructorMap<TErrorMap>, TMeta>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & RouterBuilder<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TErrorMap, TMeta>;
+    'prefix'(prefix: HTTPPath): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap, TMeta>;
+    'tag'(...tags: string[]): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap, TMeta>;
+    'router'<U extends Router<TCurrentContext, ContractRouter<TMeta>>>(router: U): AdaptedRouter<U, TInitialContext, TErrorMap>;
+    'lazy'<U extends Router<TCurrentContext, ContractRouter<TMeta>>>(loader: () => Promise<{
+        default: U;
+    }>): AdaptedRouter<FlattenLazy<U>, TInitialContext, TErrorMap>;
+}
+//# sourceMappingURL=builder-variants.d.ts.map

package/dist/src/builder.d.ts

@@ -1,43 +1,57 @@
-import type { ContractRouter, ErrorMap, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
-import type { ContextGuard } from './context';
-import type { FlattenLazy } from './lazy';
-import type { Middleware } from './middleware';
+import type { ContractProcedureDef, ContractRouter, ErrorMap, HTTPPath, MergedErrorMap, Meta, ORPCErrorConstructorMap, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { BuilderWithMiddlewares, ProcedureBuilder, ProcedureBuilderWithInput, ProcedureBuilderWithOutput, RouterBuilder } from './builder-variants';
+import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { FlattenLazy } from './lazy-utils';
+import type { AnyMiddleware, MapInputMiddleware, Middleware } from './middleware';
 import type { DecoratedMiddleware } from './middleware-decorated';
 import type { ProcedureHandler } from './procedure';
-import type { Router } from './router';
-import type { AdaptedRouter } from './router-builder';
-import type { Context, MergeContext } from './types';
-import { BuilderWithErrors } from './builder-with-errors';
-import { BuilderWithMiddlewares } from './builder-with-middlewares';
-import { type ChainableImplementer } from './implementer-chainable';
-import { ProcedureBuilder } from './procedure-builder';
-import { ProcedureBuilderWithInput } from './procedure-builder-with-input';
-import { ProcedureBuilderWithOutput } from './procedure-builder-with-output';
+import type { AdaptedRouter, AdaptRouterOptions, Router } from './router';
 import { DecoratedProcedure } from './procedure-decorated';
-import { RouterBuilder } from './router-builder';
-export interface BuilderDef<TContext extends Context> {
-    types?: {
-        context: TContext;
-    };
+export interface BuilderConfig {
+    initialInputValidationIndex?: number;
+    initialOutputValidationIndex?: number;
 }
-export declare class Builder<TContext extends Context> {
-    '~type': "Builder";
-    '~orpc': BuilderDef<TContext>;
-    constructor(def: BuilderDef<TContext>);
-    context<UContext extends Context = TContext>(): Builder<UContext>;
-    middleware<UExtraContext extends Context & ContextGuard<TContext>, TInput, TOutput = any>(middleware: Middleware<TContext, UExtraContext, TInput, TOutput, Record<never, never>>): DecoratedMiddleware<TContext, UExtraContext, TInput, TOutput, Record<never, never>>;
-    errors<U extends ErrorMap & ErrorMapSuggestions>(errors: U): BuilderWithErrors<TContext, U>;
-    use<U extends Context & ContextGuard<TContext>>(middleware: Middleware<TContext, U, unknown, unknown, Record<never, never>>): BuilderWithMiddlewares<TContext, U>;
-    route(route: RouteOptions): ProcedureBuilder<TContext, undefined, Record<never, never>>;
-    input<USchema extends Schema>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilderWithInput<TContext, undefined, USchema, Record<never, never>>;
-    output<USchema extends Schema>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilderWithOutput<TContext, undefined, USchema, Record<never, never>>;
-    handler<UFuncOutput>(handler: ProcedureHandler<TContext, undefined, undefined, undefined, UFuncOutput, Record<never, never>>): DecoratedProcedure<TContext, undefined, undefined, undefined, UFuncOutput, Record<never, never>>;
-    prefix(prefix: HTTPPath): RouterBuilder<TContext, undefined, Record<never, never>>;
-    tag(...tags: string[]): RouterBuilder<TContext, undefined, Record<never, never>>;
-    router<U extends Router<MergeContext<TContext, undefined>, any>>(router: U): AdaptedRouter<TContext, U, Record<never, never>>;
-    lazy<U extends Router<MergeContext<TContext, undefined>, any>>(loader: () => Promise<{
+export interface BuilderDef<TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TInputSchema, TOutputSchema, TErrorMap, TMeta>, AdaptRouterOptions<TErrorMap> {
+    middlewares: AnyMiddleware[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+    config: BuilderConfig;
+}
+export declare class Builder<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    '~orpc': BuilderDef<TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    constructor(def: BuilderDef<TInputSchema, TOutputSchema, TErrorMap, TMeta>);
+    /**
+     * Reset config
+     */
+    $config(config: BuilderConfig): Builder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    /**
+     * Reset initial context
+     */
+    $context<U extends Context>(): Builder<U, U, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    /**
+     * Reset initial meta
+     */
+    $meta<U extends Meta>(initialMeta: U): Builder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, U>;
+    /**
+     * Reset initial route
+     */
+    $route(initialRoute: Route): Builder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    middleware<UOutContext extends Context, TInput, TOutput = any>(// = any here is important to make middleware can be used in any output by default
+    middleware: Middleware<TCurrentContext, UOutContext, TInput, TOutput, ORPCErrorConstructorMap<TErrorMap>, TMeta>): DecoratedMiddleware<TCurrentContext, UOutContext, TInput, TOutput, ORPCErrorConstructorMap<any>, TMeta>;
+    errors<U extends ErrorMap>(errors: U): Builder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, MergedErrorMap<TErrorMap, U>, TMeta>;
+    use<UOutContext extends Context>(middleware: Middleware<TCurrentContext, UOutContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & BuilderWithMiddlewares<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    use<UOutContext extends Context, UInput>(middleware: Middleware<TCurrentContext, UOutContext, UInput, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & BuilderWithMiddlewares<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    meta(meta: TMeta): ProcedureBuilder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    route(route: Route): ProcedureBuilder<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    input<USchema extends Schema>(schema: USchema): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, USchema, TOutputSchema, TErrorMap, TMeta>;
+    output<USchema extends Schema>(schema: USchema): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, TInputSchema, USchema, TErrorMap, TMeta>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>;
+    prefix(prefix: HTTPPath): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap, TMeta>;
+    tag(...tags: string[]): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap, TMeta>;
+    router<U extends Router<TCurrentContext, ContractRouter<TMeta>>>(router: U): AdaptedRouter<U, TInitialContext, TErrorMap>;
+    lazy<U extends Router<TCurrentContext, ContractRouter<TMeta>>>(loader: () => Promise<{
         default: U;
-    }>): AdaptedRouter<TContext, FlattenLazy<U>, Record<never, never>>;
-    contract<U extends ContractRouter<any>>(contract: U): ChainableImplementer<TContext, undefined, U>;
+    }>): AdaptedRouter<FlattenLazy<U>, TInitialContext, TErrorMap>;
 }
+export declare const os: Builder<Context, Context, undefined, undefined, {}, {}>;
 //# sourceMappingURL=builder.d.ts.map

package/dist/src/config.d.ts

@@ -0,0 +1,6 @@
+export interface Config {
+    initialInputValidationIndex: number;
+    initialOutputValidationIndex: number;
+}
+export declare function fallbackConfig<T extends keyof Config>(key: T, value?: Config[T]): Config[T];
+//# sourceMappingURL=config.d.ts.map

package/dist/src/context.d.ts

@@ -1,11 +1,9 @@
-import type { Context } from './types';
-/**
- * U extends Context & ContextGuard<TContext>
- *
- * Purpose:
- *  - Ensures that any extension `U` of `Context` must conform to the current `TContext`.
- * - This is useful when redefining `TContext` to maintain type compatibility with the existing context.
- *
- */
-export type ContextGuard<T extends Context> = Partial<T> | undefined;
+import type { IsNever } from '@orpc/shared';
+export type Context = Record<string, any>;
+export type TypeInitialContext<T extends Context> = (type: T) => unknown;
+export type MergedContext<T extends Context, U extends Context> = T & U;
+export declare function mergeContext<T extends Context, U extends Context>(context: T, other: U): MergedContext<T, U>;
+export type ConflictContextGuard<T extends Context> = true extends IsNever<T> | {
+    [K in keyof T]: IsNever<T[K]>;
+}[keyof T] ? never : unknown;
 //# sourceMappingURL=context.d.ts.map

package/dist/src/hidden.d.ts

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

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

@@ -0,0 +1,30 @@
+import type { ClientRest, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { BuilderDef } from './builder';
+import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { MapInputMiddleware, Middleware } from './middleware';
+import type { Procedure, ProcedureHandler } from './procedure';
+import type { CreateProcedureClientRest, ProcedureClient } from './procedure-client';
+import type { DecoratedProcedure } from './procedure-decorated';
+/**
+ * Like `DecoratedProcedure`, but removed all method that can change the contract.
+ */
+export interface ImplementedProcedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta> extends Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> {
+    use: (<U extends Context>(middleware: Middleware<TCurrentContext, U, SchemaOutput<TInputSchema>, THandlerOutput, ORPCErrorConstructorMap<TErrorMap>, TMeta>) => ConflictContextGuard<MergedContext<TCurrentContext, U>> & DecoratedProcedure<TInitialContext, MergedContext<TCurrentContext, U>, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>) & (<UOutContext extends Context, UInput>(middleware: Middleware<TCurrentContext, UOutContext, UInput, THandlerOutput, ORPCErrorConstructorMap<TErrorMap>, TMeta>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, THandlerOutput>, UInput>) => ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & DecoratedProcedure<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>);
+    /**
+     * 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, TMeta> & 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, TMeta> & ((...rest: ClientRest<TClientContext, SchemaInput<TInputSchema>>) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>);
+}
+/**
+ * Like `ProcedureBuilderWithoutHandler`, but removed all method that can change the contract.
+ */
+export interface ProcedureImplementer<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    '~orpc': BuilderDef<TInputSchema, TOutputSchema, TErrorMap, TMeta>;
+    'use': (<U extends Context>(middleware: Middleware<TCurrentContext, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>) => ConflictContextGuard<MergedContext<TCurrentContext, U>> & ProcedureImplementer<TInitialContext, MergedContext<TCurrentContext, U>, TInputSchema, TOutputSchema, TErrorMap, TMeta>) & (<UOutContext extends Context, UInput>(middleware: Middleware<TCurrentContext, UOutContext, UInput, SchemaInput<TOutputSchema>, ORPCErrorConstructorMap<TErrorMap>, TMeta>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>) => ConflictContextGuard<MergedContext<TCurrentContext, UOutContext>> & ProcedureImplementer<TInitialContext, MergedContext<TCurrentContext, UOutContext>, TInputSchema, TOutputSchema, TErrorMap, TMeta>);
+    'handler'<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>): ImplementedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, UFuncOutput, TErrorMap, TMeta>;
+}
+//# sourceMappingURL=implementer-procedure.d.ts.map

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

@@ -0,0 +1,16 @@
+import type { AnyContractRouter, ContractProcedure, ContractRouter, ContractRouterToErrorMap, ORPCErrorConstructorMap } from '@orpc/contract';
+import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { ProcedureImplementer } from './implementer-procedure';
+import type { FlattenLazy } from './lazy-utils';
+import type { Middleware } from './middleware';
+import type { AdaptedRouter, Router } from './router';
+export type ImplementerInternalWithMiddlewares<TContract extends AnyContractRouter, TInitialContext extends Context, TCurrentContext extends Context> = (TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta> ? ProcedureImplementer<TInitialContext, TCurrentContext, UInputSchema, UOutputSchema, UErrorMap, UMeta> : TContract extends ContractRouter<infer UMeta> ? {
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, unknown, unknown, ORPCErrorConstructorMap<ContractRouterToErrorMap<TContract>>, UMeta>): ConflictContextGuard<MergedContext<TCurrentContext, U>> & ImplementerInternalWithMiddlewares<TContract, TInitialContext, MergedContext<TCurrentContext, U>>;
+    router<U extends Router<TCurrentContext, TContract>>(router: U): AdaptedRouter<U, TInitialContext, Record<never, never>>;
+    lazy<U extends Router<TInitialContext, TContract>>(loader: () => Promise<{
+        default: U;
+    }>): AdaptedRouter<FlattenLazy<U>, TInitialContext, Record<never, never>>;
+} & {
+    [K in keyof TContract]: TContract[K] extends AnyContractRouter ? ImplementerInternalWithMiddlewares<TContract[K], TInitialContext, TCurrentContext> : never;
+} : never);
+//# sourceMappingURL=implementer-variants.d.ts.map

package/dist/src/implementer.d.ts

@@ -0,0 +1,27 @@
+import type { AnyContractRouter, ContractProcedure, ContractRouter, ContractRouterToErrorMap, ContractRouterToMeta, ORPCErrorConstructorMap } from '@orpc/contract';
+import type { ConflictContextGuard, Context, MergedContext } from './context';
+import type { ProcedureImplementer } from './implementer-procedure';
+import type { ImplementerInternalWithMiddlewares } from './implementer-variants';
+import type { AnyMiddleware, Middleware } from './middleware';
+import { type BuilderConfig } from './builder';
+import { type FlattenLazy } from './lazy-utils';
+import { type DecoratedMiddleware } from './middleware-decorated';
+import { type AdaptedRouter, type Router } from './router';
+export type ImplementerInternal<TContract extends AnyContractRouter, TInitialContext extends Context, TCurrentContext extends Context> = (TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta> ? ProcedureImplementer<TInitialContext, TCurrentContext, UInputSchema, UOutputSchema, UErrorMap, UMeta> : TContract extends ContractRouter<infer UMeta> ? {
+    middleware<UOutContext extends Context, TInput, TOutput = any>(// = any here is important to make middleware can be used in any output by default
+    middleware: Middleware<TCurrentContext, UOutContext, TInput, TOutput, ORPCErrorConstructorMap<ContractRouterToErrorMap<TContract>>, ContractRouterToMeta<TContract>>): DecoratedMiddleware<TCurrentContext, UOutContext, TInput, TOutput, ORPCErrorConstructorMap<any>, UMeta>;
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, unknown, unknown, ORPCErrorConstructorMap<ContractRouterToErrorMap<TContract>>, UMeta>): ConflictContextGuard<MergedContext<TCurrentContext, U>> & ImplementerInternalWithMiddlewares<TContract, TInitialContext, MergedContext<TCurrentContext, U>>;
+    router<U extends Router<TCurrentContext, TContract>>(router: U): AdaptedRouter<U, TInitialContext, Record<never, never>>;
+    lazy<U extends Router<TCurrentContext, TContract>>(loader: () => Promise<{
+        default: U;
+    }>): AdaptedRouter<FlattenLazy<U>, TInitialContext, Record<never, never>>;
+} & {
+    [K in keyof TContract]: TContract[K] extends AnyContractRouter ? ImplementerInternal<TContract[K], TInitialContext, TCurrentContext> : never;
+} : never);
+export declare function implementerInternal<TContract extends AnyContractRouter, TInitialContext extends Context, TCurrentContext extends Context>(contract: TContract, config: BuilderConfig, middlewares: AnyMiddleware[]): ImplementerInternal<TContract, TInitialContext, TCurrentContext>;
+export type Implementer<TContract extends AnyContractRouter, TInitialContext extends Context, TCurrentContext extends Context> = {
+    $context<U extends Context>(): Implementer<TContract, U, U>;
+    $config(config: BuilderConfig): Implementer<TContract, TInitialContext, TCurrentContext>;
+} & ImplementerInternal<TContract, TInitialContext, TCurrentContext>;
+export declare function implement<TContract extends AnyContractRouter, TInitialContext extends Context, TCurrentContext extends Context>(contract: TContract, config?: BuilderConfig): Implementer<TContract, TInitialContext, TCurrentContext>;
+//# sourceMappingURL=implementer.d.ts.map

package/dist/src/index.d.ts

@@ -1,25 +1,21 @@
-import type { WELL_CONTEXT } from './types';
-import { Builder } from './builder';
 export * from './builder';
-export * from './error';
+export * from './builder-variants';
+export * from './config';
+export * from './context';
 export * from './hidden';
-export * from './implementer-chainable';
+export * from './implementer';
+export * from './implementer-procedure';
+export * from './implementer-variants';
 export * from './lazy';
-export * from './lazy-decorated';
+export * from './lazy-utils';
 export * from './middleware';
 export * from './middleware-decorated';
 export * from './procedure';
-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-accessible-lazy';
 export * from './router-client';
-export * from './router-implementer';
-export * from './types';
-export * from './utils';
-export { configGlobal, fallbackToGlobalConfig, isDefinedError, ORPCError, safe, type } from '@orpc/contract';
-export declare const os: Builder<WELL_CONTEXT>;
+export { isDefinedError, ORPCError, safe, type, ValidationError } from '@orpc/contract';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,4 +1,6 @@
 import type { Lazy } from './lazy';
-import { type ANY_PROCEDURE } from './procedure';
-export declare function createLazyProcedureFormAnyLazy(lazied: Lazy<any>): Lazy<ANY_PROCEDURE>;
+import { type AnyProcedure } from './procedure';
+export type FlattenLazy<T> = T extends Lazy<infer U> ? FlattenLazy<U> : Lazy<T>;
+export declare function flatLazy<T extends Lazy<any>>(lazied: T): FlattenLazy<T>;
+export declare function createLazyProcedureFormAnyLazy(lazied: Lazy<any>): Lazy<AnyProcedure>;
 //# sourceMappingURL=lazy-utils.d.ts.map

package/dist/src/lazy.d.ts

@@ -1,18 +1,22 @@
+import type { HTTPPath } from '@orpc/contract';
 export declare const LAZY_LOADER_SYMBOL: unique symbol;
+export interface LazyMeta {
+    prefix?: HTTPPath;
+}
 export interface Lazy<T> {
-    [LAZY_LOADER_SYMBOL]: () => Promise<{
+    [LAZY_LOADER_SYMBOL](): Promise<{
         default: T;
     }>;
 }
 export type Lazyable<T> = T | Lazy<T>;
-export type ANY_LAZY = Lazy<any>;
+export interface LazyOptions {
+    prefix?: HTTPPath;
+}
 export declare function lazy<T>(loader: () => Promise<{
     default: T;
 }>): Lazy<T>;
-export declare function isLazy(item: unknown): item is ANY_LAZY;
+export declare function isLazy(item: unknown): item is Lazy<any>;
 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 flatLazy<T extends ANY_LAZY>(lazied: T): FlattenLazy<T>;
 //# sourceMappingURL=lazy.d.ts.map

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

@@ -1,10 +1,10 @@
-import type { ContextGuard } from './context';
-import type { ORPCErrorConstructorMap } from './error';
+import type { Meta, ORPCErrorConstructorMap } from '@orpc/contract';
+import type { Context, MergedContext } from './context';
 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 interface DecoratedMiddleware<TInContext extends Context, TOutContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> extends Middleware<TInContext, TOutContext, TInput, TOutput, TErrorConstructorMap, TMeta> {
+    concat<UOutContext extends Context, UInput>(middleware: Middleware<TInContext & TOutContext, UOutContext, UInput & TInput, TOutput, TErrorConstructorMap, TMeta>): DecoratedMiddleware<TInContext, MergedContext<TOutContext, UOutContext>, UInput & TInput, TOutput, TErrorConstructorMap, TMeta>;
+    concat<UOutContext extends Context, UInput, UMappedInput>(middleware: Middleware<TInContext & TOutContext, UOutContext, UMappedInput, TOutput, TErrorConstructorMap, TMeta>, mapInput: MapInputMiddleware<UInput & TInput, UMappedInput>): DecoratedMiddleware<TInContext, TOutContext & UOutContext, UInput & TInput, TOutput, TErrorConstructorMap, TMeta>;
+    mapInput<UInput = unknown>(map: MapInputMiddleware<UInput, TInput>): DecoratedMiddleware<TInContext, TOutContext, UInput, TOutput, TErrorConstructorMap, TMeta>;
 }
-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>;
+export declare function decorateMiddleware<TInContext extends Context, TOutContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta>(middleware: Middleware<TInContext, TOutContext, TInput, TOutput, TErrorConstructorMap, TMeta>): DecoratedMiddleware<TInContext, TOutContext, TInput, TOutput, TErrorConstructorMap, TMeta>;
 //# sourceMappingURL=middleware-decorated.d.ts.map