@orpc/server 0.0.0-next.9fe2a8b → 0.0.0-next.a05fbfd

package/dist/{chunk-KK4SDLC7.js → shared/server.V6zT5iYQ.mjs}

@@ -1,11 +1,8 @@
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
+import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
+import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, adaptRoute } from '@orpc/contract';
+import { value, intercept, toError } from '@orpc/shared';
 
-// src/lazy.ts
-var LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
+const LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
 function lazy(loader) {
   return {
     [LAZY_LOADER_SYMBOL]: loader
@@ -18,14 +15,12 @@ function unlazy(lazied) {
   return isLazy(lazied) ? lazied[LAZY_LOADER_SYMBOL]() : Promise.resolve({ default: lazied });
 }
 
-// src/procedure.ts
-import { isContractProcedure } from "@orpc/contract";
-var Procedure = class {
+class Procedure {
   "~orpc";
   constructor(def) {
     this["~orpc"] = def;
   }
-};
+}
 function isProcedure(item) {
   if (item instanceof Procedure) {
     return true;
@@ -33,7 +28,6 @@ function isProcedure(item) {
   return isContractProcedure(item) && "middlewares" in item["~orpc"] && "inputValidationIndex" in item["~orpc"] && "outputValidationIndex" in item["~orpc"] && "handler" in item["~orpc"];
 }
 
-// src/lazy-utils.ts
 function flatLazy(lazied) {
   const flattenLoader = async () => {
     let current = await unlazy(lazied);
@@ -62,37 +56,87 @@ function createLazyProcedureFormAnyLazy(lazied) {
   return lazyProcedure;
 }
 
-// src/middleware.ts
+function dedupeMiddlewares(compare, middlewares) {
+  let min = 0;
+  for (let i = 0; i < middlewares.length; i++) {
+    const index = compare.indexOf(middlewares[i], min);
+    if (index === -1) {
+      return middlewares.slice(i);
+    }
+    min = index + 1;
+  }
+  return [];
+}
+function mergeMiddlewares(first, second) {
+  return [...first, ...dedupeMiddlewares(first, second)];
+}
+function addMiddleware(middlewares, addition) {
+  return [...middlewares, addition];
+}
+
+function createORPCErrorConstructorMap(errors) {
+  const proxy = new Proxy(errors, {
+    get(target, code) {
+      if (typeof code !== "string") {
+        return Reflect.get(target, code);
+      }
+      const item = (...[options]) => {
+        const config = errors[code];
+        return new ORPCError(code, {
+          defined: Boolean(config),
+          status: config?.status,
+          message: options?.message ?? config?.message,
+          data: options?.data,
+          cause: options?.cause
+        });
+      };
+      return item;
+    }
+  });
+  return proxy;
+}
+async function validateORPCError(map, error) {
+  const { code, status, message, data, cause, defined } = error;
+  const config = map?.[error.code];
+  if (!config || fallbackORPCErrorStatus(error.code, config.status) !== error.status) {
+    return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
+  }
+  if (!config.data) {
+    return defined ? error : new ORPCError(code, { defined: true, status, message, data, cause });
+  }
+  const validated = await config.data["~standard"].validate(error.data);
+  if (validated.issues) {
+    return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
+  }
+  return new ORPCError(code, { defined: true, status, message, data: validated.value, cause });
+}
+
 function middlewareOutputFn(output) {
   return { output, context: {} };
 }
 
-// src/procedure-client.ts
-import { createORPCErrorConstructorMap, ORPCError, validateORPCError, ValidationError } from "@orpc/contract";
-import { executeWithHooks, toError, value } from "@orpc/shared";
 function createProcedureClient(lazyableProcedure, ...[options]) {
   return async (...[input, callerOptions]) => {
     const path = options?.path ?? [];
     const { default: procedure } = await unlazy(lazyableProcedure);
-    const context = await value(options?.context ?? {}, callerOptions?.context);
+    const clientContext = callerOptions?.context ?? {};
+    const context = await value(options?.context ?? {}, clientContext);
     const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
-    const executeOptions = {
-      input,
-      context,
-      errors,
-      path,
-      procedure,
-      signal: callerOptions?.signal
-    };
     try {
-      const output = await executeWithHooks({
-        hooks: options,
-        input,
-        context,
-        meta: executeOptions,
-        execute: () => executeProcedureInternal(procedure, executeOptions)
-      });
-      return output;
+      return await intercept(
+        options?.interceptors ?? [],
+        {
+          context,
+          input,
+          // input only optional when it undefinable so we can safely cast it
+          errors,
+          path,
+          procedure,
+          signal: callerOptions?.signal,
+          lastEventId: callerOptions?.lastEventId
+        },
+        (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
+      );
     } catch (e) {
       if (!(e instanceof ORPCError)) {
         throw toError(e);
@@ -161,8 +205,7 @@ async function executeProcedureInternal(procedure, options) {
   return (await next({})).output;
 }
 
-// src/hidden.ts
-var ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_ROUTER_CONTRACT");
+const ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_ROUTER_CONTRACT");
 function setRouterContract(obj, contract) {
   return new Proxy(obj, {
     get(target, key) {
@@ -176,7 +219,7 @@ function setRouterContract(obj, contract) {
 function getRouterContract(obj) {
   return obj[ROUTER_CONTRACT_SYMBOL];
 }
-var LAZY_ROUTER_PREFIX_SYMBOL = Symbol("ORPC_LAZY_ROUTER_PREFIX");
+const LAZY_ROUTER_PREFIX_SYMBOL = Symbol("ORPC_LAZY_ROUTER_PREFIX");
 function deepSetLazyRouterPrefix(router, prefix) {
   return new Proxy(router, {
     get(target, key) {
@@ -195,29 +238,20 @@ function getLazyRouterPrefix(obj) {
   return obj[LAZY_ROUTER_PREFIX_SYMBOL];
 }
 
-// src/router.ts
-import { adaptRoute, mergeErrorMap, mergePrefix } from "@orpc/contract";
-
-// src/middleware-utils.ts
-function dedupeMiddlewares(compare, middlewares) {
-  let min = 0;
-  for (let i = 0; i < middlewares.length; i++) {
-    const index = compare.indexOf(middlewares[i], min);
-    if (index === -1) {
-      return middlewares.slice(i);
+function createAccessibleLazyRouter(lazied) {
+  const flattenLazy = flatLazy(lazied);
+  const recursive = new Proxy(flattenLazy, {
+    get(target, key) {
+      if (typeof key !== "string") {
+        return Reflect.get(target, key);
+      }
+      const next = getRouterChild(flattenLazy, key);
+      return createAccessibleLazyRouter(next);
     }
-    min = index + 1;
-  }
-  return [];
-}
-function mergeMiddlewares(first, second) {
-  return [...first, ...dedupeMiddlewares(first, second)];
-}
-function addMiddleware(middlewares, addition) {
-  return [...middlewares, addition];
+  });
+  return recursive;
 }
 
-// src/router.ts
 function adaptRouter(router, options) {
   if (isLazy(router)) {
     const adapted2 = lazy(async () => {
@@ -281,40 +315,65 @@ function getRouterChild(router, ...path) {
   return current;
 }
 
-// src/router-accessible-lazy.ts
-function createAccessibleLazyRouter(lazied) {
-  const flattenLazy = flatLazy(lazied);
-  const recursive = new Proxy(flattenLazy, {
-    get(target, key) {
-      if (typeof key !== "string") {
-        return Reflect.get(target, key);
-      }
-      const next = getRouterChild(flattenLazy, key);
-      return createAccessibleLazyRouter(next);
+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 (isContractProcedure(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 lazy of lazies) {
+      const { default: router } = await unlazy(lazy.lazied);
+      pending.push({
+        path: lazy.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
   });
-  return recursive;
 }
 
-export {
-  __export,
-  LAZY_LOADER_SYMBOL,
-  lazy,
-  isLazy,
-  unlazy,
-  Procedure,
-  isProcedure,
-  flatLazy,
-  createLazyProcedureFormAnyLazy,
-  addMiddleware,
-  middlewareOutputFn,
-  createProcedureClient,
-  setRouterContract,
-  getRouterContract,
-  deepSetLazyRouterPrefix,
-  getLazyRouterPrefix,
-  createAccessibleLazyRouter,
-  adaptRouter,
-  getRouterChild
-};
-//# sourceMappingURL=chunk-KK4SDLC7.js.map
+export { LAZY_LOADER_SYMBOL as L, Procedure as P, convertPathToHttpPath as a, createContractedProcedure as b, createProcedureClient as c, addMiddleware as d, eachContractProcedure as e, adaptRouter as f, getRouterChild as g, flatLazy as h, isProcedure as i, isLazy as j, createLazyProcedureFormAnyLazy as k, lazy as l, getRouterContract as m, deepSetLazyRouterPrefix as n, getLazyRouterPrefix as o, middlewareOutputFn as p, createAccessibleLazyRouter as q, eachAllContractProcedure as r, setRouterContract as s, unlazy as u };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.9fe2a8b",
+  "version": "0.0.0-next.a05fbfd",
   "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.9fe2a8b",
-    "@orpc/shared": "0.0.0-next.9fe2a8b"
+    "@orpc/client": "0.0.0-next.a05fbfd",
+    "@orpc/shared": "0.0.0-next.a05fbfd",
+    "@orpc/standard-server": "0.0.0-next.a05fbfd",
+    "@orpc/contract": "0.0.0-next.a05fbfd",
+    "@orpc/standard-server-fetch": "0.0.0-next.a05fbfd",
+    "@orpc/standard-server-node": "0.0.0-next.a05fbfd"
+  },
+  "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-ESTRJAOX.js

@@ -1,299 +0,0 @@
-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