From 47308bb834c4175875bb65d51bfe2cf756ecd467 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Wed, 23 Oct 2024 13:59:19 +0100 Subject: [PATCH 1/8] chore: highlight swallowed errors from await blocks in DEV --- .../svelte/src/internal/client/dom/blocks/await.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js index 75bbb23cdd8f..f814cdb5b4f2 100644 --- a/packages/svelte/src/internal/client/dom/blocks/await.js +++ b/packages/svelte/src/internal/client/dom/blocks/await.js @@ -80,9 +80,13 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) { else then_effect = branch(() => then_fn(anchor, input_source)); } - if (state === CATCH && catch_fn) { - if (catch_effect) resume_effect(catch_effect); - else catch_effect = branch(() => catch_fn(anchor, error_source)); + if (state === CATCH) { + if (catch_fn) { + if (catch_effect) resume_effect(catch_effect); + else catch_effect = branch(() => catch_fn(anchor, error_source)); + } else if (DEV) { + console.error(error_source.v); + } } if (state !== PENDING && pending_effect) { From 6577d99806f08c2785b49acfe05b3af3890de53b Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Wed, 23 Oct 2024 13:59:39 +0100 Subject: [PATCH 2/8] chore: highlight swallowed errors from await blocks in DEV --- .changeset/blue-boats-call.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/blue-boats-call.md diff --git a/.changeset/blue-boats-call.md b/.changeset/blue-boats-call.md new file mode 100644 index 000000000000..0bad5986b4bc --- /dev/null +++ b/.changeset/blue-boats-call.md @@ -0,0 +1,5 @@ +--- +'svelte': patch +--- + +chore: highlight swallowed errors from await blocks in DEV From 6f052ab2227baa92688f8b463f69216593f16e4b Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Wed, 23 Oct 2024 14:07:53 +0100 Subject: [PATCH 3/8] chore: highlight swallowed errors from await blocks in DEV --- .../svelte/src/internal/client/dom/blocks/await.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js index f814cdb5b4f2..1bfdd99634f2 100644 --- a/packages/svelte/src/internal/client/dom/blocks/await.js +++ b/packages/svelte/src/internal/client/dom/blocks/await.js @@ -80,13 +80,9 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) { else then_effect = branch(() => then_fn(anchor, input_source)); } - if (state === CATCH) { - if (catch_fn) { + if (state === CATCH && catch_fn) { if (catch_effect) resume_effect(catch_effect); else catch_effect = branch(() => catch_fn(anchor, error_source)); - } else if (DEV) { - console.error(error_source.v); - } } if (state !== PENDING && pending_effect) { @@ -135,6 +131,10 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) { // but let's use internal_set for consistency and just to be safe internal_set(error_source, error); update(CATCH, true); + if (!catch_fn && DEV) { + // eslint-disable-next-line no-console + console.error(error_source.v); + } } ); From 62001debb4e72fe7bfeb9127a6af7c6c955be60f Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Wed, 23 Oct 2024 16:21:20 +0100 Subject: [PATCH 4/8] lint --- packages/svelte/src/internal/client/dom/blocks/await.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js index 1bfdd99634f2..8316729dbb7f 100644 --- a/packages/svelte/src/internal/client/dom/blocks/await.js +++ b/packages/svelte/src/internal/client/dom/blocks/await.js @@ -81,8 +81,8 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) { } if (state === CATCH && catch_fn) { - if (catch_effect) resume_effect(catch_effect); - else catch_effect = branch(() => catch_fn(anchor, error_source)); + if (catch_effect) resume_effect(catch_effect); + else catch_effect = branch(() => catch_fn(anchor, error_source)); } if (state !== PENDING && pending_effect) { From 753e9d7496da976302b94807cea44491c24d103a Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 25 Oct 2024 14:04:49 +0100 Subject: [PATCH 5/8] feedback --- packages/svelte/src/internal/client/dom/blocks/await.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js index 8316729dbb7f..3c6bc9900da8 100644 --- a/packages/svelte/src/internal/client/dom/blocks/await.js +++ b/packages/svelte/src/internal/client/dom/blocks/await.js @@ -131,9 +131,9 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) { // but let's use internal_set for consistency and just to be safe internal_set(error_source, error); update(CATCH, true); - if (!catch_fn && DEV) { - // eslint-disable-next-line no-console - console.error(error_source.v); + if (!catch_fn) { + // Rethrow the error if no catch block exists + throw error_source.v; } } ); From 40c41079304e27e97efcdc7a98b876c01a44b09b Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 25 Oct 2024 14:05:28 +0100 Subject: [PATCH 6/8] feedback --- .changeset/blue-boats-call.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/blue-boats-call.md b/.changeset/blue-boats-call.md index 0bad5986b4bc..0f6c31025d0b 100644 --- a/.changeset/blue-boats-call.md +++ b/.changeset/blue-boats-call.md @@ -2,4 +2,4 @@ 'svelte': patch --- -chore: highlight swallowed errors from await blocks in DEV +fix: rethrow errors from await block if no catch block exists From 37d01274ed308f08d96efc2611601f500e4d74ca Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 25 Oct 2024 14:12:25 +0100 Subject: [PATCH 7/8] add test --- .../samples/await-no-catch-error/_config.js | 22 +++++++++++++++++++ .../samples/await-no-catch-error/main.svelte | 12 ++++++++++ 2 files changed, 34 insertions(+) create mode 100644 packages/svelte/tests/runtime-runes/samples/await-no-catch-error/_config.js create mode 100644 packages/svelte/tests/runtime-runes/samples/await-no-catch-error/main.svelte diff --git a/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/_config.js b/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/_config.js new file mode 100644 index 000000000000..568b58ff951b --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/_config.js @@ -0,0 +1,22 @@ +import { flushSync } from 'svelte'; +import { test } from '../../test'; + +export default test({ + async test({ assert, target }) { + const b1 = target.querySelector('button'); + + let err = ''; + window.addEventListener('error', (e) => { + e.preventDefault(); + err = e.message; + }); + + b1?.click(); + await Promise.resolve(); + flushSync(); + + assert.throws(() => { + throw err; + }, /Test/); + } +}); diff --git a/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/main.svelte b/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/main.svelte new file mode 100644 index 000000000000..4a2fbf6dabb2 --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/main.svelte @@ -0,0 +1,12 @@ + + + + +{#if toggle} + {#await promise}{/await} +{/if} From 3c46a5585130d1e5cf788e82c5c8a97154db4738 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Fri, 25 Oct 2024 21:34:15 +0200 Subject: [PATCH 8/8] Update packages/svelte/tests/runtime-runes/samples/await-no-catch-error/main.svelte --- .../runtime-runes/samples/await-no-catch-error/main.svelte | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/main.svelte b/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/main.svelte index 4a2fbf6dabb2..bd2fb1e2f2ef 100644 --- a/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/await-no-catch-error/main.svelte @@ -1,7 +1,5 @@