@orpc/server 0.0.0-next.3f6c426 → 0.0.0-next.43889a7

package/dist/{chunk-B2EZJB7X.js → chunk-26GHKV43.js}

@@ -4,7 +4,7 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-6A7XHEBH.js";
+} from "./chunk-LDIL7OEP.js";
 
 // src/adapters/fetch/super-json.ts
 var super_json_exports = {};
@@ -130,8 +130,8 @@ function deserialize({
 }
 
 // src/adapters/fetch/orpc-payload-codec.ts
+import { ORPCError } from "@orpc/contract";
 import { findDeepMatches, set } from "@orpc/shared";
-import { ORPCError } from "@orpc/shared/error";
 var ORPCPayloadCodec = class {
   /**
    * If method is GET, the payload will be encoded as query string.
@@ -236,49 +236,46 @@ var ORPCProcedureMatcher = class {
 };
 
 // src/adapters/fetch/orpc-handler.ts
-import { executeWithHooks, ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim as trim2 } from "@orpc/shared";
-import { ORPCError as ORPCError2 } from "@orpc/shared/error";
-var ORPCHandler = class {
+import { ORPCError as ORPCError2 } from "@orpc/contract";
+import { executeWithHooks, trim as trim2 } from "@orpc/shared";
+var RPCHandler = class {
   constructor(router, options) {
-    this.router = router;
     this.options = options;
     this.procedureMatcher = options?.procedureMatcher ?? new ORPCProcedureMatcher(router);
     this.payloadCodec = options?.payloadCodec ?? new ORPCPayloadCodec();
   }
   procedureMatcher;
   payloadCodec;
-  condition(request) {
-    return Boolean(request.headers.get(ORPC_HANDLER_HEADER)?.includes(ORPC_HANDLER_VALUE));
-  }
-  async fetch(request, ...[options]) {
-    const context = options?.context;
+  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) {
-        throw new ORPCError2({ code: "NOT_FOUND", message: "Not found" });
+        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: options?.signal });
+      const output = await client(input, { signal: request.signal });
       const { body, headers } = this.payloadCodec.encode(output);
-      return new Response(body, { headers });
+      const response = new Response(body, { headers });
+      return { matched: true, response };
     };
     try {
-      return await executeWithHooks({
+      const result = await executeWithHooks({
         context,
         execute,
         input: request,
         hooks: this.options,
         meta: {
-          signal: options?.signal
+          signal: request.signal
         }
       });
+      return result;
     } catch (e) {
       const error = e instanceof ORPCError2 ? e : new ORPCError2({
         code: "INTERNAL_SERVER_ERROR",
@@ -286,10 +283,11 @@ var ORPCHandler = class {
         cause: e
       });
       const { body, headers } = this.payloadCodec.encode(error.toJSON());
-      return new Response(body, {
+      const response = new Response(body, {
         headers,
         status: error.status
       });
+      return { matched: true, response };
     }
   }
 };
@@ -298,6 +296,6 @@ export {
   super_json_exports,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
-  ORPCHandler
+  RPCHandler
 };
-//# sourceMappingURL=chunk-B2EZJB7X.js.map
+//# sourceMappingURL=chunk-26GHKV43.js.map

package/dist/{chunk-6A7XHEBH.js → chunk-LDIL7OEP.js}

@@ -4,18 +4,6 @@ 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;
-  return {
-    ...a,
-    ...b
-  };
-}
-
 // src/procedure.ts
 import { isContractProcedure } from "@orpc/contract";
 var Procedure = class {
@@ -32,6 +20,30 @@ function isProcedure(item) {
   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;
+}
+
 // src/lazy.ts
 var LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
 function lazy(loader) {
@@ -59,36 +71,44 @@ function flatLazy(lazied) {
   return lazy(flattenLoader);
 }
 
+// src/middleware.ts
+function middlewareOutputFn(output) {
+  return { output, context: {} };
+}
+
 // src/procedure-client.ts
-import { executeWithHooks, value } from "@orpc/shared";
-import { ORPCError } from "@orpc/shared/error";
-function createProcedureClient(options) {
+import { ORPCError as ORPCError2, 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(options.procedure);
-    const context = await value(options.context);
-    const meta = {
+    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 executeOptions = {
+      input,
+      context,
+      errors,
       path,
       procedure,
       signal: callerOptions?.signal
     };
-    const executeWithValidation = async () => {
-      const validInput = await validateInput(procedure, input);
-      const output = await executeMiddlewareChain(
-        procedure,
-        validInput,
+    try {
+      const output = await executeWithHooks({
+        hooks: options,
+        input,
         context,
-        meta
-      );
-      return validateOutput(procedure, output);
-    };
-    return executeWithHooks({
-      hooks: options,
-      input,
-      context,
-      meta,
-      execute: executeWithValidation
-    });
+        meta: executeOptions,
+        execute: () => executeProcedureInternal(procedure, executeOptions)
+      });
+      return output;
+    } catch (e) {
+      if (!(e instanceof ORPCError2)) {
+        throw toError(e);
+      }
+      const validated = await validateORPCError(procedure["~orpc"].contract["~orpc"].errorMap, e);
+      throw validated;
+    }
   };
 }
 async function validateInput(procedure, input) {
@@ -97,10 +117,13 @@ async function validateInput(procedure, input) {
     return input;
   const result = await schema["~standard"].validate(input);
   if (result.issues) {
-    throw new ORPCError({
+    throw new ORPCError2({
       message: "Input validation failed",
       code: "BAD_REQUEST",
-      issues: result.issues
+      data: {
+        issues: result.issues
+      },
+      cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
     });
   }
   return result.value;
@@ -111,33 +134,37 @@ async function validateOutput(procedure, output) {
     return output;
   const result = await schema["~standard"].validate(output);
   if (result.issues) {
-    throw new ORPCError({
+    throw new ORPCError2({
       message: "Output validation failed",
       code: "INTERNAL_SERVER_ERROR",
-      issues: result.issues
+      cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
     });
   }
   return result.value;
 }
-async function executeMiddlewareChain(procedure, input, context, meta) {
-  const middlewares = procedure["~orpc"].middlewares ?? [];
-  let currentMidIndex = 0;
-  let currentContext = context;
-  const next = async (nextOptions) => {
-    const mid = middlewares[currentMidIndex];
-    currentMidIndex += 1;
-    currentContext = mergeContext(currentContext, nextOptions.context);
-    if (mid) {
-      return await mid(input, currentContext, {
-        ...meta,
-        next,
-        output: (output) => ({ output, context: void 0 })
-      });
+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
+      };
     }
-    const result = {
-      output: await procedure["~orpc"].handler(input, currentContext, meta),
-      context: currentContext
-    };
     return result;
   };
   return (await next({})).output;
@@ -175,15 +202,16 @@ function getRouterChild(router, ...path) {
 
 export {
   __export,
-  mergeContext,
   Procedure,
   isProcedure,
+  createORPCErrorConstructorMap,
   LAZY_LOADER_SYMBOL,
   lazy,
   isLazy,
   unlazy,
   flatLazy,
+  middlewareOutputFn,
   createProcedureClient,
   getRouterChild
 };
-//# sourceMappingURL=chunk-6A7XHEBH.js.map
+//# sourceMappingURL=chunk-LDIL7OEP.js.map

package/dist/chunk-WUOGVGWG.js

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

package/dist/fetch.js

@@ -1,32 +1,15 @@
+import "./chunk-WUOGVGWG.js";
 import {
-  ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
+  RPCHandler,
   super_json_exports
-} from "./chunk-B2EZJB7X.js";
-import "./chunk-6A7XHEBH.js";
-
-// src/adapters/fetch/composite-handler.ts
-var CompositeHandler = class {
-  constructor(handlers) {
-    this.handlers = handlers;
-  }
-  async fetch(request, ...opt) {
-    for (const handler of this.handlers) {
-      if (handler.condition(request)) {
-        return handler.fetch(request, ...opt);
-      }
-    }
-    return new Response("None of the handlers can handle the request.", {
-      status: 404
-    });
-  }
-};
+} from "./chunk-26GHKV43.js";
+import "./chunk-LDIL7OEP.js";
 export {
-  CompositeHandler,
-  ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
+  RPCHandler,
   super_json_exports as SuperJSON
 };
 //# sourceMappingURL=fetch.js.map

package/dist/hono.js

@@ -0,0 +1,30 @@
+import "./chunk-WUOGVGWG.js";
+import {
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  RPCHandler,
+  super_json_exports
+} from "./chunk-26GHKV43.js";
+import "./chunk-LDIL7OEP.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 { matched, response } = await handler.handle(c.req.raw, { ...options, context });
+    if (matched) {
+      c.res = response;
+      return;
+    }
+    await next();
+  };
+}
+export {
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  RPCHandler,
+  super_json_exports as SuperJSON,
+  createMiddleware
+};
+//# sourceMappingURL=hono.js.map