htmljs-parser 5.4.2 → 5.5.0

package/dist/index.js

@@ -1378,12 +1378,14 @@ var CONCISE_HTML_CONTENT = {
         parentTag = this.activeTag;
       }
       if (!parentTag && curIndent) {
-        this.emitError(
-          this.pos,
-          7 /* INVALID_INDENTATION */,
-          "Line has extra indentation at the beginning"
-        );
-        return;
+        if (code !== 47 /* FORWARD_SLASH */) {
+          this.emitError(
+            this.pos,
+            7 /* INVALID_INDENTATION */,
+            "Line has extra indentation at the beginning"
+          );
+          return;
+        }
       }
       if (parentTag) {
         if (parentTag.type === 1 /* text */ && code !== 45 /* HTML_BLOCK_DELIMITER */) {
@@ -1624,8 +1626,21 @@ var EXPRESSION = {
         return;
       }
       if (expression.shouldTerminate(code, this.data, this.pos)) {
-        this.exitState();
-        return;
+        let wasExpression = false;
+        if (expression.operators) {
+          const prevNonWhitespacePos = lookBehindWhile(
+            isWhitespaceCode,
+            this.data,
+            this.pos - 1
+          );
+          if (prevNonWhitespacePos > expression.start) {
+            wasExpression = lookBehindForOperator(this.data, prevNonWhitespacePos) !== -1;
+          }
+        }
+        if (!wasExpression) {
+          this.exitState();
+          return;
+        }
       }
     }
     switch (code) {
@@ -2646,6 +2661,7 @@ var PARSED_STRING = {
   },
   char(code, str) {
     if (code === str.quoteCharCode) {
+      this.startText();
       this.pos++;
       this.exitState();
     } else if (!states_exports.checkForPlaceholder(this, code)) {

package/dist/index.mjs

@@ -1353,12 +1353,14 @@ var CONCISE_HTML_CONTENT = {
         parentTag = this.activeTag;
       }
       if (!parentTag && curIndent) {
-        this.emitError(
-          this.pos,
-          7 /* INVALID_INDENTATION */,
-          "Line has extra indentation at the beginning"
-        );
-        return;
+        if (code !== 47 /* FORWARD_SLASH */) {
+          this.emitError(
+            this.pos,
+            7 /* INVALID_INDENTATION */,
+            "Line has extra indentation at the beginning"
+          );
+          return;
+        }
       }
       if (parentTag) {
         if (parentTag.type === 1 /* text */ && code !== 45 /* HTML_BLOCK_DELIMITER */) {
@@ -1599,8 +1601,21 @@ var EXPRESSION = {
         return;
       }
       if (expression.shouldTerminate(code, this.data, this.pos)) {
-        this.exitState();
-        return;
+        let wasExpression = false;
+        if (expression.operators) {
+          const prevNonWhitespacePos = lookBehindWhile(
+            isWhitespaceCode,
+            this.data,
+            this.pos - 1
+          );
+          if (prevNonWhitespacePos > expression.start) {
+            wasExpression = lookBehindForOperator(this.data, prevNonWhitespacePos) !== -1;
+          }
+        }
+        if (!wasExpression) {
+          this.exitState();
+          return;
+        }
       }
     }
     switch (code) {
@@ -2621,6 +2636,7 @@ var PARSED_STRING = {
   },
   char(code, str) {
     if (code === str.quoteCharCode) {
+      this.startText();
       this.pos++;
       this.exitState();
     } else if (!states_exports.checkForPlaceholder(this, code)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "htmljs-parser",
   "description": "An HTML parser recognizes content and string placeholders and allows JavaScript expressions as attribute values",
-  "version": "5.4.2",
+  "version": "5.5.0",
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.7",
     "@changesets/cli": "^2.25.2",