get rid of the class

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

@@ -266,7 +266,7 @@ export function analyze_module(ast, options) {
 			scopes,
 			analysis: /** @type {ComponentAnalysis} */ (analysis),
 			classes: new Map(),
-			class: null,
+			state_fields: null,
 			// TODO the following are not needed for modules, but we have to pass them in order to avoid type error,
 			// and reducing the type would result in a lot of tedious type casts elsewhere - find a good solution one day
 			ast_type: /** @type {any} */ (null),
@@ -626,7 +626,7 @@ export function analyze_component(root, source, options) {
 				component_slots: new Set(),
 				expression: null,
 				classes: new Map(),
-				class: null,
+				state_fields: null,
 				function_depth: scope.function_depth,
 				reactive_statement: null
 			};
@@ -694,7 +694,7 @@ export function analyze_component(root, source, options) {
 				component_slots: new Set(),
 				expression: null,
 				classes: new Map(),
-				class: null,
+				state_fields: null,
 				function_depth: scope.function_depth
 			};
 

packages/svelte/src/compiler/phases/2-analyze/types.d.ts

@@ -1,7 +1,6 @@
 import type { Scope } from '../scope.js';
 import type { ComponentAnalysis, ReactiveStatement } from '../types.js';
-import type { AST, ExpressionMetadata, ValidatedCompileOptions } from '#compiler';
+import type { AST, ExpressionMetadata, StateFields, ValidatedCompileOptions } from '#compiler';
-import type { ClassAnalysis } from './visitors/shared/class-analysis.js';
 import type { ClassBody } from 'estree';
 
 export interface AnalysisState {
@@ -22,8 +21,8 @@ export interface AnalysisState {
 	expression: ExpressionMetadata | null;
 
 	/** Used to analyze class state. */
-	classes: Map<ClassBody, ClassAnalysis>;
+	classes: Map<ClassBody, StateFields>;
-	class: ClassAnalysis | null;
+	state_fields: StateFields | null;
 
 	function_depth: number;
 

packages/svelte/src/compiler/phases/2-analyze/visitors/ClassBody.js

@@ -1,6 +1,6 @@
 /** @import { AssignmentExpression, ClassBody, PropertyDefinition, Expression, PrivateIdentifier, MethodDefinition } from 'estree' */
+/** @import { StateFields } from '#compiler' */
 /** @import { Context } from '../types' */
-/** @import { StateCreationRuneName } from '../../../../utils.js' */
 import { get_rune } from '../../scope.js';
 import * as e from '../../../errors.js';
 import { is_state_creation_rune } from '../../../../utils.js';
@@ -15,7 +15,8 @@ export function ClassBody(node, context) {
 		return;
 	}
 
-	const analyzed = new ClassAnalysis();
+	/** @type {StateFields} */
+	const state_fields = {};
 
 	/** @type {string[]} */
 	const seen = [];
@@ -39,7 +40,7 @@ export function ClassBody(node, context) {
 				e.constructor_state_reassignment(node); // TODO the same thing applies to duplicate fields, so the code/message needs to change
 			}
 
-			analyzed.fields[name] = {
+			state_fields[name] = {
 				node,
 				type: rune
 			};
@@ -81,7 +82,7 @@ export function ClassBody(node, context) {
 
 	context.next({
 		...context.state,
-		class: analyzed
+		state_fields
 	});
 }
 
@@ -93,11 +94,3 @@ function get_name(node) {
 
 	return null;
 }
-
-/** @typedef { StateCreationRuneName | 'regular'} PropertyAssignmentType */
-/** @typedef {{ type: PropertyAssignmentType; node: AssignmentExpression | PropertyDefinition; }} PropertyAssignmentDetails */
-
-class ClassAnalysis {
-	/** @type {Record<string, PropertyAssignmentDetails>} */
-	fields = {};
-}

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

@@ -1,6 +1,7 @@
 import type { AST, Binding } from '#compiler';
-import type { Identifier, LabeledStatement, Node, Program } from 'estree';
+import type { AssignmentExpression, Identifier, LabeledStatement, Node, Program } from 'estree';
 import type { Scope, ScopeRoot } from './scope.js';
+import type { StateCreationRuneName } from '../../utils.js';
 
 export interface Js {
 	ast: Program;

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

@@ -2,6 +2,8 @@ import type { SourceMap } from 'magic-string';
 import type { Binding } from '../phases/scope.js';
 import type { AST, Namespace } from './template.js';
 import type { ICompileDiagnostic } from '../utils/compile_diagnostic.js';
+import type { StateCreationRuneName } from '../../utils.js';
+import type { AssignmentExpression, PropertyDefinition } from 'estree';
 
 /** The return value of `compile` from `svelte/compiler` */
 export interface CompileResult {
@@ -269,6 +271,13 @@ export interface ExpressionMetadata {
 	has_call: boolean;
 }
 
+export interface StateFields {
+	[name: string]: {
+		type: StateCreationRuneName;
+		node: PropertyDefinition | AssignmentExpression;
+	};
+}
+
 export * from './template.js';
 
 export { Binding, Scope } from '../phases/scope.js';