htmljs-parser 3.3.1 → 3.3.4

package/dist/index.js

@@ -363,6 +363,7 @@ __export(states_exports, {
   REGULAR_EXPRESSION: () => REGULAR_EXPRESSION,
   STRING: () => STRING,
   TAG_NAME: () => TAG_NAME,
+  TAG_STAGE: () => TAG_STAGE,
   TEMPLATE_STRING: () => TEMPLATE_STRING,
   checkForCDATA: () => checkForCDATA,
   checkForClosingTag: () => checkForClosingTag,
@@ -984,8 +985,9 @@ var DTD = {
 };
 
 // src/states/EXPRESSION.ts
-var conciseOperatorPattern = buildOperatorPattern(true);
-var htmlOperatorPattern = buildOperatorPattern(false);
+var htmlAttrsPattern = buildPattern(0 /* HTML_ATTRS */);
+var conciseAttrsPattern = buildPattern(1 /* CONCISE_ATTRS */);
+var conciseAttrsGroupPattern = buildPattern(2 /* CONCISE_ATTRS_GROUP */);
 var EXPRESSION = {
   name: "EXPRESSION",
   enter(parent, start) {
@@ -1068,7 +1070,7 @@ var EXPRESSION = {
     }
   },
   eol(_, expression) {
-    if (!expression.groupStack.length && (expression.terminatedByWhitespace || expression.terminatedByEOL)) {
+    if (!expression.groupStack.length && (expression.terminatedByEOL || expression.terminatedByWhitespace) && !checkForOperators(this, expression)) {
       this.exitState();
     }
   },
@@ -1096,28 +1098,30 @@ var EXPRESSION = {
   return() {
   }
 };
-function buildOperatorPattern(isConcise) {
-  const binary = `[!~*%&^|?:<]+|(?<=[!=<>&^~|/*?%+-])=|=(?=[!=<>&^~|/*?%+-])|(?<!\\+)[ \\t]*\\+(?:[ \\t]*\\+[ \\t]*\\+)*[ \\t]*(?!\\+)|(?<!-)-${isConcise ? "" : "(?:[ \\t]*-[ \\t]*-)*[ \\t]*"}(?!-)|(?<![/*])/(?![/*${isConcise ? "" : ">"}])|(?<!\\.)\\.(?!\\.)|>${isConcise ? "+" : "{2,}"}|\\b(?:in(?:stanceof)?|as|extends)(?=[ \\t]+[^=/,;:>])`;
-  const unary = "\\b(?:a(?:sync|wait)|keyof|class|function|new|typeof|void)\\b";
-  const lookAheadPattern = "[ \\t]*(?:" + binary + `)[ \\t]*|[ \\t]+(?=[{(])`;
+function buildPattern(type) {
+  const space = type === 1 /* CONCISE_ATTRS */ ? "[ \\t]" : "\\s";
+  const binary = `(?:[!~*%&^|?<]+=*)+|:+(?!=)|[>/+=-]+=|=>|(?<!\\+)[ \\t]*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!-)-${type === 1 /* CONCISE_ATTRS */ ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${type === 0 /* HTML_ATTRS */ ? ">" : ""}])|(?<!\\.)\\.(?!\\.)|>${type === 0 /* HTML_ATTRS */ ? "{2,}" : "+"}|[ \\t]+(?:in(?:stanceof)?|as|extends)(?=[ \\t]+[^=/,;:>])`;
+  const unary = "\\b(?<![.]\\s*)(?:a(?:sync|wait)|keyof|class|function|new|typeof|void)\\b";
+  const lookAheadPattern = `${space}*(?:${binary})\\s*|${space}+(?=[{(])`;
   const lookBehindPattern = `(?<=${unary}|${binary})`;
   return new RegExp(`${lookAheadPattern}|${lookBehindPattern}`, "ym");
 }
 function checkForOperators(parser, expression) {
+  var _a;
   if (expression.skipOperators) {
     return false;
   }
-  const pattern = parser.isConcise || expression.terminatedByEOL ? conciseOperatorPattern : htmlOperatorPattern;
+  const pattern = parser.isConcise ? ((_a = parser.activeTag) == null ? void 0 : _a.stage) === states_exports.TAG_STAGE.ATTR_GROUP ? conciseAttrsGroupPattern : conciseAttrsPattern : expression.terminatedByEOL ? conciseAttrsPattern : htmlAttrsPattern;
   pattern.lastIndex = parser.pos;
   const matches = pattern.exec(parser.data);
   if (matches) {
     const [match] = matches;
     if (match.length === 0) {
       parser.consumeWhitespace();
-      parser.pos--;
     } else {
-      parser.pos += match.length - 1;
+      parser.pos += match.length;
     }
+    parser.forward = 0;
   } else {
     return false;
   }
@@ -1740,6 +1744,14 @@ var TEMPLATE_STRING = {
 };
 
 // src/states/OPEN_TAG.ts
+var TAG_STAGE = /* @__PURE__ */ ((TAG_STAGE2) => {
+  TAG_STAGE2[TAG_STAGE2["UNKNOWN"] = 0] = "UNKNOWN";
+  TAG_STAGE2[TAG_STAGE2["VAR"] = 1] = "VAR";
+  TAG_STAGE2[TAG_STAGE2["ARGUMENT"] = 2] = "ARGUMENT";
+  TAG_STAGE2[TAG_STAGE2["PARAMS"] = 3] = "PARAMS";
+  TAG_STAGE2[TAG_STAGE2["ATTR_GROUP"] = 4] = "ATTR_GROUP";
+  return TAG_STAGE2;
+})(TAG_STAGE || {});
 var CONCISE_TAG_VAR_TERMINATORS = [
   59 /* SEMICOLON */,
   40 /* OPEN_PAREN */,
@@ -1924,8 +1936,10 @@ var OPEN_TAG = {
     } else if (code === 47 /* FORWARD_SLASH */ && !tag.hasAttrs) {
       tag.stage = 1 /* VAR */;
       this.pos++;
+      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.skipOperators = true;
       expr.terminatedByWhitespace = true;
       expr.terminator = this.isConcise ? CONCISE_TAG_VAR_TERMINATORS : HTML_TAG_VAR_TERMINATORS;
       this.pos--;

package/dist/index.mjs

@@ -342,6 +342,7 @@ __export(states_exports, {
   REGULAR_EXPRESSION: () => REGULAR_EXPRESSION,
   STRING: () => STRING,
   TAG_NAME: () => TAG_NAME,
+  TAG_STAGE: () => TAG_STAGE,
   TEMPLATE_STRING: () => TEMPLATE_STRING,
   checkForCDATA: () => checkForCDATA,
   checkForClosingTag: () => checkForClosingTag,
@@ -963,8 +964,9 @@ var DTD = {
 };
 
 // src/states/EXPRESSION.ts
-var conciseOperatorPattern = buildOperatorPattern(true);
-var htmlOperatorPattern = buildOperatorPattern(false);
+var htmlAttrsPattern = buildPattern(0 /* HTML_ATTRS */);
+var conciseAttrsPattern = buildPattern(1 /* CONCISE_ATTRS */);
+var conciseAttrsGroupPattern = buildPattern(2 /* CONCISE_ATTRS_GROUP */);
 var EXPRESSION = {
   name: "EXPRESSION",
   enter(parent, start) {
@@ -1047,7 +1049,7 @@ var EXPRESSION = {
     }
   },
   eol(_, expression) {
-    if (!expression.groupStack.length && (expression.terminatedByWhitespace || expression.terminatedByEOL)) {
+    if (!expression.groupStack.length && (expression.terminatedByEOL || expression.terminatedByWhitespace) && !checkForOperators(this, expression)) {
       this.exitState();
     }
   },
@@ -1075,28 +1077,30 @@ var EXPRESSION = {
   return() {
   }
 };
-function buildOperatorPattern(isConcise) {
-  const binary = `[!~*%&^|?:<]+|(?<=[!=<>&^~|/*?%+-])=|=(?=[!=<>&^~|/*?%+-])|(?<!\\+)[ \\t]*\\+(?:[ \\t]*\\+[ \\t]*\\+)*[ \\t]*(?!\\+)|(?<!-)-${isConcise ? "" : "(?:[ \\t]*-[ \\t]*-)*[ \\t]*"}(?!-)|(?<![/*])/(?![/*${isConcise ? "" : ">"}])|(?<!\\.)\\.(?!\\.)|>${isConcise ? "+" : "{2,}"}|\\b(?:in(?:stanceof)?|as|extends)(?=[ \\t]+[^=/,;:>])`;
-  const unary = "\\b(?:a(?:sync|wait)|keyof|class|function|new|typeof|void)\\b";
-  const lookAheadPattern = "[ \\t]*(?:" + binary + `)[ \\t]*|[ \\t]+(?=[{(])`;
+function buildPattern(type) {
+  const space = type === 1 /* CONCISE_ATTRS */ ? "[ \\t]" : "\\s";
+  const binary = `(?:[!~*%&^|?<]+=*)+|:+(?!=)|[>/+=-]+=|=>|(?<!\\+)[ \\t]*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!-)-${type === 1 /* CONCISE_ATTRS */ ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${type === 0 /* HTML_ATTRS */ ? ">" : ""}])|(?<!\\.)\\.(?!\\.)|>${type === 0 /* HTML_ATTRS */ ? "{2,}" : "+"}|[ \\t]+(?:in(?:stanceof)?|as|extends)(?=[ \\t]+[^=/,;:>])`;
+  const unary = "\\b(?<![.]\\s*)(?:a(?:sync|wait)|keyof|class|function|new|typeof|void)\\b";
+  const lookAheadPattern = `${space}*(?:${binary})\\s*|${space}+(?=[{(])`;
   const lookBehindPattern = `(?<=${unary}|${binary})`;
   return new RegExp(`${lookAheadPattern}|${lookBehindPattern}`, "ym");
 }
 function checkForOperators(parser, expression) {
+  var _a;
   if (expression.skipOperators) {
     return false;
   }
-  const pattern = parser.isConcise || expression.terminatedByEOL ? conciseOperatorPattern : htmlOperatorPattern;
+  const pattern = parser.isConcise ? ((_a = parser.activeTag) == null ? void 0 : _a.stage) === states_exports.TAG_STAGE.ATTR_GROUP ? conciseAttrsGroupPattern : conciseAttrsPattern : expression.terminatedByEOL ? conciseAttrsPattern : htmlAttrsPattern;
   pattern.lastIndex = parser.pos;
   const matches = pattern.exec(parser.data);
   if (matches) {
     const [match] = matches;
     if (match.length === 0) {
       parser.consumeWhitespace();
-      parser.pos--;
     } else {
-      parser.pos += match.length - 1;
+      parser.pos += match.length;
     }
+    parser.forward = 0;
   } else {
     return false;
   }
@@ -1719,6 +1723,14 @@ var TEMPLATE_STRING = {
 };
 
 // src/states/OPEN_TAG.ts
+var TAG_STAGE = /* @__PURE__ */ ((TAG_STAGE2) => {
+  TAG_STAGE2[TAG_STAGE2["UNKNOWN"] = 0] = "UNKNOWN";
+  TAG_STAGE2[TAG_STAGE2["VAR"] = 1] = "VAR";
+  TAG_STAGE2[TAG_STAGE2["ARGUMENT"] = 2] = "ARGUMENT";
+  TAG_STAGE2[TAG_STAGE2["PARAMS"] = 3] = "PARAMS";
+  TAG_STAGE2[TAG_STAGE2["ATTR_GROUP"] = 4] = "ATTR_GROUP";
+  return TAG_STAGE2;
+})(TAG_STAGE || {});
 var CONCISE_TAG_VAR_TERMINATORS = [
   59 /* SEMICOLON */,
   40 /* OPEN_PAREN */,
@@ -1903,8 +1915,10 @@ var OPEN_TAG = {
     } else if (code === 47 /* FORWARD_SLASH */ && !tag.hasAttrs) {
       tag.stage = 1 /* VAR */;
       this.pos++;
+      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.skipOperators = true;
       expr.terminatedByWhitespace = true;
       expr.terminator = this.isConcise ? CONCISE_TAG_VAR_TERMINATORS : HTML_TAG_VAR_TERMINATORS;
       this.pos--;

package/dist/states/OPEN_TAG.d.ts

@@ -1,5 +1,5 @@
 import { StateDefinition, Ranges, Meta, TagType } from "../internal";
-declare const enum TAG_STAGE {
+export declare const enum TAG_STAGE {
     UNKNOWN = 0,
     VAR = 1,
     ARGUMENT = 2,
@@ -22,4 +22,3 @@ export interface OpenTagMeta extends Meta {
     parentTag: OpenTagMeta | undefined;
 }
 export declare const OPEN_TAG: StateDefinition<OpenTagMeta>;
-export {};

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