@orpc/server 0.0.0-next.e361acd → 0.0.0-next.eb37cbe

package/dist/{chunk-FN62GL22.js → chunk-37HIYNDO.js}

@@ -23,7 +23,7 @@ function isProcedure(item) {
   if (item instanceof Procedure) {
     return true;
   }
-  return (typeof item === "object" || typeof item === "function") && item !== null && "~type" in item && item["~type"] === "Procedure" && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "contract" in item["~orpc"] && isContractProcedure(item["~orpc"].contract) && "func" in item["~orpc"] && typeof item["~orpc"].func === "function";
+  return (typeof item === "object" || typeof item === "function") && item !== null && "~type" in item && item["~type"] === "Procedure" && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "contract" in item["~orpc"] && isContractProcedure(item["~orpc"].contract) && "handler" in item["~orpc"] && typeof item["~orpc"].handler === "function";
 }
 
 // src/lazy.ts
@@ -129,7 +129,7 @@ async function executeMiddlewareChain(procedure, input, context, meta) {
       });
     }
     const result = {
-      output: await procedure["~orpc"].func(input, currentContext, meta),
+      output: await procedure["~orpc"].handler(input, currentContext, meta),
       context: currentContext
     };
     return result;
@@ -179,4 +179,4 @@ export {
   createProcedureClient,
   getRouterChild
 };
-//# sourceMappingURL=chunk-FN62GL22.js.map
+//# sourceMappingURL=chunk-37HIYNDO.js.map

package/dist/fetch.js

@@ -3,110 +3,313 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-FN62GL22.js";
+} from "./chunk-37HIYNDO.js";
 
-// src/fetch/handle-request.ts
+// src/fetch/composite-handler.ts
+var CompositeHandler = class {
+  constructor(handlers) {
+    this.handlers = handlers;
+  }
+  async fetch(request, ...opt) {
+    for (const handler of this.handlers) {
+      if (handler.condition(request)) {
+        return handler.fetch(request, ...opt);
+      }
+    }
+    return new Response("None of the handlers can handle the request.", {
+      status: 404
+    });
+  }
+};
+
+// src/fetch/orpc-handler.ts
+import { executeWithHooks, ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim as trim2 } from "@orpc/shared";
+import { ORPCError as ORPCError2 } from "@orpc/shared/error";
+
+// src/fetch/orpc-payload-codec.ts
+import { findDeepMatches, set } from "@orpc/shared";
 import { ORPCError } from "@orpc/shared/error";
