@orpc/server 0.17.0 → 0.18.0

package/dist/fetch.js

@@ -5,108 +5,282 @@ import {
   unlazy
 } from "./chunk-FN62GL22.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 };
+  }
+  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;
   }
-  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"
+  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 {
+  encode(payload) {
+    const { data, meta } = serialize(payload);
+    const { maps, values } = findDeepMatches((v) => v instanceof Blob, data);
+    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 };
+    }
+    return {
+      body: JSON.stringify({ data, meta }),
+      headers: new Headers({
+        "content-type": "application/json"
+      })
+    };
+  }
+  async decode(re) {
+    try {
+      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/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,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,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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -33,13 +33,9 @@
     "!**/*.tsbuildinfo",
     "dist"
   ],
-  "peerDependencies": {
-    "@orpc/zod": "0.17.0"
-  },
   "dependencies": {
-    "@orpc/contract": "0.17.0",
-    "@orpc/shared": "0.17.0",
-    "@orpc/transformer": "0.17.0"
+    "@orpc/contract": "0.18.0",
+    "@orpc/shared": "0.18.0"
   },
   "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