@orpc/server 0.0.0-next.4220427 → 0.0.0-next.43889a7

package/dist/next.js

@@ -1,17 +1,17 @@
 import "./chunk-WUOGVGWG.js";
 import {
-  ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
+  RPCHandler,
   super_json_exports
-} from "./chunk-V3I7RIRY.js";
-import "./chunk-DNG2IB3R.js";
+} from "./chunk-26GHKV43.js";
+import "./chunk-LDIL7OEP.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;
@@ -27,9 +27,9 @@ function serve(handler, ...[options]) {
   };
 }
 export {
-  ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
+  RPCHandler,
   super_json_exports as SuperJSON,
   serve
 };

package/dist/node.js

@@ -1,7 +1,7 @@
 import {
-  ORPCHandler
-} from "./chunk-V3I7RIRY.js";
-import "./chunk-DNG2IB3R.js";
+  RPCHandler
+} from "./chunk-26GHKV43.js";
+import "./chunk-LDIL7OEP.js";
 
 // src/adapters/node/request-listener.ts
 function createRequest(req, res) {
@@ -61,25 +61,25 @@ async function sendResponse(res, response) {
 }
 
 // src/adapters/node/orpc-handler.ts
-var ORPCHandler2 = class {
+var RPCHandler2 = class {
   orpcFetchHandler;
   constructor(router, options) {
-    this.orpcFetchHandler = new ORPCHandler(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 };
   }
 };
 export {
-  ORPCHandler2 as ORPCHandler,
+  RPCHandler2 as RPCHandler,
   createHeaders,
   createRequest,
   sendResponse

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

@@ -1,20 +1,20 @@
 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';
-export type ORPCHandlerOptions<T extends Context> = Hooks<Request, FetchHandleResult, T, {
+export type RPCHandlerOptions<T extends Context> = Hooks<Request, FetchHandleResult, T, {
     signal?: AbortSignal;
 }> & {
     procedureMatcher?: PublicORPCProcedureMatcher;
     payloadCodec?: PublicORPCPayloadCodec;
 };
-export declare class ORPCHandler<T extends Context> implements FetchHandler<T> {
+export declare class RPCHandler<T extends Context> implements FetchHandler<T> {
     private readonly options?;
     private readonly procedureMatcher;
     private readonly payloadCodec;
-    constructor(router: Router<T, any>, options?: NoInfer<ORPCHandlerOptions<T>> | undefined);
+    constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>> | undefined);
     handle(request: Request, ...[options]: FetchHandleRest<T>): Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=orpc-handler.d.ts.map

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;

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,13 +1,13 @@
 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>;

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 { ORPCHandlerOptions } from '../fetch/orpc-handler';
+import type { RPCHandlerOptions } from '../fetch/orpc-handler';
 import type { RequestHandler, RequestHandleRest, RequestHandleResult } from './types';
 import { type ExpressableIncomingMessage } from './request-listener';
-export declare class ORPCHandler<T extends Context> implements RequestHandler<T> {
+export declare class RPCHandler<T extends Context> implements RequestHandler<T> {
     private readonly orpcFetchHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<ORPCHandlerOptions<T>>);
-    handle(req: ExpressableIncomingMessage, res: ServerResponse, ...[options]: RequestHandleRest<T>): Promise<RequestHandleResult>;
+    constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
+    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,16 +1,16 @@
 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 ? {
+} & (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;
 } | {

package/dist/src/builder-with-errors-middlewares.d.ts

@@ -0,0 +1,49 @@
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput, StrictErrorMap } from '@orpc/contract';
+import type { ConflictContextGuard, Context, TypeCurrentContext, TypeInitialContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { FlattenLazy } from './lazy';
+import type { Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
+import type { Router } from './router';
+import type { AdaptedRouter } from './router-builder';
+import { ProcedureBuilder } from './procedure-builder';
+import { ProcedureBuilderWithInput } from './procedure-builder-with-input';
+import { ProcedureBuilderWithOutput } from './procedure-builder-with-output';
+import { DecoratedProcedure } from './procedure-decorated';
+import { RouterBuilder } from './router-builder';
+export interface BuilderWithErrorsMiddlewaresDef<TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    __currentContext?: TypeCurrentContext<TCurrentContext>;
+    errorMap: TErrorMap;
+    middlewares: Middleware<any, any, any, any, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+    config: ContractBuilderConfig;
+}
+/**
+ * `BuilderWithErrorsMiddlewares` is a combination of `BuilderWithErrorsMiddlewares` and `BuilderWithErrors`.
+ *
+ * Why?
+ * - prevents .middleware after .use (can mislead the behavior)
+ * - prevents .contract after .errors (add error map to existing contract can make the contract invalid)
+ * - prevents .context after .use (middlewares required current context, so it tricky when change the current context)
+ *
+ */
+export declare class BuilderWithErrorsMiddlewares<TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> {
+    '~type': "BuilderWithErrorsMiddlewares";
+    '~orpc': BuilderWithErrorsMiddlewaresDef<TInitialContext, TCurrentContext, TErrorMap>;
+    constructor(def: BuilderWithErrorsMiddlewaresDef<TInitialContext, TCurrentContext, TErrorMap>);
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): BuilderWithErrorsMiddlewares<TInitialContext, TCurrentContext, TErrorMap & U>;
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, unknown, unknown, ORPCErrorConstructorMap<TErrorMap>>): ConflictContextGuard<TCurrentContext & U> & BuilderWithErrorsMiddlewares<TInitialContext, TCurrentContext & U, TErrorMap>;
+    route(route: RouteOptions): ProcedureBuilder<TInitialContext, TCurrentContext, TErrorMap>;
+    input<USchema extends Schema>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, USchema, TErrorMap>;
+    output<USchema extends Schema>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, USchema, TErrorMap>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TCurrentContext, undefined, undefined, UFuncOutput, TErrorMap>): DecoratedProcedure<TInitialContext, TCurrentContext, undefined, undefined, UFuncOutput, TErrorMap>;
+    prefix(prefix: HTTPPath): RouterBuilder<TInitialContext, TCurrentContext, TErrorMap>;
+    tag(...tags: string[]): RouterBuilder<TInitialContext, TCurrentContext, 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<TInitialContext, FlattenLazy<U>, TErrorMap>;
+}
+//# sourceMappingURL=builder-with-errors-middlewares.d.ts.map

package/dist/src/builder-with-errors.d.ts

@@ -0,0 +1,49 @@
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput, StrictErrorMap } from '@orpc/contract';
+import type { BuilderConfig } from './builder';
+import type { Context, TypeInitialContext } from './context';
+import type { ORPCErrorConstructorMap } from './error';
+import type { FlattenLazy } from './lazy';
+import type { 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 { BuilderWithErrorsMiddlewares } from './builder-with-errors-middlewares';
+import { ProcedureBuilder } from './procedure-builder';
+import { ProcedureBuilderWithInput } from './procedure-builder-with-input';
+import { ProcedureBuilderWithOutput } from './procedure-builder-with-output';
+import { DecoratedProcedure } from './procedure-decorated';
+import { RouterBuilder } from './router-builder';
+export interface BuilderWithErrorsDef<TInitialContext extends Context, TErrorMap extends ErrorMap> {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    errorMap: TErrorMap;
+    config: BuilderConfig;
+}
+/**
+ * `BuilderWithErrors` is a branch of `Builder` which it has error map.
+ *
+ * Why?
+ * - prevents .contract after .errors (add error map to existing contract can make the contract invalid)
+ *
+ */
+export declare class BuilderWithErrors<TInitialContext extends Context, TErrorMap extends ErrorMap> {
+    '~type': "BuilderWithErrors";
+    '~orpc': BuilderWithErrorsDef<TInitialContext, TErrorMap>;
+    constructor(def: BuilderWithErrorsDef<TInitialContext, TErrorMap>);
+    config(config: ContractBuilderConfig): BuilderWithErrors<TInitialContext, TErrorMap>;
+    context<UContext extends Context & TInitialContext = TInitialContext>(): BuilderWithErrors<UContext, TErrorMap>;
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): BuilderWithErrors<TInitialContext, TErrorMap & U>;
+    middleware<UOutContext extends Context, TInput, TOutput = any>(middleware: Middleware<TInitialContext, UOutContext, TInput, TOutput, ORPCErrorConstructorMap<TErrorMap>>): DecoratedMiddleware<TInitialContext, UOutContext, TInput, TOutput, ORPCErrorConstructorMap<TErrorMap>>;
+    use<U extends Context>(middleware: Middleware<TInitialContext, U, unknown, unknown, ORPCErrorConstructorMap<TErrorMap>>): BuilderWithErrorsMiddlewares<TInitialContext, TInitialContext & U, TErrorMap>;
+    route(route: RouteOptions): ProcedureBuilder<TInitialContext, TInitialContext, TErrorMap>;
+    input<USchema extends Schema>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilderWithInput<TInitialContext, TInitialContext, USchema, TErrorMap>;
+    output<USchema extends Schema>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilderWithOutput<TInitialContext, TInitialContext, USchema, TErrorMap>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TInitialContext, undefined, undefined, UFuncOutput, TErrorMap>): DecoratedProcedure<TInitialContext, TInitialContext, undefined, undefined, UFuncOutput, TErrorMap>;
+    prefix(prefix: HTTPPath): RouterBuilder<TInitialContext, TInitialContext, TErrorMap>;
+    tag(...tags: string[]): RouterBuilder<TInitialContext, TInitialContext, TErrorMap>;
+    router<U extends Router<TInitialContext, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(router: U): AdaptedRouter<TInitialContext, U, TErrorMap>;
+    lazy<U extends Router<TInitialContext, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(loader: () => Promise<{
+        default: U;
+    }>): AdaptedRouter<TInitialContext, FlattenLazy<U>, TErrorMap>;
+}
+//# sourceMappingURL=builder-with-errors.d.ts.map

package/dist/src/builder-with-middlewares.d.ts

@@ -0,0 +1,49 @@
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ConflictContextGuard, Context, TypeCurrentContext, TypeInitialContext } from './context';
+import type { FlattenLazy } from './lazy';
+import type { Middleware } from './middleware';
+import type { ProcedureHandler } from './procedure';
+import type { Router } from './router';
+import type { AdaptedRouter } from './router-builder';
+import { BuilderWithErrorsMiddlewares } from './builder-with-errors-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 { DecoratedProcedure } from './procedure-decorated';
+import { RouterBuilder } from './router-builder';
+/**
+ * `BuilderWithMiddlewares` is a branch of `Builder` which it has middlewares.
+ *
+ * Why?
+ * - prevents .middleware after .use (can mislead the behavior)
+ * - prevents .context after .use (middlewares required current context, so it tricky when change the current context)
+ *
+ */
+export interface BuilderWithMiddlewaresDef<TInitialContext extends Context, TCurrentContext extends Context> {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    __currentContext?: TypeCurrentContext<TCurrentContext>;
+    config: ContractBuilderConfig;
+    middlewares: Middleware<any, any, any, any, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+}
+export declare class BuilderWithMiddlewares<TInitialContext extends Context, TCurrentContext extends Context> {
+    '~type': "BuilderHasMiddlewares";
+    '~orpc': BuilderWithMiddlewaresDef<TInitialContext, TCurrentContext>;
+    constructor(def: BuilderWithMiddlewaresDef<TInitialContext, TCurrentContext>);
+    use<U extends Context>(middleware: Middleware<TCurrentContext, U, unknown, unknown, Record<never, never>>): ConflictContextGuard<TCurrentContext & U> & BuilderWithMiddlewares<TInitialContext, TCurrentContext & U>;
+    errors<U extends ErrorMap & ErrorMapSuggestions>(errors: U): BuilderWithErrorsMiddlewares<TInitialContext, TCurrentContext, U>;
+    route(route: RouteOptions): ProcedureBuilder<TInitialContext, TCurrentContext, Record<never, never>>;
+    input<USchema extends Schema>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilderWithInput<TInitialContext, TCurrentContext, USchema, Record<never, never>>;
+    output<USchema extends Schema>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilderWithOutput<TInitialContext, TCurrentContext, USchema, Record<never, never>>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TCurrentContext, undefined, undefined, UFuncOutput, Record<never, never>>): DecoratedProcedure<TInitialContext, TCurrentContext, undefined, undefined, UFuncOutput, Record<never, never>>;
+    prefix(prefix: HTTPPath): RouterBuilder<TInitialContext, TCurrentContext, Record<never, never>>;
+    tag(...tags: string[]): RouterBuilder<TInitialContext, TCurrentContext, Record<never, never>>;
+    router<U extends Router<TCurrentContext, any>>(router: U): AdaptedRouter<TInitialContext, U, Record<never, never>>;
+    lazy<U extends Router<TCurrentContext, any>>(loader: () => Promise<{
+        default: U;
+    }>): AdaptedRouter<TInitialContext, FlattenLazy<U>, Record<never, never>>;
+    contract<U extends ContractRouter<any>>(contract: U): ChainableImplementer<TInitialContext, TCurrentContext, U>;
+}
+//# sourceMappingURL=builder-with-middlewares.d.ts.map

