feat: It is now at least backwards compatible. though the new stuff may still be wrong

Author: elliott-with-the-longest-name-on-github

packages/svelte/src/compiler/phases/3-transform/client/types.d.ts

@@ -3,7 +3,6 @@ import type {
 	Statement,
 	LabeledStatement,
 	Identifier,
-	PrivateIdentifier,
 	Expression,
 	AssignmentExpression,
 	UpdateExpression,
@@ -13,11 +12,10 @@ import type { AST, Namespace, ValidatedCompileOptions } from '#compiler';
 import type { TransformState } from '../types.js';
 import type { ComponentAnalysis } from '../../types.js';
 import type { SourceLocation } from '#shared';
-import type { StateCreationRuneName } from '../../../../utils.js';
-import type { ClassAnalysis } from './visitors/shared/class-analysis.js';
+import type { ClassAnalysis } from '../shared/types.js';
 
 export interface ClientTransformState extends TransformState {
-	readonly class_analysis: ClassAnalysis | null;
+	readonly class_analysis: ClassAnalysis<Context> | null;
 
 	/**
 	 * `true` if the current lexical scope belongs to a class constructor. this allows
@@ -95,11 +93,6 @@ export interface ComponentClientTransformState extends ClientTransformState {
 	readonly module_level_snippets: VariableDeclaration[];
 }
 
-export interface StateField {
-	kind: StateCreationRuneName;
-	id: PrivateIdentifier;
-}
-
 export type Context = import('zimmerframe').Context<AST.SvelteNode, ClientTransformState>;
 export type Visitors = import('zimmerframe').Visitors<AST.SvelteNode, any>;
 

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

@@ -57,15 +57,15 @@ function build_assignment(operator, left, right, context) {
 		left.type === 'MemberExpression' &&
 		left.property.type === 'PrivateIdentifier'
 	) {
-		const private_state = context.state.class_analysis?.private_state.get(left.property.name);
+		const private_state = context.state.class_analysis?.get_field(left.property.name, true);
 
 		if (private_state !== undefined) {
 			let value = /** @type {Expression} */ (
 				context.visit(build_assignment_value(operator, left, right))
 			);
 
 			const needs_proxy =
-				private_state.kind === '$state' &&
+				private_state?.kind === '$state' &&
 				is_non_coercive_operator(operator) &&
 				should_proxy(value, context.state.scope);
 

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

@@ -1,7 +1,6 @@
-/** @import { ClassBody, Identifier, Literal, MethodDefinition, PrivateIdentifier, PropertyDefinition } from 'estree' */
-/** @import { Context, StateField } from '../types' */
-import { regex_invalid_identifier_chars } from '../../../patterns.js';
-import { ClassAnalysis } from './shared/class-analysis.js';
+/** @import { ClassBody } from 'estree' */
+/** @import { Context } from '../types' */
+import { create_client_class_analysis } from './shared/client-class-analysis.js';
 
 /**
  * @param {ClassBody} node
@@ -13,46 +12,8 @@ export function ClassBody(node, context) {
 		return;
 	}
 
-	const class_analysis = new ClassAnalysis();
-
-	for (const definition of node.body) {
-		class_analysis.register_body_definition(definition, context.state.scope);
-	}
-
-	class_analysis.finalize_property_definitions();
-
-	/** @type {Array<MethodDefinition | PropertyDefinition>} */
-	const body = [];
-
-	const child_state = {
-		...context.state,
-		class_analysis
-	};
-
-	// we need to visit the constructor first so that it can add to the field maps.
-	const constructor_node = node.body.find(
-		(child) => child.type === 'MethodDefinition' && child.kind === 'constructor'
-	);
-	const constructor = constructor_node && context.visit(constructor_node, child_state);
-
-	// Replace parts of the class body
-	for (const definition of node.body) {
-		if (definition === constructor_node) {
-			body.push(/** @type {MethodDefinition} */ (constructor));
-			continue;
-		}
-
-		const state_field = class_analysis.build_state_field_from_body_definition(definition, context);
-
-		if (state_field) {
-			body.push(...state_field);
-			continue;
-		}
-
-		body.push(/** @type {MethodDefinition} **/ (context.visit(definition, child_state)));
-	}
-
-	body.push(...class_analysis.constructor_state_fields);
+	const class_analysis = create_client_class_analysis(node.body);
+	const body = class_analysis.generate_body(context);
 
 	return { ...node, body };
 }

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

@@ -9,7 +9,7 @@ import * as b from '#compiler/builders';
 export function MemberExpression(node, context) {
 	// rewrite `this.#foo` as `this.#foo.v` inside a constructor
 	if (node.property.type === 'PrivateIdentifier') {
-		const field = context.state.class_analysis?.private_state.get(node.property.name);
+		const field = context.state.class_analysis?.get_field(node.property.name, true);
 		if (field) {
 			return context.state.in_constructor &&
 				(field.kind === '$state.raw' || field.kind === '$state')

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

@@ -15,7 +15,7 @@ export function UpdateExpression(node, context) {
 		argument.type === 'MemberExpression' &&
 		argument.object.type === 'ThisExpression' &&
 		argument.property.type === 'PrivateIdentifier' &&
-		context.state.class_analysis?.private_state.has(argument.property.name)
+		context.state.class_analysis?.get_field(argument.property.name, true)
 	) {
 		let fn = '$.update';
 		if (node.prefix) fn += '_pre';