refactor: extract setting derived status to helper, apply to sources.js

Author: hmnd

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

@@ -22,7 +22,8 @@ import {
 	increment_write_version,
 	set_active_effect,
 	push_reaction_value,
-	is_destroying_effect
+	is_destroying_effect,
+	update_derived_status
 } from '../runtime.js';
 import { equals, safe_equals } from './equality.js';
 import * as e from '../errors.js';
@@ -386,13 +387,7 @@ export function update_derived(derived) {
 		}
 	}
 
-	// Only mark as MAYBE_DIRTY if disconnected AND has dependencies.
-	// Deriveds with no deps can never become dirty from dependency changes.
 	if (batch_values === null || derived.deps === null) {
-		if ((derived.f & CONNECTED) === 0 && derived.deps !== null) {
-			set_signal_status(derived, MAYBE_DIRTY);
-		} else {
-			set_signal_status(derived, CLEAN);
-		}
+		update_derived_status(derived);
 	}
 }

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

@@ -16,7 +16,8 @@ import {
 	is_destroying_effect,
 	push_reaction_value,
 	set_is_updating_effect,
-	is_updating_effect
+	is_updating_effect,
+	update_derived_status
 } from '../runtime.js';
 import { equals, safe_equals } from './equality.js';
 import {
@@ -218,12 +219,14 @@ export function internal_set(source, value) {
 		}
 
 		if ((source.f & DERIVED) !== 0) {
+			const derived = /** @type {Derived} */ (source);
+
 			// if we are assigning to a dirty derived we set it to clean/maybe dirty but we also eagerly execute it to track the dependencies
 			if ((source.f & DIRTY) !== 0) {
-				execute_derived(/** @type {Derived} */ (source));
+				execute_derived(derived);
 			}
 
-			set_signal_status(source, (source.f & CONNECTED) !== 0 ? CLEAN : MAYBE_DIRTY);
+			update_derived_status(derived);
 		}
 
 		source.wv = increment_write_version();

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

@@ -185,12 +185,12 @@ export function is_dirty(reaction) {
 		}
 
 		if (
-			(flags & CONNECTED) !== 0 &&
+			(flags & DERIVED) !== 0 &&
 			// During time traveling we don't want to reset the status so that
 			// traversal of the graph in the other batches still happens
-			batch_values === null
+			(batch_values === null || reaction.deps === null)
 		) {
-			set_signal_status(reaction, CLEAN);
+			update_derived_status(/** @type {Derived} */ (reaction));
 		}
 	}
 
@@ -732,6 +732,19 @@ export function set_signal_status(signal, status) {
 	signal.f = (signal.f & STATUS_MASK) | status;
 }
 
+/**
+ * Set a derived's status to CLEAN or MAYBE_DIRTY based on its connection state.
+ * @param {Derived} derived
+ */
+export function update_derived_status(derived) {
+	// Only mark as MAYBE_DIRTY if disconnected and has dependencies.
+	if ((derived.f & CONNECTED) !== 0 || derived.deps === null) {
+		set_signal_status(derived, CLEAN);
+	} else {
+		set_signal_status(derived, MAYBE_DIRTY);
+	}
+}
+
 /**
  * @param {Record<string | symbol, unknown>} obj
  * @param {Array<string | symbol>} keys