WIP

Author: trueadm

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

@@ -237,13 +237,6 @@ export function lazy_effect(fn, states) {
 		LAZY_EFFECT,
 		() => {
 			var teardown = fn();
-			if (new_deps !== null) {
-				for (var i = new_deps.length - 1; i >= 0; i--) {
-					if (states.includes(/** @type {Derived} */ (new_deps[i]))) {
-						new_deps.splice(i, 1);
-					}
-				}
-			}
 			var current_effect = /** @type {Effect} */ (active_reaction);
 			(current_effect.deriveds ??= []).push(...states);
 

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

@@ -248,9 +248,10 @@ export function internal_set(source, value) {
 /**
  * @param {Value} signal
  * @param {number} status should be DIRTY or MAYBE_DIRTY
+ * @param {Set<Value>} [visited]
  * @returns {void}
  */
-function mark_reactions(signal, status) {
+function mark_reactions(signal, status, visited) {
 	var reactions = signal.reactions;
 	if (reactions === null) return;
 
@@ -265,11 +266,14 @@ function mark_reactions(signal, status) {
 			var effect = /** @type {Effect} */ (reaction);
 			var deriveds = effect.deriveds;
 			if (deriveds !== null) {
+				const visited_set = visited ?? new Set();
+
 				for (let i = 0; i < deriveds.length; i++) {
 					var derived = deriveds[i];
-					if (derived.parent !== effect) {
+					if (derived.parent !== effect && !visited_set?.has(derived)) {
+						visited_set.add(derived)
 						set_signal_status(derived, DIRTY);
-						mark_reactions(derived, MAYBE_DIRTY);
+						mark_reactions(derived, MAYBE_DIRTY, visited_set);
 					}
 				}
 			}
@@ -292,7 +296,7 @@ function mark_reactions(signal, status) {
 		// If the signal a) was previously clean or b) is an unowned derived, then mark it
 		if ((flags & (CLEAN | UNOWNED)) !== 0) {
 			if ((flags & DERIVED) !== 0) {
-				mark_reactions(/** @type {Derived} */ (reaction), MAYBE_DIRTY);
+				mark_reactions(/** @type {Derived} */ (reaction), MAYBE_DIRTY, visited);
 			} else {
 				effect = /** @type {Effect} */ (reaction);
 				schedule_effect(effect);