merge main

Author: Rich-Harris

.changeset/afraid-kids-hide.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: throw error when auto-subscribed store variable shadow by local variable

.changeset/calm-pandas-vanish.md

@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: make ownership validation work correctly with HMR

.changeset/cool-comics-marry.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix missing classes after dynamic expressions in class attribute

.changeset/few-teachers-know.md

@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: revert ownership widening change

.changeset/fresh-dots-destroy.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: add validation around disallowed sequence expressions to element attributes

.changeset/pre.json

@@ -53,6 +53,7 @@
     "cold-birds-own",
     "cold-masks-learn",
     "cool-ants-leave",
+    "cool-comics-marry",
     "cool-peas-lick",
     "cool-rabbits-tickle",
     "cool-roses-trade",
@@ -89,6 +90,7 @@
     "empty-bulldogs-exercise",
     "empty-crabs-think",
     "empty-tools-share",
+    "fair-bags-smoke",
     "fair-crabs-check",
     "fair-pianos-talk",
     "fair-spies-repeat",
@@ -111,6 +113,7 @@
     "forty-suns-smile",
     "four-flies-hammer",
     "four-mice-hammer",
+    "fresh-dots-destroy",
     "fresh-impalas-bow",
     "fresh-weeks-trade",
     "friendly-candles-relate",
@@ -316,6 +319,7 @@
     "small-sheep-type",
     "small-spiders-fail",
     "smart-cherries-leave",
+    "smart-grapes-mate",
     "smart-parents-swim",
     "smart-turkeys-tell",
     "smart-zebras-pay",

.changeset/shy-fishes-drive.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: fix string name of reactive map and set iterator

.changeset/smart-grapes-mate.md

@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: generate correct types for reactive Map/Set/Date

.changeset/wicked-wasps-allow.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+feat: update error message for snippet binding and assignments

packages/svelte/CHANGELOG.md

@@ -1,5 +1,21 @@
 # svelte
 
