@orpc/server 0.0.0-next.9b3a030 → 0.0.0-next.a2e4a58

package/dist/next.js

@@ -1,11 +1,11 @@
 import "./chunk-WUOGVGWG.js";
 import {
-  ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
+  RPCHandler,
   super_json_exports
-} from "./chunk-V3I7RIRY.js";
-import "./chunk-DNG2IB3R.js";
+} from "./chunk-SXUFCJBY.js";
+import "./chunk-GK2Z6B6W.js";
 
 // src/adapters/next/serve.ts
 import { value } from "@orpc/shared";
@@ -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-SXUFCJBY.js";
+import "./chunk-GK2Z6B6W.js";
 
 // src/adapters/node/request-listener.ts
 function createRequest(req, res) {
@@ -61,10 +61,10 @@ 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]) {
     const request = createRequest(req, res);
@@ -79,7 +79,7 @@ var ORPCHandler2 = class {
   }
 };
 export {
-  ORPCHandler2 as ORPCHandler,
+  RPCHandler2 as RPCHandler,
   createHeaders,
   createRequest,
   sendResponse

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

@@ -4,17 +4,17 @@ 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/node/orpc-handler.d.ts

@@ -1,12 +1,12 @@
 import type { ServerResponse } from 'node:http';
 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>>);
+    constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
     handle(req: ExpressableIncomingMessage, res: ServerResponse, ...[options]: RequestHandleRest<T>): Promise<RequestHandleResult>;
 }
 //# sourceMappingURL=orpc-handler.d.ts.map

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

@@ -0,0 +1,51 @@
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput, StrictErrorMap } from '@orpc/contract';
+import type { ContextGuard } 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 type { Context, MergeContext } from './types';
+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<TContext extends Context, TExtraContext extends Context, TErrorMap extends ErrorMap> {
+    types?: {
+        context: TContext;
+    };
+    errorMap: TErrorMap;
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, ORPCErrorConstructorMap<TErrorMap>>[];
+    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<TContext extends Context, TExtraContext extends Context, TErrorMap extends ErrorMap> {
+    '~type': "BuilderWithErrorsMiddlewares";
+    '~orpc': BuilderWithErrorsMiddlewaresDef<TContext, TExtraContext, TErrorMap>;
+    constructor(def: BuilderWithErrorsMiddlewaresDef<TContext, TExtraContext, TErrorMap>);
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): BuilderWithErrorsMiddlewares<TContext, TExtraContext, TErrorMap & U>;
+    use<U extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, unknown, unknown, ORPCErrorConstructorMap<TErrorMap>>): BuilderWithErrorsMiddlewares<TContext, MergeContext<TExtraContext, U>, TErrorMap>;
+    route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, TErrorMap>;
+    input<USchema extends Schema>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilderWithInput<TContext, TExtraContext, USchema, TErrorMap>;
+    output<USchema extends Schema>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilderWithOutput<TContext, TExtraContext, USchema, TErrorMap>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TContext, TExtraContext, undefined, undefined, UFuncOutput, TErrorMap>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput, TErrorMap>;
+    prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext, TErrorMap>;
+    tag(...tags: string[]): RouterBuilder<TContext, TExtraContext, TErrorMap>;
+    router<U extends Router<MergeContext<TContext, TExtraContext>, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(router: U): AdaptedRouter<TContext, U, TErrorMap>;
+    lazy<U extends Router<MergeContext<TContext, TExtraContext>, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(loader: () => Promise<{
+        default: U;
+    }>): AdaptedRouter<TContext, FlattenLazy<U>, TErrorMap>;
+}
+//# sourceMappingURL=builder-with-errors-middlewares.d.ts.map

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

