From ab18c982694e1634b8cef05f2040a5a53705972c Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Mon, 21 Oct 2024 14:16:54 +0200
Subject: [PATCH] fix #13727

---
 packages/svelte/src/compiler/migrate/index.js   | 17 +++++++++++++----
 .../migrate/samples/derivations/output.svelte   |  5 +++++
 .../tests/migrate/samples/effects/input.svelte  |  2 +-
 .../tests/migrate/samples/effects/output.svelte |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/svelte/src/compiler/migrate/index.js b/packages/svelte/src/compiler/migrate/index.js
index abe940af7c..1bbb71abef 100644
--- a/packages/svelte/src/compiler/migrate/index.js
+++ b/packages/svelte/src/compiler/migrate/index.js
@@ -558,14 +558,22 @@ const instance_script = {
 						const declaration = reference.path.find((el) => el.type === 'VariableDeclaration');
 						const assignment = reference.path.find((el) => el.type === 'AssignmentExpression');
 						const update = reference.path.find((el) => el.type === 'UpdateExpression');
-						const labeled = reference.path.find(
-							(el) => el.type === 'LabeledStatement' && el.label.name === '$'
+						const labeled = /** @type {LabeledStatement | undefined} */ (
+							reference.path.find((el) => el.type === 'LabeledStatement' && el.label.name === '$')
 						);
 
-						if (assignment && labeled) {
+						if (
+							assignment &&
+							labeled &&
+							// ensure that $: foo = bar * 2 is not counted as a reassignment of bar
+							(labeled.body.type !== 'ExpressionStatement' ||
+								labeled.body.expression !== assignment ||
+								(assignment.left.type === 'Identifier' &&
+									assignment.left.name === binding.node.name))
+						) {
 							if (assignment_in_labeled) return false;
 							assignment_in_labeled = /** @type {AssignmentExpression} */ (assignment);
-							labeled_statement = /** @type {LabeledStatement} */ (labeled);
+							labeled_statement = labeled;
 						}
 
 						return (
@@ -739,6 +747,7 @@ const instance_script = {
 			);
 			const bindings = ids.map((id) => state.scope.get(id.name));
 			const reassigned_bindings = bindings.filter((b) => b?.reassigned);
+
 			if (
 				reassigned_bindings.length === 0 &&
 				!bindings.some((b) => b?.kind === 'store_sub') &&
diff --git a/packages/svelte/tests/migrate/samples/derivations/output.svelte b/packages/svelte/tests/migrate/samples/derivations/output.svelte
index ed6e72dfab..23bac4ccaf 100644
--- a/packages/svelte/tests/migrate/samples/derivations/output.svelte
+++ b/packages/svelte/tests/migrate/samples/derivations/output.svelte
@@ -6,6 +6,11 @@
 	// no semicolon at the end
 	let time_8 = $derived(count * 8)
 	let { time_16 } = $derived({ time_16: count * 16 })
+	// preceeding let that doesn't do anything
+	let time_32 = $derived(count * doubled);
+	
+	let very_high = $derived(time_32 * count);
+	
 </script>
 
 {count} / {doubled} / {quadrupled} / {time_8} / {time_16}
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/effects/input.svelte b/packages/svelte/tests/migrate/samples/effects/input.svelte
index a81c030aba..35d7c1bd51 100644
--- a/packages/svelte/tests/migrate/samples/effects/input.svelte
+++ b/packages/svelte/tests/migrate/samples/effects/input.svelte
@@ -10,7 +10,7 @@
 		console.log('bar');
 	}
 	$: $count = 1;
-	$: $count.x = count;
+	$: foo.x = count;
 </script>
 
 <button onclick={() => count++}>increment</button>
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/effects/output.svelte b/packages/svelte/tests/migrate/samples/effects/output.svelte
index 5808929e6a..59d7eec618 100644
--- a/packages/svelte/tests/migrate/samples/effects/output.svelte
+++ b/packages/svelte/tests/migrate/samples/effects/output.svelte
@@ -19,7 +19,7 @@
 		$count = 1;
 	});
 	run(() => {
-		$count.x = count;
+		foo.x = count;
 	});
 </script>