From 2ffb863b5d77c6b8a477427fc18469ed21644536 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 15 May 2025 17:59:17 -0400 Subject: [PATCH] on second thoughts --- packages/svelte/src/compiler/phases/2-analyze/types.d.ts | 6 +++--- .../src/compiler/phases/2-analyze/visitors/ClassBody.js | 4 ++-- packages/svelte/src/compiler/types/index.d.ts | 8 +++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/svelte/src/compiler/phases/2-analyze/types.d.ts b/packages/svelte/src/compiler/phases/2-analyze/types.d.ts index 97b6029f79..3bbab7d067 100644 --- a/packages/svelte/src/compiler/phases/2-analyze/types.d.ts +++ b/packages/svelte/src/compiler/phases/2-analyze/types.d.ts @@ -1,6 +1,6 @@ import type { Scope } from '../scope.js'; import type { ComponentAnalysis, ReactiveStatement } from '../types.js'; -import type { AST, ExpressionMetadata, StateFields, ValidatedCompileOptions } from '#compiler'; +import type { AST, ExpressionMetadata, StateField, ValidatedCompileOptions } from '#compiler'; import type { ClassBody } from 'estree'; export interface AnalysisState { @@ -21,8 +21,8 @@ export interface AnalysisState { expression: ExpressionMetadata | null; /** Used to analyze class state. */ - classes: Map; - state_fields: StateFields | null; + classes: Map>; + state_fields: Record | null; function_depth: number; diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/ClassBody.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/ClassBody.js index 6c5055bc17..6d6390b650 100644 --- a/packages/svelte/src/compiler/phases/2-analyze/visitors/ClassBody.js +++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/ClassBody.js @@ -1,5 +1,5 @@ /** @import { AssignmentExpression, ClassBody, PropertyDefinition, Expression, PrivateIdentifier, MethodDefinition } from 'estree' */ -/** @import { StateFields } from '#compiler' */ +/** @import { StateField } from '#compiler' */ /** @import { Context } from '../types' */ import { get_rune } from '../../scope.js'; import * as e from '../../../errors.js'; @@ -15,7 +15,7 @@ export function ClassBody(node, context) { return; } - /** @type {StateFields} */ + /** @type {Record} */ const state_fields = {}; /** @type {string[]} */ diff --git a/packages/svelte/src/compiler/types/index.d.ts b/packages/svelte/src/compiler/types/index.d.ts index 20fe2c5eec..8f96b3308f 100644 --- a/packages/svelte/src/compiler/types/index.d.ts +++ b/packages/svelte/src/compiler/types/index.d.ts @@ -271,11 +271,9 @@ export interface ExpressionMetadata { has_call: boolean; } -export interface StateFields { - [name: string]: { - type: StateCreationRuneName; - node: PropertyDefinition | AssignmentExpression; - }; +export interface StateField { + type: StateCreationRuneName; + node: PropertyDefinition | AssignmentExpression; } export * from './template.js';