@orpc/server 0.0.0-next.cba521d → 0.0.0-next.cc8802c

package/dist/shared/server.CSZRzcSW.mjs

@@ -0,0 +1,158 @@
+import { ORPCError, toORPCError } from '@orpc/client';
+import { intercept, trim, parseEmptyableJSON } from '@orpc/shared';
+import { C as CompositePlugin } from './server.Q6ZmnTgO.mjs';
+import { c as createProcedureClient, t as traverseContractProcedures, a as toHttpPath, i as isProcedure, u as unlazy, g as getRouter, b as createContractedProcedure } from './server.CMrS28Go.mjs';
+
+class StandardHandler {
+  constructor(router, matcher, codec, options) {
+    this.matcher = matcher;
+    this.codec = codec;
+    this.options = options;
+    this.plugin = new CompositePlugin(options.plugins);
+    this.plugin.init(this.options);
+    this.matcher.init(router);
+  }
+  plugin;
+  handle(request, ...[options]) {
+    return intercept(
+      this.options.rootInterceptors ?? [],
+      {
+        request,
+        ...options,
+        context: options?.context ?? {}
+        // context is optional only when all fields are optional so we can safely force it to have a context
+      },
+      async (interceptorOptions) => {
+        let isDecoding = false;
+        try {
+          return await intercept(
+            this.options.interceptors ?? [],
+            interceptorOptions,
+            async (interceptorOptions2) => {
+              const method = interceptorOptions2.request.method;
+              const url = interceptorOptions2.request.url;
+              const pathname = `/${trim(url.pathname.replace(interceptorOptions2.prefix ?? "", ""), "/")}`;
+              const match = await this.matcher.match(method, pathname);
+              if (!match) {
+                return { matched: false, response: void 0 };
+              }
+              const client = createProcedureClient(match.procedure, {
+                context: interceptorOptions2.context,
+                path: match.path,
+                interceptors: this.options.clientInterceptors
+              });
+              isDecoding = true;
+              const input = await this.codec.decode(request, match.params, match.procedure);
+              isDecoding = false;
+              const lastEventId = Array.isArray(request.headers["last-event-id"]) ? request.headers["last-event-id"].at(-1) : request.headers["last-event-id"];
+              const output = await client(input, { signal: request.signal, lastEventId });
+              const response = this.codec.encode(output, match.procedure);
+              return {
+                matched: true,
+                response
+              };
+            }
+          );
+        } catch (e) {
+          const error = isDecoding ? new ORPCError("BAD_REQUEST", {
+            message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
+            cause: e
+          }) : toORPCError(e);
+          const response = this.codec.encodeError(error);
+          return {
+            matched: true,
+            response
+          };
+        }
+      }
+    );
+  }
+}
+
+class RPCCodec {
+  constructor(serializer) {
+    this.serializer = serializer;
+  }
+  async decode(request, _params, _procedure) {
+    const serialized = request.method === "GET" ? parseEmptyableJSON(request.url.searchParams.getAll("data").at(-1)) : await request.body();
+    return this.serializer.deserialize(serialized);
+  }
+  encode(output, _procedure) {
+    return {
+      status: 200,
+      headers: {},
+      body: this.serializer.serialize(output)
+    };
+  }
+  encodeError(error) {
+    return {
+      status: error.status,
+      headers: {},
+      body: this.serializer.serialize(error.toJSON())
+    };
+  }
+}
+
+class RPCMatcher {
+  tree = {};
+  pendingRouters = [];
+  init(router, path = []) {
+    const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
+      const httpPath = toHttpPath(path2);
+      if (isProcedure(contract)) {
+        this.tree[httpPath] = {
+          path: path2,
+          contract,
+          procedure: contract,
+          // this mean dev not used contract-first so we can used contract as procedure directly
+          router
+        };
+      } else {
+        this.tree[httpPath] = {
+          path: path2,
+          contract,
+          procedure: void 0,
+          router
+        };
+      }
+    });
+    this.pendingRouters.push(...laziedOptions.map((option) => ({
+      ...option,
+      httpPathPrefix: toHttpPath(option.path)
+    })));
+  }
+  async match(_method, pathname) {
+    if (this.pendingRouters.length) {
+      const newPendingRouters = [];
+      for (const pendingRouter of this.pendingRouters) {
+        if (pathname.startsWith(pendingRouter.httpPathPrefix)) {
+          const { default: router } = await unlazy(pendingRouter.router);
+          this.init(router, pendingRouter.path);
+        } else {
+          newPendingRouters.push(pendingRouter);
+        }
+      }
+      this.pendingRouters = newPendingRouters;
+    }
+    const match = this.tree[pathname];
+    if (!match) {
+      return void 0;
+    }
+    if (!match.procedure) {
+      const { default: maybeProcedure } = await unlazy(getRouter(match.router, match.path));
+      if (!isProcedure(maybeProcedure)) {
+        throw new Error(`
+          [Contract-First] Missing or invalid implementation for procedure at path: ${toHttpPath(match.path)}.
+          Ensure that the procedure is correctly defined and matches the expected contract.
+        `);
+      }
+      match.procedure = createContractedProcedure(maybeProcedure, match.contract);
+    }
+    return {
+      path: match.path,
+      procedure: match.procedure
+    };
+  }
+}
+
+export { RPCCodec as R, StandardHandler as S, RPCMatcher as a };

