@orpc/server 0.0.0-next.d53d856 → 0.0.0-next.d583bc4

package/dist/shared/{server.B_fj3X5m.mjs → server.Ds4HPpvH.mjs}

@@ -1,6 +1,6 @@
-import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
-import { resolveMaybeOptionalOptions, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, asyncIteratorWithSpan } from '@orpc/shared';
-import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
+import { isContractProcedure, validateORPCError, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
+import { resolveMaybeOptionalOptions, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, overlayProxy, asyncIteratorWithSpan } from '@orpc/shared';
+import { ORPCError, mapEventIterator } from '@orpc/client';
 import { HibernationEventIterator } from '@orpc/standard-server';
 
 const LAZY_SYMBOL = Symbol("ORPC_LAZY_SYMBOL");
@@ -88,21 +88,6 @@ function createORPCErrorConstructorMap(errors) {
   });
   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: {} };
@@ -116,6 +101,12 @@ function createProcedureClient(lazyableProcedure, ...rest) {
     const clientContext = callerOptions?.context ?? {};
     const context = await value(options.context ?? {}, clientContext);
     const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
+    const validateError = async (e) => {
+      if (e instanceof ORPCError) {
+        return await validateORPCError(procedure["~orpc"].errorMap, e);
+      }
+      return e;
+    };
     try {
       const output = await runWithSpan(
         { name: "call_procedure", signal: callerOptions?.signal },
@@ -141,18 +132,20 @@ function createProcedureClient(lazyableProcedure, ...rest) {
         if (output instanceof HibernationEventIterator) {
           return output;
         }
-        return asyncIteratorWithSpan(
-          { name: "consume_event_iterator_output", signal: callerOptions?.signal },
-          output
-        );
+        return overlayProxy(output, mapEventIterator(
+          asyncIteratorWithSpan(
+            { name: "consume_event_iterator_output", signal: callerOptions?.signal },
+            output
+          ),
+          {
+            value: (v) => v,
+            error: (e) => validateError(e)
+          }
+        ));
       }
       return output;
     } catch (e) {
-      if (!(e instanceof ORPCError)) {
-        throw e;
-      }
-      const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
-      throw validated;
+      throw await validateError(e);
     }
   };
 }
@@ -171,7 +164,11 @@ async function validateInput(procedure, input) {
           data: {
             issues: result.issues
           },
-          cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
+          cause: new ValidationError({
+            message: "Input validation failed",
+            issues: result.issues,
+            data: input
+          })
         });
       }
       return result.value;