@@ -0,0 +1,52 @@
+import type { ContractBuilderConfig, ContractRouter, ErrorMap, ErrorMapGuard, ErrorMapSuggestions, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput, StrictErrorMap } from '@orpc/contract';
+import type { BuilderConfig } from './builder';
+import type { ContextGuard } 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 type { Context, MergeContext } from './types';
+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<TContext extends Context, TErrorMap extends ErrorMap> {
+    types?: {
+        context: TContext;
+    };
+    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<TContext extends Context, TErrorMap extends ErrorMap> {
+    '~type': "BuilderWithErrors";
+    '~orpc': BuilderWithErrorsDef<TContext, TErrorMap>;
+    constructor(def: BuilderWithErrorsDef<TContext, TErrorMap>);
+    config(config: ContractBuilderConfig): BuilderWithErrors<TContext, TErrorMap>;
+    context<UContext extends Context = TContext>(): BuilderWithErrors<UContext, TErrorMap>;
+    errors<U extends ErrorMap & ErrorMapGuard<TErrorMap> & ErrorMapSuggestions>(errors: U): BuilderWithErrors<TContext, TErrorMap & U>;
+    middleware<UExtraContext extends Context & ContextGuard<TContext>, TInput, TOutput = any>(middleware: Middleware<TContext, UExtraContext, TInput, TOutput, ORPCErrorConstructorMap<TErrorMap>>): DecoratedMiddleware<TContext, UExtraContext, TInput, TOutput, ORPCErrorConstructorMap<TErrorMap>>;
+    use<U extends Context & ContextGuard<TContext>>(middleware: Middleware<TContext, U, unknown, unknown, ORPCErrorConstructorMap<TErrorMap>>): BuilderWithErrorsMiddlewares<TContext, U, TErrorMap>;
+    route(route: RouteOptions): ProcedureBuilder<TContext, undefined, TErrorMap>;
+    input<USchema extends Schema>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilderWithInput<TContext, undefined, USchema, TErrorMap>;
+    output<USchema extends Schema>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilderWithOutput<TContext, undefined, USchema, TErrorMap>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TContext, undefined, undefined, undefined, UFuncOutput, TErrorMap>): DecoratedProcedure<TContext, undefined, undefined, undefined, UFuncOutput, TErrorMap>;
+    prefix(prefix: HTTPPath): RouterBuilder<TContext, undefined, TErrorMap>;
+    tag(...tags: string[]): RouterBuilder<TContext, undefined, TErrorMap>;
+    router<U extends Router<MergeContext<TContext, undefined>, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(router: U): AdaptedRouter<TContext, U, TErrorMap>;
+    lazy<U extends Router<MergeContext<TContext, undefined>, ContractRouter<ErrorMap & Partial<StrictErrorMap<TErrorMap>>>>>(loader: () => Promise<{
+        default: U;
+    }>): AdaptedRouter<TContext, FlattenLazy<U>, TErrorMap>;
+}
+//# sourceMappingURL=builder-with-errors.d.ts.map

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