package/dist/shared/server.Cq3B6PoL.mjs

@@ -0,0 +1,28 @@
+import { RPCSerializer } from '@orpc/client/standard';
+import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
+import { S as StandardHandler, a as RPCMatcher, R as RPCCodec } from './server.CSZRzcSW.mjs';
+
+class RPCHandler {
+  standardHandler;
+  constructor(router, options = {}) {
+    const serializer = new RPCSerializer();
+    const matcher = new RPCMatcher();
+    const codec = new RPCCodec(serializer);
+    this.standardHandler = new StandardHandler(router, matcher, codec, options);
+  }
+  async handle(request, ...[
+    options = {}
+  ]) {
+    const standardRequest = toStandardLazyRequest(request);
+    const result = await this.standardHandler.handle(standardRequest, options);
+    if (!result.matched) {
+      return result;
+    }
+    return {
+      matched: true,
+      response: toFetchResponse(result.response, options)
+    };
+  }
+}
+
+export { RPCHandler as R };

package/dist/shared/server.DmW25ynm.d.ts

@@ -0,0 +1,75 @@
+import { HTTPPath, AnySchema, Meta, InferSchemaOutput, ErrorFromErrorMap } from '@orpc/contract';
+import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
+import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
+import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.CPteJIPP.js';
+import { ORPCError } from '@orpc/client';
+
+type StandardParams = Record<string, string>;
+type StandardMatchResult = {
+    path: readonly string[];
+    procedure: AnyProcedure;
+    params?: StandardParams;
+} | undefined;
+interface StandardMatcher {
+    init(router: AnyRouter): void;
+    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
+}
+interface StandardCodec {
+    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
+    encodeError(error: ORPCError<any, any>): StandardResponse;
+    decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
+}
+
+type StandardHandleOptions<T extends Context> = {
+    prefix?: HTTPPath;
+} & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+type StandardHandleResult = {
+    matched: true;
+    response: StandardResponse;
+} | {
+    matched: false;
+    response: undefined;
+};
+type StandardHandlerInterceptorOptions<T extends Context> = StandardHandleOptions<T> & {
+    context: T;
+    request: StandardLazyRequest;
+};
+interface StandardHandlerOptions<TContext extends Context> {
+    plugins?: HandlerPlugin<TContext>[];
+    /**
+     * Interceptors at the request level, helpful when you want catch errors
+     */
+    interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, unknown>[];
+    /**
+     * Interceptors at the root level, helpful when you want override the request/response
+     */
+    rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, unknown>[];
+    /**
+     *
+     * Interceptors for procedure client.
+     */
+    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, AnySchema, Record<never, never>, Meta>, InferSchemaOutput<AnySchema>, ErrorFromErrorMap<Record<never, never>>>[];
+}
+declare class StandardHandler<T extends Context> {
+    private readonly matcher;
+    private readonly codec;
+    private readonly options;
+    private readonly plugin;
+    constructor(router: Router<any, T>, matcher: StandardMatcher, codec: StandardCodec, options: NoInfer<StandardHandlerOptions<T>>);
+    handle(request: StandardLazyRequest, ...[options]: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<StandardHandleResult>;
+}
+
+interface HandlerPlugin<TContext extends Context> {
+    init?(options: StandardHandlerOptions<TContext>): void;
+}
+declare class CompositePlugin<TContext extends Context> implements HandlerPlugin<TContext> {
+    private readonly plugins;
+    constructor(plugins?: HandlerPlugin<TContext>[]);
+    init(options: StandardHandlerOptions<TContext>): void;
+}
+
+export { CompositePlugin as C, type HandlerPlugin as H, type StandardHandleOptions as S, type StandardHandlerInterceptorOptions as a, type StandardHandlerOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleResult as g, StandardHandler as h };

package/dist/shared/server.Q6ZmnTgO.mjs

@@ -0,0 +1,12 @@
+class CompositePlugin {
+  constructor(plugins = []) {
+    this.plugins = plugins;
+  }
+  init(options) {
+    for (const plugin of this.plugins) {
+      plugin.init?.(options);
+    }
+  }
+}
+
+export { CompositePlugin as C };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.cba521d",
+  "version": "0.0.0-next.cc8802c",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -15,37 +15,42 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/src/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.mjs"
+    },
+    "./plugins": {
+      "types": "./dist/plugins/index.d.mts",
+      "import": "./dist/plugins/index.mjs",
+      "default": "./dist/plugins/index.mjs"
+    },
+    "./standard": {
+      "types": "./dist/adapters/standard/index.d.mts",
+      "import": "./dist/adapters/standard/index.mjs",
+      "default": "./dist/adapters/standard/index.mjs"
     },
     "./fetch": {
-      "types": "./dist/src/adapters/fetch/index.d.ts",
-      "import": "./dist/fetch.js",
-      "default": "./dist/fetch.js"
+      "types": "./dist/adapters/fetch/index.d.mts",
+      "import": "./dist/adapters/fetch/index.mjs",
+      "default": "./dist/adapters/fetch/index.mjs"
     },
     "./hono": {
-      "types": "./dist/src/adapters/hono/index.d.ts",
-      "import": "./dist/hono.js",
-      "default": "./dist/hono.js"
+      "types": "./dist/adapters/hono/index.d.mts",
+      "import": "./dist/adapters/hono/index.mjs",
+      "default": "./dist/adapters/hono/index.mjs"
     },
     "./next": {
-      "types": "./dist/src/adapters/next/index.d.ts",
-      "import": "./dist/next.js",
-      "default": "./dist/next.js"
+      "types": "./dist/adapters/next/index.d.mts",
+      "import": "./dist/adapters/next/index.mjs",
+      "default": "./dist/adapters/next/index.mjs"
     },
     "./node": {
-      "types": "./dist/src/adapters/node/index.d.ts",
-      "import": "./dist/node.js",
-      "default": "./dist/node.js"
-    },
-    "./🔒/*": {
-      "types": "./dist/src/*.d.ts"
+      "types": "./dist/adapters/node/index.d.mts",
+      "import": "./dist/adapters/node/index.mjs",
+      "default": "./dist/adapters/node/index.mjs"
     }
   },
   "files": [
-    "!**/*.map",
-    "!**/*.tsbuildinfo",
     "dist"
   ],
   "peerDependencies": {
@@ -53,11 +58,18 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@orpc/contract": "0.0.0-next.cba521d",
-    "@orpc/shared": "0.0.0-next.cba521d"
+    "@orpc/client": "0.0.0-next.cc8802c",
+    "@orpc/contract": "0.0.0-next.cc8802c",
+    "@orpc/shared": "0.0.0-next.cc8802c",
+    "@orpc/standard-server-node": "0.0.0-next.cc8802c",
+    "@orpc/standard-server-fetch": "0.0.0-next.cc8802c",
+    "@orpc/standard-server": "0.0.0-next.cc8802c"
+  },
+  "devDependencies": {
+    "light-my-request": "^6.5.1"
   },
   "scripts": {
-    "build": "tsup --onSuccess='tsc -b --noCheck'",
+    "build": "unbuild",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/chunk-3EVCPLVI.js

@@ -1,301 +0,0 @@
-import {
-  __export,
-  createProcedureClient,
-  getRouterChild,
-  isProcedure,
-  unlazy
-} from "./chunk-OUPZ7QGV.js";
-
-// src/adapters/fetch/super-json.ts
-var super_json_exports = {};
-__export(super_json_exports, {
-  deserialize: () => deserialize,
-  serialize: () => serialize
-});
-
-// ../../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/adapters/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;
-  }
-  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/adapters/fetch/orpc-payload-codec.ts
-import { ORPCError } from "@orpc/contract";
-import { findDeepMatches, set } from "@orpc/shared";
-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/adapters/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;
-    }
-    return {
-      procedure: maybeProcedure,
-      path
-    };
-  }
-};
-
-// src/adapters/fetch/orpc-handler.ts
-import { ORPCError as ORPCError2 } from "@orpc/contract";
-import { executeWithHooks, trim as trim2 } from "@orpc/shared";
-var RPCHandler = class {
-  constructor(router, options) {
-    this.options = options;
-    this.procedureMatcher = options?.procedureMatcher ?? new ORPCProcedureMatcher(router);
-    this.payloadCodec = options?.payloadCodec ?? new ORPCPayloadCodec();
-  }
-  procedureMatcher;
-  payloadCodec;
-  async handle(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) {
-        return { matched: false, response: void 0 };
-      }
-      const input = await this.payloadCodec.decode(request);
-      const client = createProcedureClient(match.procedure, {
-        context,
-        path: match.path
-      });
-      const output = await client(input, { signal: request.signal });
-      const { body, headers } = this.payloadCodec.encode(output);
-      const response = new Response(body, { headers });
-      return { matched: true, response };
-    };
-    try {
-      const result = await executeWithHooks({
-        context,
-        execute,
-        input: request,
-        hooks: this.options,
-        meta: {
-          signal: request.signal
-        }
-      });
-      return result;
-    } 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());
-      const response = new Response(body, {
-        headers,
-        status: error.status
-      });
-      return { matched: true, response };
-    }
-  }
-};
-
-export {
-  super_json_exports,
-  ORPCPayloadCodec,
-  ORPCProcedureMatcher,
-  RPCHandler
-};
-//# sourceMappingURL=chunk-3EVCPLVI.js.map