tweaks

Author: Rich-Harris

packages/svelte/src/internal/server/dev.js

@@ -9,14 +9,14 @@ import { current_component } from './context.js';
  * @typedef {{
  * 	tag: string;
  * 	parent: null | Element;
- *  filename: string;
+ *  filename: null | string;
  * }} Element
  */
 
 /**
  * @type {Element | null}
  */
-let current_element = null;
+let parent = null;
 
 /**
  * @param {import('#server').Payload} payload
@@ -33,12 +33,24 @@ function error_on_client(payload, message) {
 }
 
 /**
- * @param {string} file
+ * @param {string | null} file
  */
 function print_file(file) {
 	return file ? `(${file})` : '';
 }
 
+/**
+ * @param {import('#server').Payload} payload
+ * @param {Element} parent
+ * @param {Element} child
+ */
+function print_error(payload, parent, child) {
+	error_on_client(
+		payload,
+		`<${child.tag}> ${print_file(child.filename)} is not a valid child element of <${parent.tag}> ${print_file(parent.filename)}`
+	);
+}
+
 /**
  * @param {import('#server').Payload} payload
  * @param {string} tag
@@ -47,47 +59,37 @@ function print_file(file) {
  */
 export function push_element(payload, tag, line, column) {
 	var filename = /** @type {import('#server').Component} */ (current_component).function.filename;
+	var child = { tag, parent, filename };
 
-	if (current_element !== null && !is_tag_valid_with_parent(tag, current_element.tag)) {
-		error_on_client(
-			payload,
-			`<${tag}> ${print_file(filename)} is not a valid child element of <${current_element.tag}> ${print_file(current_element.filename)}`
-		);
+	if (parent !== null && !is_tag_valid_with_parent(tag, parent.tag)) {
+		print_error(payload, parent, child);
 	}
 
 	if (interactive_elements.has(tag)) {
-		let element = current_element;
+		let element = parent;
 		while (element !== null) {
 			if (interactive_elements.has(element.tag)) {
-				error_on_client(
-					payload,
-					`<${tag}> ${print_file(filename)} is not a valid child element of <${element.tag}> ${print_file(element.filename)}`
-				);
+				print_error(payload, element, child);
+				break;
 			}
 			element = element.parent;
 		}
 	}
 
 	if (disallowed_paragraph_contents.includes(tag)) {
-		let element = current_element;
+		let element = parent;
 		while (element !== null) {
 			if (element.tag === 'p') {
-				error_on_client(
-					payload,
-					`<${tag}> ${print_file(filename)} is not a valid child element of <p> ${print_file(element.filename)}`
-				);
+				print_error(payload, element, child);
+				break;
 			}
 			element = element.parent;
 		}
 	}
 
-	current_element = {
-		tag,
-		parent: current_element,
-		filename
-	};
+	parent = child;
 }
 
 export function pop_element() {
-	current_element = /** @type {Element} */ (current_element).parent;
+	parent = /** @type {Element} */ (parent).parent;
 }