htmljs-parser 3.3.4 → 3.3.5

package/dist/index.js

@@ -422,6 +422,7 @@ var ATTRIBUTE = {
       return;
     } else if (code === 61 /* EQUAL */ || code === 58 /* COLON */ && this.lookAtCharCodeAhead(1) === 61 /* EQUAL */ || code === 46 /* PERIOD */ && this.lookAheadFor("..")) {
       attr.valueStart = this.pos;
+      this.forward = 0;
       if (code === 58 /* COLON */) {
         ensureAttrName(this, attr);
         attr.bound = true;
@@ -439,28 +440,27 @@ var ATTRIBUTE = {
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByWhitespace = true;
       expr.terminator = this.isConcise ? CONCISE_VALUE_TERMINATORS : HTML_VALUE_TERMINATORS;
-      this.pos--;
     } else if (code === 40 /* OPEN_PAREN */) {
       ensureAttrName(this, attr);
       attr.stage = 3 /* ARGUMENT */;
       this.pos++;
+      this.forward = 0;
       this.enterState(states_exports.EXPRESSION).terminator = 41 /* CLOSE_PAREN */;
-      this.pos--;
     } else if (code === 123 /* OPEN_CURLY_BRACE */ && attr.args) {
       ensureAttrName(this, attr);
       attr.stage = 4 /* BLOCK */;
       this.pos++;
+      this.forward = 0;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByWhitespace = false;
       expr.terminator = 125 /* CLOSE_CURLY_BRACE */;
-      this.pos--;
     } else if (attr.stage === 0 /* UNKNOWN */) {
       attr.stage = 1 /* NAME */;
+      this.forward = 0;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByWhitespace = true;
       expr.skipOperators = true;
       expr.terminator = this.isConcise ? CONCISE_NAME_TERMINATORS : HTML_NAME_TERMINATORS;
-      this.pos--;
     } else {
       this.exitState();
     }
@@ -597,8 +597,8 @@ var BEGIN_DELIMITED_HTML_BLOCK = {
       const startPos = this.pos;
       if (!this.consumeWhitespaceOnLine()) {
         this.pos = startPos + 1;
+        this.forward = 0;
         this.beginHtmlBlock(void 0, true);
-        this.pos--;
       }
     }
   },
@@ -861,7 +861,7 @@ var CONCISE_HTML_CONTENT = {
           }
       }
       this.enterState(states_exports.OPEN_TAG);
