@orpc/server 0.0.0-next.8b5a6d6 → 0.0.0-next.911bdd9

package/dist/node.js

@@ -0,0 +1,87 @@
+import {
+  ORPCHandler
+} from "./chunk-3BAPJGK6.js";
+import "./chunk-E7GUWVR4.js";
+
+// src/adapters/node/request-listener.ts
+function createRequest(req, res) {
+  const controller = new AbortController();
+  res.on("close", () => {
+    controller.abort();
+  });
+  const method = req.method ?? "GET";
+  const headers = createHeaders(req);
+  const protocol = "encrypted" in req.socket && req.socket.encrypted ? "https:" : "http:";
+  const host = headers.get("Host") ?? "localhost";
+  const url = new URL(req.originalUrl ?? req.url ?? "/", `${protocol}//${host}`);
+  const init = { method, headers, signal: controller.signal };
+  if (method !== "GET" && method !== "HEAD") {
+    init.body = new ReadableStream({
+      start(controller2) {
+        req.on("data", (chunk) => {
+          controller2.enqueue(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
+        });
+        req.on("end", () => {
+          controller2.close();
+        });
+      }
+    });
+    init.duplex = "half";
+  }
+  return new Request(url, init);
+}
+function createHeaders(req) {
+  const headers = new Headers();
+  const rawHeaders = req.rawHeaders;
+  for (let i = 0; i < rawHeaders.length; i += 2) {
+    headers.append(rawHeaders[i], rawHeaders[i + 1]);
+  }
+  return headers;
+}
+async function sendResponse(res, response) {
+  const headers = {};
+  for (const [key, value] of response.headers) {
+    if (key in headers) {
+      if (Array.isArray(headers[key])) {
+        headers[key].push(value);
+      } else {
+        headers[key] = [headers[key], value];
+      }
+    } else {
+      headers[key] = value;
+    }
+  }
+  res.writeHead(response.status, headers);
+  if (response.body != null && res.req.method !== "HEAD") {
+    for await (const chunk of response.body) {
+      res.write(chunk);
+    }
+  }
+  res.end();
+}
+
+// src/adapters/node/orpc-handler.ts
+var ORPCHandler2 = class {
+  orpcFetchHandler;
+  constructor(router, options) {
+    this.orpcFetchHandler = new ORPCHandler(router, options);
+  }
+  async handle(req, res, ...[options]) {
+    const request = createRequest(req, res);
+    const castedOptions = options ?? {};
+    const result = await this.orpcFetchHandler.handle(request, castedOptions);
+    if (result.matched === false) {
+      return { matched: false };
+    }
+    await options?.beforeSend?.(result.response, castedOptions.context);
+    await sendResponse(res, result.response);
+    return { matched: true };
+  }
+};
+export {
+  ORPCHandler2 as ORPCHandler,
+  createHeaders,
+  createRequest,
+  sendResponse
+};
+//# sourceMappingURL=node.js.map

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

@@ -0,0 +1,6 @@
+export * from './orpc-handler';
+export * from './orpc-payload-codec';
+export * from './orpc-procedure-matcher';
+export * as SuperJSON from './super-json';
+export * from './types';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,20 @@
+import type { Hooks } from '@orpc/shared';
+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, {
+    signal?: AbortSignal;
+}> & {
+    procedureMatcher?: PublicORPCProcedureMatcher;
+    payloadCodec?: PublicORPCPayloadCodec;
+};
+export declare class ORPCHandler<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);
+    handle(request: Request, ...[options]: FetchHandleRest<T>): Promise<FetchHandleResult>;
+}
+//# sourceMappingURL=orpc-handler.d.ts.map

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

@@ -0,0 +1,16 @@
+import type { HTTPMethod } from '@orpc/contract';
+export declare class ORPCPayloadCodec {
+    /**
+     * If method is GET, the payload will be encoded as query string.
+     * If method is GET and payload contain file, the method will be fallback to fallbackMethod. (fallbackMethod = GET will force to use GET method)
+     */
+    encode(payload: unknown, method?: HTTPMethod, fallbackMethod?: HTTPMethod): {
+        query?: URLSearchParams;
+        body?: FormData | string;
+        headers?: Headers;
+        method: HTTPMethod;
+    };
+    decode(re: Request | Response): Promise<unknown>;
+}
+export type PublicORPCPayloadCodec = Pick<ORPCPayloadCodec, keyof ORPCPayloadCodec>;
+//# sourceMappingURL=orpc-payload-codec.d.ts.map

package/dist/src/adapters/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/adapters/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/adapters/fetch/types.d.ts

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

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

@@ -0,0 +1,5 @@
+export * from './orpc-handler';
+export * from './orpc-handler';
+export * from './request-listener';
+export * from './types';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +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 { RequestHandler, RequestHandleRest, RequestHandleResult } from './types';
+import { type ExpressableIncomingMessage } from './request-listener';
+export declare class ORPCHandler<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>;
+}
+//# sourceMappingURL=orpc-handler.d.ts.map