+## 5.0.0-next.102
+
+### Patch Changes
+
+- fix: generate correct types for reactive Map/Set/Date ([#11153](https://github.com/sveltejs/svelte/pull/11153))
+
+## 5.0.0-next.101
+
+### Patch Changes
+
+- fix missing classes after dynamic expressions in class attribute ([#11134](https://github.com/sveltejs/svelte/pull/11134))
+
+- feat: simplify HMR implementation ([#11132](https://github.com/sveltejs/svelte/pull/11132))
+
+- fix: add validation around disallowed sequence expressions to element attributes ([#11149](https://github.com/sveltejs/svelte/pull/11149))
+
 ## 5.0.0-next.100
 
 ### Patch Changes

packages/svelte/package.json

@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.0.0-next.100",
+  "version": "5.0.0-next.102",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
@@ -104,7 +104,7 @@
     "check": "tsc && cd ./tests/types && tsc",
     "check:watch": "tsc --watch",
     "generate:version": "node ./scripts/generate-version.js",
-    "generate:types": "node ./scripts/generate-types.js",
+    "generate:types": "node ./scripts/generate-types.js && tsc -p tsconfig.generated.json",
     "prepublishOnly": "pnpm build",
     "knip": "knip"
   },
@@ -116,7 +116,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-virtual": "^3.0.2",
     "@types/aria-query": "^5.0.4",
-    "dts-buddy": "^0.4.6",
+    "dts-buddy": "^0.4.7",
     "esbuild": "^0.19.11",
     "knip": "^4.2.1",
     "rollup": "^4.9.5",

packages/svelte/src/compiler/errors.js

@@ -214,6 +214,7 @@ const runes = {
 	'duplicate-props-rune': () => `Cannot use $props() more than once`,
 	'invalid-each-assignment': () =>
 		`Cannot reassign or bind to each block argument in runes mode. Use the array and index variables instead (e.g. 'array[i] = value' instead of 'entry = value')`,
+	'invalid-snippet-assignment': () => `Cannot reassign or bind to snippet parameter`,
 	'invalid-derived-call': () => `$derived.call(...) has been replaced with $derived.by(...)`,
 	'conflicting-property-name': () =>
 		`Cannot have a property and a component export with the same name`

packages/svelte/src/compiler/phases/2-analyze/index.js

@@ -302,23 +302,26 @@ export function analyze_component(root, source, options) {
 					declaration.initial.source.value === 'svelte/store'
 				))
 		) {
-			let is_nested_store_subscription = false;
-			for (const reference of references) {
+			let is_nested_store_subscription_node = undefined;
+			search: for (const reference of references) {
 				for (let i = reference.path.length - 1; i >= 0; i--) {
 					const scope =
 						scopes.get(reference.path[i]) ||
 						module.scopes.get(reference.path[i]) ||
 						instance.scopes.get(reference.path[i]);
 					if (scope) {
 						const owner = scope?.owner(store_name);
-						is_nested_store_subscription =
-							!!owner && owner !== module.scope && owner !== instance.scope;
+						if (!!owner && owner !== module.scope && owner !== instance.scope) {
+							is_nested_store_subscription_node = reference.node;
+							break search;
+						}
 						break;
 					}
 				}
 			}
-			if (is_nested_store_subscription) {
-				error(references[0].node, 'illegal-store-subscription');
+
+			if (is_nested_store_subscription_node) {
+				error(is_nested_store_subscription_node, 'illegal-store-subscription');
 			}
 
 			if (options.runes !== false) {

packages/svelte/src/compiler/phases/2-analyze/validation.js

@@ -98,7 +98,12 @@ function validate_element(node, context) {
 			if (context.state.analysis.runes && is_expression) {
 				const expression = attribute.value[0].expression;
 				if (expression.type === 'SequenceExpression') {
-					error(expression, 'invalid-sequence-expression');
+					let i = /** @type {number} */ (expression.start);
+					while (--i > 0) {
+						const char = context.state.analysis.source[i];
+						if (char === '(') break; // parenthesized sequence expressions are ok
+						if (char === '{') error(expression, 'invalid-sequence-expression');
+					}
 				}
 			}
 
@@ -348,7 +353,9 @@ const validation = {
 				error(node, 'invalid-each-assignment');
 			}
 
-			// TODO handle mutations of non-state/props in runes mode
+			if (binding.kind === 'snippet') {
+				error(node, 'invalid-snippet-assignment');
+			}
 		}
 
 		if (node.name === 'group') {
@@ -1008,14 +1015,21 @@ function validate_no_const_assignment(node, argument, scope, is_binding) {
 function validate_assignment(node, argument, state) {
 	validate_no_const_assignment(node, argument, state.scope, false);
 
-	if (state.analysis.runes && argument.type === 'Identifier') {
+	if (argument.type === 'Identifier') {
 		const binding = state.scope.get(argument.name);
-		if (binding?.kind === 'derived') {
-			error(node, 'invalid-derived-assignment');
+
+		if (state.analysis.runes) {
+			if (binding?.kind === 'derived') {
+				error(node, 'invalid-derived-assignment');
+			}
+
+			if (binding?.kind === 'each') {
+				error(node, 'invalid-each-assignment');
+			}
 		}
 
-		if (binding?.kind === 'each') {
-			error(node, 'invalid-each-assignment');
+		if (binding?.kind === 'snippet') {
+			error(node, 'invalid-snippet-assignment');
 		}
 	}
 

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

@@ -464,8 +464,8 @@ export function client_component(source, analysis, options) {
 			);
 		}
 
-		body.unshift(b.stmt(b.call(b.id('$.mark_module_start'), b.id(analysis.name))));
-		body.push(b.stmt(b.call(b.id('$.mark_module_end'))));
+		body.unshift(b.stmt(b.call(b.id('$.mark_module_start'))));
+		body.push(b.stmt(b.call(b.id('$.mark_module_end'), b.id(analysis.name))));
 	}
 
 	if (options.discloseVersion) {

packages/svelte/src/compiler/phases/3-transform/server/transform-server.js

@@ -853,9 +853,7 @@ function serialize_attribute_value(
 	/** @type {import('estree').Expression[]} */
 	const expressions = [];
 
-	if (attribute_value[0].type !== 'Text') {
-		quasis.push(b.quasi('', false));
-	}
+	quasis.push(b.quasi('', false));
 
 	let i = 0;
 	for (const node of attribute_value) {
@@ -866,17 +864,16 @@ function serialize_attribute_value(
 				// don't trim, space could be important to separate from expression tag
 				data = data.replace(regex_whitespaces_strict, ' ');
 			}
-			quasis.push(b.quasi(data, i === attribute_value.length));
+			const last = /** @type {import('estree').TemplateElement} */ (quasis.at(-1));
+			last.value.raw += data;
 		} else {
 			expressions.push(
 				b.call(
 					'$.stringify',
 					/** @type {import('estree').Expression} */ (context.visit(node.expression))
 				)
 			);
-			if (i === attribute_value.length || attribute_value[i]?.type !== 'Text') {
-				quasis.push(b.quasi('', true));
-			}
+			quasis.push(b.quasi('', i + 1 === attribute_value.length));
 		}
 	}
 

packages/svelte/src/compiler/phases/scope.js

@@ -649,7 +649,7 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 
 			for (const param of node.parameters) {
 				for (const id of extract_identifiers(param)) {
-					child_scope.declare(id, 'each', 'let');
+					child_scope.declare(id, 'snippet', 'let');
 				}
 			}
 

packages/svelte/src/compiler/types/index.d.ts

@@ -253,7 +253,8 @@ export interface Binding {
 	 * - `rest_prop`: A rest prop
 	 * - `state`: A state variable
 	 * - `derived`: A derived variable
-	 * - `each`: An each block context variable
+	 * - `each`: An each block parameter
+	 * - `snippet`: A snippet parameter
 	 * - `store_sub`: A $store value
 	 * - `legacy_reactive`: A `$:` declaration
 	 * - `legacy_reactive_import`: An imported binding that is mutated inside the component
@@ -267,6 +268,7 @@ export interface Binding {
 		| 'frozen_state'
 		| 'derived'
 		| 'each'
+		| 'snippet'
 		| 'store_sub'
 		| 'legacy_reactive'
 		| 'legacy_reactive_import';