@orpc/server 0.0.0-next.d137cdf → 0.0.0-next.d7b5662

package/dist/src/builder.d.ts

@@ -1,53 +1,35 @@
-import type { IsEqual } from '@orpc/shared';
-import type { DecoratedLazy } from './lazy';
-import type { DecoratedProcedure, Procedure, ProcedureFunc } from './procedure';
-import type { HandledRouter, Router } from './router';
-import type { Context, MergeContext } from './types';
-import { ContractProcedure, type ContractRouter, type HTTPPath, type RouteOptions, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-import { type DecoratedMiddleware, type MapInputMiddleware, type Middleware } from './middleware';
+import type { ANY_CONTRACT_PROCEDURE, ContractRouter, HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { FlattenLazy } from './lazy';
+import type { Middleware } from './middleware';
+import type { DecoratedMiddleware } from './middleware-decorated';
+import type { Router } from './router';
+import type { AdaptedRouter } from './router-builder';
+import type { Context, MergeContext, WELL_CONTEXT } from './types';
+import { type ChainableImplementer } from './implementer-chainable';
+import { type ProcedureFunc } from './procedure';
 import { ProcedureBuilder } from './procedure-builder';
-import { ProcedureImplementer } from './procedure-implementer';
+import { type DecoratedProcedure } from './procedure-decorated';
 import { RouterBuilder } from './router-builder';
-import { type ChainedRouterImplementer } from './router-implementer';
+export interface BuilderDef<TContext extends Context, TExtraContext extends Context> {
+    middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any>[];
+}
 export declare class Builder<TContext extends Context, TExtraContext extends Context> {
-    zz$b: {
-        middlewares?: Middleware<any, any, any, any>[];
-    };
-    constructor(zz$b?: {
-        middlewares?: Middleware<any, any, any, any>[];
-    });
-    /**
-     * Self chainable
-     */
-    context<UContext extends Context>(): IsEqual<UContext, Context> extends true ? Builder<TContext, TExtraContext> : Builder<UContext, TExtraContext>;
-    use<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, unknown, unknown>): Builder<TContext, MergeContext<TExtraContext, UExtraContext>>;
-    use<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UMappedInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UMappedInput, unknown>, mapInput: MapInputMiddleware<unknown, UMappedInput>): Builder<TContext, MergeContext<TExtraContext, UExtraContext>>;
-    /**
-     * Convert to ContractProcedureBuilder
-     */
-    route(opts: RouteOptions): ProcedureBuilder<TContext, TExtraContext, undefined, undefined>;
+    '~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>): 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>): DecoratedMiddleware<MergeContext<TContext, TExtraContext>, UExtraContext, TInput, TOutput>;
+    route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, undefined, undefined>;
     input<USchema extends Schema = undefined>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilder<TContext, TExtraContext, USchema, undefined>;
     output<USchema extends Schema = undefined>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilder<TContext, TExtraContext, undefined, USchema>;
-    /**
-     * Convert to Procedure
-     */
     func<UFuncOutput = undefined>(func: ProcedureFunc<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
-    /**
-     * Convert to ProcedureImplementer | RouterBuilder
-     */
-    contract<UContract extends ContractProcedure<any, any> | ContractRouter>(contract: UContract): UContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema> ? ProcedureImplementer<TContext, TExtraContext, UInputSchema, UOutputSchema> : UContract extends ContractRouter ? ChainedRouterImplementer<TContext, UContract, TExtraContext> : never;
-    /**
-     * Create ExtendedMiddleware
-     */
-    middleware<UExtraContext extends Context = undefined, TInput = unknown, TOutput = any>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, TInput, TOutput>): DecoratedMiddleware<MergeContext<TContext, TExtraContext>, UExtraContext, TInput, TOutput>;
     prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext>;
-    tags(...tags: string[]): RouterBuilder<TContext, TExtraContext>;
-    /**
-     * Create DecoratedRouter
-     */
-    router<URouter extends Router<TContext>>(router: URouter): HandledRouter<URouter>;
-    lazy<U extends Router<TContext> | Procedure<TContext, any, any, any, any>>(loader: () => Promise<{
+    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<{
         default: U;
-    }>): DecoratedLazy<U>;
+    }>): AdaptedRouter<TContext, FlattenLazy<U>>;
+    contract<U extends ANY_CONTRACT_PROCEDURE | ContractRouter>(contract: U): ChainableImplementer<TContext, TExtraContext, U>;
 }
 //# sourceMappingURL=builder.d.ts.map

package/dist/src/fetch/composite-handler.d.ts

