@orpc/server 0.30.0 → 0.31.0

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

@@ -154,44 +154,32 @@ async function validateOutput(procedure, output) {
   }
   return result.value;
 }
-function executeMiddlewareChain(middlewares, opt, input) {
+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 = opt.context;
-  const executeMiddlewareChain2 = async (nextOptions) => {
-    const mid = middlewares[currentIndex];
+  let currentContext = options.context;
+  let currentInput = options.input;
+  const next = async (nextOptions) => {
+    const index = currentIndex;
     currentIndex += 1;
     currentContext = mergeContext(currentContext, nextOptions.context);
-    if (mid) {
-      return await mid({ ...opt, context: currentContext, next: executeMiddlewareChain2 }, input, middlewareOutputFn);
+    if (index === inputValidationIndex) {
+      currentInput = await validateInput(procedure, currentInput);
     }
-    return opt.next({ context: currentContext });
-  };
-  return executeMiddlewareChain2({});
-}
-async function executeProcedureInternal(procedure, options) {
-  const executeHandler = async (context, input) => {
-    return await procedure["~orpc"].handler({ ...options, context, input });
-  };
-  const executePostMiddlewares = async (context, input) => {
-    const validatedInput = await validateInput(procedure, input);
-    const result2 = await executeMiddlewareChain(procedure["~orpc"].postMiddlewares, {
-      ...options,
-      context,
-      next: async ({ context: context2 }) => {
-        return middlewareOutputFn(
-          await executeHandler(context2, validatedInput)
-        );
-      }
-    }, validatedInput);
-    const validatedOutput = await validateOutput(procedure, result2.output);
-    return { ...result2, output: validatedOutput };
+    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;
   };
-  const result = await executeMiddlewareChain(procedure["~orpc"].preMiddlewares, {
-    ...options,
-    context: options.context,
-    next: ({ context }) => executePostMiddlewares(context, options.input)
-  }, options.input);
-  return result.output;
+  return (await next({})).output;
 }
 
 // src/router.ts
@@ -239,4 +227,4 @@ export {
   createProcedureClient,
   getRouterChild
 };
-//# sourceMappingURL=chunk-SA7HGGVY.js.map
+//# sourceMappingURL=chunk-GK2Z6B6W.js.map

package/dist/{chunk-2HRHHZJD.js → chunk-SXUFCJBY.js}

@@ -4,7 +4,7 @@ import {
   getRouterChild,
   isProcedure,
   unlazy
-} from "./chunk-SA7HGGVY.js";
+} from "./chunk-GK2Z6B6W.js";
 
 // src/adapters/fetch/super-json.ts
 var super_json_exports = {};
@@ -298,4 +298,4 @@ export {
   ORPCProcedureMatcher,
   RPCHandler
 };
-//# sourceMappingURL=chunk-2HRHHZJD.js.map
+//# sourceMappingURL=chunk-SXUFCJBY.js.map

package/dist/fetch.js

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

package/dist/hono.js

@@ -4,8 +4,8 @@ import {
   ORPCProcedureMatcher,
   RPCHandler,
   super_json_exports
-} from "./chunk-2HRHHZJD.js";
-import "./chunk-SA7HGGVY.js";
+} from "./chunk-SXUFCJBY.js";
+import "./chunk-GK2Z6B6W.js";
 
 // src/adapters/hono/middleware.ts
 import { value } from "@orpc/shared";