add lexer error for invalid tags

kbrsh · Apr 5, 2019 · e3b9b04 · e3b9b04
1 parent f29859f
commit e3b9b04
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/packages/moon/dist/moon.js b/packages/moon/dist/moon.js
@@ -107,7 +107,7 @@
 	 */
 
 	function lexError(message, input, index) {
-		var lexMessage = message + "\n\n";
+		var lexMessage = message + "\n\n"; // Show input characters surrounding the source of the error.
 
 		for (var i = Math.max(0, index - 16); i < Math.min(index + 16, input.length); i++) {
 			lexMessage += input[i];
@@ -189,6 +189,11 @@
 				// the match and captured groups.
 
 				var typeExec = typeRE.exec(input);
+
+				if ("development" === "development" && typeExec === null) {
+					lexError("Lexer expected a valid opening or closing tag.", input, i);
+				}
+
 				var typeMatch = typeExec[0];
 				var type = typeExec[1];
 				var attributesText = typeExec[2];
@@ -302,6 +307,7 @@
 
 
 	function parseErrorMessage(message) {
+		/* istanbul ignore next */
 		return "development" === "development" ? message : "";
 	}
 	/**

diff --git a/packages/moon/dist/moon.min.js b/packages/moon/dist/moon.min.js
diff --git a/packages/moon/src/compiler/lexer/lexer.js b/packages/moon/src/compiler/lexer/lexer.js
@@ -62,6 +62,7 @@ export function tokenString(token) {
 function lexError(message, input, index) {
 	let lexMessage = `${message}\n\n`;
 
+	// Show input characters surrounding the source of the error.
 	for (
 		let i = Math.max(0, index - 16);
 		i < Math.min(index + 16, input.length);
@@ -152,6 +153,11 @@ export function lex(input) {
 			// Execute the tag type regular expression on the input and store
 			// the match and captured groups.
 			const typeExec = typeRE.exec(input);
+
+			if (process.env.MOON_ENV === "development" && typeExec === null) {
+				lexError("Lexer expected a valid opening or closing tag.", input, i);
+			}
+
 			const typeMatch = typeExec[0];
 			const type = typeExec[1];
 			const attributesText = typeExec[2];

diff --git a/packages/moon/test/compiler/lexer.test.js b/packages/moon/test/compiler/lexer.test.js
@@ -93,6 +93,20 @@ test("lex error from unclosed opening bracket", () => {
 	expect(console.error).toBeCalled();
 });
 
+test("lex error from invalid opening tag", () => {
+	console.error = jest.fn();
+
+	expect(Array.isArray(lex("<div"))).toBe(true);
+	expect(console.error).toBeCalled();
+});
+
+test("lex error from invalid closing tag", () => {
+	console.error = jest.fn();
+
+	expect(Array.isArray(lex("<div/"))).toBe(true);
+	expect(console.error).toBeCalled();
+});
+
 test("lex error from unclosed self-closing tag", () => {
 	console.error = jest.fn();