From 6b2eb4743cf3f5fb038d0afd40a8bd2e002e5fb0 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 14 May 2024 14:07:37 -0400
Subject: [PATCH] use full filename, basename is not very helpful. also,
 current_component is guaranteed to not be null

---
 packages/svelte/src/internal/server/dev.js | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/svelte/src/internal/server/dev.js b/packages/svelte/src/internal/server/dev.js
index 2223df104a..67fd76421b 100644
--- a/packages/svelte/src/internal/server/dev.js
+++ b/packages/svelte/src/internal/server/dev.js
@@ -9,7 +9,7 @@ import { current_component } from './context.js';
  * @typedef {{
  * 	tag: string;
  * 	parent: null | Element;
- *  file: string;
+ *  filename: string;
  * }} Element
  */
 
@@ -46,19 +46,12 @@ function print_file(file) {
  * @param {number} column
  */
 export function push_element(payload, tag, line, column) {
-	var file;
-
-	if (current_component !== null) {
-		const filename = current_component.function.filename;
-		if (filename) {
-			file = filename.split('/').at(-1);
-		}
-	}
+	var filename = /** @type {import('#server').Component} */ (current_component).function.filename;
 
 	if (current_element !== null && !is_tag_valid_with_parent(tag, current_element.tag)) {
 		error_on_client(
 			payload,
-			`<${tag}> ${print_file(file)} is not a valid child element of <${current_element.tag}> ${print_file(current_element.file)}`
+			`<${tag}> ${print_file(filename)} is not a valid child element of <${current_element.tag}> ${print_file(current_element.filename)}`
 		);
 	}
 
@@ -68,7 +61,7 @@ export function push_element(payload, tag, line, column) {
 			if (interactive_elements.has(element.tag)) {
 				error_on_client(
 					payload,
-					`<${tag}> ${print_file(file)} is not a valid child element of <${element.tag}> ${print_file(element.file)}`
+					`<${tag}> ${print_file(filename)} is not a valid child element of <${element.tag}> ${print_file(element.filename)}`
 				);
 			}
 			element = element.parent;
@@ -81,7 +74,7 @@ export function push_element(payload, tag, line, column) {
 			if (element.tag === 'p') {
 				error_on_client(
 					payload,
-					`<${tag}> ${print_file(file)} is not a valid child element of <p> ${print_file(element.file)}`
+					`<${tag}> ${print_file(filename)} is not a valid child element of <p> ${print_file(element.filename)}`
 				);
 			}
 			element = element.parent;
@@ -91,7 +84,7 @@ export function push_element(payload, tag, line, column) {
 	current_element = {
 		tag,
 		parent: current_element,
-		file
+		filename
 	};
 }