tweak

Author: dummdidumm

packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitBlock.js

@@ -5,7 +5,7 @@ import { extract_identifiers } from '../../../../utils/ast.js';
 import * as b from '#compiler/builders';
 import { create_derived } from '../utils.js';
 import { get_value } from './shared/declarations.js';
-import { build_expression, with_dev_stack } from './shared/utils.js';
+import { build_expression, add_svelte_meta } from './shared/utils.js';
 
 /**
  * @param {AST.AwaitBlock} node
@@ -54,7 +54,7 @@ export function AwaitBlock(node, context) {
 	}
 
 	context.state.init.push(
-		with_dev_stack(
+		add_svelte_meta(
 			b.call(
 				'$.await',
 				context.state.node,

packages/svelte/src/compiler/phases/3-transform/client/visitors/EachBlock.js

@@ -13,7 +13,7 @@ import { dev } from '../../../../state.js';
 import { extract_paths, object } from '../../../../utils/ast.js';
 import * as b from '#compiler/builders';
 import { get_value } from './shared/declarations.js';
-import { build_expression, with_dev_stack } from './shared/utils.js';
+import { build_expression, add_svelte_meta } from './shared/utils.js';
 
 /**
  * @param {AST.EachBlock} node
@@ -337,7 +337,7 @@ export function EachBlock(node, context) {
 		);
 	}
 
-	context.state.init.push(with_dev_stack(b.call('$.each', ...args), node, 'each'));
+	context.state.init.push(add_svelte_meta(b.call('$.each', ...args), node, 'each'));
 }
 
 /**

packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js

@@ -2,7 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
 import * as b from '#compiler/builders';
-import { build_expression, with_dev_stack } from './shared/utils.js';
+import { build_expression, add_svelte_meta } from './shared/utils.js';
 
 /**
  * @param {AST.IfBlock} node
@@ -74,7 +74,7 @@ export function IfBlock(node, context) {
 		args.push(b.id('$$elseif'));
 	}
 
-	statements.push(with_dev_stack(b.call('$.if', ...args), node, 'if'));
+	statements.push(add_svelte_meta(b.call('$.if', ...args), node, 'if'));
 
 	context.state.init.push(b.block(statements));
 }

packages/svelte/src/compiler/phases/3-transform/client/visitors/KeyBlock.js

@@ -2,7 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
 import * as b from '#compiler/builders';
-import { build_expression, with_dev_stack } from './shared/utils.js';
+import { build_expression, add_svelte_meta } from './shared/utils.js';
 
 /**
  * @param {AST.KeyBlock} node
@@ -15,7 +15,7 @@ export function KeyBlock(node, context) {
 	const body = /** @type {Expression} */ (context.visit(node.fragment));
 
 	context.state.init.push(
-		with_dev_stack(
+		add_svelte_meta(
 			b.call('$.key', context.state.node, b.thunk(key), b.arrow([b.id('$$anchor')], body)),
 			node,
 			'key'

packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/component.js

@@ -8,7 +8,7 @@ import {
 	build_bind_this,
 	memoize_expression,
 	validate_binding,
-	with_dev_stack
+	add_svelte_meta
 } from '../shared/utils.js';
 import { build_attribute_value } from '../shared/element.js';
 import { build_event_handler } from './events.js';
@@ -490,7 +490,7 @@ export function build_component(node, component_name, context) {
 		context.state.template.push_comment();
 
 		statements.push(
-			with_dev_stack(fn(anchor), node, 'component', { componentTag: component_name })
+			add_svelte_meta(fn(anchor), node, 'component', { componentTag: component_name })
 		);
 	}
 

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

@@ -7,7 +7,7 @@ import * as b from '#compiler/builders';
 import { sanitize_template_string } from '../../../../../utils/sanitize_template_string.js';
 import { regex_is_valid_identifier } from '../../../../patterns.js';
 import is_reference from 'is-reference';
-import { dev, is_ignored, locator, filename } from '../../../../../state.js';
+import { dev, is_ignored, locator, component_name } from '../../../../../state.js';
 import { build_getter, create_derived } from '../../utils.js';
 
 /**
@@ -403,7 +403,7 @@ export function build_expression(context, expression, metadata, state = context.
  * @param {Record<string, number | string>} [additional] - Any additional properties to add to the dev stack entry
  * @returns {Statement} - Statement with or without dev stack wrapping
  */
-export function with_dev_stack(call_expression, node, type, additional) {
+export function add_svelte_meta(call_expression, node, type, additional) {
 	if (!dev) {
 		return b.stmt(call_expression);
 	}
@@ -415,10 +415,10 @@ export function with_dev_stack(call_expression, node, type, additional) {
 
 	return b.stmt(
 		b.call(
-			'$.with_dev_stack',
+			'$.add_svelte_meta',
 			b.arrow([], call_expression),
 			b.literal(type),
-			b.literal(filename),
+			b.id(component_name),
 			b.literal(location.line),
 			b.literal(location.column),
 			additional && b.object(Object.entries(additional).map(([k, v]) => b.init(k, b.literal(v))))

packages/svelte/src/compiler/state.js

@@ -16,6 +16,9 @@ export let warnings = [];
  */
 export let filename;
 
+/**
+ * The name of the component that is used in the `export default function ...` statement.
+ */
 export let component_name = '<unknown>';
 
 /**

packages/svelte/src/internal/client/context.js

@@ -11,6 +11,7 @@ import {
 } from './runtime.js';
 import { effect, teardown } from './reactivity/effects.js';
 import { legacy_mode_flag } from '../flags/index.js';
+import { FILENAME } from '../../constants.js';
 
 /** @type {ComponentContext | null} */
 export let component_context = null;
@@ -32,18 +33,18 @@ export function set_dev_stack(stack) {
  * Execute a callback with a new dev stack entry
  * @param {() => any} callback - Function to execute
  * @param {DevStackEntry['type']} type - Type of block/component
- * @param {string} file - Source file
+ * @param {any} component - Component function
  * @param {number} line - Line number
  * @param {number} column - Column number
  * @param {Record<string, any>} [additional] - Any additional properties to add to the dev stack entry
  * @returns {any}
  */
-export function with_dev_stack(callback, type, file, line, column, additional) {
+export function add_svelte_meta(callback, type, component, line, column, additional) {
 	const parent = dev_stack;
 
 	dev_stack = {
 		type,
-		file,
+		file: component[FILENAME],
 		line,
 		column,
 		parent,

packages/svelte/src/internal/client/index.js

@@ -1,6 +1,6 @@
 export { createAttachmentKey as attachment } from '../../attachments/index.js';
 export { FILENAME, HMR, NAMESPACE_SVG } from '../../constants.js';
-export { push, pop, with_dev_stack } from './context.js';
+export { push, pop, add_svelte_meta } from './context.js';
 export { assign, assign_and, assign_or, assign_nullish } from './dev/assign.js';
 export { cleanup_styles } from './dev/css.js';
 export { add_locations } from './dev/elements.js';