feat(core): cleaner opcall stack traces (#12358)

2 files changed, 17 insertions, 7 deletions

diff --git a/cli/tests/unit/opcall_test.ts b/cli/tests/unit/opcall_test.ts
index 9c0d39d2e..7e3685320 100644
--- a/cli/tests/unit/opcall_test.ts
+++ b/cli/tests/unit/opcall_test.ts
@@ -1,4 +1,9 @@
-import { assertStringIncludes, unitTest, unreachable } from "./test_util.ts";
+import {
+  assert,
+  assertStringIncludes,
+  unitTest,
+  unreachable,
+} from "./test_util.ts";
 
 unitTest(async function sendAsyncStackTrace() {
   const buf = new Uint8Array(10);
@@ -11,6 +16,10 @@ unitTest(async function sendAsyncStackTrace() {
     console.log(s);
     assertStringIncludes(s, "opcall_test.ts");
     assertStringIncludes(s, "read");
+    assert(
+      !s.includes("deno:core"),
+      "opcall stack traces should NOT include deno:core internals such as unwrapOpResult",
+    );
   }
 });
 
diff --git a/core/01_core.js b/core/01_core.js
index 5af352340..e1b0529f7 100644
--- a/core/01_core.js
+++ b/core/01_core.js
@@ -12,6 +12,7 @@
     Map,
     Array,
     ArrayPrototypeFill,
+    ErrorCaptureStackTrace,
     Promise,
     ObjectFreeze,
     ObjectFromEntries,
@@ -113,12 +114,12 @@
     if (res?.$err_class_name) {
       const className = res.$err_class_name;
       const errorBuilder = errorMap[className];
-      if (!errorBuilder) {
-        throw new Error(
-          `Unregistered error class: "${className}"\n  ${res.message}\n  Classes of errors returned from ops should be registered via Deno.core.registerErrorClass().`,
-        );
-      }
-      throw errorBuilder(res.message);
+      const err = errorBuilder ? errorBuilder(res.message) : new Error(
+        `Unregistered error class: "${className}"\n  ${res.message}\n  Classes of errors returned from ops should be registered via Deno.core.registerErrorClass().`,
+      );
+      // Strip unwrapOpResult() and errorBuilder() calls from stack trace
+      ErrorCaptureStackTrace(err, unwrapOpResult);
+      throw err;
     }
     return res;
   }