From 51e50ecb3f51c8c803344cf64a29300366276bec Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 31 Jan 2025 18:00:56 -0500
Subject: [PATCH] add test, tidy up

---
 .../svelte/src/internal/client/runtime.js     | 53 ++++++++++---------
 .../samples/async-reactivity-loss/_config.js  | 26 +++++++++
 .../samples/async-reactivity-loss/main.svelte | 19 +++++++
 3 files changed, 72 insertions(+), 26 deletions(-)
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/main.svelte

diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index c60f4d736e..716374d69f 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -969,15 +969,6 @@ export function get(signal) {
 		captured_signals.add(signal);
 	}
 
-	if (DEV && from_async_derived) {
-		var tracking = (from_async_derived.f & REACTION_IS_UPDATING) !== 0;
-		var was_read = from_async_derived.deps !== null && from_async_derived.deps.includes(signal);
-
-		if (!tracking && !was_read) {
-			w.await_reactivity_loss();
-		}
-	}
-
 	// Register the dependency on the current reaction signal.
 	if (active_reaction !== null && !untracking) {
 		if (derived_sources !== null && derived_sources.includes(signal)) {
@@ -1043,25 +1034,35 @@ export function get(signal) {
 		}
 	}
 
-	if (
-		DEV &&
-		tracing_mode_flag &&
-		tracing_expressions !== null &&
-		active_reaction !== null &&
-		tracing_expressions.reaction === active_reaction
-	) {
-		// Used when mapping state between special blocks like `each`
-		if (signal.debug) {
-			signal.debug();
-		} else if (signal.created) {
-			var entry = tracing_expressions.entries.get(signal);
-
-			if (entry === undefined) {
-				entry = { read: [] };
-				tracing_expressions.entries.set(signal, entry);
+	if (DEV) {
+		if (from_async_derived) {
+			var tracking = (from_async_derived.f & REACTION_IS_UPDATING) !== 0;
+			var was_read = from_async_derived.deps !== null && from_async_derived.deps.includes(signal);
+
+			if (!tracking && !was_read) {
+				w.await_reactivity_loss();
 			}
+		}
 
-			entry.read.push(get_stack('TracedAt'));
+		if (
+			tracing_mode_flag &&
+			tracing_expressions !== null &&
+			active_reaction !== null &&
+			tracing_expressions.reaction === active_reaction
+		) {
+			// Used when mapping state between special blocks like `each`
+			if (signal.debug) {
+				signal.debug();
+			} else if (signal.created) {
+				var entry = tracing_expressions.entries.get(signal);
+
+				if (entry === undefined) {
+					entry = { read: [] };
+					tracing_expressions.entries.set(signal, entry);
+				}
+
+				entry.read.push(get_stack('TracedAt'));
+			}
 		}
 	}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js
new file mode 100644
index 0000000000..4ed40d015b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js
@@ -0,0 +1,26 @@
+import { flushSync, tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	compileOptions: {
+		dev: true
+	},
+
+	html: `<button>a</button><button>b</button><p>pending</p>`,
+
+	async test({ assert, target, warnings }) {
+		await Promise.resolve();
+		await Promise.resolve();
+		await Promise.resolve();
+		await Promise.resolve();
+		await Promise.resolve();
+		await Promise.resolve();
+		await Promise.resolve();
+		await Promise.resolve();
+		await tick();
+		flushSync();
+		assert.htmlEqual(target.innerHTML, '<button>a</button><button>b</button><h1>3</h1>');
+
+		assert.deepEqual(warnings, ['Detected reactivity loss']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/main.svelte
new file mode 100644
index 0000000000..488fc25f32
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	let a = $state(1);
+	let b = $state(2);
+
+	async function a_plus_b() {
+		return await a + await b;
+	}
+</script>
+
+<button onclick={() => a++}>a</button>
+<button onclick={() => b++}>b</button>
+
+<svelte:boundary>
+	<h1>{await a_plus_b()}</h1>
+
+	{#snippet pending()}
+		<p>pending</p>
+	{/snippet}
+</svelte:boundary>