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

chore: create_expression_metadata -> ExpressionMetadata

Browse Source
pull/17039/head
Rich Harris 2 days ago
parent 8368a4beb9
commit c63ce54bb5
14 changed files with 68 additions and 71 deletions
Show Stats Download Patch File Download Diff File

17
packages/svelte/src/compiler/phases/1-parse/state/element.js
Unescape View File

@ -9,11 +9,10 @@ import { decode_character_references } from '../utils/html.js';
import * as e from '../../../errors.js'; import * as e from '../../../errors.js';
import * as w from '../../../warnings.js'; import * as w from '../../../warnings.js';
import { create_fragment } from '../utils/create.js'; import { create_fragment } from '../utils/create.js';
import { create_attribute, create_expression_metadata, is_element_node } from '../../nodes.js'; import { create_attribute, ExpressionMetadata, is_element_node } from '../../nodes.js';
import { get_attribute_expression, is_expression_attribute } from '../../../utils/ast.js'; import { get_attribute_expression, is_expression_attribute } from '../../../utils/ast.js';
import { closing_tag_omitted } from '../../../../html-tree-validation.js'; import { closing_tag_omitted } from '../../../../html-tree-validation.js';
import { list } from '../../../utils/string.js'; import { list } from '../../../utils/string.js';
import { regex_whitespace } from '../../patterns.js';
const regex_invalid_unquoted_attribute_value = /^(\/>|[\s"'=<>`])/; const regex_invalid_unquoted_attribute_value = /^(\/>|[\s"'=<>`])/;
const regex_closing_textarea_tag = /^<\/textarea(\s[^>]*)?>/i; const regex_closing_textarea_tag = /^<\/textarea(\s[^>]*)?>/i;
@ -297,7 +296,7 @@ export default function element(parser) {
element.tag = get_attribute_expression(definition); element.tag = get_attribute_expression(definition);
} }
element.metadata.expression = create_expression_metadata(); element.metadata.expression = new ExpressionMetadata();
} }
if (is_top_level_script_or_style) { if (is_top_level_script_or_style) {
@ -508,7 +507,7 @@ function read_attribute(parser) {
end: parser.index, end: parser.index,
expression, expression,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}; };
@ -528,7 +527,7 @@ function read_attribute(parser) {
end: parser.index, end: parser.index,
expression, expression,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}; };
@ -568,7 +567,7 @@ function read_attribute(parser) {
name name
}, },
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}; };
@ -628,7 +627,7 @@ function read_attribute(parser) {
modifiers: /** @type {Array<'important'>} */ (modifiers), modifiers: /** @type {Array<'important'>} */ (modifiers),
value, value,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}; };
} }
@ -658,7 +657,7 @@ function read_attribute(parser) {
name: directive_name, name: directive_name,
expression, expression,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}; };
@ -824,7 +823,7 @@ function read_sequence(parser, done, location) {
end: parser.index, end: parser.index,
expression, expression,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}; };

18
packages/svelte/src/compiler/phases/1-parse/state/tag.js
Unescape View File

