Merge branch 'main' into bump-dts-buddy

Author: dummdidumm

.changeset/polite-ways-serve.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: throw compilation error for malformed snippets

.changeset/pre.json

@@ -543,6 +543,7 @@
     "swift-feet-juggle",
     "swift-knives-tie",
     "swift-poets-carry",
+    "swift-rats-sing",
     "swift-ravens-hunt",
     "swift-seahorses-deliver",
     "tall-books-grin",
@@ -559,6 +560,7 @@
     "tasty-steaks-smile",
     "ten-eels-move",
     "ten-foxes-repeat",
+    "ten-geese-share",
     "ten-jokes-divide",
     "ten-peaches-sleep",
     "ten-singers-cough",

package.json

@@ -34,8 +34,6 @@
     "@svitejs/changesets-changelog-github-compact": "^1.1.0",
     "@types/node": "^20.11.5",
     "@vitest/coverage-v8": "^1.2.1",
-    "concurrently": "^8.2.2",
-    "cross-env": "^7.0.3",
     "eslint": "^9.0.0",
     "eslint-plugin-lube": "^0.4.3",
     "jsdom": "22.0.0",

packages/svelte/CHANGELOG.md

@@ -1,5 +1,13 @@
 # svelte
 
+## 5.0.0-next.164
+
+### Patch Changes
+
+- fix: prevent `a11y_label_has_associated_control` false positive for component or render tag in `<label>` ([#12119](https://github.com/sveltejs/svelte/pull/12119))
+
+- fix: allow multiple optional parameters with defaults in snippets ([#12070](https://github.com/sveltejs/svelte/pull/12070))
+
 ## 5.0.0-next.163
 
 ### Patch Changes

packages/svelte/package.json

@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.0.0-next.163",
+  "version": "5.0.0-next.164",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {

packages/svelte/src/compiler/phases/1-parse/read/context.js

@@ -14,17 +14,16 @@ import { locator } from '../../../state.js';
 
 /**
  * @param {import('../index.js').Parser} parser
- * @param {boolean} [optional_allowed]
  * @returns {import('estree').Pattern}
  */
-export default function read_pattern(parser, optional_allowed = false) {
+export default function read_pattern(parser) {
 	const start = parser.index;
 	let i = parser.index;
 
 	const code = full_char_code_at(parser.template, i);
 	if (isIdentifierStart(code, true)) {
 		const name = /** @type {string} */ (parser.read_identifier());
-		const annotation = read_type_annotation(parser, optional_allowed);
+		const annotation = read_type_annotation(parser);
 
 		return {
 			type: 'Identifier',
@@ -84,7 +83,7 @@ export default function read_pattern(parser, optional_allowed = false) {
 			parse_expression_at(`${space_with_newline}(${pattern_string} = 1)`, parser.ts, start - 1)
 		).left;
 
-		expression.typeAnnotation = read_type_annotation(parser, optional_allowed);
+		expression.typeAnnotation = read_type_annotation(parser);
 		if (expression.typeAnnotation) {
 			expression.end = expression.typeAnnotation.end;
 		}
@@ -97,19 +96,12 @@ export default function read_pattern(parser, optional_allowed = false) {
 
 /**
  * @param {import('../index.js').Parser} parser
- * @param {boolean} [optional_allowed]
  * @returns {any}
  */
-function read_type_annotation(parser, optional_allowed = false) {
+function read_type_annotation(parser) {
 	const start = parser.index;
 	parser.allow_whitespace();
 
-	if (optional_allowed && parser.eat('?')) {
-		// Acorn-TS puts the optional info as a property on the surrounding node.
-		// We spare the work here because it doesn't matter for us anywhere else.
-		parser.allow_whitespace();
-	}
-
 	if (!parser.eat(':')) {
 		parser.index = start;
 		return undefined;

packages/svelte/src/compiler/phases/1-parse/state/tag.js

@@ -269,28 +269,30 @@ function open(parser) {
 			e.expected_identifier(parser.index);
 		}
 
-		let slice_end = parser.index;
+		parser.allow_whitespace();
 
-		parser.eat('(', true);
+		const params_start = parser.index;
 
+		parser.eat('(', true);
 		let parentheses = 1;
-		let params = '';
 
-		while (!parser.match(')') || parentheses !== 1) {
+		while (parser.index < parser.template.length && (!parser.match(')') || parentheses !== 1)) {
 			if (parser.match('(')) parentheses++;
 			if (parser.match(')')) parentheses--;
-			params += parser.read(/^./);
+			parser.index += 1;
 		}
 
+		parser.eat(')', true);
+
+		const prelude = parser.template.slice(0, params_start).replace(/\S/g, ' ');
+		const params = parser.template.slice(params_start, parser.index);
+
 		let function_expression = /** @type {import('estree').ArrowFunctionExpression} */ (
-			parse_expression_at(
-				parser.template.slice(0, slice_end).replace(/\S/g, ' ') + `(${params}) => {}`,
-				parser.ts,
-				0
-			)
+			parse_expression_at(prelude + `${params} => {}`, parser.ts, params_start)
 		);
 
-		parser.index += 2;
+		parser.allow_whitespace();
+		parser.eat('}', true);
 
 		/** @type {ReturnType<typeof parser.append<import('#compiler').SnippetBlock>>} */
 		const block = parser.append({

packages/svelte/src/version.js

@@ -6,5 +6,5 @@
  * https://svelte.dev/docs/svelte-compiler#svelte-version
  * @type {string}
  */
-export const VERSION = '5.0.0-next.163';
+export const VERSION = '5.0.0-next.164';
 export const PUBLIC_VERSION = '5';

packages/svelte/tests/compiler-errors/samples/malformed-snippet-2/_config.js

@@ -0,0 +1,9 @@
+import { test } from '../../test';
+
+export default test({
+	error: {
+		code: 'expected_token',
+		message: 'Expected token )',
+		position: [31, 31]
+	}
+});

packages/svelte/tests/compiler-errors/samples/malformed-snippet-2/main.svelte

@@ -0,0 +1 @@
+{#snippet children(hi{/snippet}

packages/svelte/tests/compiler-errors/samples/malformed-snippet/_config.js

@@ -0,0 +1,9 @@
+import { test } from '../../test';
+
+export default test({
+	error: {
+		code: 'expected_token',
+		message: 'Expected token }',
+		position: [20, 20]
+	}
+});

packages/svelte/tests/compiler-errors/samples/malformed-snippet/main.svelte

@@ -0,0 +1 @@
+{#snippet children()hi{/snippet}

packages/svelte/tests/validator/samples/snippet-whitespace-ok/errors.json

@@ -0,0 +1 @@
+[]

packages/svelte/tests/validator/samples/snippet-whitespace-ok/input.svelte

@@ -0,0 +1,4 @@
+<!-- prettier-ignore -->
+{#snippet ok () }
+	asd
+{/snippet}

playgrounds/demo/package.json

@@ -13,8 +13,8 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^3.1.0",
-    "express": "^4.19.2",
     "nodemon": "^3.0.3",
+    "polka": "^1.0.0-next.25",
     "svelte": "workspace:*",
     "vite": "^5.0.13",
     "vite-plugin-inspect": "^0.8.4"

playgrounds/demo/server.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import express from 'express';
+import polka from 'polka';
 import { createServer as createViteServer } from 'vite';
 
 const PORT = process.env.PORT || '5173';
@@ -11,7 +11,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 process.env.NODE_ENV = 'development';
 
 async function createServer() {
-	const app = express();
+	const app = polka();
 
 	const vite = await createViteServer({
 		server: { middlewareMode: true },