htmljs-parser 5.4.1 → 5.4.3

package/dist/index.js

@@ -382,6 +382,7 @@ __export(states_exports, {
   JS_COMMENT_BLOCK: () => JS_COMMENT_BLOCK,
   JS_COMMENT_LINE: () => JS_COMMENT_LINE,
   OPEN_TAG: () => OPEN_TAG,
+  PARSED_STRING: () => PARSED_STRING,
   PARSED_TEXT_CONTENT: () => PARSED_TEXT_CONTENT,
   PLACEHOLDER: () => PLACEHOLDER,
   REGULAR_EXPRESSION: () => REGULAR_EXPRESSION,
@@ -1623,8 +1624,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) {
@@ -2259,6 +2273,11 @@ var PARSED_TEXT_CONTENT = {
         this.startText();
         this.enterState(states_exports.TEMPLATE_STRING);
         break;
+      case 34 /* DOUBLE_QUOTE */:
+      case 39 /* SINGLE_QUOTE */:
+        this.startText();
+        this.enterState(states_exports.PARSED_STRING).quoteCharCode = code;
+        break;
       default:
         if (!states_exports.checkForPlaceholder(this, code))
           this.startText();
@@ -2624,6 +2643,42 @@ var TEMPLATE_STRING = {
   }
 };
 
+// src/states/PARSED_STRING.ts
+var PARSED_STRING = {
+  name: "PARSED_STRING",
+  enter(parent, start) {
+    return {
+      state: PARSED_STRING,
+      parent,
+      start,
+      end: start,
+      quoteCharCode: 34 /* DOUBLE_QUOTE */
+    };
+  },
+  exit() {
+  },
+  char(code, str) {
+    if (code === str.quoteCharCode) {
+      this.startText();
+      this.pos++;
+      this.exitState();
+    } else if (!states_exports.checkForPlaceholder(this, code)) {
+      this.startText();
+    }
+  },
+  eof(str) {
+    this.emitError(
+      str,
+      13 /* INVALID_TEMPLATE_STRING */,
+      "EOF reached while parsing string expression"
+    );
+  },
+  eol() {
+  },
+  return() {
+  }
+};
+
 // src/index.ts
 function createParser(handlers) {
   const parser = new Parser(handlers);

package/dist/index.mjs

@@ -357,6 +357,7 @@ __export(states_exports, {
   JS_COMMENT_BLOCK: () => JS_COMMENT_BLOCK,
   JS_COMMENT_LINE: () => JS_COMMENT_LINE,
   OPEN_TAG: () => OPEN_TAG,
+  PARSED_STRING: () => PARSED_STRING,
   PARSED_TEXT_CONTENT: () => PARSED_TEXT_CONTENT,
   PLACEHOLDER: () => PLACEHOLDER,
   REGULAR_EXPRESSION: () => REGULAR_EXPRESSION,
@@ -1598,8 +1599,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) {
@@ -2234,6 +2248,11 @@ var PARSED_TEXT_CONTENT = {
         this.startText();
         this.enterState(states_exports.TEMPLATE_STRING);
         break;
+      case 34 /* DOUBLE_QUOTE */:
+      case 39 /* SINGLE_QUOTE */:
+        this.startText();
+        this.enterState(states_exports.PARSED_STRING).quoteCharCode = code;
+        break;
       default:
         if (!states_exports.checkForPlaceholder(this, code))
           this.startText();
@@ -2599,6 +2618,42 @@ var TEMPLATE_STRING = {
   }
 };
 
+// src/states/PARSED_STRING.ts
+var PARSED_STRING = {
+  name: "PARSED_STRING",
+  enter(parent, start) {
+    return {
+      state: PARSED_STRING,
+      parent,
+      start,
+      end: start,
+      quoteCharCode: 34 /* DOUBLE_QUOTE */
+    };
+  },
+  exit() {
+  },
+  char(code, str) {
+    if (code === str.quoteCharCode) {
+      this.startText();
+      this.pos++;
+      this.exitState();
+    } else if (!states_exports.checkForPlaceholder(this, code)) {
+      this.startText();
+    }
+  },
+  eof(str) {
+    this.emitError(
+      str,
+      13 /* INVALID_TEMPLATE_STRING */,
+      "EOF reached while parsing string expression"
+    );
+  },
+  eol() {
+  },
+  return() {
+  }
+};
+
 // src/index.ts
 function createParser(handlers) {
   const parser = new Parser(handlers);

package/dist/states/PARSED_STRING.d.ts

@@ -0,0 +1,6 @@
+import { StateDefinition, Meta } from "../internal";
+interface ParsedStringMeta extends Meta {
+    quoteCharCode: number;
+}
+export declare const PARSED_STRING: StateDefinition<ParsedStringMeta>;
+export {};

package/dist/states/index.d.ts

@@ -17,4 +17,5 @@ export * from "./REGULAR_EXPRESSION";
 export * from "./STRING";
 export * from "./TAG_NAME";
 export * from "./TEMPLATE_STRING";
+export * from "./PARSED_STRING";
 export * from "./OPEN_TAG";

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.1",
+  "version": "5.4.3",
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.7",
     "@changesets/cli": "^2.25.2",