From b5f2c340e94dc32565f6d8fe0965906319b8cc62 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Wed, 26 Jun 2024 10:52:10 +0200
Subject: [PATCH] fix: prevent false positive store declarations

variable declarations not at the top level can't be subscribed to using the `$` prefix
---
 .../src/svelte2tsx/processInstanceScriptContent.ts |  5 ++++-
 .../$store-nested-declaration/expectedv2.ts        | 14 ++++++++++++++
 .../samples/$store-nested-declaration/input.svelte |  7 +++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 packages/svelte2tsx/test/svelte2tsx/samples/$store-nested-declaration/expectedv2.ts
 create mode 100644 packages/svelte2tsx/test/svelte2tsx/samples/$store-nested-declaration/input.svelte

diff --git a/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts b/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
index a3eaad0e8..e226c2b1b 100644
--- a/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
@@ -203,7 +203,10 @@ export function processInstanceScriptContent(
         if (ts.isVariableDeclaration(node)) {
             events.checkIfIsStringLiteralDeclaration(node);
             events.checkIfDeclarationInstantiatedEventDispatcher(node);
-            implicitStoreValues.addVariableDeclaration(node);
+            // Only top level declarations can be stores
+            if (node.parent?.parent?.parent === tsAst) {
+                implicitStoreValues.addVariableDeclaration(node);
+            }
         }
 
         if (ts.isCallExpression(node)) {
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-nested-declaration/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/$store-nested-declaration/expectedv2.ts
new file mode 100644
index 000000000..25db68b0d
--- /dev/null
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-nested-declaration/expectedv2.ts
@@ -0,0 +1,14 @@
+///<reference types="svelte" />
+;function render() {
+
+    function x(tr) {
+        for (let notAStore of tr.effects) {}
+    }
+
+    $notAStore;
+;
+async () => {};
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
+
+export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) {
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-nested-declaration/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/$store-nested-declaration/input.svelte
new file mode 100644
index 000000000..4d5f2c0e5
--- /dev/null
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-nested-declaration/input.svelte
@@ -0,0 +1,7 @@
+<script>
+    function x(tr) {
+        for (let notAStore of tr.effects) {}
+    }
+
+    $notAStore;
+</script>