-async function handleFetchRequest(options) {
-  for (const handler of options.handlers) {
-    const response = await handler(options);
-    if (response) {
-      return response;
+
+// ../../node_modules/.pnpm/is-what@5.0.2/node_modules/is-what/dist/getType.js
+function getType(payload) {
+  return Object.prototype.toString.call(payload).slice(8, -1);
+}
+
+// ../../node_modules/.pnpm/is-what@5.0.2/node_modules/is-what/dist/isPlainObject.js
+function isPlainObject(payload) {
+  if (getType(payload) !== "Object")
+    return false;
+  const prototype = Object.getPrototypeOf(payload);
+  return !!prototype && prototype.constructor === Object && prototype === Object.prototype;
+}
+
+// src/fetch/super-json.ts
+function serialize(value, segments = [], meta = []) {
+  if (typeof value === "bigint") {
+    meta.push(["bigint", segments]);
+    return { data: value.toString(), meta };
+  }
+  if (value instanceof Date) {
+    meta.push(["date", segments]);
+    const data = Number.isNaN(value.getTime()) ? "Invalid Date" : value.toISOString();
+    return { data, meta };
+  }
+  if (Number.isNaN(value)) {
+    meta.push(["nan", segments]);
+    return { data: "NaN", meta };
+  }
+  if (value instanceof RegExp) {
+    meta.push(["regexp", segments]);
+    return { data: value.toString(), meta };
+  }
+  if (value instanceof URL) {
+    meta.push(["url", segments]);
+    return { data: value.toString(), meta };
+  }
+  if (isPlainObject(value)) {
+    const data = {};
+    for (const k in value) {
+      data[k] = serialize(value[k], [...segments, k], meta).data;
     }
+    return { data, meta };
   }
-  const error = new ORPCError({ code: "NOT_FOUND", message: "Not found" });
-  return new Response(JSON.stringify(error.toJSON()), {
-    status: error.status,
-    headers: {
-      "Content-Type": "application/json"
+  if (Array.isArray(value)) {
+    const data = value.map((v, i) => {
+      if (v === void 0) {
+        meta.push(["undefined", [...segments, i]]);
+        return null;
+      }
+      return serialize(v, [...segments, i], meta).data;
+    });
+    return { data, meta };
+  }
+  if (value instanceof Set) {
+    const result = serialize(Array.from(value), segments, meta);
+    meta.push(["set", segments]);
+    return result;
+  }
+  if (value instanceof Map) {
+    const result = serialize(Array.from(value.entries()), segments, meta);
+    meta.push(["map", segments]);
+    return result;
+  }
+  return { data: value, meta };
+}
+function deserialize({
+  data,
+  meta
+}) {
+  if (meta.length === 0) {
+    return data;
+  }
+  const ref = { data };
+  for (const [type, segments] of meta) {
+    let currentRef = ref;
+    let preSegment = "data";
+    for (let i = 0; i < segments.length; i++) {
+      currentRef = currentRef[preSegment];
+      preSegment = segments[i];
+    }
+    switch (type) {
+      case "nan":
+        currentRef[preSegment] = Number.NaN;
+        break;
+      case "bigint":
+        currentRef[preSegment] = BigInt(currentRef[preSegment]);
+        break;
+      case "date":
+        currentRef[preSegment] = new Date(currentRef[preSegment]);
+        break;
+      case "regexp": {
+        const [, pattern, flags] = currentRef[preSegment].match(/^\/(.*)\/([a-z]*)$/);
+        currentRef[preSegment] = new RegExp(pattern, flags);
+        break;
+      }
+      case "url":
+        currentRef[preSegment] = new URL(currentRef[preSegment]);
+        break;
+      case "undefined":
+        currentRef[preSegment] = void 0;
+        break;
+      case "map":
+        currentRef[preSegment] = new Map(currentRef[preSegment]);
+        break;
+      case "set":
+        currentRef[preSegment] = new Set(currentRef[preSegment]);
+        break;
+      /* v8 ignore next 3 */
+      default: {
+        const _expected = type;
+      }
     }
-  });
+  }
+  return ref.data;
 }
 
-// src/fetch/orpc-handler.ts
-import { executeWithHooks, ORPC_PROTOCOL_HEADER, ORPC_PROTOCOL_VALUE, trim, value } from "@orpc/shared";
-import { ORPCError as ORPCError2 } from "@orpc/shared/error";
-import { ORPCDeserializer, ORPCSerializer } from "@orpc/transformer";
-var serializer = new ORPCSerializer();
-var deserializer = new ORPCDeserializer();
-function createORPCHandler() {
-  return async (options) => {
-    if (!options.request.headers.get(ORPC_PROTOCOL_HEADER)?.includes(ORPC_PROTOCOL_VALUE)) {
+// src/fetch/orpc-payload-codec.ts
+var ORPCPayloadCodec = class {
+  /**
+   * 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, method = "POST", fallbackMethod = "POST") {
+    const { data, meta } = serialize(payload);
+    const { maps, values } = findDeepMatches((v) => v instanceof Blob, data);
+    if (method === "GET" && (values.length === 0 || fallbackMethod === "GET")) {
+      const query = new URLSearchParams({
+        data: JSON.stringify(data),
+        meta: JSON.stringify(meta)
+      });
+      return {
+        query,
+        method: "GET"
+      };
+    }
+    const nonGETMethod = method === "GET" ? fallbackMethod : method;
+    if (values.length > 0) {
+      const form = new FormData();
+      if (data !== void 0) {
+        form.append("data", JSON.stringify(data));
+      }
+      form.append("meta", JSON.stringify(meta));
+      form.append("maps", JSON.stringify(maps));
+      for (const i in values) {
+        const value = values[i];
+        form.append(i, value);
+      }
+      return {
+        body: form,
+        method: nonGETMethod
+      };
+    }
+    return {
+      body: JSON.stringify({ data, meta }),
+      headers: new Headers({
+        "content-type": "application/json"
+      }),
+      method: nonGETMethod
+    };
+  }
+  async decode(re) {
+    try {
+      if ("method" in re && re.method === "GET") {
+        const url = new URL(re.url);
+        const query = url.searchParams;
+        const data = JSON.parse(query.getAll("data").at(-1));
+        const meta = JSON.parse(query.getAll("meta").at(-1));
+        return deserialize({
+          data,
+          meta
+        });
+      }
+      if (re.headers.get("content-type")?.startsWith("multipart/form-data")) {
+        const form = await re.formData();
+        const rawData = form.get("data");
+        const rawMeta = form.get("meta");
+        const rawMaps = form.get("maps");
+        let data = JSON.parse(rawData);
+        const meta = JSON.parse(rawMeta);
+        const maps = JSON.parse(rawMaps);
+        for (const i in maps) {
+          data = set(data, maps[i], form.get(i));
+        }
+        return deserialize({
+          data,
+          meta
+        });
+      }
+      const json = await re.json();
+      return deserialize(json);
+    } catch (e) {
+      throw new ORPCError({
+        code: "BAD_REQUEST",
+        message: "Cannot parse request/response. Please check the request/response body and Content-Type header.",
+        cause: e
+      });
+    }
+  }
+};
+
+// src/fetch/orpc-procedure-matcher.ts
+import { trim } from "@orpc/shared";
+var ORPCProcedureMatcher = class {
+  constructor(router) {
+    this.router = router;
+  }
+  async match(pathname) {
+    const path = trim(pathname, "/").split("/").map(decodeURIComponent);
+    const match = getRouterChild(this.router, ...path);
+    const { default: maybeProcedure } = await unlazy(match);
+    if (!isProcedure(maybeProcedure)) {
       return void 0;
     }
-    const context = await value(options.context);
-    const handler = async () => {
-      const url = new URL(options.request.url);
-      const pathname = `/${trim(url.pathname.replace(options.prefix ?? "", ""), "/")}`;
-      const match = await resolveRouterMatch(options.router, pathname);
+    return {
+      procedure: maybeProcedure,
+      path
+    };
+  }
+};
+
+// src/fetch/orpc-handler.ts
+var ORPCHandler = class {
+  constructor(router, options) {
+    this.router = router;
+    this.options = options;
+    this.procedureMatcher = options?.procedureMatcher ?? new ORPCProcedureMatcher(router);
+    this.payloadCodec = options?.payloadCodec ?? new ORPCPayloadCodec();
+  }
+  procedureMatcher;
+  payloadCodec;
+  condition(request) {
+    return Boolean(request.headers.get(ORPC_HANDLER_HEADER)?.includes(ORPC_HANDLER_VALUE));
+  }
+  async fetch(request, ...[options]) {
+    const context = options?.context;
+    const execute = async () => {
+      const url = new URL(request.url);
+      const pathname = `/${trim2(url.pathname.replace(options?.prefix ?? "", ""), "/")}`;
+      const match = await this.procedureMatcher.match(pathname);
       if (!match) {
         throw new ORPCError2({ code: "NOT_FOUND", message: "Not found" });
       }
-      const input = await parseRequestInput(options.request);
-      const caller = createProcedureClient({
+      const input = await this.payloadCodec.decode(request);
+      const client = createProcedureClient({
         context,
         procedure: match.procedure,
         path: match.path
       });
-      const output = await caller(input, { signal: options.signal });
-      const { body, headers } = serializer.serialize(output);
-      return new Response(body, {
-        status: 200,
-        headers
-      });
+      const output = await client(input, { signal: options?.signal });
+      const { body, headers } = this.payloadCodec.encode(output);
+      return new Response(body, { headers });
     };
     try {
       return await executeWithHooks({
-        hooks: options,
         context,
-        execute: handler,
-        input: options.request,
+        execute,
+        input: request,
+        hooks: this.options,
         meta: {
-          signal: options.signal
+          signal: options?.signal
         }
       });
-    } catch (error) {
-      return handleErrorResponse(error);
+    } catch (e) {
+      const error = e instanceof ORPCError2 ? e : new ORPCError2({
+        code: "INTERNAL_SERVER_ERROR",
+        message: "Internal server error",
+        cause: e
+      });
+      const { body, headers } = this.payloadCodec.encode(error.toJSON());
+      return new Response(body, {
+        headers,
+        status: error.status
+      });
     }
-  };
-}
-async function resolveRouterMatch(router, pathname) {
-  const pathSegments = trim(pathname, "/").split("/").map(decodeURIComponent);
-  const match = getRouterChild(router, ...pathSegments);
-  const { default: maybeProcedure } = await unlazy(match);
-  if (!isProcedure(maybeProcedure)) {
-    return void 0;
-  }
-  return {
-    procedure: maybeProcedure,
-    path: pathSegments
-  };
-}
-async function parseRequestInput(request) {
-  try {
-    return await deserializer.deserialize(request);
-  } catch (error) {
-    throw new ORPCError2({
-      code: "BAD_REQUEST",
-      message: "Cannot parse request. Please check the request body and Content-Type header.",
-      cause: error
-    });
   }
-}
-function handleErrorResponse(error) {
-  const orpcError = error instanceof ORPCError2 ? error : new ORPCError2({
-    code: "INTERNAL_SERVER_ERROR",
-    message: "Internal server error",
-    cause: error
-  });
-  const { body, headers } = serializer.serialize(orpcError.toJSON());
-  return new Response(body, {
-    status: orpcError.status,
-    headers
-  });
-}
+};
 export {
-  createORPCHandler,
-  handleFetchRequest
+  CompositeHandler,
+  ORPCHandler,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher
 };
 //# sourceMappingURL=fetch.js.map

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   lazy,
   mergeContext,
   unlazy
-} from "./chunk-FN62GL22.js";
+} from "./chunk-37HIYNDO.js";
 
 // src/builder.ts
 import { ContractProcedure } from "@orpc/contract";
@@ -110,11 +110,11 @@ var ProcedureImplementer = class _ProcedureImplementer {
       middlewares: [...this["~orpc"].middlewares ?? [], mappedMiddleware]
     });
   }
-  func(func) {
+  handler(handler) {
     return decorateProcedure(new Procedure({
       middlewares: this["~orpc"].middlewares,
       contract: this["~orpc"].contract,
-      func
+      handler
     }));
   }
 };
@@ -358,11 +358,11 @@ var ProcedureBuilder = class _ProcedureBuilder {
       middlewares: this["~orpc"].middlewares
     }).use(middleware, mapInput);
   }
-  func(func) {
+  handler(handler) {
     return decorateProcedure(new Procedure({
       middlewares: this["~orpc"].middlewares,
       contract: this["~orpc"].contract,
-      func
+      handler
     }));
   }
 };
@@ -416,14 +416,14 @@ var Builder = class _Builder {
       })
     });
   }
-  func(func) {
+  handler(handler) {
     return decorateProcedure(new Procedure({
       middlewares: this["~orpc"].middlewares,
       contract: new ContractProcedure({
         InputSchema: void 0,
         OutputSchema: void 0
       }),
-      func
+      handler
     }));
   }
   prefix(prefix) {

package/dist/src/builder.d.ts

@@ -23,7 +23,7 @@ export declare class Builder<TContext extends Context, TExtraContext extends Con
     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>;
-    func<UFuncOutput = undefined>(func: ProcedureFunc<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
+    handler<UFuncOutput = undefined>(handler: ProcedureFunc<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
     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>;

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-request';
+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

@@ -1,3 +1,20 @@
-import type { FetchHandler } from './types';
-export declare function createORPCHandler(): FetchHandler;
+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,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/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,28 +1,16 @@
 import type { HTTPPath } from '@orpc/contract';
-import type { Hooks, Value } from '@orpc/shared';
-import type { Router } from '../router';
 import type { Context, WithSignal } from '../types';
-export type FetchHandlerOptions<T extends Context> = {
-    /**
-     * The `router` used for handling the request and routing,
-     *
-     */
-    router: Router<T, any>;
-    /**
-     * The request need to be handled.
-     */
-    request: Request;
-    /**
-     * Remove the prefix from the request path.
-     *
-     * @example /orpc
-     * @example /api
-     */
+export type FetchOptions<T extends Context> = WithSignal & {
     prefix?: HTTPPath;
-} & NoInfer<(undefined extends T ? {
-    context?: Value<T>;
+} & (undefined extends T ? {
+    context?: T;
 } : {
-    context: Value<T>;
-})> & WithSignal & Hooks<Request, Response, T, WithSignal>;
-export type FetchHandler = <T extends Context>(options: FetchHandlerOptions<T>) => Promise<Response | undefined>;
+    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/lazy-decorated.d.ts

@@ -3,7 +3,7 @@ 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 : {
+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>;

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

@@ -17,6 +17,6 @@ export declare class ProcedureBuilder<TContext extends Context, TExtraContext ex
     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>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: 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

@@ -3,14 +3,19 @@ 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 interface ProcedureClient<TInput, TOutput> {
-    (...opts: [input: TInput, options?: WithSignal] | (undefined extends TInput ? [] : never)): Promise<TOutput>;
+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>>;
+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.
      *
@@ -24,6 +29,6 @@ export type CreateProcedureClientOptions<TContext extends Context, TInputSchema
     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>>;
+} : 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

@@ -3,12 +3,12 @@ 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);
-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>;
+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

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

@@ -13,6 +13,6 @@ export declare class ProcedureImplementer<TContext extends Context, TExtraContex
     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>;
+    handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
 }
 //# sourceMappingURL=procedure-implementer.d.ts.map

package/dist/src/procedure.d.ts

@@ -3,18 +3,18 @@ import type { Lazy } from './lazy';
 import type { Middleware } from './middleware';
 import type { Context, MergeContext, Meta } from './types';
 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 ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
+    (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
 }
-export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
+export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput 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>;
+    handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
 }
-export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaInput<TOutputSchema>> {
+export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
     '~type': "Procedure";
-    '~orpc': ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>;
-    constructor(def: ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, TFuncOutput>);
+    '~orpc': ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
+    constructor(def: ProcedureDef<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>);
 }
 export type ANY_PROCEDURE = Procedure<any, any, any, any, any>;
 export type WELL_PROCEDURE = Procedure<Context, Context, Schema, Schema, unknown>;

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

@@ -5,8 +5,8 @@ import type { Procedure } from './procedure';
 import type { ProcedureClient } from './procedure-client';
 import type { Meta } from './types';
 import { type ANY_ROUTER, type Router } from './router';
-export type RouterClient<T extends ANY_ROUTER | ContractRouter> = T extends Lazy<infer U extends ANY_ROUTER | ContractRouter> ? RouterClient<U> : T extends ContractProcedure<infer UInputSchema, infer UOutputSchema> | Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>> : {
-    [K in keyof T]: T[K] extends ANY_ROUTER | ContractRouter ? RouterClient<T[K]> : never;
+export type RouterClient<TRouter extends ANY_ROUTER | ContractRouter, TClientContext> = TRouter extends Lazy<infer U extends ANY_ROUTER | ContractRouter> ? RouterClient<U, TClientContext> : TRouter extends ContractProcedure<infer UInputSchema, infer UOutputSchema> | Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>, TClientContext> : {
+    [K in keyof TRouter]: TRouter[K] extends ANY_ROUTER | ContractRouter ? RouterClient<TRouter[K], TClientContext> : never;
 };
 export type CreateRouterClientOptions<TRouter extends ANY_ROUTER> = {
     router: TRouter | Lazy<undefined>;
@@ -21,5 +21,5 @@ export type CreateRouterClientOptions<TRouter extends ANY_ROUTER> = {
 } : {
     context: Value<UContext>;
 } : never) & Hooks<unknown, unknown, TRouter extends Router<infer UContext, any> ? UContext : never, Meta>;
-export declare function createRouterClient<TRouter extends ANY_ROUTER>(options: CreateRouterClientOptions<TRouter>): RouterClient<TRouter>;
+export declare function createRouterClient<TRouter extends ANY_ROUTER>(options: CreateRouterClientOptions<TRouter>): RouterClient<TRouter, unknown>;
 //# sourceMappingURL=router-client.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.e361acd",
+  "version": "0.0.0-next.eb37cbe",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -33,13 +33,9 @@
     "!**/*.tsbuildinfo",
     "dist"
   ],
-  "peerDependencies": {
-    "@orpc/zod": "0.0.0-next.e361acd"
-  },
   "dependencies": {
-    "@orpc/contract": "0.0.0-next.e361acd",
-    "@orpc/transformer": "0.0.0-next.e361acd",
-    "@orpc/shared": "0.0.0-next.e361acd"
+    "@orpc/contract": "0.0.0-next.eb37cbe",
+    "@orpc/shared": "0.0.0-next.eb37cbe"
   },
   "devDependencies": {
     "zod": "^3.24.1"

package/dist/src/fetch/handle-request.d.ts

@@ -1,7 +0,0 @@
-import type { Context } from '../types';
-import type { FetchHandler, FetchHandlerOptions } from './types';
-export type HandleFetchRequestOptions<T extends Context> = FetchHandlerOptions<T> & {
-    handlers: readonly [FetchHandler, ...FetchHandler[]];
-};
-export declare function handleFetchRequest<T extends Context>(options: HandleFetchRequestOptions<T>): Promise<Response>;
-//# sourceMappingURL=handle-request.d.ts.map