-      this.pos--;
+      this.forward = 0;
     }
   },
   eol() {
@@ -1307,17 +1307,16 @@ var INLINE_SCRIPT = {
   eof() {
   },
   char(code, inlineScript) {
+    this.forward = 0;
     if (code === 123 /* OPEN_CURLY_BRACE */) {
       inlineScript.block = true;
       this.pos++;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminator = 125 /* CLOSE_CURLY_BRACE */;
       expr.skipOperators = true;
-      this.pos--;
     } else {
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByEOL = true;
-      this.pos--;
     }
   },
   return(child, inlineScript) {
@@ -1513,8 +1512,8 @@ function checkForPlaceholder(parser, code) {
       parser.endText();
       parser.enterState(PLACEHOLDER).escape = escape;
       parser.pos += escape ? 2 : 3;
+      parser.forward = 0;
       parser.enterState(states_exports.EXPRESSION).terminator = 125 /* CLOSE_CURLY_BRACE */;
-      parser.pos--;
       return true;
     }
   }
@@ -1660,8 +1659,8 @@ var TAG_NAME = {
   char(code) {
     if (code === 36 /* DOLLAR */ && this.lookAtCharCodeAhead(1) === 123 /* OPEN_CURLY_BRACE */) {
       this.pos += 2;
+      this.forward = 0;
       this.enterState(states_exports.EXPRESSION).terminator = 125 /* CLOSE_CURLY_BRACE */;
-      this.pos--;
     } else if (isWhitespaceCode(code) || code === 61 /* EQUAL */ || code === 58 /* COLON */ && this.lookAtCharCodeAhead(1) === 61 /* EQUAL */ || code === 40 /* OPEN_PAREN */ || code === 47 /* FORWARD_SLASH */ || code === 124 /* PIPE */ || (this.isConcise ? code === 59 /* SEMICOLON */ : code === 62 /* CLOSE_ANGLE_BRACKET */)) {
       this.activeTag.shorthandEnd = this.pos;
       this.exitState();
@@ -1931,18 +1930,18 @@ var OPEN_TAG = {
     if (isWhitespaceCode(code)) {
     } else if (code === 44 /* COMMA */) {
       this.pos++;
+      this.forward = 0;
       this.consumeWhitespace();
-      this.pos--;
     } else if (code === 47 /* FORWARD_SLASH */ && !tag.hasAttrs) {
       tag.stage = 1 /* VAR */;
       this.pos++;
+      this.forward = 0;
       if (isWhitespaceCode(this.lookAtCharCodeAhead(0))) {
         return this.emitError(this.pos, 23 /* MISSING_TAG_VARIABLE */, "A slash was found that was not followed by a variable name or lhs expression");
       }
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByWhitespace = true;
       expr.terminator = this.isConcise ? CONCISE_TAG_VAR_TERMINATORS : HTML_TAG_VAR_TERMINATORS;
-      this.pos--;
     } else if (code === 40 /* OPEN_PAREN */ && !tag.hasAttrs) {
       if (tag.hasArgs) {
         this.emitError(this.pos, 11 /* INVALID_TAG_ARGUMENT */, "A tag can only have one argument");
@@ -1950,25 +1949,25 @@ var OPEN_TAG = {
       }
       tag.stage = 2 /* ARGUMENT */;
       this.pos++;
+      this.forward = 0;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.skipOperators = true;
       expr.terminator = 41 /* CLOSE_PAREN */;
-      this.pos--;
     } else if (code === 124 /* PIPE */ && !tag.hasAttrs) {
       tag.stage = 3 /* PARAMS */;
       this.pos++;
+      this.forward = 0;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.skipOperators = true;
       expr.terminator = 124 /* PIPE */;
-      this.pos--;
     } else {
+      this.forward = 0;
       if (tag.tagName) {
         this.enterState(states_exports.ATTRIBUTE);
         tag.hasAttrs = true;
       } else {
         this.enterState(states_exports.TAG_NAME);
       }
-      this.pos--;
     }
   },
   return(child, tag) {
@@ -2005,7 +2004,7 @@ var OPEN_TAG = {
               attr.start = start;
               attr.args = { start, end, value };
               tag.hasAttrs = true;
-              this.pos--;
+              this.forward = 0;
             } else {
               tag.hasArgs = true;
               (_d = (_c = this.options).onTagArgs) == null ? void 0 : _d.call(_c, {

package/dist/index.mjs

@@ -401,6 +401,7 @@ var ATTRIBUTE = {
       return;
     } else if (code === 61 /* EQUAL */ || code === 58 /* COLON */ && this.lookAtCharCodeAhead(1) === 61 /* EQUAL */ || code === 46 /* PERIOD */ && this.lookAheadFor("..")) {
       attr.valueStart = this.pos;
+      this.forward = 0;
       if (code === 58 /* COLON */) {
         ensureAttrName(this, attr);
         attr.bound = true;
@@ -418,28 +419,27 @@ var ATTRIBUTE = {
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByWhitespace = true;
       expr.terminator = this.isConcise ? CONCISE_VALUE_TERMINATORS : HTML_VALUE_TERMINATORS;
-      this.pos--;
     } else if (code === 40 /* OPEN_PAREN */) {
       ensureAttrName(this, attr);
       attr.stage = 3 /* ARGUMENT */;
       this.pos++;
+      this.forward = 0;
       this.enterState(states_exports.EXPRESSION).terminator = 41 /* CLOSE_PAREN */;
-      this.pos--;
     } else if (code === 123 /* OPEN_CURLY_BRACE */ && attr.args) {
       ensureAttrName(this, attr);
       attr.stage = 4 /* BLOCK */;
       this.pos++;
+      this.forward = 0;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByWhitespace = false;
       expr.terminator = 125 /* CLOSE_CURLY_BRACE */;
-      this.pos--;
     } else if (attr.stage === 0 /* UNKNOWN */) {
       attr.stage = 1 /* NAME */;
+      this.forward = 0;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByWhitespace = true;
       expr.skipOperators = true;
       expr.terminator = this.isConcise ? CONCISE_NAME_TERMINATORS : HTML_NAME_TERMINATORS;
-      this.pos--;
     } else {
       this.exitState();
     }
@@ -576,8 +576,8 @@ var BEGIN_DELIMITED_HTML_BLOCK = {
       const startPos = this.pos;
       if (!this.consumeWhitespaceOnLine()) {
         this.pos = startPos + 1;
+        this.forward = 0;
         this.beginHtmlBlock(void 0, true);
-        this.pos--;
       }
     }
   },
@@ -840,7 +840,7 @@ var CONCISE_HTML_CONTENT = {
           }
       }
       this.enterState(states_exports.OPEN_TAG);
-      this.pos--;
+      this.forward = 0;
     }
   },
   eol() {
@@ -1286,17 +1286,16 @@ var INLINE_SCRIPT = {
   eof() {
   },
   char(code, inlineScript) {
+    this.forward = 0;
     if (code === 123 /* OPEN_CURLY_BRACE */) {
       inlineScript.block = true;
       this.pos++;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminator = 125 /* CLOSE_CURLY_BRACE */;
       expr.skipOperators = true;
-      this.pos--;
     } else {
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByEOL = true;
-      this.pos--;
     }
   },
   return(child, inlineScript) {
@@ -1492,8 +1491,8 @@ function checkForPlaceholder(parser, code) {
       parser.endText();
       parser.enterState(PLACEHOLDER).escape = escape;
       parser.pos += escape ? 2 : 3;
+      parser.forward = 0;
       parser.enterState(states_exports.EXPRESSION).terminator = 125 /* CLOSE_CURLY_BRACE */;
-      parser.pos--;
       return true;
     }
   }
@@ -1639,8 +1638,8 @@ var TAG_NAME = {
   char(code) {
     if (code === 36 /* DOLLAR */ && this.lookAtCharCodeAhead(1) === 123 /* OPEN_CURLY_BRACE */) {
       this.pos += 2;
+      this.forward = 0;
       this.enterState(states_exports.EXPRESSION).terminator = 125 /* CLOSE_CURLY_BRACE */;
-      this.pos--;
     } else if (isWhitespaceCode(code) || code === 61 /* EQUAL */ || code === 58 /* COLON */ && this.lookAtCharCodeAhead(1) === 61 /* EQUAL */ || code === 40 /* OPEN_PAREN */ || code === 47 /* FORWARD_SLASH */ || code === 124 /* PIPE */ || (this.isConcise ? code === 59 /* SEMICOLON */ : code === 62 /* CLOSE_ANGLE_BRACKET */)) {
       this.activeTag.shorthandEnd = this.pos;
       this.exitState();
@@ -1910,18 +1909,18 @@ var OPEN_TAG = {
     if (isWhitespaceCode(code)) {
     } else if (code === 44 /* COMMA */) {
       this.pos++;
+      this.forward = 0;
       this.consumeWhitespace();
-      this.pos--;
     } else if (code === 47 /* FORWARD_SLASH */ && !tag.hasAttrs) {
       tag.stage = 1 /* VAR */;
       this.pos++;
+      this.forward = 0;
       if (isWhitespaceCode(this.lookAtCharCodeAhead(0))) {
         return this.emitError(this.pos, 23 /* MISSING_TAG_VARIABLE */, "A slash was found that was not followed by a variable name or lhs expression");
       }
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.terminatedByWhitespace = true;
       expr.terminator = this.isConcise ? CONCISE_TAG_VAR_TERMINATORS : HTML_TAG_VAR_TERMINATORS;
-      this.pos--;
     } else if (code === 40 /* OPEN_PAREN */ && !tag.hasAttrs) {
       if (tag.hasArgs) {
         this.emitError(this.pos, 11 /* INVALID_TAG_ARGUMENT */, "A tag can only have one argument");
@@ -1929,25 +1928,25 @@ var OPEN_TAG = {
       }
       tag.stage = 2 /* ARGUMENT */;
       this.pos++;
+      this.forward = 0;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.skipOperators = true;
       expr.terminator = 41 /* CLOSE_PAREN */;
-      this.pos--;
     } else if (code === 124 /* PIPE */ && !tag.hasAttrs) {
       tag.stage = 3 /* PARAMS */;
       this.pos++;
+      this.forward = 0;
       const expr = this.enterState(states_exports.EXPRESSION);
       expr.skipOperators = true;
       expr.terminator = 124 /* PIPE */;
-      this.pos--;
     } else {
+      this.forward = 0;
       if (tag.tagName) {
         this.enterState(states_exports.ATTRIBUTE);
         tag.hasAttrs = true;
       } else {
         this.enterState(states_exports.TAG_NAME);
       }
-      this.pos--;
     }
   },
   return(child, tag) {
@@ -1984,7 +1983,7 @@ var OPEN_TAG = {
               attr.start = start;
               attr.args = { start, end, value };
               tag.hasAttrs = true;
-              this.pos--;
+              this.forward = 0;
             } else {
               tag.hasArgs = true;
               (_d = (_c = this.options).onTagArgs) == null ? void 0 : _d.call(_c, {

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": "3.3.4",
+  "version": "3.3.5",
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.4",
     "@changesets/cli": "^2.22.0",
@@ -68,13 +68,12 @@
     "lint:prettier": "prettier \"./**/*{.ts,.js,.json,.md,.yml,rc}\"",
     "mocha": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
     "prepare": "husky install",
-    "prepublishOnly": "npm run build",
     "publish": "npm run build && changeset publish",
     "report": "open ./coverage/lcov-report/index.html",
     "test": "npm run mocha -- --watch",
     "test:inspect": "npm test -- --inspect",
     "test:update": "npm run mocha -- --update",
-    "version": "changeset version"
+    "version": "changeset version && npm i --package-lock-only"
   },
   "types": "dist/index.d.ts"
 }