@orpc/server 0.0.0-next.31590a1 → 0.0.0-next.32cb70c

package/dist/chunk-ESTRJAOX.js

@@ -0,0 +1,299 @@
+import {
+  __export,
+  createProcedureClient,
+  getRouterChild,
+  isProcedure,
+  unlazy
+} from "./chunk-KK4SDLC7.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("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("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-ESTRJAOX.js.map

package/dist/{chunk-NOA3GBJQ.js → chunk-KK4SDLC7.js}

@@ -1,3 +1,9 @@
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
 // src/lazy.ts
 var LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
 function lazy(loader) {
@@ -290,70 +296,8 @@ function createAccessibleLazyRouter(lazied) {
   return recursive;
 }
 
-// src/utils.ts
-import { isContractProcedure as isContractProcedure2 } from "@orpc/contract";
-function eachContractProcedure(options, callback, laziedOptions = []) {
-  const hiddenContract = getRouterContract(options.router);
-  if (hiddenContract) {
-    return eachContractProcedure(
-      {
-        router: hiddenContract,
-        path: options.path
-      },
-      callback,
-      laziedOptions
-    );
-  }
-  if (isLazy(options.router)) {
-    laziedOptions.push({
-      lazied: options.router,
-      path: options.path
-    });
-  } else if (isContractProcedure2(options.router)) {
-    callback({
-      contract: options.router,
-      path: options.path
-    });
-  } else {
-    for (const key in options.router) {
-      eachContractProcedure(
-        {
-          router: options.router[key],
-          path: [...options.path, key]
-        },
-        callback,
-        laziedOptions
-      );
-    }
-  }
-  return laziedOptions;
-}
-async function eachAllContractProcedure(options, callback) {
-  const pending = [options];
-  for (const item of pending) {
-    const lazies = eachContractProcedure(item, callback);
-    for (const lazy2 of lazies) {
-      const { default: router } = await unlazy(lazy2.lazied);
-      pending.push({
-        path: lazy2.path,
-        router
-      });
-    }
-  }
-}
-function convertPathToHttpPath(path) {
-  return `/${path.map(encodeURIComponent).join("/")}`;
-}
-function createContractedProcedure(contract, procedure) {
-  return new Procedure({
-    ...procedure["~orpc"],
-    errorMap: contract["~orpc"].errorMap,
-    route: contract["~orpc"].route,
-    meta: contract["~orpc"].meta
-  });
-}
-
 export {
+  __export,
   LAZY_LOADER_SYMBOL,
   lazy,
   isLazy,
@@ -371,10 +315,6 @@ export {
   getLazyRouterPrefix,
   createAccessibleLazyRouter,
   adaptRouter,
-  getRouterChild,
-  eachContractProcedure,
-  eachAllContractProcedure,
-  convertPathToHttpPath,
-  createContractedProcedure
+  getRouterChild
 };
-//# sourceMappingURL=chunk-NOA3GBJQ.js.map
+//# sourceMappingURL=chunk-KK4SDLC7.js.map

package/dist/chunk-WUOGVGWG.js

@@ -0,0 +1 @@
+//# sourceMappingURL=chunk-WUOGVGWG.js.map

package/dist/fetch.js

@@ -1,18 +1,15 @@
+import "./chunk-WUOGVGWG.js";
 import {
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
   RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
-  standardResponseToFetchResponse
-} from "./chunk-EYGVJA7A.js";
-import "./chunk-CVIWJKJC.js";
-import "./chunk-NOA3GBJQ.js";
-import "./chunk-OXB4YX67.js";
+  super_json_exports
+} from "./chunk-ESTRJAOX.js";
+import "./chunk-KK4SDLC7.js";
 export {
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
   RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
-  standardResponseToFetchResponse
+  super_json_exports as SuperJSON
 };
 //# sourceMappingURL=fetch.js.map

package/dist/hono.js

@@ -1,42 +1,30 @@
+import "./chunk-WUOGVGWG.js";
 import {
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
   RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
-  standardResponseToFetchResponse
-} from "./chunk-EYGVJA7A.js";
-import "./chunk-CVIWJKJC.js";
-import "./chunk-NOA3GBJQ.js";
-import "./chunk-OXB4YX67.js";
+  super_json_exports
+} from "./chunk-ESTRJAOX.js";
+import "./chunk-KK4SDLC7.js";
 
 // src/adapters/hono/middleware.ts
 import { value } from "@orpc/shared";
 function createMiddleware(handler, ...[options]) {
   return async (c, next) => {
-    const bodyProps = /* @__PURE__ */ new Set(["arrayBuffer", "blob", "formData", "json", "text"]);
-    const request = c.req.method === "GET" || c.req.method === "HEAD" ? c.req.raw : new Proxy(c.req.raw, {
-      // https://github.com/honojs/middleware/blob/main/packages/trpc-server/src/index.ts#L39
-      get(target, prop) {
-        if (bodyProps.has(prop)) {
-          return () => c.req[prop]();
-        }
-        return Reflect.get(target, prop, target);
-      }
-    });
     const context = await value(options?.context ?? {}, c);
-    const { matched, response } = await handler.handle(request, { ...options, context });
+    const { matched, response } = await handler.handle(c.req.raw, { ...options, context });
     if (matched) {
-      return c.body(response.body, response);
+      c.res = response;
+      return;
     }
     await next();
   };
 }
 export {
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
   RPCHandler,
-  createMiddleware,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
-  standardResponseToFetchResponse
+  super_json_exports as SuperJSON,
+  createMiddleware
 };
 //# sourceMappingURL=hono.js.map

package/dist/index.js

@@ -3,14 +3,10 @@ import {
   Procedure,
   adaptRouter,
   addMiddleware,
-  convertPathToHttpPath,
   createAccessibleLazyRouter,
-  createContractedProcedure,
   createLazyProcedureFormAnyLazy,
   createProcedureClient,
   deepSetLazyRouterPrefix,
-  eachAllContractProcedure,
-  eachContractProcedure,
   flatLazy,
   getLazyRouterPrefix,
   getRouterChild,
@@ -21,7 +17,7 @@ import {
   middlewareOutputFn,
   setRouterContract,
   unlazy
-} from "./chunk-NOA3GBJQ.js";
+} from "./chunk-KK4SDLC7.js";
 
 // src/builder.ts
 import { mergeErrorMap as mergeErrorMap2, mergeMeta as mergeMeta2, mergePrefix, mergeRoute as mergeRoute2, mergeTags } from "@orpc/contract";
@@ -357,27 +353,21 @@ function createRouterClient(router, ...rest) {
 }
 
 // src/index.ts
-import { isDefinedError, ORPCError, safe, type, ValidationError } from "@orpc/contract";
-import { onError, onFinish, onStart, onSuccess } from "@orpc/shared";
+import { isDefinedError, ORPCError, safe, type } from "@orpc/contract";
 export {
   Builder,
   DecoratedProcedure,
   LAZY_LOADER_SYMBOL,
   ORPCError,
   Procedure,
-  ValidationError,
   adaptRouter,
   call,
-  convertPathToHttpPath,
   createAccessibleLazyRouter,
-  createContractedProcedure,
   createLazyProcedureFormAnyLazy,
   createProcedureClient,
   createRouterClient,
   decorateMiddleware,
   deepSetLazyRouterPrefix,
-  eachAllContractProcedure,
-  eachContractProcedure,
   fallbackConfig,
   flatLazy,
   getLazyRouterPrefix,
@@ -391,10 +381,6 @@ export {
   lazy,
   mergeContext,
   middlewareOutputFn,
-  onError,
-  onFinish,
-  onStart,
-  onSuccess,
   os,
   safe,
   setRouterContract,

package/dist/next.js

@@ -1,13 +1,11 @@
+import "./chunk-WUOGVGWG.js";
 import {
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
   RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardBodyToFetchBody,
-  standardResponseToFetchResponse
-} from "./chunk-EYGVJA7A.js";
-import "./chunk-CVIWJKJC.js";
-import "./chunk-NOA3GBJQ.js";
-import "./chunk-OXB4YX67.js";
+  super_json_exports
+} from "./chunk-ESTRJAOX.js";
+import "./chunk-KK4SDLC7.js";
 
 // src/adapters/next/serve.ts
 import { value } from "@orpc/shared";
@@ -29,11 +27,10 @@ function serve(handler, ...[options]) {
   };
 }
 export {
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
   RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  serve,
-  standardBodyToFetchBody,
-  standardResponseToFetchResponse
+  super_json_exports as SuperJSON,
+  serve
 };
 //# sourceMappingURL=next.js.map