@ -3,7 +3,7 @@
/** @import { Parser } from '../index.js' */ /** @import { Parser } from '../index.js' */
import { walk } from 'zimmerframe'; import { walk } from 'zimmerframe';
import * as e from '../../../errors.js'; import * as e from '../../../errors.js';
import { create_expression_metadata } from '../../nodes.js'; import { ExpressionMetadata } from '../../nodes.js';
import { parse_expression_at } from '../acorn.js'; import { parse_expression_at } from '../acorn.js';
import read_pattern from '../read/context.js'; import read_pattern from '../read/context.js';
import read_expression, { get_loose_identifier } from '../read/expression.js'; import read_expression, { get_loose_identifier } from '../read/expression.js';
@ -42,7 +42,7 @@ export default function tag(parser) {
end: parser.index, end: parser.index,
expression, expression,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}); });
} }
@ -65,7 +65,7 @@ function open(parser) {
consequent: create_fragment(), consequent: create_fragment(),
alternate: null, alternate: null,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}); });
@ -249,7 +249,7 @@ function open(parser) {
then: null, then: null,
catch: null, catch: null,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}); });
@ -334,7 +334,7 @@ function open(parser) {
expression, expression,
fragment: create_fragment(), fragment: create_fragment(),
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}); });
@ -477,7 +477,7 @@ function next(parser) {
consequent: create_fragment(), consequent: create_fragment(),
alternate: null, alternate: null,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}); });
@ -643,7 +643,7 @@ function special(parser) {
end: parser.index, end: parser.index,
expression, expression,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}); });
@ -721,7 +721,7 @@ function special(parser) {
end: parser.index - 1 end: parser.index - 1
}, },
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
}); });
} }
@ -748,7 +748,7 @@ function special(parser) {
end: parser.index, end: parser.index,
expression: /** @type {AST.RenderTag['expression']} */ (expression), expression: /** @type {AST.RenderTag['expression']} */ (expression),
metadata: { metadata: {
expression: create_expression_metadata(), expression: new ExpressionMetadata(),
dynamic: false, dynamic: false,
arguments: [], arguments: [],
path: [], path: [],

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

@ -1,6 +1,7 @@
import type { Scope } from '../scope.js'; import type { Scope } from '../scope.js';
import type { ComponentAnalysis, ReactiveStatement } from '../types.js'; import type { ComponentAnalysis, ReactiveStatement } from '../types.js';
import type { AST, ExpressionMetadata, StateField, ValidatedCompileOptions } from '#compiler'; import type { AST, StateField, ValidatedCompileOptions } from '#compiler';
import type { ExpressionMetadata } from '../nodes.js';
export interface AnalysisState { export interface AnalysisState {
scope: Scope; scope: Scope;

4
packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
Unescape View File

@ -7,7 +7,7 @@ import { get_parent } from '../../../utils/ast.js';
import { is_pure, is_safe_identifier } from './shared/utils.js'; import { is_pure, is_safe_identifier } from './shared/utils.js';
import { dev, locate_node, source } from '../../../state.js'; import { dev, locate_node, source } from '../../../state.js';
import * as b from '#compiler/builders'; import * as b from '#compiler/builders';
import { create_expression_metadata } from '../../nodes.js'; import { ExpressionMetadata } from '../../nodes.js';
/** /**
* @param {CallExpression} node * @param {CallExpression} node
@ -243,7 +243,7 @@ export function CallExpression(node, context) {
// `$inspect(foo)` or `$derived(foo) should not trigger the `static-state-reference` warning // `$inspect(foo)` or `$derived(foo) should not trigger the `static-state-reference` warning
if (rune === '$derived') { if (rune === '$derived') {
const expression = create_expression_metadata(); const expression = new ExpressionMetadata();
context.next({ context.next({
...context.state, ...context.state,

4
packages/svelte/src/compiler/phases/2-analyze/visitors/RenderTag.js
Unescape View File

@ -5,7 +5,7 @@ import * as e from '../../../errors.js';
import { validate_opening_tag } from './shared/utils.js'; import { validate_opening_tag } from './shared/utils.js';
import { mark_subtree_dynamic } from './shared/fragment.js'; import { mark_subtree_dynamic } from './shared/fragment.js';
import { is_resolved_snippet } from './shared/snippets.js'; import { is_resolved_snippet } from './shared/snippets.js';
import { create_expression_metadata } from '../../nodes.js'; import { ExpressionMetadata } from '../../nodes.js';
/** /**
* @param {AST.RenderTag} node * @param {AST.RenderTag} node
@ -57,7 +57,7 @@ export function RenderTag(node, context) {
context.visit(callee, { ...context.state, expression: node.metadata.expression }); context.visit(callee, { ...context.state, expression: node.metadata.expression });
for (const arg of expression.arguments) { for (const arg of expression.arguments) {
const metadata = create_expression_metadata(); const metadata = new ExpressionMetadata();
node.metadata.arguments.push(metadata); node.metadata.arguments.push(metadata);
context.visit(arg, { context.visit(arg, {

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

@ -1,5 +1,5 @@
/** @import { Expression, Identifier, ObjectExpression } from 'estree' */ /** @import { Expression, Identifier, ObjectExpression } from 'estree' */
/** @import { AST, ExpressionMetadata } from '#compiler' */ /** @import { AST } from '#compiler' */
/** @import { ComponentContext } from '../../types' */ /** @import { ComponentContext } from '../../types' */
import { escape_html } from '../../../../../../escaping.js'; import { escape_html } from '../../../../../../escaping.js';
import { normalize_attribute } from '../../../../../../utils.js'; import { normalize_attribute } from '../../../../../../utils.js';
@ -8,6 +8,7 @@ import { is_event_attribute } from '../../../../../utils/ast.js';
import * as b from '#compiler/builders'; import * as b from '#compiler/builders';
import { build_class_directives_object, build_style_directives_object } from '../RegularElement.js'; import { build_class_directives_object, build_style_directives_object } from '../RegularElement.js';
import { build_expression, build_template_chunk, Memoizer } from './utils.js'; import { build_expression, build_template_chunk, Memoizer } from './utils.js';
import { ExpressionMetadata } from '../../../../nodes.js';
/** /**
* @param {Array<AST.Attribute | AST.SpreadAttribute>} attributes * @param {Array<AST.Attribute | AST.SpreadAttribute>} attributes

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

@ -1,9 +1,10 @@
/** @import { Expression } from 'estree' */ /** @import { Expression } from 'estree' */
/** @import { AST, ExpressionMetadata } from '#compiler' */ /** @import { AST } from '#compiler' */
/** @import { ComponentContext } from '../../types' */ /** @import { ComponentContext } from '../../types' */
import { is_capture_event, is_passive_event } from '../../../../../../utils.js'; import { is_capture_event, is_passive_event } from '../../../../../../utils.js';
import { dev, locator } from '../../../../../state.js'; import { dev, locator } from '../../../../../state.js';
import * as b from '#compiler/builders'; import * as b from '#compiler/builders';
import { ExpressionMetadata } from '../../../../nodes.js';
/** /**
* @param {AST.Attribute} node * @param {AST.Attribute} node

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

@ -1,5 +1,5 @@
/** @import { AssignmentExpression, Expression, Identifier, MemberExpression, SequenceExpression, Literal, Super, UpdateExpression, ExpressionStatement } from 'estree' */ /** @import { AssignmentExpression, Expression, Identifier, MemberExpression, SequenceExpression, Literal, Super, UpdateExpression, ExpressionStatement } from 'estree' */
/** @import { AST, ExpressionMetadata } from '#compiler' */ /** @import { AST } from '#compiler' */
/** @import { ComponentClientTransformState, ComponentContext, Context } from '../../types' */ /** @import { ComponentClientTransformState, ComponentContext, Context } from '../../types' */
import { walk } from 'zimmerframe'; import { walk } from 'zimmerframe';
import { object } from '../../../../../utils/ast.js'; import { object } from '../../../../../utils/ast.js';
@ -9,6 +9,7 @@ import { regex_is_valid_identifier } from '../../../../patterns.js';
import is_reference from 'is-reference'; import is_reference from 'is-reference';
import { dev, is_ignored, locator, component_name } from '../../../../../state.js'; import { dev, is_ignored, locator, component_name } from '../../../../../state.js';
import { build_getter } from '../../utils.js'; import { build_getter } from '../../utils.js';
import { ExpressionMetadata } from '../../../../nodes.js';
/** /**
* A utility for extracting complex expressions (such as call expressions) * A utility for extracting complex expressions (such as call expressions)

12
packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
Unescape View File

@ -1,13 +1,9 @@
/** @import { ArrayExpression, Expression, Literal, ObjectExpression } from 'estree' */ /** @import { ArrayExpression, Expression, Literal, ObjectExpression } from 'estree' */
/** @import { AST, ExpressionMetadata } from '#compiler' */ /** @import { AST } from '#compiler' */
/** @import { ComponentContext, ComponentServerTransformState } from '../../types.js' */ /** @import { ComponentContext, ComponentServerTransformState } from '../../types.js' */
import { is_event_attribute, is_text_attribute } from '../../../../../utils/ast.js'; import { is_event_attribute, is_text_attribute } from '../../../../../utils/ast.js';
import { binding_properties } from '../../../../bindings.js'; import { binding_properties } from '../../../../bindings.js';
import { import { create_attribute, ExpressionMetadata, is_custom_element_node } from '../../../../nodes.js';
create_attribute,
create_expression_metadata,
is_custom_element_node
} from '../../../../nodes.js';
import { regex_starts_with_newline } from '../../../../patterns.js'; import { regex_starts_with_newline } from '../../../../patterns.js';
import * as b from '#compiler/builders'; import * as b from '#compiler/builders';
import { import {
@ -160,7 +156,7 @@ export function build_element_attributes(node, context, transform) {
build_attribute_value(value_attribute.value, context, transform) build_attribute_value(value_attribute.value, context, transform)
), ),
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
} }
]) ])
@ -174,7 +170,7 @@ export function build_element_attributes(node, context, transform) {
end: -1, end: -1,
expression, expression,
metadata: { metadata: {
expression: create_expression_metadata() expression: new ExpressionMetadata()
} }
} }
]) ])

