From a9f2d6f6d0dd079aa5cc19b4f9541baae1c80421 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Wed, 21 May 2025 15:20:10 -0400 Subject: [PATCH] tidy up --- .../phases/3-transform/client/transform-template/index.js | 4 ++-- .../3-transform/client/transform-template/to-functions.js | 8 +++----- .../3-transform/client/transform-template/to-string.js | 6 ++---- .../src/compiler/phases/3-transform/client/types.d.ts | 7 +++---- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/index.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/index.js index becf987be9..b401ba1406 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/index.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/index.js @@ -1,7 +1,7 @@ /** - * @import { ComponentContext, TemplateOperations, ComponentClientTransformState } from "../types.js" + * @import { ComponentContext, ComponentClientTransformState } from "../types.js" * @import { Identifier, Expression } from "estree" - * @import { AST, Namespace } from '#compiler' + * @import { Namespace } from '#compiler' * @import { SourceLocation } from '#shared' */ import { dev } from '../../../../state.js'; diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/to-functions.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/to-functions.js index f89e82e11b..ff6dafb527 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/to-functions.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/to-functions.js @@ -1,13 +1,11 @@ -/** - * @import { TemplateOperations } from "../types.js" - * @import { ObjectExpression, Identifier, ArrayExpression, Property, Expression, Literal } from "estree" - */ +/** @import { TemplateOperation } from '../types.js' */ +/** @import { ObjectExpression, Identifier, ArrayExpression, Property, Expression, Literal } from 'estree' */ import * as b from '../../../../utils/builders.js'; import { regex_is_valid_identifier } from '../../../patterns.js'; import fix_attribute_casing from './fix-attribute-casing.js'; /** - * @param {TemplateOperations} items + * @param {TemplateOperation[]} items */ export function template_to_functions(items) { let elements = b.array([]); diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/to-string.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/to-string.js index 80c9770378..a7614036cf 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/to-string.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/to-string.js @@ -1,11 +1,9 @@ -/** - * @import { TemplateOperations } from "../types.js" - */ +/** @import { TemplateOperation } from '../types.js' */ import { escape_html } from '../../../../../escaping.js'; import { is_void } from '../../../../../utils.js'; /** - * @param {TemplateOperations} items + * @param {TemplateOperation[]} items */ export function template_to_string(items) { /** 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 06db1b381a..abca828d68 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 @@ -36,7 +36,7 @@ export interface ClientTransformState extends TransformState { >; } -type TemplateOperations = Array< +type TemplateOperation = | { kind: 'create_element'; name: string; @@ -59,8 +59,7 @@ type TemplateOperations = Array< } | { kind: 'pop_element'; - } ->; + }; export interface ComponentClientTransformState extends ClientTransformState { readonly analysis: ComponentAnalysis; @@ -79,7 +78,7 @@ export interface ComponentClientTransformState extends ClientTransformState { /** Expressions used inside the render effect */ readonly expressions: Expression[]; /** The HTML template string */ - readonly template: TemplateOperations; + readonly template: TemplateOperation[]; readonly locations: SourceLocation[]; readonly metadata: { namespace: Namespace;