package/dist/src/builder.d.ts

@@ -1,36 +1,46 @@
-import type { ANY_CONTRACT_PROCEDURE, ContractRouter, ErrorMap, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ConflictContextGuard, Context, TypeInitialContext } from './context';
 import type { FlattenLazy } from './lazy';
 import type { 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, WELL_CONTEXT } from './types';
+import { BuilderWithErrors } from './builder-with-errors';
+import { BuilderWithMiddlewares } from './builder-with-middlewares';
 import { type ChainableImplementer } from './implementer-chainable';
-import { type ProcedureHandler } from './procedure';
 import { ProcedureBuilder } from './procedure-builder';
-import { type DecoratedProcedure } from './procedure-decorated';
+import { ProcedureBuilderWithInput } from './procedure-builder-with-input';
+import { ProcedureBuilderWithOutput } from './procedure-builder-with-output';
+import { DecoratedProcedure } from './procedure-decorated';
 import { RouterBuilder } from './router-builder';
-export interface BuilderDef<TContext extends Context, TExtraContext extends Context> {
-    middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, Record<string, unknown>>[];
+export interface BuilderConfig extends ContractBuilderConfig {
+    initialInputValidationIndex?: number;
+    initialOutputValidationIndex?: number;
 }
-export declare class Builder<TContext extends Context, TExtraContext extends Context> {
+export interface BuilderDef<TInitialContext extends Context> {
+    __initialContext?: TypeInitialContext<TInitialContext>;
+    config: BuilderConfig;
+}
+export declare class Builder<TInitialContext extends Context> {
     '~type': "Builder";
-    '~orpc': BuilderDef<TContext, TExtraContext>;
-    constructor(def: BuilderDef<TContext, TExtraContext>);
-    context<UContext extends Context = WELL_CONTEXT>(): Builder<UContext, undefined>;
-    use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, unknown, unknown, Record<string, unknown>>): Builder<TContext, MergeContext<TExtraContext, U>>;
-    middleware<UExtraContext extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, TInput = unknown, TOutput = any>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, TInput, TOutput, Record<string, unknown>>): DecoratedMiddleware<MergeContext<TContext, TExtraContext>, UExtraContext, TInput, TOutput, Record<string, unknown>>;
-    route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, undefined, undefined, undefined>;
-    input<USchema extends Schema>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilder<TContext, TExtraContext, USchema, undefined, undefined>;
-    output<USchema extends Schema>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilder<TContext, TExtraContext, undefined, USchema, undefined>;
-    errors<UErrorMap extends ErrorMap>(errors: UErrorMap): ProcedureBuilder<TContext, TExtraContext, undefined, undefined, UErrorMap>;
-    handler<UFuncOutput = undefined>(handler: ProcedureHandler<TContext, TExtraContext, undefined, undefined, UFuncOutput, undefined>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput, undefined>;
-    prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext>;
-    tag(...tags: string[]): RouterBuilder<TContext, TExtraContext>;
-    router<U extends Router<MergeContext<TContext, TExtraContext>, any>>(router: U): AdaptedRouter<TContext, U>;
-    lazy<U extends Router<MergeContext<TContext, TExtraContext>, any>>(loader: () => Promise<{
+    '~orpc': BuilderDef<TInitialContext>;
+    constructor(def: BuilderDef<TInitialContext>);
+    config(config: ContractBuilderConfig): Builder<TInitialContext>;
+    context<UContext extends Context & TInitialContext = TInitialContext>(): Builder<UContext>;
+    middleware<UOutContext extends Context, TInput, TOutput = any>(middleware: Middleware<TInitialContext, UOutContext, TInput, TOutput, Record<never, never>>): DecoratedMiddleware<TInitialContext, UOutContext, TInput, TOutput, Record<never, never>>;
+    errors<U extends ErrorMap & ErrorMapSuggestions>(errors: U): BuilderWithErrors<TInitialContext, U>;
+    use<UOutContext extends Context>(middleware: Middleware<TInitialContext, UOutContext, unknown, unknown, Record<never, never>>): ConflictContextGuard<TInitialContext & UOutContext> & BuilderWithMiddlewares<TInitialContext, TInitialContext & UOutContext>;
+    route(route: RouteOptions): ProcedureBuilder<TInitialContext, TInitialContext, Record<never, never>>;
+    input<USchema extends Schema>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilderWithInput<TInitialContext, TInitialContext, USchema, Record<never, never>>;
+    output<USchema extends Schema>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilderWithOutput<TInitialContext, TInitialContext, USchema, Record<never, never>>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TInitialContext, undefined, undefined, UFuncOutput, Record<never, never>>): DecoratedProcedure<TInitialContext, TInitialContext, undefined, undefined, UFuncOutput, Record<never, never>>;
+    prefix(prefix: HTTPPath): RouterBuilder<TInitialContext, TInitialContext, Record<never, never>>;
+    tag(...tags: string[]): RouterBuilder<TInitialContext, TInitialContext, Record<never, never>>;
+    router<U extends Router<TInitialContext, any>>(router: U): AdaptedRouter<TInitialContext, U, Record<never, never>>;
+    lazy<U extends Router<TInitialContext, any>>(loader: () => Promise<{
         default: U;
-    }>): AdaptedRouter<TContext, FlattenLazy<U>>;
-    contract<U extends ANY_CONTRACT_PROCEDURE | ContractRouter>(contract: U): ChainableImplementer<TContext, TExtraContext, U>;
+    }>): AdaptedRouter<TInitialContext, FlattenLazy<U>, Record<never, never>>;
+    contract<U extends ContractRouter<any>>(contract: U): ChainableImplementer<TInitialContext, TInitialContext, U>;
 }
 //# 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