5
packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
Unescape View File

@ -1,5 +1,5 @@
/** @import { AssignmentOperator, Expression, Identifier, Node, Statement, BlockStatement } from 'estree' */ /** @import { Expression, Identifier, Node, Statement, BlockStatement } from 'estree' */
/** @import { AST, ExpressionMetadata } from '#compiler' */ /** @import { AST } from '#compiler' */
/** @import { ComponentContext, ServerTransformState } from '../../types.js' */ /** @import { ComponentContext, ServerTransformState } from '../../types.js' */
import { escape_html } from '../../../../../../escaping.js'; import { escape_html } from '../../../../../../escaping.js';
@ -13,6 +13,7 @@ import * as b from '#compiler/builders';
import { sanitize_template_string } from '../../../../../utils/sanitize_template_string.js'; import { sanitize_template_string } from '../../../../../utils/sanitize_template_string.js';
import { regex_whitespaces_strict } from '../../../../patterns.js'; import { regex_whitespaces_strict } from '../../../../patterns.js';
import { has_await_expression } from '../../../../../utils/ast.js'; import { has_await_expression } from '../../../../../utils/ast.js';
import { ExpressionMetadata } from '../../../../nodes.js';
/** Opens an if/each block, so that we can remove nodes in the case of a mismatch */ /** Opens an if/each block, so that we can remove nodes in the case of a mismatch */
export const block_open = b.literal(BLOCK_OPEN); export const block_open = b.literal(BLOCK_OPEN);

