From 408955dae6dcd926d24aa799db88b2254b80f12b Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 22 May 2025 07:22:31 -0400 Subject: [PATCH] rename stuff --- .../client/transform-template/template.js | 16 ++++++++-------- .../client/transform-template/types.d.ts | 6 +++--- .../3-transform/client/visitors/AwaitBlock.js | 2 +- .../3-transform/client/visitors/Comment.js | 2 +- .../3-transform/client/visitors/EachBlock.js | 2 +- .../3-transform/client/visitors/Fragment.js | 2 +- .../3-transform/client/visitors/HtmlTag.js | 2 +- .../3-transform/client/visitors/IfBlock.js | 2 +- .../3-transform/client/visitors/KeyBlock.js | 2 +- .../client/visitors/RegularElement.js | 2 +- .../3-transform/client/visitors/RenderTag.js | 2 +- .../3-transform/client/visitors/SlotElement.js | 2 +- .../client/visitors/SvelteBoundary.js | 2 +- .../3-transform/client/visitors/SvelteElement.js | 2 +- .../client/visitors/shared/component.js | 8 ++++---- .../client/visitors/shared/fragment.js | 4 ++-- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/template.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/template.js index 4801f9e452..6b31bb15ed 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/template.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/template.js @@ -31,7 +31,7 @@ export class Template { * @param {string} name * @param {number} start */ - create_element(name, start) { + push_element(name, start) { this.#element = { type: 'element', name, @@ -47,12 +47,12 @@ export class Template { } /** @param {string} [data] */ - create_anchor(data) { - this.#fragment.push({ type: 'anchor', data }); + push_comment(data) { + this.#fragment.push({ type: 'comment', data }); } /** @param {AST.Text[]} nodes */ - create_text(nodes) { + push_text(nodes) { this.#fragment.push({ type: 'text', nodes }); } @@ -75,8 +75,8 @@ export class Template { as_objects() { // if the first item is a comment we need to add another comment for effect.start - if (this.nodes[0].type === 'anchor') { - this.nodes.unshift({ type: 'anchor', data: undefined }); + if (this.nodes[0].type === 'comment') { + this.nodes.unshift({ type: 'comment', data: undefined }); } return b.array(this.nodes.map(objectify)); @@ -91,7 +91,7 @@ function stringify(item) { return item.nodes.map((node) => node.raw).join(''); } - if (item.type === 'anchor') { + if (item.type === 'comment') { return item.data ? `` : ''; } @@ -120,7 +120,7 @@ function objectify(item) { return b.literal(item.nodes.map((node) => node.data).join('')); } - if (item.type === 'anchor') { + if (item.type === 'comment') { return item.data ? b.array([b.literal(`// ${item.data}`)]) : null; } diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/types.d.ts b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/types.d.ts index 92a55e79c5..1555e10ef0 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/types.d.ts +++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/types.d.ts @@ -14,9 +14,9 @@ export interface Text { nodes: AST.Text[]; } -export interface Anchor { - type: 'anchor'; +export interface Comment { + type: 'comment'; data: string | undefined; } -export type Node = Element | Text | Anchor; +export type Node = Element | Text | Comment; diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitBlock.js index 8a5031cd9f..30e370327f 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitBlock.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitBlock.js @@ -11,7 +11,7 @@ import { get_value } from './shared/declarations.js'; * @param {ComponentContext} context */ export function AwaitBlock(node, context) { - context.state.template.create_anchor(); + context.state.template.push_comment(); // Visit {#await } first to ensure that scopes are in the correct order const expression = b.thunk(/** @type {Expression} */ (context.visit(node.expression))); diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Comment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Comment.js index 1124c198a3..21d1619f8a 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Comment.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Comment.js @@ -7,5 +7,5 @@ */ export function Comment(node, context) { // We'll only get here if comments are not filtered out, which they are unless preserveComments is true - context.state.template.create_anchor(node.data); + context.state.template.push_comment(node.data); } diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/EachBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/EachBlock.js index fcdc8bda05..f80fa0e61e 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/EachBlock.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/EachBlock.js @@ -32,7 +32,7 @@ export function EachBlock(node, context) { ); if (!each_node_meta.is_controlled) { - context.state.template.create_anchor(); + context.state.template.push_comment(); } let flags = 0; diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js index 938a8736ac..6125d5bc89 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js @@ -140,7 +140,7 @@ export function Fragment(node, context) { flags |= TEMPLATE_USE_IMPORT_NODE; } - if (state.template.nodes.length === 1 && state.template.nodes[0].type === 'anchor') { + if (state.template.nodes.length === 1 && state.template.nodes[0].type === 'comment') { // special case — we can use `$.comment` instead of creating a unique template body.push(b.var(id, b.call('$.comment'))); } else { diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/HtmlTag.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/HtmlTag.js index 5d5b85a21b..405b400b42 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/HtmlTag.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/HtmlTag.js @@ -9,7 +9,7 @@ import * as b from '#compiler/builders'; * @param {ComponentContext} context */ export function HtmlTag(node, context) { - context.state.template.create_anchor(); + context.state.template.push_comment(); const expression = /** @type {Expression} */ (context.visit(node.expression)); diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js index b6af5c79fe..3702a47bc9 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js @@ -8,7 +8,7 @@ import * as b from '#compiler/builders'; * @param {ComponentContext} context */ export function IfBlock(node, context) { - context.state.template.create_anchor(); + context.state.template.push_comment(); const statements = []; const consequent = /** @type {BlockStatement} */ (context.visit(node.consequent)); diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/KeyBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/KeyBlock.js index aa5fce595a..5e63f7e872 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/KeyBlock.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/KeyBlock.js @@ -8,7 +8,7 @@ import * as b from '#compiler/builders'; * @param {ComponentContext} context */ export function KeyBlock(node, context) { - context.state.template.create_anchor(); + context.state.template.push_comment(); const key = /** @type {Expression} */ (context.visit(node.expression)); const body = /** @type {Expression} */ (context.visit(node.fragment)); diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js index 8869da55c8..c1806b5128 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js @@ -36,7 +36,7 @@ import { visit_event_attribute } from './shared/events.js'; * @param {ComponentContext} context */ export function RegularElement(node, context) { - context.state.template.create_element(node.name, node.start); + context.state.template.push_element(node.name, node.start); if (node.name === 'noscript') { context.state.template.pop_element(); diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js index 2c09d602bc..fec7b5762a 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js @@ -9,7 +9,7 @@ import * as b from '#compiler/builders'; * @param {ComponentContext} context */ export function RenderTag(node, context) { - context.state.template.create_anchor(); + context.state.template.push_comment(); const expression = unwrap_optional(node.expression); diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js index 30f21024f1..401cfde428 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js @@ -11,7 +11,7 @@ import { memoize_expression } from './shared/utils.js'; */ export function SlotElement(node, context) { // fallback --> $.slot($$slots.default, { get a() { .. } }, () => ...fallback); - context.state.template.create_anchor(); + context.state.template.push_comment(); /** @type {Property[]} */ const props = []; diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js index 2ce66cb4f4..ec1c650814 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js @@ -88,7 +88,7 @@ export function SvelteBoundary(node, context) { b.call('$.boundary', context.state.node, props, b.arrow([b.id('$$anchor')], block)) ); - context.state.template.create_anchor(); + context.state.template.push_comment(); context.state.init.push( external_statements.length > 0 ? b.block([...external_statements, boundary]) : boundary ); diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js index 75d1472f0f..7e97035e00 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js @@ -13,7 +13,7 @@ import { build_render_statement } from './shared/utils.js'; * @param {ComponentContext} context */ export function SvelteElement(node, context) { - context.state.template.create_anchor(); + context.state.template.push_comment(); /** @type {Array} */ const attributes = []; diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/component.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/component.js index eeaa2c5680..57402c2b4a 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/component.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/component.js @@ -442,14 +442,14 @@ export function build_component(node, component_name, context, anchor = context. if (Object.keys(custom_css_props).length > 0) { if (context.state.metadata.namespace === 'svg') { // this boils down to - context.state.template.create_element('g', node.start); + context.state.template.push_element('g', node.start); } else { // this boils down to - context.state.template.create_element('svelte-css-wrapper', node.start); + context.state.template.push_element('svelte-css-wrapper', node.start); context.state.template.set_prop('style', 'display: contents'); } - context.state.template.create_anchor(); + context.state.template.push_comment(); context.state.template.pop_element(); statements.push( @@ -458,7 +458,7 @@ export function build_component(node, component_name, context, anchor = context. b.stmt(b.call('$.reset', anchor)) ); } else { - context.state.template.create_anchor(); + context.state.template.push_comment(); statements.push(b.stmt(fn(anchor))); } diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js index 70bf082b31..7af2c2d4aa 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js @@ -64,11 +64,11 @@ export function process_children(nodes, initial, is_element, { visit, state }) { function flush_sequence(sequence) { if (sequence.every((node) => node.type === 'Text')) { skipped += 1; - state.template.create_text(sequence); + state.template.push_text(sequence); return; } - state.template.create_text([{ type: 'Text', data: ' ', raw: ' ', start: -1, end: -1 }]); + state.template.push_text([{ type: 'Text', data: ' ', raw: ' ', start: -1, end: -1 }]); const { has_state, value } = build_template_chunk(sequence, visit, state);