@@ -9,7 +9,7 @@ import { current_component } from './context.js';
9
9
* @typedef {{
10
10
* tag: string;
11
11
* parent: null | Element;
12
- * file : string;
12
+ * filename : string;
13
13
* }} Element
14
14
*/
15
15
@@ -46,19 +46,12 @@ function print_file(file) {
46
46
* @param {number } column
47
47
*/
48
48
export function push_element ( payload , tag , line , column ) {
49
- var file ;
50
-
51
- if ( current_component !== null ) {
52
- const filename = current_component . function . filename ;
53
- if ( filename ) {
54
- file = filename . split ( '/' ) . at ( - 1 ) ;
55
- }
56
- }
49
+ var filename = /** @type {import('#server').Component } */ ( current_component ) . function . filename ;
57
50
58
51
if ( current_element !== null && ! is_tag_valid_with_parent ( tag , current_element . tag ) ) {
59
52
error_on_client (
60
53
payload ,
61
- `<${ tag } > ${ print_file ( file ) } is not a valid child element of <${ current_element . tag } > ${ print_file ( current_element . file ) } `
54
+ `<${ tag } > ${ print_file ( filename ) } is not a valid child element of <${ current_element . tag } > ${ print_file ( current_element . filename ) } `
62
55
) ;
63
56
}
64
57
@@ -68,7 +61,7 @@ export function push_element(payload, tag, line, column) {
68
61
if ( interactive_elements . has ( element . tag ) ) {
69
62
error_on_client (
70
63
payload ,
71
- `<${ tag } > ${ print_file ( file ) } is not a valid child element of <${ element . tag } > ${ print_file ( element . file ) } `
64
+ `<${ tag } > ${ print_file ( filename ) } is not a valid child element of <${ element . tag } > ${ print_file ( element . filename ) } `
72
65
) ;
73
66
}
74
67
element = element . parent ;
@@ -81,7 +74,7 @@ export function push_element(payload, tag, line, column) {
81
74
if ( element . tag === 'p' ) {
82
75
error_on_client (
83
76
payload ,
84
- `<${ tag } > ${ print_file ( file ) } is not a valid child element of <p> ${ print_file ( element . file ) } `
77
+ `<${ tag } > ${ print_file ( filename ) } is not a valid child element of <p> ${ print_file ( element . filename ) } `
85
78
) ;
86
79
}
87
80
element = element . parent ;
@@ -91,7 +84,7 @@ export function push_element(payload, tag, line, column) {
91
84
current_element = {
92
85
tag,
93
86
parent : current_element ,
94
- file
87
+ filename
95
88
} ;
96
89
}
97
90
0 commit comments