sveltejs · dummdidumm · Feb 25, 2025 · Feb 24, 2025 · Feb 24, 2025
diff --git a/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts b/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
@@ -1,6 +1,6 @@
 import MagicString from 'magic-string';
 import { Node } from 'estree-walker';
-import ts from 'typescript';
+import ts, { VariableDeclaration } from 'typescript';
 import { getBinaryAssignmentExpr, isNotPropertyNameOfImport, moveNode } from './utils/tsAst';
 import { ExportedNames, is$$PropsDeclaration } from './nodes/ExportedNames';
 import { ImplicitTopLevelNames } from './nodes/ImplicitTopLevelNames';
@@ -32,6 +32,7 @@ interface PendingStoreResolution {
     node: ts.Identifier;
     parent: ts.Node;
     scope: Scope;
+    isPropsId: boolean;
 }
 
 export function processInstanceScriptContent(
@@ -82,13 +83,19 @@ export function processInstanceScriptContent(
     //track if we are in a declaration scope
     let isDeclaration = false;
 
+    //track the variable declaration node
+    let variableDeclarationNode: VariableDeclaration | null = null;
+
     //track $store variables since we are only supposed to give top level scopes special treatment, and users can declare $blah variables at higher scopes
     //which prevents us just changing all instances of Identity that start with $
-    const pendingStoreResolutions: PendingStoreResolution[] = [];
+    let pendingStoreResolutions: PendingStoreResolution[] = [];
 
     let scope = new Scope();
     const rootScope = scope;
 
+    //track is the variable declared as `props` comes from `$props()`
+    let isPropsDeclarationRune = false;
+
     const pushScope = () => (scope = new Scope(scope));
     const popScope = () => (scope = scope.parent);
 
@@ -124,6 +131,17 @@ export function processInstanceScriptContent(
             return;
         }
 
+        //if we are in a variable declaration and the identifier is `props` we check the initializer
+        if (
+            ident.text === 'props' &&
+            variableDeclarationNode &&
+            variableDeclarationNode.initializer &&
+            ts.isCallExpression(variableDeclarationNode.initializer) &&
+            variableDeclarationNode.initializer.getText() === '$props()'
+        ) {
+            isPropsDeclarationRune = true;
+        }
+
         if (isDeclaration || ts.isParameter(parent)) {
             if (
                 isNotPropertyNameOfImport(ident) &&
@@ -148,14 +166,25 @@ export function processInstanceScriptContent(
                     !ts.isTypeAliasDeclaration(parent) &&
                     !ts.isInterfaceDeclaration(parent)
                 ) {
+                    let isPropsId = false;
+                    if (
+                        text === '$props' &&
+                        ts.isPropertyAccessExpression(parent) &&
+                        parent.parent &&
+                        ts.isCallExpression(parent.parent) &&
+                        parent.parent.arguments.length === 0
+                    ) {
+                        const text = parent.getText();
+                        isPropsId = text === '$props.id';
+                    }
                     // Handle the const { ...props } = $props() case
                     const is_rune =
                         (text === '$props' || text === '$derived' || text === '$state') &&
                         ts.isCallExpression(parent) &&
                         ts.isVariableDeclaration(parent.parent) &&
                         parent.parent.name.getText().includes(text.slice(1));
                     if (!is_rune) {
-                        pendingStoreResolutions.push({ node: ident, parent, scope });
+                        pendingStoreResolutions.push({ node: ident, parent, scope, isPropsId });
                     }
                 }
             }
@@ -234,7 +263,11 @@ export function processInstanceScriptContent(
 
         if (ts.isVariableDeclaration(parent) && parent.name == node) {
             isDeclaration = true;
-            onLeaveCallbacks.push(() => (isDeclaration = false));
+            variableDeclarationNode = parent;
+            onLeaveCallbacks.push(() => {
+                isDeclaration = false;
+                variableDeclarationNode = null;
+            });
         }
 
         if (ts.isBindingElement(parent) && parent.name == node) {
@@ -295,6 +328,10 @@ export function processInstanceScriptContent(
     tsAst.forEachChild((n) => walk(n, tsAst));
 
     //resolve stores
+    if (isPropsDeclarationRune) {
+        //we filter out every pendingStore resolution that `isPropsId` if the variable names `props` comes from `$props()`
+        pendingStoreResolutions = pendingStoreResolutions.filter(({ isPropsId }) => !isPropsId);
+    }
     pendingStoreResolutions.map(resolveStore);
 
     // declare implicit reactive variables we found in the script

diff --git a/...te2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-destructured.v5/expectedv2.ts b/...te2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-destructured.v5/expectedv2.ts
@@ -0,0 +1,13 @@
+///<reference types="svelte" />
+;function $$render() {
+
+	let/** @typedef {{ props: any }} $$ComponentProps *//** @type {$$ComponentProps} */ { props } = $props();
+	let id = $props.id();
+;
+async () => {
+
+id; props;};
+return { props: /** @type {$$ComponentProps} */({}), exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }}
+const Input__SvelteComponent_ = __sveltets_2_fn_component($$render());
+type Input__SvelteComponent_ = ReturnType<typeof Input__SvelteComponent_>;
+export default Input__SvelteComponent_;
diff --git a/...lte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-destructured.v5/input.svelte b/...lte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-destructured.v5/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	let { props } = $props();
+	let id = $props.id();
+</script>
+
+{id} {props}
diff --git a/...tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/expectedv2.ts b/...tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/expectedv2.ts
@@ -0,0 +1,13 @@
+///<reference types="svelte" />
+;function $$render() {
+
+	let props = {}/*Ωignore_startΩ*/;let $props = __sveltets_2_store_get(props);/*Ωignore_endΩ*/;
+	let id = $props.id();
+;
+async () => {
+
+id; props;};
+return { props: /** @type {Record<string, never>} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }}
+const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render())));
+/*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType<typeof Input__SvelteComponent_>;
+/*Ωignore_endΩ*/export default Input__SvelteComponent_;
diff --git a/...2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/input.svelte b/...2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	let props = {};
+	let id = $props.id();
+</script>
+
+{id} {props}
diff --git a/...s/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/expectedv2.ts b/...s/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/expectedv2.ts
@@ -0,0 +1,13 @@
+///<reference types="svelte" />
+;function $$render() {
+
+	let/** @typedef {Record<string, any>} $$ComponentProps *//** @type {$$ComponentProps} */ {...props} = $props();
+	let id = $props.id();
+;
+async () => {
+
+id; props;};
+return { props: /** @type {$$ComponentProps} */({}), exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }}
+const Input__SvelteComponent_ = __sveltets_2_fn_component($$render());
+type Input__SvelteComponent_ = ReturnType<typeof Input__SvelteComponent_>;
+export default Input__SvelteComponent_;
diff --git a/...es/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/input.svelte b/...es/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	let {...props} = $props();
+	let id = $props.id();
+</script>
+
+{id} {props}
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/expectedv2.ts
@@ -0,0 +1,13 @@
+///<reference types="svelte" />
+;function $$render() {
+
+	let props = $props();
+	let id = $props.id();
+;
+async () => {
+
+id; props;};
+return { props: /** @type {$$ComponentProps} */({}), exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }}
+const Input__SvelteComponent_ = __sveltets_2_fn_component($$render());
+type Input__SvelteComponent_ = ReturnType<typeof Input__SvelteComponent_>;
+export default Input__SvelteComponent_;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	let props = $props();
+	let id = $props.id();
+</script>
+
+{id} {props}