41
packages/svelte/src/compiler/phases/nodes.js
Unescape View File

@ -1,5 +1,5 @@
/** @import { Expression, PrivateIdentifier } from 'estree' */ /** @import { Expression, PrivateIdentifier } from 'estree' */
/** @import { AST, ExpressionMetadata } from '#compiler' */ /** @import { AST, Binding } from '#compiler' */
/** /**
* All nodes that can appear elsewhere than the top level, have attributes and can contain children * All nodes that can appear elsewhere than the top level, have attributes and can contain children
@ -64,20 +64,33 @@ export function create_attribute(name, start, end, value) {
} }
}; };
} }
export class ExpressionMetadata {
/** True if the expression references state directly, or _might_ (via member/call expressions) */
has_state = false;
/** /** True if the expression involves a call expression (often, it will need to be wrapped in a derived) */
* @returns {ExpressionMetadata} has_call = false;
*/
export function create_expression_metadata() { /** True if the expression contains `await` */
return { has_await = false;
dependencies: new Set(),
references: new Set(), /** True if the expression includes a member expression */
has_state: false, has_member_expression = false;
has_call: false,
has_member_expression: false, /** True if the expression includes an assignment or an update */
has_assignment: false, has_assignment = false;
has_await: false
}; /**
* All the bindings that are referenced eagerly (not inside functions) in this expression
* @type {Set<Binding>}
*/
dependencies = new Set();
/**
* True if the expression references state directly, or _might_ (via member/call expressions)
* @type {Set<Binding>}
*/
references = new Set();
} }
/** /**

6
packages/svelte/src/compiler/phases/scope.js
Unescape View File

@ -1,9 +1,9 @@
/** @import { ArrowFunctionExpression, BinaryOperator, ClassDeclaration, Expression, FunctionDeclaration, FunctionExpression, Identifier, ImportDeclaration, MemberExpression, LogicalOperator, Node, Pattern, UnaryOperator, VariableDeclarator, Super } from 'estree' */ /** @import { BinaryOperator, ClassDeclaration, Expression, FunctionDeclaration, Identifier, ImportDeclaration, MemberExpression, LogicalOperator, Node, Pattern, UnaryOperator, VariableDeclarator, Super } from 'estree' */
/** @import { Context, Visitor } from 'zimmerframe' */ /** @import { Context, Visitor } from 'zimmerframe' */
/** @import { AST, BindingKind, DeclarationKind } from '#compiler' */ /** @import { AST, BindingKind, DeclarationKind } from '#compiler' */
import is_reference from 'is-reference'; import is_reference from 'is-reference';
import { walk } from 'zimmerframe'; import { walk } from 'zimmerframe';
import { create_expression_metadata } from './nodes.js'; import { ExpressionMetadata } from './nodes.js';
import * as b from '#compiler/builders'; import * as b from '#compiler/builders';
import * as e from '../errors.js'; import * as e from '../errors.js';
import { import {
@ -1201,7 +1201,7 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
if (node.fallback) visit(node.fallback, { scope }); if (node.fallback) visit(node.fallback, { scope });
node.metadata = { node.metadata = {
expression: create_expression_metadata(), expression: new ExpressionMetadata(),
keyed: false, keyed: false,
contains_group_binding: false, contains_group_binding: false,
index: scope.root.unique('$$index'), index: scope.root.unique('$$index'),

17
packages/svelte/src/compiler/types/index.d.ts vendored
Unescape View File

@ -294,23 +294,6 @@ export type DeclarationKind =
| 'using' | 'using'
| 'await using'; | 'await using';
export interface ExpressionMetadata {
/** All the bindings that are referenced eagerly (not inside functions) in this expression */
dependencies: Set<Binding>;
/** All the bindings that are referenced inside this expression, including inside functions */
references: Set<Binding>;
/** True if the expression references state directly, or _might_ (via member/call expressions) */
has_state: boolean;
/** True if the expression involves a call expression (often, it will need to be wrapped in a derived) */
has_call: boolean;
/** True if the expression contains `await` */
has_await: boolean;
/** True if the expression includes a member expression */
has_member_expression: boolean;
/** True if the expression includes an assignment or an update */
has_assignment: boolean;
}
export interface StateField { export interface StateField {
type: StateCreationRuneName; type: StateCreationRuneName;
node: PropertyDefinition | AssignmentExpression; node: PropertyDefinition | AssignmentExpression;

3
packages/svelte/src/compiler/types/template.d.ts vendored
Unescape View File

@ -1,4 +1,4 @@
import type { Binding, ExpressionMetadata } from '#compiler'; import type { Binding } from '#compiler';
import type { import type {
ArrayExpression, ArrayExpression,
ArrowFunctionExpression, ArrowFunctionExpression,
@ -17,6 +17,7 @@ import type {
} from 'estree'; } from 'estree';
import type { Scope } from '../phases/scope'; import type { Scope } from '../phases/scope';
import type { _CSS } from './css'; import type { _CSS } from './css';
import type { ExpressionMetadata } from '../phases/nodes';
/** /**
* - `html` — the default, for e.g. `<div>` or `<span>` * - `html` — the default, for e.g. `<div>` or `<span>`

Write Preview
Loading…
Cancel
Save