@@ -0,0 +1,8 @@
+import type { Context } from '../types';
+import type { ConditionalFetchHandler, FetchHandler, FetchOptions } from './types';
+export declare class CompositeHandler<T extends Context> implements FetchHandler<T> {
+    private readonly handlers;
+    constructor(handlers: ConditionalFetchHandler<T>[]);
+    fetch(request: Request, ...opt: [options: FetchOptions<T>] | (undefined extends T ? [] : never)): Promise<Response>;
+}
+//# sourceMappingURL=composite-handler.d.ts.map

package/dist/src/fetch/index.d.ts

@@ -1,4 +1,6 @@
-export * from './handle';
-export * from './handler';
+export * from './composite-handler';
+export * from './orpc-handler';
+export * from './orpc-payload-codec';
+export * from './orpc-procedure-matcher';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,20 @@
+import type { Hooks } from '@orpc/shared';
+import type { Router } from '../router';
+import type { Context, WithSignal } from '../types';
+import type { ConditionalFetchHandler, FetchOptions } from './types';
+import { type PublicORPCPayloadCodec } from './orpc-payload-codec';
+import { type PublicORPCProcedureMatcher } from './orpc-procedure-matcher';
+export type ORPCHandlerOptions<T extends Context> = Hooks<Request, Response, T, WithSignal> & {
+    procedureMatcher?: PublicORPCProcedureMatcher;
+    payloadCodec?: PublicORPCPayloadCodec;
+};
+export declare class ORPCHandler<T extends Context> implements ConditionalFetchHandler<T> {
+    readonly router: Router<T, any>;
+    readonly options?: NoInfer<ORPCHandlerOptions<T>> | undefined;
+    private readonly procedureMatcher;
+    private readonly payloadCodec;
+    constructor(router: Router<T, any>, options?: NoInfer<ORPCHandlerOptions<T>> | undefined);
+    condition(request: Request): boolean;
+    fetch(request: Request, ...[options]: [options: FetchOptions<T>] | (undefined extends T ? [] : never)): Promise<Response>;
+}
+//# sourceMappingURL=orpc-handler.d.ts.map

package/dist/src/fetch/orpc-payload-codec.d.ts

@@ -0,0 +1,9 @@
+export declare class ORPCPayloadCodec {
+    encode(payload: unknown): {
+        body: FormData | string;
+        headers?: Headers;
+    };
+    decode(re: Request | Response): Promise<unknown>;
+}
+export type PublicORPCPayloadCodec = Pick<ORPCPayloadCodec, keyof ORPCPayloadCodec>;
+//# sourceMappingURL=orpc-payload-codec.d.ts.map

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

@@ -0,0 +1,12 @@
+import type { ANY_PROCEDURE } from '../procedure';
+import { type ANY_ROUTER } from '../router';
+export declare class ORPCProcedureMatcher {
+    private readonly router;
+    constructor(router: ANY_ROUTER);
+    match(pathname: string): Promise<{
+        path: string[];
+        procedure: ANY_PROCEDURE;
+    } | undefined>;
+}
+export type PublicORPCProcedureMatcher = Pick<ORPCProcedureMatcher, keyof ORPCProcedureMatcher>;
+//# sourceMappingURL=orpc-procedure-matcher.d.ts.map

package/dist/src/fetch/super-json.d.ts

@@ -0,0 +1,12 @@
+import type { Segment } from '@orpc/shared';
+export type JSONExtraType = 'bigint' | 'date' | 'nan' | 'undefined' | 'set' | 'map' | 'regexp' | 'url';
+export type JSONMeta = [JSONExtraType, Segment[]][];
+export declare function serialize(value: unknown, segments?: Segment[], meta?: JSONMeta): {
+    data: unknown;
+    meta: JSONMeta;
+};
+export declare function deserialize({ data, meta, }: {
+    data: unknown;
+    meta: JSONMeta;
+}): unknown;
+//# sourceMappingURL=super-json.d.ts.map

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