package/dist/src/adapters/node/request-listener.d.ts

@@ -0,0 +1,28 @@
+import type { IncomingMessage, ServerResponse } from 'node:http';
+export interface ExpressableIncomingMessage extends IncomingMessage {
+    originalUrl?: string;
+}
+/**
+ * Creates a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request) object from a Node.js
+ * [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) and
+ * [`http.ServerResponse`](https://nodejs.org/api/http.html#class-httpserverresponse) pair.
+ *
+ */
+export declare function createRequest(req: ExpressableIncomingMessage, res: ServerResponse): Request;
+/**
+ * Creates a [`Headers`](https://developer.mozilla.org/en-US/docs/Web/API/Headers) object from the headers
+ * in a Node.js [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage).
+ *
+ * @param req The incoming request object.
+ * @returns A headers object.
+ */
+export declare function createHeaders(req: IncomingMessage): Headers;
+/**
+ * Sends a [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response) to the client using the
+ * Node.js [`http.ServerResponse`](https://nodejs.org/api/http.html#class-httpserverresponse) object.
+ *
+ * @param res The server response object.
+ * @param response The response to send.
+ */
+export declare function sendResponse(res: ServerResponse, response: Response): Promise<void>;
+//# sourceMappingURL=request-listener.d.ts.map

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

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

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 ProcedureHandler } 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>;
+    handler<UFuncOutput = undefined>(handler: ProcedureHandler<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
     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/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,24 @@
+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 { configGlobal, fallbackToGlobalConfig } from '@orpc/contract';
 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,26 +1,33 @@
 import type { Promisable } from '@orpc/shared';
-import type { Context, MergeContext, Meta } from './types';
+import type { ANY_PROCEDURE } from './procedure';
+import type { Context } from './types';
 export type MiddlewareResult<TExtraContext extends Context, TOutput> = Promisable<{
     output: TOutput;
     context: TExtraContext;
 }>;
-export interface MiddlewareMeta<TOutput> extends Meta {
-    next: <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
+export interface MiddlewareNextFn<TOutput> {
+    <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
         context?: UExtraContext;
     } : {
         context: UExtraContext;
-    }) => MiddlewareResult<UExtraContext, TOutput>;
-    output: <UOutput>(output: UOutput) => MiddlewareResult<undefined, UOutput>;
+    }): MiddlewareResult<UExtraContext, TOutput>;
+}
+export interface MiddlewareOutputFn<TOutput> {
+    (output: TOutput): MiddlewareResult<undefined, TOutput>;
+}
+export interface MiddlewareOptions<TContext extends Context, TOutput> {
+    context: TContext;
+    path: string[];
+    procedure: ANY_PROCEDURE;
+    signal?: AbortSignal;
+    next: MiddlewareNextFn<TOutput>;
 }
 export interface Middleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput> {
-    (input: TInput, context: TContext, meta: MiddlewareMeta<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
+    (options: MiddlewareOptions<TContext, TOutput>, input: TInput, output: MiddlewareOutputFn<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 ProcedureHandler } 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>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<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, THandlerOutput extends SchemaInput<TOutputSchema>> = {
+    procedure: Lazyable<Procedure<TContext, any, TInputSchema, TOutputSchema, THandlerOutput>>;
+    /**
+     * This is helpful for logging and analytics.
+     *
+     * @internal
+     */
+    path?: string[];
+} & ({
+    /**
+     * The context used when calling the procedure.
+     */
+    context: Value<TContext>;
+} | (undefined extends TContext ? {
+    context?: undefined;
+} : never)) & Hooks<unknown, SchemaOutput<TOutputSchema, THandlerOutput>, TContext, Meta>;
+export declare function createProcedureClient<TContext extends Context = WELL_CONTEXT, TInputSchema extends Schema = undefined, TOutputSchema extends Schema = undefined, THandlerOutput extends SchemaInput<TOutputSchema> = SchemaInput<TOutputSchema>>(options: CreateProcedureClientOptions<TContext, TInputSchema, TOutputSchema, THandlerOutput>): ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, unknown>;
+//# 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, THandlerOutput extends SchemaInput<TOutputSchema>> = Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput> & {
+    prefix: (prefix: HTTPPath) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    route: (route: RouteOptions) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    use: (<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, THandlerOutput>>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema, THandlerOutput>) & (<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema, THandlerOutput>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema, THandlerOutput>, UInput>) => DecoratedProcedure<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema, THandlerOutput>);
+    unshiftTag: (...tags: string[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    unshiftMiddleware: <U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(...middlewares: Middleware<TContext, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema, THandlerOutput>>[]) => DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+} & (undefined extends TContext ? ProcedureClient<SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, unknown> : unknown);
+export declare function decorateProcedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>>(procedure: Procedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+//# sourceMappingURL=procedure-decorated.d.ts.map