feedback

Author: trueadm

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

@@ -35,25 +35,24 @@ import { component_context } from '../context.js';
 /*#__NO_SIDE_EFFECTS__*/
 export function derived(fn) {
 	var flags = DERIVED | DIRTY;
+	var parent_derived =
+		active_reaction !== null && (active_reaction.f & DERIVED) !== 0
+			? /** @type {Derived} */ (active_reaction)
+			: null;
 
-	if (active_effect === null) {
+	if (active_effect === null || (parent_derived !== null && (parent_derived.f & UNOWNED) !== 0)) {
 		flags |= UNOWNED;
 	} else {
 		// Since deriveds are evaluated lazily, any effects created inside them are
 		// created too late to ensure that the parent effect is added to the tree
 		active_effect.f |= EFFECT_HAS_DERIVED;
 	}
 
-	var parent_derived =
-		active_reaction !== null && (active_reaction.f & DERIVED) !== 0
-			? /** @type {Derived} */ (active_reaction)
-			: null;
-
 	/** @type {Derived<V>} */
 	const signal = {
-		children: null,
 		ctx: component_context,
 		deps: null,
+		effects: null,
 		equals,
 		f: flags,
 		fn,
@@ -87,19 +86,14 @@ export function derived_safe_equal(fn) {
  * @param {Derived} derived
  * @returns {void}
  */
-export function destroy_derived_children(derived) {
-	var children = derived.children;
-
-	if (children !== null) {
-		derived.children = null;
-
-		for (var i = 0; i < children.length; i += 1) {
-			var child = children[i];
-			if ((child.f & DERIVED) !== 0) {
-				destroy_derived(/** @type {Derived} */ (child));
-			} else {
-				destroy_effect(/** @type {Effect} */ (child));
-			}
+export function destroy_derived_effects(derived) {
+	var effects = derived.effects;
+
+	if (effects !== null) {
+		derived.effects = null;
+
+		for (var i = 0; i < effects.length; i += 1) {
+			destroy_effect(/** @type {Effect} */ (effects[i]));
 		}
 	}
 }
@@ -147,7 +141,7 @@ export function execute_derived(derived) {
 
 			stack.push(derived);
 
-			destroy_derived_children(derived);
+			destroy_derived_effects(derived);
 			value = update_reaction(derived);
 		} finally {
 			set_active_effect(prev_active_effect);
@@ -156,7 +150,7 @@ export function execute_derived(derived) {
 		}
 	} else {
 		try {
-			destroy_derived_children(derived);
+			destroy_derived_effects(derived);
 			value = update_reaction(derived);
 		} finally {
 			set_active_effect(prev_active_effect);
@@ -188,9 +182,9 @@ export function update_derived(derived) {
  * @returns {void}
  */
 export function destroy_derived(derived) {
-	destroy_derived_children(derived);
+	destroy_derived_effects(derived);
 	remove_reactions(derived, 0);
 	set_signal_status(derived, DESTROYED);
 
-	derived.v = derived.children = derived.deps = derived.ctx = derived.reactions = null;
+	derived.v = derived.deps = derived.ctx = derived.reactions = null;
 }

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

@@ -53,7 +53,7 @@ export function validate_effect(rune) {
 		e.effect_orphan(rune);
 	}
 
-	if (active_reaction !== null && (active_reaction.f & UNOWNED) !== 0) {
+	if (active_reaction !== null && (active_reaction.f & UNOWNED) !== 0 && active_effect === null) {
 		e.effect_in_unowned_derived();
 	}
 
@@ -153,7 +153,7 @@ function create_effect(type, fn, sync, push = true) {
 		// if we're in a derived, add the effect there too
 		if (active_reaction !== null && (active_reaction.f & DERIVED) !== 0) {
 			var derived = /** @type {Derived} */ (active_reaction);
-			(derived.children ??= []).push(effect);
+			(derived.effects ??= []).push(effect);
 		}
 	}
 

packages/svelte/src/internal/client/reactivity/types.d.ts

@@ -36,8 +36,8 @@ export interface Reaction extends Signal {
 export interface Derived<V = unknown> extends Value<V>, Reaction {
 	/** The derived function */
 	fn: () => V;
-	/** Reactions created inside this signal */
-	children: null | Reaction[];
+	/** Effects created inside this signal */
+	effects: null | Effect[];
 	/** Parent effect or derived */
 	parent: Effect | Derived | null;
 }

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

@@ -30,7 +30,7 @@ import { flush_tasks } from './dom/task.js';
 import { internal_set, set } from './reactivity/sources.js';
 import {
 	destroy_derived,
-	destroy_derived_children,
+	destroy_derived_effects,
 	execute_derived,
 	update_derived
 } from './reactivity/deriveds.js';
@@ -419,11 +419,10 @@ export function update_reaction(reaction) {
 		(flags & UNOWNED) !== 0 &&
 		(!is_flushing_effect ||
 			// If we were previously not in a reactive context and we're reading an unowned derived
-			// that was created inside another derived, then we don't fully know the real owner and thus
+			// that was created inside another reaction, then we don't fully know the real owner and thus
 			// we need to skip adding any reactions for this unowned
 				((previous_reaction === null || previous_untracking) &&
-				(/** @type {Derived} */ (reaction).parent !== null &&
-				(/** @type {Derived} */ (reaction).parent.f & DERIVED) !== 0)));
+				/** @type {Derived} */ (reaction).parent !== null));
 
 	derived_sources = null;
 	set_component_context(reaction.ctx);
@@ -533,7 +532,7 @@ function remove_reaction(signal, dependency) {
 			dependency.f ^= DISCONNECTED;
 		}
 		// Disconnect any reactions owned by this reaction
-		destroy_derived_children(/** @type {Derived} **/ (dependency));
+		destroy_derived_effects(/** @type {Derived} **/ (dependency));
 		remove_reactions(/** @type {Derived} **/ (dependency), 0);
 	}
 }
@@ -951,11 +950,18 @@ export function get(signal) {
 				new_deps.push(signal);
 			}
 		}
-	} else if (is_derived && /** @type {Derived} */ (signal).deps === null) {
+	} else if (
+		is_derived &&
+		/** @type {Derived} */ (signal).deps === null &&
+		/** @type {Derived} */ (signal).effects === null
+	) {
 		var derived = /** @type {Derived} */ (signal);
 		var parent = derived.parent;
 
 		if (parent !== null) {
+			// if ((parent.f & UNOWNED) === 0) {
+			// 	derived.f ^= UNOWNED;
+			// }
 			// If the derived is owned by another derived then mark it as unowned
 			// as the derived value might have been referenced in a different context
 			// since and thus its parent might not be its true owner anymore

packages/svelte/tests/signals/test.ts

@@ -928,7 +928,7 @@ describe('signals', () => {
 			});
 
 			assert.deepEqual(a.deriveds?.length, 1);
-			assert.deepEqual(b?.children, null);
+			assert.deepEqual(b?.effects, null);
 
 			destroy();
 
@@ -957,14 +957,14 @@ describe('signals', () => {
 				});
 			});
 
-			assert.equal(c!.children?.length, 1);
+			assert.equal(c!.effects?.length, 1);
 			assert.equal(a.first, a.last);
 
 			set(b, 1);
 
 			flushSync();
 
-			assert.equal(c!.children?.length, 1);
+			assert.equal(c!.effects?.length, 1);
 			assert.equal(a.first, a.last);
 
 			destroy();
@@ -1001,14 +1001,14 @@ describe('signals', () => {
 				});
 			});
 
-			assert.equal(c!.children?.length, 1);
+			assert.equal(c!.effects?.length, 1);
 			assert.equal(a.first, a.last);
 
 			set(b, 1);
 
 			flushSync();
 
-			assert.equal(c!.children?.length, 1);
+			assert.equal(c!.effects?.length, 1);
 			assert.equal(a.first, a.last);
 
 			destroy();