@@ -1,27 +1,16 @@
-import type { Hooks, PartialOnUndefinedDeep, Value } from '@orpc/shared';
-import type { Router } from '../router';
-export type FetchHandlerOptions<TRouter extends Router<any>> = {
-    /**
-     * The `router` used for handling the request and routing,
-     *
-     */
-    router: TRouter;
-    /**
-     * The request need to be handled.
-     */
-    request: Request;
-    /**
-     * Remove the prefix from the request path.
-     *
-     * @example /orpc
-     * @example /api
-     */
-    prefix?: string;
-} & PartialOnUndefinedDeep<{
-    /**
-     * The context used to handle the request.
-     */
-    context: Value<TRouter extends Router<infer UContext> ? UContext : never>;
-}> & Hooks<Request, Response, TRouter extends Router<infer UContext> ? UContext : never, undefined>;
-export type FetchHandler = <TRouter extends Router<any>>(options: FetchHandlerOptions<TRouter>) => Promise<Response | undefined>;
+import type { HTTPPath } from '@orpc/contract';
+import type { Context, WithSignal } from '../types';
+export type FetchOptions<T extends Context> = WithSignal & {
+    prefix?: HTTPPath;
+} & (undefined extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+export interface FetchHandler<T extends Context> {
+    fetch: (request: Request, ...opt: [options: FetchOptions<T>] | (undefined extends T ? [] : never)) => Promise<Response>;
+}
+export interface ConditionalFetchHandler<T extends Context> extends FetchHandler<T> {
+    condition: (request: Request) => boolean;
+}
 //# sourceMappingURL=types.d.ts.map

package/dist/src/hidden.d.ts

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

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

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

package/dist/src/index.d.ts

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

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

@@ -0,0 +1,10 @@
+import type { SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Lazy } from './lazy';
+import type { Procedure } from './procedure';
+import type { ProcedureClient } from './procedure-client';
+import { type ANY_ROUTER } from './router';
+export type DecoratedLazy<T> = T extends Lazy<infer U> ? DecoratedLazy<U> : Lazy<T> & (T extends Procedure<infer UContext, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? undefined extends UContext ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>, unknown> : unknown : {
+    [K in keyof T]: T[K] extends object ? DecoratedLazy<T[K]> : never;
+});
+export declare function decorateLazy<T extends Lazy<ANY_ROUTER | undefined>>(lazied: T): DecoratedLazy<T>;
+//# sourceMappingURL=lazy-decorated.d.ts.map

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

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

package/dist/src/lazy.d.ts

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

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

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

package/dist/src/middleware.d.ts

@@ -1,5 +1,5 @@
 import type { Promisable } from '@orpc/shared';
-import type { Context, MergeContext, Meta } from './types';
+import type { Context, Meta } from './types';
 export type MiddlewareResult<TExtraContext extends Context, TOutput> = Promisable<{
     output: TOutput;
     context: TExtraContext;
@@ -15,12 +15,9 @@ export interface MiddlewareMeta<TOutput> extends Meta {
 export interface Middleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput> {
     (input: TInput, context: TContext, meta: MiddlewareMeta<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
 }
+export type ANY_MIDDLEWARE = Middleware<any, any, any, any>;
 export interface MapInputMiddleware<TInput, TMappedInput> {
     (input: TInput): TMappedInput;
 }
-export interface DecoratedMiddleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput> extends Middleware<TContext, TExtraContext, TInput, TOutput> {
-    concat: (<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UInput = TInput>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UInput & TInput, TOutput>) => DecoratedMiddleware<TContext, MergeContext<TExtraContext, UExtraContext>, TInput & UInput, TOutput>) & (<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UInput = TInput, UMappedInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UMappedInput, TOutput>, mapInput: MapInputMiddleware<UInput, UMappedInput>) => DecoratedMiddleware<TContext, MergeContext<TExtraContext, UExtraContext>, TInput & UInput, TOutput>);
-    mapInput: <UInput = unknown>(map: MapInputMiddleware<UInput, TInput>) => DecoratedMiddleware<TContext, TExtraContext, UInput, TOutput>;
-}
-export declare function decorateMiddleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput>(middleware: Middleware<TContext, TExtraContext, TInput, TOutput>): DecoratedMiddleware<TContext, TExtraContext, TInput, TOutput>;
+export type ANY_MAP_INPUT_MIDDLEWARE = MapInputMiddleware<any, any>;
 //# sourceMappingURL=middleware.d.ts.map

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

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

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

@@ -0,0 +1,34 @@
+import type { Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { Hooks, Value } from '@orpc/shared';
+import type { Lazyable } from './lazy';
+import type { Procedure } from './procedure';
+import type { Context, Meta, WELL_CONTEXT, WithSignal } from './types';
+export type ProcedureClientOptions<TClientContext> = WithSignal & (undefined extends TClientContext ? {
+    context?: TClientContext;
+} : {
+    context: TClientContext;
+});
+export interface ProcedureClient<TInput, TOutput, TClientContext> {
+    (...opts: [input: TInput, options: ProcedureClientOptions<TClientContext>] | (undefined extends TInput & TClientContext ? [] : never) | (undefined extends TClientContext ? [input: TInput] : never)): Promise<TOutput>;
+}
+/**
+ * Options for creating a procedure caller with comprehensive type safety
+ */
+export type CreateProcedureClientOptions<TContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> = {
+    procedure: Lazyable<Procedure<TContext, any, TInputSchema, TOutputSchema, TFuncOutput>>;
+    /**
+     * This is helpful for logging and analytics.
+     *
+     * @internal
+     */
+    path?: string[];
+} & ({
+    /**
+     * The context used when calling the procedure.
+     */
+    context: Value<TContext>;
+} | (undefined extends TContext ? {
+    context?: undefined;
+} : never)) & Hooks<unknown, SchemaOutput<TOutputSchema, TFuncOutput>, TContext, Meta>;
+export declare function createProcedureClient<TContext extends Context = WELL_CONTEXT, TInputSchema extends Schema = undefined, TOutputSchema extends Schema = undefined, TFuncOutput extends SchemaInput<TOutputSchema> = SchemaInput<TOutputSchema>>(options: CreateProcedureClientOptions<TContext, TInputSchema, TOutputSchema, TFuncOutput>): ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, TFuncOutput>, unknown>;
+//# sourceMappingURL=procedure-client.d.ts.map

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

@@ -0,0 +1,14 @@
+import type { HTTPPath, RouteOptions, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { MapInputMiddleware, Middleware } from './middleware';
+import type { ProcedureClient } from './procedure-client';
+import type { Context, MergeContext } from './types';
+import { Procedure } from './procedure';
+export type DecoratedProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> = Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput> & {
+    prefix: (prefix: HTTPPath) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+    route: (route: RouteOptions) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+    use: (<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, TFuncOutput>>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema, TFuncOutput>) & (<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema, TFuncOutput>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, TFuncOutput>, UInput>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema, TFuncOutput>);
+    unshiftTag: (...tags: string[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+    unshiftMiddleware: <U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(...middlewares: Middleware<TContext, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, TFuncOutput>>[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+} & (undefined extends TContext ? ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, TFuncOutput>, unknown> : unknown);
+export declare function decorateProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>>(procedure: Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+//# sourceMappingURL=procedure-decorated.d.ts.map

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

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

package/dist/src/procedure.d.ts

@@ -1,32 +1,23 @@
 import type { Promisable } from '@orpc/shared';
 import type { Lazy } from './lazy';
-import type { ProcedureCaller } from './procedure-caller';
+import type { Middleware } from './middleware';
 import type { Context, MergeContext, Meta } from './types';
-import { type ContractProcedure, type HTTPPath, type RouteOptions, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-import { type MapInputMiddleware, type Middleware } from './middleware';
-export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> {
-    zz$p: {
-        middlewares?: Middleware<any, any, any, any>[];
-        contract: ContractProcedure<TInputSchema, TOutputSchema>;
-        func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    };
-    constructor(zz$p: {
-        middlewares?: Middleware<any, any, any, any>[];
-        contract: ContractProcedure<TInputSchema, TOutputSchema>;
-        func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    });
+import { type ContractProcedure, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
+export interface ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
+    (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, TFuncOutput>>;
+}
+export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
+    middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, SchemaOutput<TInputSchema>, any>[];
+    contract: ContractProcedure<TInputSchema, TOutputSchema>;
+    func: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+}
+export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
+    '~type': "Procedure";
+    '~orpc': ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
+    constructor(def: ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>);
 }
 export type ANY_PROCEDURE = Procedure<any, any, any, any, any>;
-export type WELL_DEFINED_PROCEDURE = Procedure<Context, Context, Schema, Schema, unknown>;
+export type WELL_PROCEDURE = Procedure<Context, Context, Schema, Schema, unknown>;
 export type ANY_LAZY_PROCEDURE = Lazy<ANY_PROCEDURE>;
-export type DecoratedProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> = Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput> & {
-    prefix: (prefix: HTTPPath) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    route: (opts: RouteOptions) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    use: (<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, TFuncOutput>>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtraContext>, TInputSchema, TOutputSchema, TFuncOutput>) & (<UExtraContext extends Partial<MergeContext<Context, MergeContext<TContext, TExtraContext>>> | undefined = undefined, UMappedInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtraContext, UMappedInput, SchemaInput<TOutputSchema, TFuncOutput>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, TFuncOutput>, UMappedInput>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtraContext>, TInputSchema, TOutputSchema, TFuncOutput>);
-} & (undefined extends TContext ? ProcedureCaller<Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>> : unknown);
-export interface ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TOutput extends SchemaOutput<TOutputSchema>> {
-    (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, TOutput>>;
-}
-export declare function decorateProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>>(procedure: Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
 export declare function isProcedure(item: unknown): item is ANY_PROCEDURE;
 //# sourceMappingURL=procedure.d.ts.map

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

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