diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js index 0282a71f6d..740bcae479 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js @@ -163,7 +163,7 @@ export function client_component(analysis, options) { }, events: new Set(), preserve_whitespace: options.preserveWhitespace, - class_analysis: null, + class_transformer: null, transform: {}, in_constructor: false, instance_level_snippets: [], @@ -672,7 +672,7 @@ export function client_module(analysis, options) { scopes: analysis.module.scopes, transform: {}, in_constructor: false, - class_analysis: null + class_transformer: null }; const module = /** @type {ESTree.Program} */ ( diff --git a/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts b/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts index ce201958da..c2292292da 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts +++ b/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts @@ -15,7 +15,7 @@ import type { SourceLocation } from '#shared'; import type { ClassTransformer } from '../shared/types.js'; export interface ClientTransformState extends TransformState { - readonly class_analysis: ClassTransformer | null; + readonly class_transformer: ClassTransformer | null; /** * `true` if the current lexical scope belongs to a class constructor. this allows diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js index 34d80d388c..d11938af97 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js @@ -17,7 +17,7 @@ import { validate_mutation } from './shared/utils.js'; * @param {Context} context */ export function AssignmentExpression(node, context) { - const stripped_node = context.state.class_analysis?.generate_assignment(node, context); + const stripped_node = context.state.class_transformer?.generate_assignment(node, context); if (stripped_node) { return stripped_node; } @@ -61,7 +61,7 @@ function build_assignment(operator, left, right, context) { left.type === 'MemberExpression' && left.property.type === 'PrivateIdentifier' ) { - const private_state = context.state.class_analysis?.get_field(left.property.name, true); + const private_state = context.state.class_transformer?.get_field(left.property.name, true); if (private_state !== undefined) { let value = /** @type {Expression} */ ( diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/MemberExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/MemberExpression.js index 87a886fd3b..02052942f5 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/MemberExpression.js +++ b/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?.get_field(node.property.name, true); + const field = context.state.class_transformer?.get_field(node.property.name, true); if (field) { return context.state.in_constructor && (field.kind === '$state.raw' || field.kind === '$state') diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/UpdateExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/UpdateExpression.js index 2e6f9123dd..ca81fa1493 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/UpdateExpression.js +++ b/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?.get_field(argument.property.name, true) + context.state.class_transformer?.get_field(argument.property.name, true) ) { let fn = '$.update'; if (node.prefix) fn += '_pre'; diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js index e159e2ff4e..661b73d659 100644 --- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js +++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js @@ -99,7 +99,7 @@ export function server_component(analysis, options) { template: /** @type {any} */ (null), namespace: options.namespace, preserve_whitespace: options.preserveWhitespace, - class_analysis: null, + class_transformer: null, skip_hydration_boundaries: false }; @@ -395,7 +395,7 @@ export function server_module(analysis, options) { // to be present for `javascript_visitors_legacy` and so is included in module // transform state as well as component transform state legacy_reactive_statements: new Map(), - class_analysis: null + class_transformer: null }; const module = /** @type {Program} */ ( diff --git a/packages/svelte/src/compiler/phases/3-transform/server/types.d.ts b/packages/svelte/src/compiler/phases/3-transform/server/types.d.ts index 9d2d3164a9..24b35d3761 100644 --- a/packages/svelte/src/compiler/phases/3-transform/server/types.d.ts +++ b/packages/svelte/src/compiler/phases/3-transform/server/types.d.ts @@ -7,7 +7,7 @@ import type { ClassTransformer } from '../shared/types.js'; export interface ServerTransformState extends TransformState { /** The $: calls, which will be ordered in the end */ readonly legacy_reactive_statements: Map; - readonly class_analysis: ClassTransformer | null; + readonly class_transformer: ClassTransformer | null; } export interface ComponentServerTransformState extends ServerTransformState { diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AssignmentExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AssignmentExpression.js index ae84f08782..939dd45ca2 100644 --- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AssignmentExpression.js +++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AssignmentExpression.js @@ -10,7 +10,7 @@ import { visit_assignment_expression } from '../../shared/assignments.js'; * @param {Context} context */ export function AssignmentExpression(node, context) { - const stripped_node = context.state.class_analysis?.generate_assignment(node, context); + const stripped_node = context.state.class_transformer?.generate_assignment(node, context); if (stripped_node) { return stripped_node; } diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/MemberExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/MemberExpression.js index 2f72327191..2a90307293 100644 --- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/MemberExpression.js +++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/MemberExpression.js @@ -12,7 +12,7 @@ export function MemberExpression(node, context) { node.object.type === 'ThisExpression' && node.property.type === 'PrivateIdentifier' ) { - const field = context.state.class_analysis?.get_field(node.property.name, true, [ + const field = context.state.class_transformer?.get_field(node.property.name, true, [ '$derived', '$derived.by' ]);