msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

lint, tidy up

Browse Source
pull/15820/head
Rich Harris 4 months ago
parent 255603111b
commit c7e8422ceb
8 changed files with 61 additions and 87 deletions
Show Stats Download Patch File Download Diff File

3
packages/svelte/src/compiler/phases/3-transform/client/types.d.ts vendored
Unescape View File

@ -15,9 +15,6 @@ import type { ComponentAnalysis } from '../../types.js';
import type { SourceLocation } from '#shared';
export interface ClientTransformState extends TransformState {
readonly state_fields: Record<string, StateField>;
readonly backing_fields: Record<string, PrivateIdentifier>;
/**
* `true` if the current lexical scope belongs to a class constructor. this allows
* us to rewrite `this.foo` as `this.#foo.value`

68
packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js
Unescape View File

@ -55,46 +55,48 @@ function build_assignment(operator, left, right, context) {
if (context.state.analysis.runes && left.type === 'MemberExpression') {
const name = get_name(left.property);
// special case — state declaration in class constructor
const ancestor = context.path.at(-4);
if (ancestor?.type === 'MethodDefinition' && ancestor.kind === 'constructor') {
const rune = get_rune(right, context.state.scope);
if (rune) {
const child_state = {
...context.state,
in_constructor: rune !== '$derived' && rune !== '$derived.by'
};
const l = b.member(
b.this,
left.property.type === 'PrivateIdentifier'
? left.property
: context.state.backing_fields[name]
);
if (name !== null) {
// special case — state declaration in class constructor
const ancestor = context.path.at(-4);
if (ancestor?.type === 'MethodDefinition' && ancestor.kind === 'constructor') {
const rune = get_rune(right, context.state.scope);
if (rune) {
const child_state = {
...context.state,
in_constructor: rune !== '$derived' && rune !== '$derived.by'
};
const l = b.member(
b.this,
left.property.type === 'PrivateIdentifier'
? left.property
: context.state.backing_fields[name]
);
const r = /** @type {Expression} */ (context.visit(right, child_state));
const r = /** @type {Expression} */ (context.visit(right, child_state));
return b.assignment(operator, l, r);
return b.assignment(operator, l, r);
}
}
}
// special case — assignment to private state field
if (left.property.type === 'PrivateIdentifier') {
const field = context.state.state_fields[name];
// special case — assignment to private state field
if (left.property.type === 'PrivateIdentifier') {
const field = context.state.state_fields[name];
if (field) {
let value = /** @type {Expression} */ (
context.visit(build_assignment_value(operator, left, right))
);
if (field) {
let value = /** @type {Expression} */ (
context.visit(build_assignment_value(operator, left, right))
);
const needs_proxy =
field.type === '$state' &&
is_non_coercive_operator(operator) &&
should_proxy(value, context.state.scope);
const needs_proxy =
field.type === '$state' &&
is_non_coercive_operator(operator) &&
should_proxy(value, context.state.scope);
return b.call('$.set', left, value, needs_proxy && b.true);
return b.call('$.set', left, value, needs_proxy && b.true);
}
}
}
}

8
packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
Unescape View File

