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

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

@@ -4,7 +4,7 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-DNG2IB3R.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
       });
@@ -238,7 +237,7 @@ var ORPCProcedureMatcher = class {
 // src/adapters/fetch/orpc-handler.ts
 import { ORPCError as ORPCError2 } from "@orpc/contract";
 import { executeWithHooks, trim as trim2 } from "@orpc/shared";
-var ORPCHandler = class {
+var RPCHandler = class {
   constructor(router, options) {
     this.options = options;
     this.procedureMatcher = options?.procedureMatcher ?? new ORPCProcedureMatcher(router);
@@ -247,7 +246,7 @@ var ORPCHandler = 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 ?? "", ""), "/")}`;
@@ -256,9 +255,8 @@ var ORPCHandler = class {
         return { matched: false, response: void 0 };
       }
       const input = await this.payloadCodec.decode(request);
-      const client = createProcedureClient({
+      const client = createProcedureClient(match.procedure, {
         context,
-        procedure: match.procedure,
         path: match.path
       });
       const output = await client(input, { signal: request.signal });
@@ -278,8 +276,7 @@ var ORPCHandler = 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
       });
@@ -297,6 +294,6 @@ export {
   super_json_exports,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
-  ORPCHandler
+  RPCHandler
 };
-//# sourceMappingURL=chunk-V3I7RIRY.js.map
+//# sourceMappingURL=chunk-ESTRJAOX.js.map

package/dist/chunk-KK4SDLC7.js

@@ -0,0 +1,320 @@
+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) {
+  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/procedure.ts
+import { isContractProcedure } from "@orpc/contract";
+var Procedure = class {
+  "~orpc";
+  constructor(def) {
+    this["~orpc"] = def;
+  }
+};
+function isProcedure(item) {
+  if (item instanceof Procedure) {
+    return true;
+  }
+  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);
+    while (true) {
+      if (!isLazy(current.default)) {
+        break;
+      }
+      current = await unlazy(current.default);
+    }
+    return current;
+  };
+  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: {} };
+}
+
+// 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 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;
+    } catch (e) {
+      if (!(e instanceof ORPCError)) {
+        throw toError(e);
+      }
+      const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
+      throw validated;
+    }
+  };
+}
+async function validateInput(procedure, input) {
+  const schema = procedure["~orpc"].inputSchema;
+  if (!schema) {
+    return input;
+  }
+  const result = await schema["~standard"].validate(input);
+  if (result.issues) {
+    throw new ORPCError("BAD_REQUEST", {
+      message: "Input validation failed",
+      data: {
+        issues: result.issues
+      },
+      cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
+    });
+  }
+  return result.value;
+}
+async function validateOutput(procedure, output) {
+  const schema = procedure["~orpc"].outputSchema;
+  if (!schema) {
+    return output;
+  }
+  const result = await schema["~standard"].validate(output);
+  if (result.issues) {
+    throw new ORPCError("INTERNAL_SERVER_ERROR", {
+      message: "Output validation failed",
+      cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
+    });
+  }
+  return result.value;
+}
+async function executeProcedureInternal(procedure, options) {
+  const middlewares = procedure["~orpc"].middlewares;
+  const inputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].inputValidationIndex), middlewares.length);
+  const outputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].outputValidationIndex), middlewares.length);
+  let currentIndex = 0;
+  let currentContext = options.context;
+  let currentInput = options.input;
+  const next = async (...[nextOptions]) => {
+    const index = currentIndex;
+    currentIndex += 1;
+    currentContext = { ...currentContext, ...nextOptions?.context };
+    if (index === inputValidationIndex) {
+      currentInput = await validateInput(procedure, currentInput);
+    }
+    const mid = middlewares[index];
+    const result = mid ? await mid({ ...options, context: currentContext, next }, currentInput, middlewareOutputFn) : { output: await procedure["~orpc"].handler({ ...options, context: currentContext, input: currentInput }), context: currentContext };
+    if (index === outputValidationIndex) {
+      const validatedOutput = await validateOutput(procedure, result.output);
+      return {
+        ...result,
+        output: validatedOutput
+      };
+    }
+    return result;
+  };
+  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++) {
+    const segment = path[i];
+    if (!current) {
+      return void 0;
+    }
+    if (isProcedure(current)) {
+      return void 0;
+    }
+    if (!isLazy(current)) {
+      current = current[segment];
+      continue;
+    }
+    const lazied = current;
+    const rest = path.slice(i);
+    const newLazy = lazy(async () => {
+      const unwrapped = await unlazy(lazied);
+      if (!unwrapped.default) {
+        return unwrapped;
+      }
+      const next = getRouterChild(unwrapped.default, ...rest);
+      return { default: next };
+    });
+    return flatLazy(newLazy);
+  }
+  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,
+  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

package/dist/fetch.js

@@ -1,15 +1,15 @@
 import "./chunk-WUOGVGWG.js";
 import {
-  ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
+  RPCHandler,
   super_json_exports
-} from "./chunk-V3I7RIRY.js";
-import "./chunk-DNG2IB3R.js";
+} from "./chunk-ESTRJAOX.js";
+import "./chunk-KK4SDLC7.js";
 export {
-  ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
+  RPCHandler,
   super_json_exports as SuperJSON
 };
 //# sourceMappingURL=fetch.js.map

package/dist/hono.js

@@ -1,17 +1,17 @@
 import "./chunk-WUOGVGWG.js";
 import {
-  ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
+  RPCHandler,
   super_json_exports
-} from "./chunk-V3I7RIRY.js";
-import "./chunk-DNG2IB3R.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;
@@ -21,9 +21,9 @@ function createMiddleware(handler, ...[options]) {
   };
 }
 export {
-  ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
+  RPCHandler,
   super_json_exports as SuperJSON,
   createMiddleware
 };