fix: handle errors thrown in await catch attrs

marko-js · Aug 4, 2023 · 4286236 · 4286236
1 parent 59dd026
commit 4286236
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/.changeset/gold-timers-sleep.md b/.changeset/gold-timers-sleep.md
@@ -0,0 +1,5 @@
+---
+"marko": patch
+---
+
+Handle errors thrown in await catch attribute
diff --git a/packages/marko/src/core-tags/core/await/renderer.js b/packages/marko/src/core-tags/core/await/renderer.js
@@ -220,7 +220,11 @@ function renderContents(err, data, input, out) {
   if (err) {
     if (input.catch) {
       if (errorRenderer) {
-        errorRenderer(out, err);
+        try {
+          errorRenderer(out, err);
+        } catch (err2) {
+          out.error(err2);
+        }
       }
     } else {
       out.error(err);

diff --git a/packages/marko/test/render/fixtures/await-error-rethrow-catch/template.marko b/packages/marko/test/render/fixtures/await-error-rethrow-catch/template.marko
@@ -0,0 +1,10 @@
+---
+BEFORE
+<await(Promise.reject(new Error("Something went wrong!")))>
+    <@then|testData|>Success!</@then>
+    <@catch|err|>
+        $ throw err
+    </@catch>
+</await>
+AFTER
+---
diff --git a/packages/marko/test/render/fixtures/await-error-rethrow-catch/test.js b/packages/marko/test/render/fixtures/await-error-rethrow-catch/test.js
@@ -0,0 +1,10 @@
+var expect = require("chai").expect;
+
+exports.templateData = {};
+
+exports.skip_vdom = "VDOM does not support async components";
+
+exports.checkError = function (e) {
+  var message = e.toString();
+  expect(message).to.contain("Something went wrong");
+};