fix issue with rethrowing

Author: trueadm

packages/svelte/src/internal/client/dom/blocks/boundary.js

@@ -10,7 +10,14 @@ import {
 	set_active_reaction,
 	set_component_context
 } from '../../runtime.js';
-import { hydrate_next, hydrate_node, hydrating } from '../hydration.js';
+import {
+	hydrate_next,
+	hydrate_node,
+	hydrating,
+	next,
+	remove_nodes,
+	set_hydrate_node
+} from '../hydration.js';
 import { queue_micro_task } from '../task.js';
 
 /**
@@ -50,6 +57,7 @@ export function boundary(node, boundary_fn, props) {
 
 	block(() => {
 		var boundary = /** @type {Effect} */ (active_effect);
+		var hydrate_open = hydrate_node;
 
 		// We re-use the effect's fn property to avoid allocation of an additional field
 		boundary.fn = (/** @type { Error }} */ error) => {
@@ -58,6 +66,10 @@ export function boundary(node, boundary_fn, props) {
 
 			if (boundary_effect) {
 				destroy_effect(boundary_effect);
+			} else if (hydrating) {
+				set_hydrate_node(hydrate_open);
+				next();
+				set_hydrate_node(remove_nodes());
 			}
 
 			// If we have nothing to capture the error then rethrow the error

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

@@ -258,19 +258,29 @@ function propagate_error(error, effect) {
 	throw error;
 }
 
+/**
+ * @param {Effect} effect
+ */
+function should_rethrow_error(effect) {
+	return (
+		(effect.f & DESTROYED) === 0 &&
+		(effect.parent === null || (effect.parent.f & BOUNDARY_EFFECT) === 0)
+	);
+}
+
 /**
  * @param {Error} error
  * @param {Effect} effect
  * @param {ComponentContext | null} component_context
  */
 function handle_error(error, effect, component_context) {
 	if (handled_errors.has(error)) {
-		// If the parent is not an error boundary then re-throw the error
-		if (effect.parent === null || (effect.parent.f & BOUNDARY_EFFECT) === 0) {
+		if (should_rethrow_error(effect)) {
 			throw error;
 		}
 		return;
 	}
+
 	handled_errors.add(error);
 
 	if (!DEV || component_context === null) {
@@ -327,6 +337,9 @@ function handle_error(error, effect, component_context) {
 	}
 
 	propagate_error(error, effect);
+	if (should_rethrow_error(effect)) {
+		throw error;
+	}
 }
 
 /**

packages/svelte/tests/runtime-runes/samples/error-boundary-12/_config.js

@@ -2,7 +2,7 @@ import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
-	test({ assert, target, logs }) {
+	test({ assert, target }) {
 		const btn = target.querySelector('button');
 
 		btn?.click();

packages/svelte/tests/runtime-runes/samples/error-boundary-13/_config.js

@@ -2,7 +2,7 @@ import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
-	test({ assert, target, logs }) {
+	test({ assert, target }) {
 		const btn = target.querySelector('button');
 
 		btn?.click();

packages/svelte/tests/runtime-runes/samples/error-boundary-14/Child.svelte

@@ -0,0 +1,9 @@
+<script>
+	function throw_error() {
+		throw new Error('throw_error');
+	}
+</script>
+
+{throw_error()}
+
+<div>Foo</div>

packages/svelte/tests/runtime-runes/samples/error-boundary-14/_config.js

@@ -0,0 +1,9 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['client'],
+
+	test({ assert, logs }) {
+		assert.deepEqual(logs, ['error caught']);
+	}
+});

packages/svelte/tests/runtime-runes/samples/error-boundary-14/main.svelte

@@ -0,0 +1,13 @@
+<script>
+	import Child from "./Child.svelte";
+
+	function throw_error() {
+		throw new Error('test')
+	}
+</script>
+
+<svelte:boundary onerror={(e) => console.log('error caught')}>
+	<Child />
+</svelte:boundary>
+
+