@orpc/server 0.0.0-next.0787cc6 → 0.0.0-next.08f0a9e

package/dist/shared/server.DFuJLDuo.mjs

@@ -0,0 +1,190 @@
+import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
+import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
+import '@orpc/standard-server/batch';
+import { ORPCError, toORPCError } from '@orpc/client';
+import { S as StrictGetMethodPlugin } from './server.BW-nUGgA.mjs';
+import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.C37gDhSZ.mjs';
+
+class CompositeStandardHandlerPlugin {
+  plugins;
+  constructor(plugins = []) {
+    this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+  }
+  init(options) {
+    for (const plugin of this.plugins) {
+      plugin.init?.(options);
+    }
+  }
+}
+
+class StandardHandler {
+  constructor(router, matcher, codec, options) {
+    this.matcher = matcher;
+    this.codec = codec;
+    const plugins = new CompositeStandardHandlerPlugin(options.plugins);
+    plugins.init(options);
+    this.interceptors = toArray(options.interceptors);
+    this.clientInterceptors = toArray(options.clientInterceptors);
+    this.rootInterceptors = toArray(options.rootInterceptors);
+    this.matcher.init(router);
+  }
+  interceptors;
+  clientInterceptors;
+  rootInterceptors;
+  async handle(request, options) {
+    const prefix = options.prefix?.replace(/\/$/, "") || void 0;
+    if (prefix && !request.url.pathname.startsWith(`${prefix}/`) && request.url.pathname !== prefix) {
+      return { matched: false, response: void 0 };
+    }
+    return intercept(
+      this.rootInterceptors,
+      { ...options, request, prefix },
+      async (interceptorOptions) => {
+        let isDecoding = false;
+        try {
+          return await intercept(
+            this.interceptors,
+            interceptorOptions,
+            async ({ request: request2, context, prefix: prefix2 }) => {
+              const method = request2.method;
+              const url = request2.url;
+              const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
+              const match = await this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`);
+              if (!match) {
+                return { matched: false, response: void 0 };
+              }
+              const client = createProcedureClient(match.procedure, {
+                context,
+                path: match.path,
+                interceptors: this.clientInterceptors
+              });
+              isDecoding = true;
+              const input = await this.codec.decode(request2, match.params, match.procedure);
+              isDecoding = false;
+              const lastEventId = Array.isArray(request2.headers["last-event-id"]) ? request2.headers["last-event-id"].at(-1) : request2.headers["last-event-id"];
+              const output = await client(input, { signal: request2.signal, lastEventId });
+              const response = this.codec.encode(output, match.procedure);
+              return {
+                matched: true,
+                response
+              };
+            }
+          );
+        } catch (e) {
+          const error = isDecoding && !(e instanceof ORPCError) ? 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 StandardRPCCodec {
+  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 StandardRPCMatcher {
+  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
+    };
+  }
+}
+
+class StandardRPCHandler extends StandardHandler {
+  constructor(router, options) {
+    options.plugins ??= [];
+    const strictGetMethodPluginEnabled = options.strictGetMethodPluginEnabled ?? true;
+    if (strictGetMethodPluginEnabled) {
+      options.plugins.push(new StrictGetMethodPlugin());
+    }
+    const jsonSerializer = new StandardRPCJsonSerializer(options);
+    const serializer = new StandardRPCSerializer(jsonSerializer);
+    const matcher = new StandardRPCMatcher();
+    const codec = new StandardRPCCodec(serializer);
+    super(router, matcher, codec, options);
+  }
+}
+
+export { CompositeStandardHandlerPlugin as C, StandardHandler as S, StandardRPCCodec as a, StandardRPCHandler as b, StandardRPCMatcher as c };

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

@@ -0,0 +1,10 @@
+import { C as Context } from './server.BVHsfJ99.js';
+import { g as StandardHandleOptions } from './server.CaWivVk3.js';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };

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

@@ -0,0 +1,18 @@
+import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
+import { C as Context, R as Router } from './server.BVHsfJ99.js';
+import { b as StandardHandlerOptions, i as StandardHandler } from './server.CaWivVk3.js';
+
+interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
+    /**
+     * Enables or disables the StrictGetMethodPlugin.
+     *
+     * @default true
+     */
+    strictGetMethodPluginEnabled?: boolean;
+}
+declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
+    constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
+}
+
+export { StandardRPCHandler as a };
+export type { StandardRPCHandlerOptions as S };

package/dist/shared/server.Dwnm6cSk.d.mts

@@ -0,0 +1,10 @@
+import { C as Context } from './server.BVHsfJ99.mjs';
+import { g as StandardHandleOptions } from './server.B1oIHH_j.mjs';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.0787cc6",
+  "version": "0.0.0-next.08f0a9e",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -15,63 +15,47 @@
   ],
   "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/src/plugins/index.d.ts",
-      "import": "./dist/plugins.js",
-      "default": "./dist/plugins.js"
+      "types": "./dist/plugins/index.d.mts",
+      "import": "./dist/plugins/index.mjs",
+      "default": "./dist/plugins/index.mjs"
     },
     "./standard": {
-      "types": "./dist/src/adapters/standard/index.d.ts",
-      "import": "./dist/standard.js",
-      "default": "./dist/standard.js"
+      "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"
-    },
-    "./hono": {
-      "types": "./dist/src/adapters/hono/index.d.ts",
-      "import": "./dist/hono.js",
-      "default": "./dist/hono.js"
-    },
-    "./next": {
-      "types": "./dist/src/adapters/next/index.d.ts",
-      "import": "./dist/next.js",
-      "default": "./dist/next.js"
+      "types": "./dist/adapters/fetch/index.d.mts",
+      "import": "./dist/adapters/fetch/index.mjs",
+      "default": "./dist/adapters/fetch/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": {
-    "hono": ">=4.6.0",
-    "next": ">=14.0.0"
-  },
   "dependencies": {
-    "@tinyhttp/content-disposition": "^2.2.2",
-    "@orpc/contract": "0.0.0-next.0787cc6",
-    "@orpc/shared": "0.0.0-next.0787cc6"
+    "@orpc/client": "0.0.0-next.08f0a9e",
+    "@orpc/standard-server": "0.0.0-next.08f0a9e",
+    "@orpc/standard-server-fetch": "0.0.0-next.08f0a9e",
+    "@orpc/shared": "0.0.0-next.08f0a9e",
+    "@orpc/contract": "0.0.0-next.08f0a9e",
+    "@orpc/standard-server-node": "0.0.0-next.08f0a9e"
   },
   "devDependencies": {
-    "light-my-request": "^6.5.1"
+    "supertest": "^7.1.0"
   },
   "scripts": {
-    "build": "tsup --onSuccess='tsc -b --noCheck'",
+    "build": "unbuild",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/chunk-2OH4QMZ4.js

@@ -1,145 +0,0 @@
-import {
-  RPCCodec,
-  RPCMatcher,
-  StandardHandler
-} from "./chunk-BFGSRNYZ.js";
-
-// src/adapters/fetch/utils.ts
-import { once } from "@orpc/shared";
-import { contentDisposition, parse as parseContentDisposition } from "@tinyhttp/content-disposition";
-function fetchHeadersToStandardHeaders(headers) {
-  const standardHeaders = {};
-  for (const [key, value] of headers) {
-    if (Array.isArray(standardHeaders[key])) {
-      standardHeaders[key].push(value);
-    } else if (standardHeaders[key] !== void 0) {
-      standardHeaders[key] = [standardHeaders[key], value];
-    } else {
-      standardHeaders[key] = value;
-    }
-  }
-  return standardHeaders;
-}
-async function fetchReToStandardBody(re) {
-  if (!re.body) {
-    return void 0;
-  }
-  const contentDisposition2 = re.headers.get("content-disposition");
-  if (contentDisposition2) {
-    const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
-    if (typeof fileName === "string") {
-      const blob2 = await re.blob();
-      return new File([blob2], fileName, {
-        type: blob2.type
-      });
-    }
-  }
-  const contentType = re.headers.get("content-type");
-  if (!contentType || contentType.startsWith("application/json")) {
-    const text = await re.text();
-    if (!text) {
-      return void 0;
-    }
-    return JSON.parse(text);
-  }
-  if (contentType.startsWith("multipart/form-data")) {
-    return await re.formData();
-  }
-  if (contentType.startsWith("application/x-www-form-urlencoded")) {
-    return new URLSearchParams(await re.text());
-  }
-  if (contentType.startsWith("text/")) {
-    return await re.text();
-  }
-  const blob = await re.blob();
-  return new File([blob], "blob", {
-    type: blob.type
-  });
-}
-function fetchRequestToStandardRequest(request) {
-  const url = new URL(request.url);
-  return {
-    raw: { request },
-    url,
-    signal: request.signal,
-    method: request.method,
-    body: once(() => {
-      return fetchReToStandardBody(request);
-    }),
-    get headers() {
-      const headers = fetchHeadersToStandardHeaders(request.headers);
-      Object.defineProperty(this, "headers", { value: headers, writable: true });
-      return headers;
-    },
-    set headers(value) {
-      Object.defineProperty(this, "headers", { value, writable: true });
-    }
-  };
-}
-function standardResponseToFetchHeaders(response) {
-  const fetchHeaders = new Headers();
-  for (const [key, value] of Object.entries(response.headers)) {
-    if (Array.isArray(value)) {
-      for (const v of value) {
-        fetchHeaders.append(key, v);
-      }
-    } else if (value !== void 0) {
-      fetchHeaders.append(key, value);
-    }
-  }
-  return fetchHeaders;
-}
-function standardResponseToFetchResponse(response) {
-  const resHeaders = standardResponseToFetchHeaders(response);
-  resHeaders.delete("content-type");
-  resHeaders.delete("content-disposition");
-  if (response.body === void 0) {
-    return new Response(void 0, { headers: resHeaders, status: response.status });
-  }
-  if (response.body instanceof Blob) {
-    resHeaders.set("content-type", response.body.type);
-    resHeaders.set("content-length", response.body.size.toString());
-    resHeaders.set(
-      "content-disposition",
-      contentDisposition(response.body instanceof File ? response.body.name : "blob", { type: "inline" })
-    );
-    return new Response(response.body, { headers: resHeaders, status: response.status });
-  }
-  if (response.body instanceof FormData) {
-    return new Response(response.body, { headers: resHeaders, status: response.status });
-  }
-  if (response.body instanceof URLSearchParams) {
-    return new Response(response.body, { headers: resHeaders, status: response.status });
-  }
-  resHeaders.set("content-type", "application/json");
-  return new Response(JSON.stringify(response.body), { headers: resHeaders, status: response.status });
-}
-
-// src/adapters/fetch/rpc-handler.ts
-var RPCHandler = class {
-  standardHandler;
-  constructor(router, options) {
-    const matcher = options?.matcher ?? new RPCMatcher();
-    const codec = options?.codec ?? new RPCCodec();
-    this.standardHandler = new StandardHandler(router, matcher, codec, options);
-  }
-  async handle(request, ...rest) {
-    const standardRequest = fetchRequestToStandardRequest(request);
-    const result = await this.standardHandler.handle(standardRequest, ...rest);
-    if (!result.matched) {
-      return result;
-    }
-    return {
-      matched: true,
-      response: standardResponseToFetchResponse(result.response)
-    };
-  }
-};
-
-export {
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse,
-  RPCHandler
-};
-//# sourceMappingURL=chunk-2OH4QMZ4.js.map