conflict

Author: trueadm

.changeset/eight-jeans-compare.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: improve reactive Map and Set implementations

.changeset/gentle-ties-fetch.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: improve controlled each block cleanup performance

.changeset/pre.json

@@ -110,6 +110,7 @@
     "eight-carrots-hunt",
     "eight-cougars-watch",
     "eight-hornets-punch",
+    "eight-jeans-compare",
     "eight-pianos-raise",
     "eight-steaks-shout",
     "eighty-bikes-camp",
@@ -170,6 +171,7 @@
     "gentle-dolls-juggle",
     "gentle-sheep-hug",
     "gentle-spies-happen",
+    "gentle-ties-fetch",
     "gentle-toys-chew",
     "gentle-trees-exercise",
     "gentle-wasps-pull",

packages/svelte/CHANGELOG.md

@@ -1,5 +1,13 @@
 # svelte
 
+## 5.0.0-next.147
+
+### Patch Changes
+
+- fix: improve reactive Map and Set implementations ([#11827](https://github.com/sveltejs/svelte/pull/11827))
+
+- fix: improve controlled each block cleanup performance ([#11839](https://github.com/sveltejs/svelte/pull/11839))
+
 ## 5.0.0-next.146
 
 ### Patch Changes

packages/svelte/package.json

@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.0.0-next.146",
+  "version": "5.0.0-next.147",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {

packages/svelte/src/internal/client/dev/inspect.js

@@ -62,16 +62,6 @@ export function inspect(get_value, inspector = console.log) {
  */
 function deep_snapshot(value, visited = new Map()) {
 	if (typeof value === 'object' && value !== null && !visited.has(value)) {
-		if (DEV) {
-			// When dealing with ReactiveMap or ReactiveSet, return normal versions
-			// so that console.log provides better output versions
-			if (value instanceof Map && value.constructor !== Map) {
-				return new Map(value);
-			}
-			if (value instanceof Set && value.constructor !== Set) {
-				return new Set(value);
-			}
-		}
 		const unstated = snapshot(value);
 
 		if (unstated !== value) {

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

@@ -68,17 +68,20 @@ function pause_effects(items, controlled_anchor, callback) {
 		pause_children(items[i].e, transitions, true);
 	}
 
+	var is_controlled = length > 0 && transitions.length === 0 && controlled_anchor !== null;
 	// If we have a controlled anchor, it means that the each block is inside a single
 	// DOM element, so we can apply a fast-path for clearing the contents of the element.
-	if (length > 0 && transitions.length === 0 && controlled_anchor !== null) {
-		var parent_node = /** @type {Element} */ (controlled_anchor.parentNode);
+	if (is_controlled) {
+		var parent_node = /** @type {Element} */ (
+			/** @type {Element} */ (controlled_anchor).parentNode
+		);
 		clear_text_content(parent_node);
-		parent_node.append(controlled_anchor);
+		parent_node.append(/** @type {Element} */ (controlled_anchor));
 	}
 
 	run_out_transitions(transitions, () => {
 		for (var i = 0; i < length; i++) {
-			destroy_effect(items[i].e);
+			destroy_effect(items[i].e, !is_controlled);
 		}
 
 		if (callback !== undefined) callback();

packages/svelte/src/internal/client/dom/elements/events.js

@@ -172,38 +172,59 @@ export function handle_event_propagation(handler_element, event) {
 		}
 	});
 
-	/** @param {Element} next_target */
-	function next(next_target) {
-		current_target = next_target;
-		/** @type {null | Element} */
-		var parent_element = next_target.parentNode || /** @type {any} */ (next_target).host || null;
-
-		try {
-			// @ts-expect-error
-			var delegated = next_target['__' + event_name];
-
-			if (delegated !== undefined && !(/** @type {any} */ (next_target).disabled)) {
-				if (is_array(delegated)) {
-					var [fn, ...data] = delegated;
-					fn.apply(next_target, [event, ...data]);
+	try {
+		/**
+		 * @type {unknown}
+		 */
+		var throw_error;
+		/**
+		 * @type {unknown[]}
+		 */
+		var other_errors = [];
+		while (current_target !== null) {
+			/** @type {null | Element} */
+			var parent_element =
+				current_target.parentNode || /** @type {any} */ (current_target).host || null;
+
+			try {
+				// @ts-expect-error
+				var delegated = current_target['__' + event_name];
+
+				if (delegated !== undefined && !(/** @type {any} */ (current_target).disabled)) {
+					if (is_array(delegated)) {
+						var [fn, ...data] = delegated;
+						fn.apply(current_target, [event, ...data]);
+					} else {
+						delegated.call(current_target, event);
+					}
+				}
+			} catch (error) {
+				if (throw_error) {
+					other_errors.push(error);
 				} else {
-					delegated.call(next_target, event);
+					throw_error = error;
 				}
 			}
-		} finally {
 			if (
-				!event.cancelBubble &&
-				parent_element !== handler_element &&
-				parent_element !== null &&
-				next_target !== handler_element
+				event.cancelBubble ||
+				parent_element === handler_element ||
+				parent_element === null ||
+				current_target === handler_element
 			) {
-				next(parent_element);
+				break;
 			}
+			current_target = parent_element;
 		}
-	}
 
-	try {
-		next(/** @type {Element} */ (current_target));
+		if (throw_error) {
+			for (let error of other_errors) {
+				// Throw the rest of the errors, one-by-one on a microtask
+				queueMicrotask(() => {
+					throw error;
+				});
+			}
+			throw throw_error;
+		}
 	} finally {
 		// @ts-expect-error is used above
 		event.__root = handler_element;

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

@@ -311,16 +311,17 @@ export function execute_effect_teardown(effect) {
 
 /**
  * @param {import('#client').Effect} effect
+ * @param {boolean} [remove_dom]
  * @returns {void}
  */
-export function destroy_effect(effect) {
+export function destroy_effect(effect, remove_dom = true) {
 	var dom = effect.dom;
 
-	if (dom !== null) {
+	if (dom !== null && remove_dom) {
 		remove(dom);
 	}
 
-	destroy_effect_children(effect);
+	destroy_effect_children(effect, remove_dom);
 	remove_reactions(effect, 0);
 	set_signal_status(effect, DESTROYED);
 

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

@@ -476,16 +476,17 @@ export function remove_reactions(signal, start_index) {
 
 /**
  * @param {import('#client').Reaction} signal
+ * @param {boolean} [remove_dom]
  * @returns {void}
  */
-export function destroy_effect_children(signal) {
+export function destroy_effect_children(signal, remove_dom = true) {
 	let effect = signal.first;
 	signal.first = null;
 	signal.last = null;
 	var sibling;
 	while (effect !== null) {
 		sibling = effect.next;
-		destroy_effect(effect);
+		destroy_effect(effect, remove_dom);
 		effect = sibling;
 	}
 }