@@ -0,0 +1,48 @@
+import type { ContractBuilderConfig, 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 { ProcedureHandler } from './procedure';
+import type { Router } from './router';
+import type { AdaptedRouter } from './router-builder';
+import type { Context, MergeContext } from './types';
+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<TContext extends Context, TExtraContext extends Context> {
+    config: ContractBuilderConfig;
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, Record<never, never>>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+}
+export declare class BuilderWithMiddlewares<TContext extends Context, TExtraContext extends Context> {
+    '~type': "BuilderHasMiddlewares";
+    '~orpc': BuilderWithMiddlewaresDef<TContext, TExtraContext>;
+    constructor(def: BuilderWithMiddlewaresDef<TContext, TExtraContext>);
+    use<U extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, unknown, unknown, Record<never, never>>): BuilderWithMiddlewares<TContext, MergeContext<TExtraContext, U>>;
+    errors<U extends ErrorMap & ErrorMapSuggestions>(errors: U): BuilderWithErrorsMiddlewares<TContext, TExtraContext, U>;
+    route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, Record<never, never>>;
+    input<USchema extends Schema>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilderWithInput<TContext, TExtraContext, USchema, Record<never, never>>;
+    output<USchema extends Schema>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilderWithOutput<TContext, TExtraContext, USchema, Record<never, never>>;
+    handler<UFuncOutput>(handler: ProcedureHandler<TContext, TExtraContext, undefined, undefined, UFuncOutput, Record<never, never>>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput, Record<never, never>>;
+    prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext, Record<never, never>>;
+    tag(...tags: string[]): RouterBuilder<TContext, TExtraContext, Record<never, never>>;
+    router<U extends Router<MergeContext<TContext, TExtraContext>, any>>(router: U): AdaptedRouter<TContext, U, Record<never, never>>;
+    lazy<U extends Router<MergeContext<TContext, TExtraContext>, any>>(loader: () => Promise<{
+        default: U;
+    }>): AdaptedRouter<TContext, FlattenLazy<U>, Record<never, never>>;
+    contract<U extends ContractRouter<any>>(contract: U): ChainableImplementer<TContext, TExtraContext, U>;
+}
+//# sourceMappingURL=builder-with-middlewares.d.ts.map

package/dist/src/builder.d.ts

@@ -1,36 +1,49 @@
-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 { ContextGuard } 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 type { Context, MergeContext } 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<TContext extends Context> {
+    types?: {
+        context: TContext;
+    };
+    config: BuilderConfig;
+}
+export declare class Builder<TContext 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<TContext>;
+    constructor(def: BuilderDef<TContext>);
+    config(config: ContractBuilderConfig): Builder<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<{
         default: U;
-    }>): AdaptedRouter<TContext, FlattenLazy<U>>;
-    contract<U extends ANY_CONTRACT_PROCEDURE | ContractRouter>(contract: U): ChainableImplementer<TContext, TExtraContext, U>;
+    }>): AdaptedRouter<TContext, FlattenLazy<U>, Record<never, never>>;
+    contract<U extends ContractRouter<any>>(contract: U): ChainableImplementer<TContext, undefined, 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,11 @@
+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;
+//# 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

@@ -3,8 +3,12 @@ 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;
+export type ChainableImplementer<TContext extends Context, TExtraContext extends Context, TContract extends ContractRouter<any>> = TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap> ? ProcedureImplementer<TContext, TExtraContext, UInputSchema, UOutputSchema, UErrorMap> : {
+    [K in keyof TContract]: TContract[K] extends ContractRouter<any> ? ChainableImplementer<TContext, TExtraContext, TContract[K]> : never;
 } & Omit<RouterImplementer<TContext, TExtraContext, TContract>, '~type' | '~orpc'>;
-export declare function createChainableImplementer<TContext extends Context = WELL_CONTEXT, TExtraContext extends Context = undefined, TContract extends ContractRouter = any>(contract: TContract, middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, Record<string, unknown>>[]): ChainableImplementer<TContext, TExtraContext, TContract>;
+export declare function createChainableImplementer<TContext extends Context = WELL_CONTEXT, TExtraContext extends Context = undefined, TContract extends ContractRouter<any> = any>(contract: TContract, options: {
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, any>[];
+    inputValidationIndex: number;
+    outputValidationIndex: number;
+}): ChainableImplementer<TContext, TExtraContext, TContract>;
 //# sourceMappingURL=implementer-chainable.d.ts.map

package/dist/src/index.d.ts

@@ -1,6 +1,7 @@
 import type { WELL_CONTEXT } from './types';
 import { Builder } from './builder';
 export * from './builder';
+export * from './config';
 export * from './error';
 export * from './hidden';
 export * from './implementer-chainable';
@@ -13,12 +14,13 @@ 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<WELL_CONTEXT>;
 //# sourceMappingURL=index.d.ts.map

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

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

package/dist/src/middleware.d.ts

@@ -32,4 +32,5 @@ 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<undefined, TOutput>;
 //# sourceMappingURL=middleware.d.ts.map

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

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

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

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

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

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