@ -23,7 +23,6 @@ import { Identifier } from './visitors/Identifier.js';
import { IfBlock } from './visitors/IfBlock.js';
import { KeyBlock } from './visitors/KeyBlock.js';
import { LabeledStatement } from './visitors/LabeledStatement.js';
import { MemberExpression } from './visitors/MemberExpression.js';
import { PropertyDefinition } from './visitors/PropertyDefinition.js';
import { RegularElement } from './visitors/RegularElement.js';
import { RenderTag } from './visitors/RenderTag.js';
@ -49,7 +48,6 @@ const global_visitors = {
ExpressionStatement,
Identifier,
LabeledStatement,
MemberExpression,
PropertyDefinition,
UpdateExpression,
VariableDeclaration
@ -99,7 +97,8 @@ export function server_component(analysis, options) {
template: /** @type {any} */ (null),
namespace: options.namespace,
preserve_whitespace: options.preserveWhitespace,
private_derived: new Map(),
state_fields: {},
backing_fields: {},
skip_hydration_boundaries: false
};
@ -395,7 +394,8 @@ 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(),
private_derived: new Map()
state_fields: {},
backing_fields: {}
};
const module = /** @type {Program} */ (

2
packages/svelte/src/compiler/phases/3-transform/server/types.d.ts vendored
Unescape View File

@ -2,12 +2,10 @@ import type { Expression, Statement, ModuleDeclaration, LabeledStatement } from
import type { AST, Namespace, ValidatedCompileOptions } from '#compiler';
import type { TransformState } from '../types.js';
import type { ComponentAnalysis } from '../../types.js';
import type { StateField } from '../client/types.js';
export interface ServerTransformState extends TransformState {
/** The $: calls, which will be ordered in the end */
readonly legacy_reactive_statements: Map<LabeledStatement, Statement>;
readonly private_derived: Map<string, StateField>;
}
export interface ComponentServerTransformState extends ServerTransformState {

29
packages/svelte/src/compiler/phases/3-transform/server/visitors/AssignmentExpression.js
Unescape View File

@ -25,24 +25,27 @@ export function AssignmentExpression(node, context) {
*/
function build_assignment(operator, left, right, context) {
if (context.state.analysis.runes && left.type === 'MemberExpression') {
// special case — state declaration in class constructor
const ancestor = context.path.at(-4);
const name = get_name(left.property);
if (ancestor?.type === 'MethodDefinition' && ancestor.kind === 'constructor') {
const rune = get_rune(right, context.state.scope);
if (name !== null) {
// special case — state declaration in class constructor
const ancestor = context.path.at(-4);
if (rune) {
const name = get_name(left.property);
const key =
left.property.type === 'PrivateIdentifier' || rune === '$state' || rune === '$state.raw'
? left.property
: context.state.backing_fields[name];
if (ancestor?.type === 'MethodDefinition' && ancestor.kind === 'constructor') {
const rune = get_rune(right, context.state.scope);
const l = b.member(b.this, key, key.type === 'Literal');
if (rune) {
const key =
left.property.type === 'PrivateIdentifier' || rune === '$state' || rune === '$state.raw'
? left.property
: context.state.backing_fields[name];
const r = /** @type {Expression} */ (context.visit(right));
const l = b.member(b.this, key, key.type === 'Literal');
return b.assignment(operator, l, r);
const r = /** @type {Expression} */ (context.visit(right));
return b.assignment(operator, l, r);
}
}
}
}

9
packages/svelte/src/compiler/phases/3-transform/server/visitors/ClassBody.js
Unescape View File

@ -69,14 +69,9 @@ export function ClassBody(node, context) {
const backing = backing_fields[name];
const member = b.member(b.this, backing);
const should_proxy = field.type === '$state' && true; // TODO
const key = b.key(name);
body.push(
b.prop_def(backing, null),
b.method('get', key, [], [b.return(b.call(member))])
b.method('get', b.key(name), [], [b.return(b.call(member))])
);
}
}
@ -108,8 +103,6 @@ export function ClassBody(node, context) {
const backing = backing_fields[name];
const member = b.member(b.this, backing);
const should_proxy = field.type === '$state' && true; // TODO
body.push(
b.prop_def(
backing,

23
packages/svelte/src/compiler/phases/3-transform/server/visitors/MemberExpression.js
Unescape View File

@ -1,23 +0,0 @@
/** @import { MemberExpression } from 'estree' */
/** @import { Context } from '../types.js' */
import * as b from '#compiler/builders';
/**
* @param {MemberExpression} node
* @param {Context} context
*/
export function MemberExpression(node, context) {
if (
context.state.analysis.runes &&
node.object.type === 'ThisExpression' &&
node.property.type === 'PrivateIdentifier'
) {
const field = context.state.private_derived.get(node.property.name);
if (field) {
return b.call(node);
}
}
context.next();
}

6
packages/svelte/src/compiler/phases/3-transform/types.d.ts vendored
Unescape View File

@ -1,10 +1,14 @@
import type { Scope } from '../scope.js';
import type { AST, ValidatedModuleCompileOptions } from '#compiler';
import type { AST, StateField, ValidatedModuleCompileOptions } from '#compiler';
import type { Analysis } from '../types.js';
import type { PrivateIdentifier } from 'estree';
export interface TransformState {
readonly analysis: Analysis;
readonly options: ValidatedModuleCompileOptions;
readonly scope: Scope;
readonly scopes: Map<AST.SvelteNode, Scope>;
readonly state_fields: Record<string, StateField>;
readonly backing_fields: Record<string, PrivateIdentifier>;
}

Write Preview
Loading…
Cancel
Save