@@ -0,0 +1,10 @@
+import type { IsNever } from '@orpc/shared';
+export type Context = Record<string, any>;
+export type TypeInitialContext<T extends Context> = (type: T) => any;
+export type TypeCurrentContext<T extends Context> = {
+    type: T;
+};
+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/error.d.ts

@@ -3,7 +3,7 @@ import { ORPCError } from '@orpc/contract';
 export type ORPCErrorConstructorMapItemOptions<TData> = Omit<ORPCErrorOptions<any, TData>, 'defined' | 'code' | 'status'>;
 export type ORPCErrorConstructorMapItemRest<TData> = [options: ORPCErrorConstructorMapItemOptions<TData>] | (undefined extends TData ? [] : never);
 export type ORPCErrorConstructorMapItem<TCode extends string, TDataSchema extends Schema> = (...rest: ORPCErrorConstructorMapItemRest<SchemaInput<TDataSchema>>) => ORPCError<TCode, SchemaOutput<TDataSchema>>;
-export type ORPCErrorConstructorMap<T extends ErrorMap> = T extends undefined ? Record<string, unknown> : {
+export type ORPCErrorConstructorMap<T extends ErrorMap> = {
     [K in keyof T]: K extends string ? T[K] extends ErrorMapItem<infer UInputSchema> ? ORPCErrorConstructorMapItem<K, UInputSchema> : never : never;
 };
 export declare function createORPCErrorConstructorMap<T extends ErrorMap>(errors: T): ORPCErrorConstructorMap<T>;

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, infer UErrorMap> ? ProcedureImplementer<TContext, TExtraContext, UInputSchema, UOutputSchema, UErrorMap> : {
-    [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, Record<string, unknown>>[]): 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,7 @@
-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';
@@ -13,12 +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, isDefinedError, ORPCError, safe } from '@orpc/contract';
-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 { ErrorFromErrorMap, 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, infer UErrorMap> ? undefined extends UContext ? ProcedureClient<unknown, SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>, ErrorFromErrorMap<UErrorMap>> : 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,9 +1,9 @@
+import type { Context } from './context';
 import type { ORPCErrorConstructorMap } from './error';
 import type { MapInputMiddleware, Middleware } from './middleware';
-import type { Context, MergeContext } from './types';
-export interface DecoratedMiddleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> extends Middleware<TContext, TExtraContext, TInput, TOutput, TErrorConstructorMap> {
-    concat: (<UExtraContext extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UInput & TInput, TOutput, TErrorConstructorMap>) => DecoratedMiddleware<TContext, MergeContext<TExtraContext, UExtraContext>, UInput & TInput, TOutput, TErrorConstructorMap>) & (<UExtraContext extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, 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>> 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, 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>>(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,35 +1,39 @@
 import type { Promisable } from '@orpc/shared';
+import type { Context } from './context';
 import type { ORPCErrorConstructorMap } from './error';
 import type { ANY_PROCEDURE } from './procedure';
-import type { AbortSignal, Context } from './types';
-export type MiddlewareResult<TExtraContext extends Context, TOutput> = Promisable<{
+import type { AbortSignal } from './types';
+export type MiddlewareResult<TOutContext extends Context, TOutput> = Promisable<{
     output: TOutput;
-    context: TExtraContext;
+    context: TOutContext;
 }>;
-export interface MiddlewareNextFn<TOutput> {
-    <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
-        context?: UExtraContext;
-    } : {
-        context: UExtraContext;
-    }): MiddlewareResult<UExtraContext, TOutput>;
+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 MiddlewareOutputFn<TOutput> {
-    (output: TOutput): MiddlewareResult<undefined, TOutput>;
+    (output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;
 }
-export interface MiddlewareOptions<TContext extends Context, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
-    context: TContext;
+export interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
+    context: TInContext;
     path: string[];
     procedure: ANY_PROCEDURE;
     signal?: AbortSignal;
-    next: MiddlewareNextFn<TOutput>;
+    next: MiddlewareNextFn<TInContext, TOutput>;
     errors: TErrorConstructorMap;
 }
-export interface Middleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>> {
-    (options: MiddlewareOptions<TContext, TOutput, TErrorConstructorMap>, input: TInput, output: MiddlewareOutputFn<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
+export 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