fix: correctly differentiate static fields before emitting duplicate_class_field (#16526)

Ocean-OS · web-flow · commit f5950f866c51 · 2025-07-31T12:11:52.000+03:00
* fix: correctly differentiate static fields before emitting `duplicate_class_field`

* remove unnecessary `#` concatenation

* add test
diff --git a/.changeset/nine-cups-film.md b/.changeset/nine-cups-film.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly differentiate static fields before emitting `duplicate_class_field`
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/ClassBody.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/ClassBody.js
@@ -57,7 +57,7 @@ export function ClassBody(node, context) {
 				e.state_field_duplicate(node, name);
 			}
 
-			const _key = (key.type === 'PrivateIdentifier' ? '#' : '') + name;
+			const _key = (node.type === 'AssignmentExpression' || !node.static ? '' : '@') + name;
 			const field = fields.get(_key);
 
 			// if there's already a method or assigned field, error
@@ -78,7 +78,7 @@ export function ClassBody(node, context) {
 	for (const child of node.body) {
 		if (child.type === 'PropertyDefinition' && !child.computed && !child.static) {
 			handle(child, child.key, child.value);
-			const key = (child.key.type === 'PrivateIdentifier' ? '#' : '') + get_name(child.key);
+			const key = /** @type {string} */ (get_name(child.key));
 			const field = fields.get(key);
 			if (!field) {
 				fields.set(key, [child.value ? 'assigned_prop' : 'prop']);
@@ -91,7 +91,7 @@ export function ClassBody(node, context) {
 			if (child.kind === 'constructor') {
 				constructor = child;
 			} else if (!child.computed) {
-				const key = (child.key.type === 'PrivateIdentifier' ? '#' : '') + get_name(child.key);
+				const key = (child.static ? '@' : '') + get_name(child.key);
 				const field = fields.get(key);
 				if (!field) {
 					fields.set(key, [child.kind]);
diff --git a/packages/svelte/tests/validator/samples/class-state-constructor-9/input.svelte.js b/packages/svelte/tests/validator/samples/class-state-constructor-9/input.svelte.js
@@ -1,6 +1,6 @@
 export class Counter {
 	count = -1;
-
+	static count() {}
 	constructor() {
 		this.count = $state(0);
 	}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'svelte': patch
 +---
++
 +fix: correctly differentiate static fields before emitting `duplicate_class_field`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`export class Counter {`
`2`	`2`	`count = -1;`
`3`		`-`
	`3`	`+ static count() {}`
`4`	`4`	`constructor() {`
`5`	`5`	`this.count = $state(0);`
`6`	`6`	`}`