@@ -190,7 +187,11 @@ async function validateOutput(procedure, output) {
       if (result.issues) {
         throw new ORPCError("INTERNAL_SERVER_ERROR", {
           message: "Output validation failed",
-          cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
+          cause: new ValidationError({
+            message: "Output validation failed",
+            issues: result.issues,
+            data: output
+          })
         });
       }
       return result.value;
@@ -405,4 +406,4 @@ function call(procedure, input, ...rest) {
   return createProcedureClient(procedure, options)(input, options);
 }
 
-export { LAZY_SYMBOL as L, Procedure as P, createContractedProcedure as a, addMiddleware as b, createProcedureClient as c, isLazy as d, enhanceRouter as e, createAssertedLazyProcedure as f, getRouter as g, createORPCErrorConstructorMap as h, isProcedure as i, getLazyMeta as j, middlewareOutputFn as k, lazy as l, mergeCurrentContext as m, isStartWithMiddlewares as n, mergeMiddlewares as o, call as p, getHiddenRouterContract as q, createAccessibleLazyRouter as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u, validateORPCError as v, resolveContractProcedures as w, unlazyRouter as x };
+export { LAZY_SYMBOL as L, Procedure as P, createContractedProcedure as a, addMiddleware as b, createProcedureClient as c, isLazy as d, enhanceRouter as e, createAssertedLazyProcedure as f, getRouter as g, createORPCErrorConstructorMap as h, isProcedure as i, getLazyMeta as j, middlewareOutputFn as k, lazy as l, mergeCurrentContext as m, isStartWithMiddlewares as n, mergeMiddlewares as o, call as p, getHiddenRouterContract as q, createAccessibleLazyRouter as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u, resolveContractProcedures as v, unlazyRouter as w };

package/dist/shared/{server.DhJj-1X9.d.mts → server.DzV1hr3z.d.mts}

@@ -1,5 +1,5 @@
 import { ErrorMap, EnhanceRouteOptions, MergedErrorMap, AnyContractRouter, AnyContractProcedure } from '@orpc/contract';
-import { a as AnyMiddleware, L as Lazyable, b as AnyRouter, C as Context, c as Lazy, A as AnyProcedure, P as Procedure, M as MergedInitialContext } from './server.CYNGeoCm.mjs';
+import { a as AnyMiddleware, L as Lazyable, b as AnyRouter, C as Context, c as Lazy, A as AnyProcedure, P as Procedure, M as MergedInitialContext } from './server.B4BGqy3Y.mjs';
 
 declare function getRouter<T extends Lazyable<AnyRouter | undefined>>(router: T, path: readonly string[]): T extends Lazy<any> ? Lazy<AnyRouter | undefined> : Lazyable<AnyRouter | undefined>;
 type AccessibleLazyRouter<T extends Lazyable<AnyRouter | undefined>> = T extends Lazy<infer U extends AnyRouter | undefined | Lazy<AnyRouter | undefined>> ? AccessibleLazyRouter<U> : T extends AnyProcedure | undefined ? Lazy<T> : Lazy<T> & {

package/dist/shared/{server.BW-nUGgA.mjs → server.TEVCLCFC.mjs}

@@ -3,6 +3,9 @@ import { ORPCError, fallbackContractConfig } from '@orpc/contract';
 const STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL = Symbol("STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT");
 class StrictGetMethodPlugin {
   error;
+  /**
+   * make sure execute before batch plugin to get real method
+   */
   order = 7e6;
   constructor(options = {}) {
     this.error = options.error ?? new ORPCError("METHOD_NOT_SUPPORTED");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.d53d856",
+  "version": "0.0.0-next.d583bc4",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -102,20 +102,20 @@
   },
   "dependencies": {
     "cookie": "^1.0.2",
-    "@orpc/client": "0.0.0-next.d53d856",
-    "@orpc/contract": "0.0.0-next.d53d856",
-    "@orpc/interop": "0.0.0-next.d53d856",
-    "@orpc/standard-server": "0.0.0-next.d53d856",
-    "@orpc/shared": "0.0.0-next.d53d856",
-    "@orpc/standard-server-aws-lambda": "0.0.0-next.d53d856",
-    "@orpc/standard-server-node": "0.0.0-next.d53d856",
-    "@orpc/standard-server-fetch": "0.0.0-next.d53d856",
-    "@orpc/standard-server-peer": "0.0.0-next.d53d856"
+    "@orpc/client": "0.0.0-next.d583bc4",
+    "@orpc/interop": "0.0.0-next.d583bc4",
+    "@orpc/shared": "0.0.0-next.d583bc4",
+    "@orpc/contract": "0.0.0-next.d583bc4",
+    "@orpc/standard-server": "0.0.0-next.d583bc4",
+    "@orpc/standard-server-aws-lambda": "0.0.0-next.d583bc4",
+    "@orpc/standard-server-node": "0.0.0-next.d583bc4",
+    "@orpc/standard-server-fetch": "0.0.0-next.d583bc4",
+    "@orpc/standard-server-peer": "0.0.0-next.d583bc4"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
     "crossws": "^0.4.1",
-    "next": "^15.4.5",
+    "next": "^15.5.4",
     "supertest": "^7.1.4",
     "ws": "^8.18.3"
   },