failing test + fix

Author: dummdidumm

packages/svelte/src/internal/client/async_body.js

@@ -1,6 +1,5 @@
 export { createAttachmentKey as attachment } from '../../attachments/index.js';
 export { FILENAME, HMR, NAMESPACE_SVG } from '../../constants.js';
-export { async_body } from './async_body.js';
 export { push, pop, add_svelte_meta } from './context.js';
 export { assign, assign_and, assign_or, assign_nullish } from './dev/assign.js';
 export { cleanup_styles } from './dev/css.js';
@@ -100,6 +99,7 @@ export {
 	with_script
 } from './dom/template.js';
 export {
+	async_body,
 	for_await_track_reactivity_loss,
 	save,
 	track_reactivity_loss

packages/svelte/src/internal/client/index.js

@@ -11,14 +11,15 @@ import {
 	set_active_effect,
 	set_active_reaction
 } from '../runtime.js';
-import { current_batch } from './batch.js';
+import { current_batch, suspend } from './batch.js';
 import {
 	async_derived,
 	current_async_effect,
 	derived,
 	derived_safe_equal,
 	set_from_async_derived
 } from './deriveds.js';
+import { aborted } from './effects.js';
 
 /**
  *
@@ -170,3 +171,21 @@ export function unset_context() {
 	set_component_context(null);
 	if (DEV) set_from_async_derived(null);
 }
+
+/**
+ * @param {() => Promise<void>} fn
+ */
+export async function async_body(fn) {
+	const unsuspend = suspend();
+	const active = /** @type {Effect} */ (active_effect);
+
+	try {
+		await fn();
+	} catch (error) {
+		if (!aborted(active)) {
+			invoke_error_boundary(error, active);
+		}
+	} finally {
+		unsuspend();
+	}
+}

packages/svelte/src/internal/client/reactivity/async.js

@@ -0,0 +1,9 @@
+<script>
+	import { route } from "./main.svelte";
+
+	await new Promise(async (_, reject) => {
+		await Promise.resolve();
+		route.current = 'other'
+		route.reject = reject;
+	});
+</script>

packages/svelte/tests/runtime-runes/samples/async-top-level-error-nested-obsolete/Child.svelte

@@ -0,0 +1,15 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	html: `<button>reject</button> <p>pending</p>`,
+
+	async test({ assert, target }) {
+		const [reject] = target.querySelectorAll('button');
+
+		await tick();
+		reject.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<button>reject</button> <p>route: other</p>');
+	}
+});

packages/svelte/tests/runtime-runes/samples/async-top-level-error-nested-obsolete/_config.js

@@ -0,0 +1,18 @@
+<script module>
+	import Child from './Child.svelte';
+	export let route = $state({ current: 'home' });
+</script>
+
+<button onclick={() => route.reject()}>reject</button>
+
+<svelte:boundary>
+	{#if route.current === 'home'}
+		<Child />
+	{:else}
+		<p>route: {route.current}</p>
+	{/if}
+
+	{#snippet pending()}
+		<p>pending</p>
+	{/snippet}
+</svelte:boundary>

packages/svelte/tests/runtime-runes/samples/async-top-level-error-nested-obsolete/main.svelte

@@ -2,8 +2,6 @@
 	import { route } from "./main.svelte";
 
 	await new Promise(async (_, reject) => {
-		await Promise.resolve();
-		route.current = 'other'
 		route.reject = reject;
 	});
 </script>

packages/svelte/tests/runtime-runes/samples/async-top-level-error-nested/Child.svelte

@@ -7,9 +7,8 @@ export default test({
 	async test({ assert, target }) {
 		const [reject] = target.querySelectorAll('button');
 
-		await tick();
 		reject.click();
 		await tick();
-		assert.htmlEqual(target.innerHTML, '<button>reject</button> <p>route: other</p>');
+		assert.htmlEqual(target.innerHTML, '<button>reject</button> <p>failed</p>');
 	}
 });

packages/svelte/tests/runtime-runes/samples/async-top-level-error-nested/_config.js

@@ -1,18 +1,18 @@
 <script module>
 	import Child from './Child.svelte';
-	export let route = $state({ current: 'home' });
+	export let route = $state({});
 </script>
 
 <button onclick={() => route.reject()}>reject</button>
 
 <svelte:boundary>
-	{#if route.current === 'home'}
-		<Child />
-	{:else}
-		<p>route: {route.current}</p>
-	{/if}
+	<Child />
 
 	{#snippet pending()}
 		<p>pending</p>
 	{/snippet}
+
+	{#snippet failed()}
+		<p>failed</p>
+	{/snippet}
 </svelte:boundary>