simplify

Author: dummdidumm

packages/svelte/src/compiler/phases/3-transform/client/utils.js

@@ -456,39 +456,30 @@ function get_hoistable_params(node, context) {
 
 	/** @type {import('estree').Identifier[]} */
 	const params = [];
-	let added_props = false;
 
 	/**
-	 * we only want to push if it's not already present to avoid name clashing
+	 * We only want to push if it's not already present to avoid name clashing
 	 * @param {import('estree').Identifier} id
 	 */
-	function safe_push(id) {
+	function push_unique(id) {
 		if (!params.find((param) => param.name === id.name)) {
 			params.push(id);
 		}
 	}
 
 	for (const [reference] of scope.references) {
-		const binding = scope.get(reference);
+		let binding = scope.get(reference);
 
 		if (binding !== null && !scope.declarations.has(reference) && binding.initial !== node) {
 			if (binding.kind === 'store_sub') {
-				const is_from_prop =
-					binding.declaration_kind === 'synthetic' &&
-					[...binding.scope.declarations.values()].find(
-						(declaration) => declaration.kind === 'prop' || declaration.kind === 'bindable_prop'
-					);
-				if (is_from_prop && !added_props) {
-					// if the store come from props we want $$props to be pushed rather than the name
-					// of the store since that variable doesn't exist
-					added_props = true;
-					safe_push(b.id('$$props'));
-				} else {
-					// We need both the subscription for getting the value and the store for updating
-					safe_push(b.id(binding.node.name.slice(1)));
-				}
-				safe_push(b.id(binding.node.name));
-			} else if (
+				// We need both the subscription for getting the value and the store for updating
+				push_unique(b.id(binding.node.name));
+				binding = /** @type {import('#compiler').Binding} */ (
+					scope.get(binding.node.name.slice(1))
+				);
+			}
+
+			if (
 				// If it's a destructured derived binding, then we can extract the derived signal reference and use that.
 				binding.expression !== null &&
 				typeof binding.expression !== 'function' &&
@@ -498,22 +489,18 @@ function get_hoistable_params(node, context) {
 				binding.expression.object.callee.name === '$.get' &&
 				binding.expression.object.arguments[0].type === 'Identifier'
 			) {
-				safe_push(b.id(binding.expression.object.arguments[0].name));
+				push_unique(b.id(binding.expression.object.arguments[0].name));
 			} else if (
 				// If we are referencing a simple $$props value, then we need to reference the object property instead
 				(binding.kind === 'prop' || binding.kind === 'bindable_prop') &&
 				!binding.reassigned &&
 				binding.initial === null &&
 				!context.state.analysis.accessors
 			) {
-				// Handle $$props.something use-cases
-				if (!added_props) {
-					added_props = true;
-					safe_push(b.id('$$props'));
-				}
+				push_unique(b.id('$$props'));
 			} else {
 				// create a copy to remove start/end tags which would mess up source maps
-				safe_push(b.id(binding.node.name));
+				push_unique(b.id(binding.node.name));
 			}
 		}
 	}

packages/svelte/tests/runtime-runes/samples/store-from-props-hoisting/_config.js

@@ -4,6 +4,15 @@ export default test({
 	compileOptions: {
 		dev: true
 	},
-	recover: true,
-	mode: ['client']
+	async test({ assert, target }) {
+		const button = target.querySelector('button');
+		await button?.click();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>1</button>
+		`
+		);
+	}
 });

packages/svelte/tests/runtime-runes/samples/store-from-props-hoisting/child.svelte

@@ -0,0 +1,8 @@
+<script>
+	const { attrs } = $props();
+	function increment() {
+		$attrs.count++;
+	}
+</script>
+
+<button onclick={increment}>{$attrs.count}</button>

packages/svelte/tests/runtime-runes/samples/store-from-props-hoisting/main.svelte

@@ -1,10 +1,7 @@
 <script>
-	const { attrs } = $props();
-	function increment() {
-		$attrs.count++;
-	}
+	import { writable } from "svelte/store";
+	import Child from "./child.svelte";
+	const attrs = writable({ count: 0 });
 </script>
 
-<button onclick={increment}>
-	+
-</button>
+<Child {attrs} />