use node.metadata.path

Author: Rich-Harris

packages/svelte/src/compiler/phases/2-analyze/index.js

@@ -709,8 +709,8 @@ export function analyze_component(root, source, options) {
 		analyze_css(analysis.css.ast, analysis);
 
 		// mark nodes as scoped/unused/empty etc
-		for (const element of analysis.elements) {
-			prune(analysis.css.ast, element.node);
+		for (const node of analysis.elements) {
+			prune(analysis.css.ast, node);
 		}
 
 		const { comment } = analysis.css.ast.content;
@@ -724,7 +724,7 @@ export function analyze_component(root, source, options) {
 			warn_unused(analysis.css.ast);
 		}
 
-		outer: for (const { node } of analysis.elements) {
+		outer: for (const node of analysis.elements) {
 			if (node.type === 'RenderTag') continue;
 
 			if (node.metadata.scoped) {

packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js

@@ -19,12 +19,10 @@ import { mark_subtree_dynamic } from './shared/fragment.js';
  */
 export function RegularElement(node, context) {
 	validate_element(node, context);
-
 	check_element(node, context);
 
 	node.metadata.path = [...context.path];
-
-	context.state.analysis.elements.push({ node, path: context.path });
+	context.state.analysis.elements.push(node);
 
 	// Special case: Move the children of <textarea> into a value attribute if they are dynamic
 	if (node.name === 'textarea' && node.fragment.nodes.length > 0) {

packages/svelte/src/compiler/phases/2-analyze/visitors/RenderTag.js

@@ -12,7 +12,8 @@ import { mark_subtree_dynamic } from './shared/fragment.js';
 export function RenderTag(node, context) {
 	validate_opening_tag(node, context.state, '@');
 
-	context.state.analysis.elements.push({ node, path: context.path });
+	node.metadata.path = [...context.path];
+	context.state.analysis.elements.push(node);
 
 	const callee = unwrap_optional(node.expression).callee;
 

packages/svelte/src/compiler/phases/2-analyze/visitors/SvelteElement.js

@@ -12,10 +12,10 @@ import { mark_subtree_dynamic } from './shared/fragment.js';
  */
 export function SvelteElement(node, context) {
 	validate_element(node, context);
-
 	check_element(node, context);
 
-	context.state.analysis.elements.push({ node, path: context.path });
+	node.metadata.path = [...context.path];
+	context.state.analysis.elements.push(node);
 
 	const xmlns = /** @type {AST.Attribute & { value: [AST.Text] } | undefined} */ (
 		node.attributes.find(

packages/svelte/src/compiler/phases/types.d.ts

@@ -1,4 +1,4 @@
-import type { AST, Binding, Css, ElementWithPath, SvelteNode } from '#compiler';
+import type { AST, Binding, Css, SvelteNode } from '#compiler';
 import type { Identifier, LabeledStatement, Program, VariableDeclaration } from 'estree';
 import type { Scope, ScopeRoot } from './scope.js';
 
@@ -37,7 +37,7 @@ export interface ComponentAnalysis extends Analysis {
 	instance: Js;
 	template: Template;
 	/** Used for CSS pruning and scoping */
-	elements: ElementWithPath[];
+	elements: Array<AST.RegularElement | AST.SvelteElement | AST.RenderTag>;
 	runes: boolean;
 	exports: Array<{ name: string; alias: string | null }>;
 	/** Whether the component uses `$$props` */

packages/svelte/src/compiler/types/template.d.ts

@@ -167,6 +167,7 @@ export namespace AST {
 		metadata: {
 			dynamic: boolean;
 			args_with_call_expression: Set<number>;
+			path: SvelteNode[];
 		};
 	}
 
@@ -344,6 +345,7 @@ export namespace AST {
 			 */
 			mathml: boolean;
 			scoped: boolean;
+			path: SvelteNode[];
 		};
 	}
 
@@ -514,11 +516,6 @@ export type TemplateNode =
 
 export type SvelteNode = Node | TemplateNode | AST.Fragment | Css.Node;
 
-export interface ElementWithPath {
-	node: AST.RegularElement | AST.SvelteElement | AST.RenderTag;
-	path: SvelteNode[];
-}
-
 declare module 'estree' {
 	export interface BaseNode {
 		/** Added by the Svelte parser */