@orpc/server 0.31.0 → 0.33.0

package/dist/{chunk-SXUFCJBY.js → chunk-ESTRJAOX.js}

@@ -4,7 +4,7 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-GK2Z6B6W.js";
+} from "./chunk-KK4SDLC7.js";
 
 // src/adapters/fetch/super-json.ts
 var super_json_exports = {};
@@ -206,8 +206,7 @@ var ORPCPayloadCodec = class {
       const json = await re.json();
       return deserialize(json);
     } catch (e) {
-      throw new ORPCError({
-        code: "BAD_REQUEST",
+      throw new ORPCError("BAD_REQUEST", {
         message: "Cannot parse request/response. Please check the request/response body and Content-Type header.",
         cause: e
       });
@@ -247,7 +246,7 @@ var RPCHandler = class {
   procedureMatcher;
   payloadCodec;
   async handle(request, ...[options]) {
-    const context = options?.context;
+    const context = options?.context ?? {};
     const execute = async () => {
       const url = new URL(request.url);
       const pathname = `/${trim2(url.pathname.replace(options?.prefix ?? "", ""), "/")}`;
@@ -277,8 +276,7 @@ var RPCHandler = class {
       });
       return result;
     } catch (e) {
-      const error = e instanceof ORPCError2 ? e : new ORPCError2({
-        code: "INTERNAL_SERVER_ERROR",
+      const error = e instanceof ORPCError2 ? e : new ORPCError2("INTERNAL_SERVER_ERROR", {
         message: "Internal server error",
         cause: e
       });
@@ -298,4 +296,4 @@ export {
   ORPCProcedureMatcher,
   RPCHandler
 };
-//# sourceMappingURL=chunk-SXUFCJBY.js.map
+//# sourceMappingURL=chunk-ESTRJAOX.js.map

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

@@ -4,22 +4,23 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/utils.ts
-function mergeContext(a, b) {
-  if (!a)
-    return b;
-  if (!b)
-    return a;
+// src/lazy.ts
+var LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
+function lazy(loader) {
   return {
-    ...a,
-    ...b
+    [LAZY_LOADER_SYMBOL]: loader
   };
 }
+function isLazy(item) {
+  return (typeof item === "object" || typeof item === "function") && item !== null && LAZY_LOADER_SYMBOL in item && typeof item[LAZY_LOADER_SYMBOL] === "function";
+}
+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 {
-  "~type" = "Procedure";
   "~orpc";
   constructor(def) {
     this["~orpc"] = def;
@@ -29,46 +30,10 @@ function isProcedure(item) {
   if (item instanceof Procedure) {
     return true;
   }
-  return (typeof item === "object" || typeof item === "function") && item !== null && "~type" in item && item["~type"] === "Procedure" && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "contract" in item["~orpc"] && isContractProcedure(item["~orpc"].contract) && "handler" in item["~orpc"] && typeof item["~orpc"].handler === "function";
-}
-
-// src/error.ts
-import { ORPCError } from "@orpc/contract";
-function createORPCErrorConstructorMap(errors) {
-  const constructors = {};
-  for (const code in errors) {
-    const config = errors[code];
-    if (!config) {
-      continue;
-    }
-    const constructor = (...[options]) => {
-      return new ORPCError({
-        code,
-        defined: true,
-        status: config.status,
-        message: options?.message ?? config.message,
-        data: options?.data,
-        cause: options?.cause
-      });
-    };
-    constructors[code] = constructor;
-  }
-  return constructors;
+  return isContractProcedure(item) && "middlewares" in item["~orpc"] && "inputValidationIndex" in item["~orpc"] && "outputValidationIndex" in item["~orpc"] && "handler" in item["~orpc"];
 }
 
-// src/lazy.ts
-var LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
-function lazy(loader) {
-  return {
-    [LAZY_LOADER_SYMBOL]: loader
-  };
-}
-function isLazy(item) {
-  return (typeof item === "object" || typeof item === "function") && item !== null && LAZY_LOADER_SYMBOL in item && typeof item[LAZY_LOADER_SYMBOL] === "function";
-}
-function unlazy(lazied) {
-  return isLazy(lazied) ? lazied[LAZY_LOADER_SYMBOL]() : Promise.resolve({ default: lazied });
-}
+// src/lazy-utils.ts
 function flatLazy(lazied) {
   const flattenLoader = async () => {
     let current = await unlazy(lazied);
@@ -82,21 +47,35 @@ function flatLazy(lazied) {
   };
   return lazy(flattenLoader);
 }
+function createLazyProcedureFormAnyLazy(lazied) {
+  const lazyProcedure = lazy(async () => {
+    const { default: maybeProcedure } = await unlazy(flatLazy(lazied));
+    if (!isProcedure(maybeProcedure)) {
+      throw new Error(`
+            Expected a lazy<procedure> but got lazy<unknown>.
+            This should be caught by TypeScript compilation.
+            Please report this issue if this makes you feel uncomfortable.
+        `);
+    }
+    return { default: maybeProcedure };
+  });
+  return lazyProcedure;
+}
 
 // src/middleware.ts
 function middlewareOutputFn(output) {
-  return { output, context: void 0 };
+  return { output, context: {} };
 }
 
 // src/procedure-client.ts
-import { ORPCError as ORPCError2, validateORPCError, ValidationError } from "@orpc/contract";
+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 errors = createORPCErrorConstructorMap(procedure["~orpc"].contract["~orpc"].errorMap);
+    const context = await value(options?.context ?? {}, callerOptions?.context);
+    const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
     const executeOptions = {
       input,
       context,
@@ -115,23 +94,23 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
       });
       return output;
     } catch (e) {
-      if (!(e instanceof ORPCError2)) {
+      if (!(e instanceof ORPCError)) {
         throw toError(e);
       }
-      const validated = await validateORPCError(procedure["~orpc"].contract["~orpc"].errorMap, e);
+      const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
       throw validated;
     }
   };
 }
 async function validateInput(procedure, input) {
-  const schema = procedure["~orpc"].contract["~orpc"].InputSchema;
-  if (!schema)
+  const schema = procedure["~orpc"].inputSchema;
+  if (!schema) {
     return input;
+  }
   const result = await schema["~standard"].validate(input);
   if (result.issues) {
-    throw new ORPCError2({
+    throw new ORPCError("BAD_REQUEST", {
       message: "Input validation failed",
-      code: "BAD_REQUEST",
       data: {
         issues: result.issues
       },
@@ -141,14 +120,14 @@ async function validateInput(procedure, input) {
   return result.value;
 }
 async function validateOutput(procedure, output) {
-  const schema = procedure["~orpc"].contract["~orpc"].OutputSchema;
-  if (!schema)
+  const schema = procedure["~orpc"].outputSchema;
+  if (!schema) {
     return output;
+  }
   const result = await schema["~standard"].validate(output);
   if (result.issues) {
-    throw new ORPCError2({
+    throw new ORPCError("INTERNAL_SERVER_ERROR", {
       message: "Output validation failed",
-      code: "INTERNAL_SERVER_ERROR",
       cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
     });
   }
@@ -161,10 +140,10 @@ async function executeProcedureInternal(procedure, options) {
   let currentIndex = 0;
   let currentContext = options.context;
   let currentInput = options.input;
-  const next = async (nextOptions) => {
+  const next = async (...[nextOptions]) => {
     const index = currentIndex;
     currentIndex += 1;
-    currentContext = mergeContext(currentContext, nextOptions.context);
+    currentContext = { ...currentContext, ...nextOptions?.context };
     if (index === inputValidationIndex) {
       currentInput = await validateInput(procedure, currentInput);
     }
@@ -182,7 +161,97 @@ async function executeProcedureInternal(procedure, options) {
   return (await next({})).output;
 }
 
+// src/hidden.ts
+var ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_ROUTER_CONTRACT");
+function setRouterContract(obj, contract) {
+  return new Proxy(obj, {
+    get(target, key) {
+      if (key === ROUTER_CONTRACT_SYMBOL) {
+        return contract;
+      }
+      return Reflect.get(target, key);
+    }
+  });
+}
+function getRouterContract(obj) {
+  return obj[ROUTER_CONTRACT_SYMBOL];
+}
+var LAZY_ROUTER_PREFIX_SYMBOL = Symbol("ORPC_LAZY_ROUTER_PREFIX");
+function deepSetLazyRouterPrefix(router, prefix) {
+  return new Proxy(router, {
+    get(target, key) {
+      if (key !== LAZY_ROUTER_PREFIX_SYMBOL) {
+        const val = Reflect.get(target, key);
+        if (isLazy(val)) {
+          return deepSetLazyRouterPrefix(val, prefix);
+        }
+        return val;
+      }
+      return prefix;
+    }
+  });
+}
+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);
+    }
+    min = index + 1;
+  }
+  return [];
+}
+function mergeMiddlewares(first, second) {
+  return [...first, ...dedupeMiddlewares(first, second)];
+}
+function addMiddleware(middlewares, addition) {
+  return [...middlewares, addition];
+}
+
+// src/router.ts
+function adaptRouter(router, options) {
+  if (isLazy(router)) {
+    const adapted2 = lazy(async () => {
+      const unlaziedRouter = (await unlazy(router)).default;
+      const adapted3 = adaptRouter(unlaziedRouter, options);
+      return { default: adapted3 };
+    });
+    const accessible = createAccessibleLazyRouter(adapted2);
+    const currentPrefix = getLazyRouterPrefix(router);
+    const prefix = currentPrefix ? mergePrefix(options.prefix, currentPrefix) : options.prefix;
+    if (prefix) {
+      return deepSetLazyRouterPrefix(accessible, prefix);
+    }
+    return accessible;
+  }
+  if (isProcedure(router)) {
+    const newMiddlewares = mergeMiddlewares(options.middlewares, router["~orpc"].middlewares);
+    const newMiddlewareAdded = newMiddlewares.length - router["~orpc"].middlewares.length;
+    const adapted2 = new Procedure({
+      ...router["~orpc"],
+      route: adaptRoute(router["~orpc"].route, options),
+      errorMap: mergeErrorMap(options.errorMap, router["~orpc"].errorMap),
+      middlewares: newMiddlewares,
+      inputValidationIndex: router["~orpc"].inputValidationIndex + newMiddlewareAdded,
+      outputValidationIndex: router["~orpc"].outputValidationIndex + newMiddlewareAdded
+    });
+    return adapted2;
+  }
+  const adapted = {};
+  for (const key in router) {
+    adapted[key] = adaptRouter(router[key], options);
+  }
+  return adapted;
+}
 function getRouterChild(router, ...path) {
   let current = router;
   for (let i = 0; i < path.length; i++) {
@@ -212,19 +281,40 @@ 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);
+    }
+  });
+  return recursive;
+}
+
 export {
   __export,
-  mergeContext,
-  Procedure,
-  isProcedure,
-  createORPCErrorConstructorMap,
   LAZY_LOADER_SYMBOL,
   lazy,
   isLazy,
   unlazy,
+  Procedure,
+  isProcedure,
   flatLazy,
+  createLazyProcedureFormAnyLazy,
+  addMiddleware,
   middlewareOutputFn,
   createProcedureClient,
+  setRouterContract,
+  getRouterContract,
+  deepSetLazyRouterPrefix,
+  getLazyRouterPrefix,
+  createAccessibleLazyRouter,
+  adaptRouter,
   getRouterChild
 };
-//# sourceMappingURL=chunk-GK2Z6B6W.js.map
+//# sourceMappingURL=chunk-KK4SDLC7.js.map

package/dist/fetch.js

@@ -4,8 +4,8 @@ import {
   ORPCProcedureMatcher,
   RPCHandler,
   super_json_exports
-} from "./chunk-SXUFCJBY.js";
-import "./chunk-GK2Z6B6W.js";
+} from "./chunk-ESTRJAOX.js";
+import "./chunk-KK4SDLC7.js";
 export {
   ORPCPayloadCodec,
   ORPCProcedureMatcher,

package/dist/hono.js

@@ -4,14 +4,14 @@ import {
   ORPCProcedureMatcher,
   RPCHandler,
   super_json_exports
-} from "./chunk-SXUFCJBY.js";
-import "./chunk-GK2Z6B6W.js";
+} 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 context = await value(options?.context, c);
+    const context = await value(options?.context ?? {}, c);
     const { matched, response } = await handler.handle(c.req.raw, { ...options, context });
     if (matched) {
       c.res = response;