htmljs-parser 5.2.4 → 5.4.0

package/dist/index.js

@@ -272,6 +272,8 @@ var Parser = class {
       cur++;
     if (this.lookAheadFor(str, cur)) {
       this.pos = cur;
+      if (this.forward > 1)
+        this.forward = 1;
       return true;
     }
     return false;
@@ -420,7 +422,7 @@ var OPEN_TAG = {
       hasArgs: false,
       hasAttrs: false,
       hasParams: false,
-      types: void 0,
+      typeParams: void 0,
       selfClosed: false,
       shorthandEnd: -1,
       tagName: void 0,
@@ -458,7 +460,7 @@ var OPEN_TAG = {
     }
   },
   eol(_, tag) {
-    if (this.isConcise && tag.stage !== 5 /* ATTR_GROUP */) {
+    if (this.isConcise && tag.stage !== 5 /* ATTR_GROUP */ && !this.consumeWhitespaceIfBefore(",")) {
       this.exitState();
     }
   },
@@ -668,7 +670,7 @@ var OPEN_TAG = {
     }
   },
   return(child, tag) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (child.state !== states_exports.EXPRESSION)
       return;
     switch (tag.stage) {
@@ -691,7 +693,7 @@ var OPEN_TAG = {
         break;
       }
       case 2 /* ARGUMENT */: {
-        const { types } = tag;
+        const { typeParams } = tag;
         const start = child.start - 1;
         const end = ++this.pos;
         const value = {
@@ -700,9 +702,9 @@ var OPEN_TAG = {
         };
         if (this.consumeWhitespaceIfBefore("{")) {
           const attr = this.enterState(states_exports.ATTRIBUTE);
-          if (types) {
-            attr.start = types.start;
-            attr.typeParams = types;
+          if (typeParams) {
+            attr.start = typeParams.start;
+            attr.typeParams = typeParams;
           } else {
             attr.start = start;
           }
@@ -710,10 +712,15 @@ var OPEN_TAG = {
           this.forward = 0;
           tag.hasAttrs = true;
         } else {
-          if (types) {
-            (_d = (_c = this.options).onTagTypeArgs) == null ? void 0 : _d.call(_c, types);
+          if (typeParams) {
+            this.emitError(
+              child,
+              27 /* INVALID_TAG_TYPES */,
+              "Unexpected types. Type arguments must directly follow a tag name and type paremeters must precede a method or tag parameters."
+            );
+            break;
           }
-          (_f = (_e = this.options).onTagArgs) == null ? void 0 : _f.call(_e, {
+          (_d = (_c = this.options).onTagArgs) == null ? void 0 : _d.call(_c, {
             start,
             end,
             value
@@ -722,9 +729,9 @@ var OPEN_TAG = {
         break;
       }
       case 3 /* TYPES */: {
-        const { types, hasParams, hasArgs } = tag;
+        const { typeParams, hasParams, hasArgs } = tag;
         const end = ++this.pos;
-        const typeArgs = {
+        const types = {
           start: child.start - 1,
           end,
           value: {
@@ -732,33 +739,28 @@ var OPEN_TAG = {
             end: child.end
           }
         };
+        if (tag.tagName.end === types.start) {
+          (_f = (_e = this.options).onTagTypeArgs) == null ? void 0 : _f.call(_e, types);
+          break;
+        }
         this.consumeWhitespace();
         const nextCode = this.lookAtCharCodeAhead(0);
-        if (!hasParams && nextCode === 124 /* PIPE */) {
-          if (types) {
-            (_h = (_g = this.options).onTagTypeArgs) == null ? void 0 : _h.call(_g, types);
-          }
-          (_j = (_i = this.options).onTagTypeParams) == null ? void 0 : _j.call(_i, typeArgs);
-        } else if (!hasArgs && nextCode === 40 /* OPEN_PAREN */) {
-          if (types) {
-            (_l = (_k = this.options).onTagTypeArgs) == null ? void 0 : _l.call(_k, types);
-          }
-          tag.types = typeArgs;
-        } else if (!(types || hasParams || hasArgs)) {
-          (_n = (_m = this.options).onTagTypeArgs) == null ? void 0 : _n.call(_m, typeArgs);
-          tag.types = typeArgs;
+        if (nextCode === 124 /* PIPE */ && !hasParams) {
+          (_h = (_g = this.options).onTagTypeParams) == null ? void 0 : _h.call(_g, types);
+        } else if (nextCode === 40 /* OPEN_PAREN */ && !(typeParams || hasParams || hasArgs)) {
+          tag.typeParams = types;
         } else {
           this.emitError(
             child,
             27 /* INVALID_TAG_TYPES */,
-            "Unexpected types. Type arguments must follow a tag name and type paremeters must precede a method or tag parameters."
+            "Unexpected types. Type arguments must directly follow a tag name and type paremeters must precede a method or tag parameters."
           );
         }
         break;
       }
       case 4 /* PARAMS */: {
         const end = ++this.pos;
-        (_p = (_o = this.options).onTagParams) == null ? void 0 : _p.call(_o, {
+        (_j = (_i = this.options).onTagParams) == null ? void 0 : _j.call(_i, {
           start: child.start - 1,
           end,
           value: {
@@ -1781,11 +1783,14 @@ function lookBehindForOperator(data, pos) {
     case 60 /* OPEN_ANGLE_BRACKET */:
     case 62 /* CLOSE_ANGLE_BRACKET */:
     case 37 /* PERCENT */:
-    case 46 /* PERIOD */:
     case 124 /* PIPE */:
     case 63 /* QUESTION */:
     case 126 /* TILDE */:
       return curPos;
+    case 46 /* PERIOD */: {
+      const nextPos = lookAheadWhile(isWhitespaceCode, data, pos);
+      return isWordCode(data.charCodeAt(nextPos)) ? nextPos : -1;
+    }
     case 43 /* PLUS */:
     case 45 /* HYPHEN */: {
       if (data.charCodeAt(curPos - 1) === code) {
@@ -1828,8 +1833,10 @@ function lookAheadForOperator(data, pos) {
     case 123 /* OPEN_CURLY_BRACE */:
     case 40 /* OPEN_PAREN */:
       return pos;
-    case 46 /* PERIOD */:
-      return data.charCodeAt(pos + 1) === 46 /* PERIOD */ ? -1 : pos + 1;
+    case 46 /* PERIOD */: {
+      const nextPos = lookAheadWhile(isWhitespaceCode, data, pos + 1);
+      return isWordCode(data.charCodeAt(nextPos)) ? nextPos : -1;
+    }
     default: {
       for (const keyword of binaryKeywords) {
         let nextPos = lookAheadFor(data, pos, keyword);
@@ -1867,7 +1874,7 @@ function canFollowDivision(code) {
   return isWordCode(code) || code === 37 /* PERCENT */ || code === 41 /* CLOSE_PAREN */ || code === 46 /* PERIOD */ || code === 60 /* OPEN_ANGLE_BRACKET */ || code === 93 /* CLOSE_SQUARE_BRACKET */ || code === 125 /* CLOSE_CURLY_BRACE */;
 }
 function isWordCode(code) {
-  return code >= 65 /* UPPER_A */ && code <= 90 /* UPPER_Z */ || code >= 97 /* LOWER_A */ && code <= 122 /* LOWER_Z */ || code >= 48 /* NUMBER_0 */ && code <= 57 /* NUMBER_9 */ || code === 95 /* UNDERSCORE */;
+  return code >= 65 /* UPPER_A */ && code <= 90 /* UPPER_Z */ || code >= 97 /* LOWER_A */ && code <= 122 /* LOWER_Z */ || code >= 48 /* NUMBER_0 */ && code <= 57 /* NUMBER_9 */ || code == 36 /* DOLLAR */ || code === 95 /* UNDERSCORE */;
 }
 function isIndentCode(code) {
   return code === 9 /* TAB */ || code === 32 /* SPACE */;
@@ -2521,7 +2528,7 @@ var TAG_NAME = {
       this.pos += 2;
       this.forward = 0;
       this.enterState(states_exports.EXPRESSION).shouldTerminate = matchesCloseCurlyBrace;
-    } 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 */ || code === 60 /* OPEN_ANGLE_BRACKET */ || (this.isConcise ? code === 59 /* SEMICOLON */ : code === 62 /* CLOSE_ANGLE_BRACKET */)) {
+    } 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 */ || code === 60 /* OPEN_ANGLE_BRACKET */ || code === 44 /* COMMA */ || (this.isConcise ? code === 59 /* SEMICOLON */ : code === 62 /* CLOSE_ANGLE_BRACKET */)) {
       this.activeTag.shorthandEnd = this.pos;
       this.exitState();
     } else if (code === 46 /* PERIOD */ || code === 35 /* NUMBER_SIGN */) {

package/dist/index.mjs

@@ -247,6 +247,8 @@ var Parser = class {
       cur++;
     if (this.lookAheadFor(str, cur)) {
       this.pos = cur;
+      if (this.forward > 1)
+        this.forward = 1;
       return true;
     }
     return false;
@@ -395,7 +397,7 @@ var OPEN_TAG = {
       hasArgs: false,
       hasAttrs: false,
       hasParams: false,
-      types: void 0,
+      typeParams: void 0,
       selfClosed: false,
       shorthandEnd: -1,
       tagName: void 0,
@@ -433,7 +435,7 @@ var OPEN_TAG = {
     }
   },
   eol(_, tag) {
-    if (this.isConcise && tag.stage !== 5 /* ATTR_GROUP */) {
+    if (this.isConcise && tag.stage !== 5 /* ATTR_GROUP */ && !this.consumeWhitespaceIfBefore(",")) {
       this.exitState();
     }
   },
@@ -643,7 +645,7 @@ var OPEN_TAG = {
     }
   },
   return(child, tag) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (child.state !== states_exports.EXPRESSION)
       return;
     switch (tag.stage) {
@@ -666,7 +668,7 @@ var OPEN_TAG = {
         break;
       }
       case 2 /* ARGUMENT */: {
-        const { types } = tag;
+        const { typeParams } = tag;
         const start = child.start - 1;
         const end = ++this.pos;
         const value = {
@@ -675,9 +677,9 @@ var OPEN_TAG = {
         };
         if (this.consumeWhitespaceIfBefore("{")) {
           const attr = this.enterState(states_exports.ATTRIBUTE);
-          if (types) {
-            attr.start = types.start;
-            attr.typeParams = types;
+          if (typeParams) {
+            attr.start = typeParams.start;
+            attr.typeParams = typeParams;
           } else {
             attr.start = start;
           }
@@ -685,10 +687,15 @@ var OPEN_TAG = {
           this.forward = 0;
           tag.hasAttrs = true;
         } else {
-          if (types) {
-            (_d = (_c = this.options).onTagTypeArgs) == null ? void 0 : _d.call(_c, types);
+          if (typeParams) {
+            this.emitError(
+              child,
+              27 /* INVALID_TAG_TYPES */,
+              "Unexpected types. Type arguments must directly follow a tag name and type paremeters must precede a method or tag parameters."
+            );
+            break;
           }
-          (_f = (_e = this.options).onTagArgs) == null ? void 0 : _f.call(_e, {
+          (_d = (_c = this.options).onTagArgs) == null ? void 0 : _d.call(_c, {
             start,
             end,
             value
@@ -697,9 +704,9 @@ var OPEN_TAG = {
         break;
       }
       case 3 /* TYPES */: {
-        const { types, hasParams, hasArgs } = tag;
+        const { typeParams, hasParams, hasArgs } = tag;
         const end = ++this.pos;
-        const typeArgs = {
+        const types = {
           start: child.start - 1,
           end,
           value: {
@@ -707,33 +714,28 @@ var OPEN_TAG = {
             end: child.end
           }
         };
+        if (tag.tagName.end === types.start) {
+          (_f = (_e = this.options).onTagTypeArgs) == null ? void 0 : _f.call(_e, types);
+          break;
+        }
         this.consumeWhitespace();
         const nextCode = this.lookAtCharCodeAhead(0);
-        if (!hasParams && nextCode === 124 /* PIPE */) {
-          if (types) {
-            (_h = (_g = this.options).onTagTypeArgs) == null ? void 0 : _h.call(_g, types);
-          }
-          (_j = (_i = this.options).onTagTypeParams) == null ? void 0 : _j.call(_i, typeArgs);
-        } else if (!hasArgs && nextCode === 40 /* OPEN_PAREN */) {
-          if (types) {
-            (_l = (_k = this.options).onTagTypeArgs) == null ? void 0 : _l.call(_k, types);
-          }
-          tag.types = typeArgs;
-        } else if (!(types || hasParams || hasArgs)) {
-          (_n = (_m = this.options).onTagTypeArgs) == null ? void 0 : _n.call(_m, typeArgs);
-          tag.types = typeArgs;
+        if (nextCode === 124 /* PIPE */ && !hasParams) {
+          (_h = (_g = this.options).onTagTypeParams) == null ? void 0 : _h.call(_g, types);
+        } else if (nextCode === 40 /* OPEN_PAREN */ && !(typeParams || hasParams || hasArgs)) {
+          tag.typeParams = types;
         } else {
           this.emitError(
             child,
             27 /* INVALID_TAG_TYPES */,
-            "Unexpected types. Type arguments must follow a tag name and type paremeters must precede a method or tag parameters."
+            "Unexpected types. Type arguments must directly follow a tag name and type paremeters must precede a method or tag parameters."
           );
         }
         break;
       }
       case 4 /* PARAMS */: {
         const end = ++this.pos;
-        (_p = (_o = this.options).onTagParams) == null ? void 0 : _p.call(_o, {
+        (_j = (_i = this.options).onTagParams) == null ? void 0 : _j.call(_i, {
           start: child.start - 1,
           end,
           value: {
@@ -1756,11 +1758,14 @@ function lookBehindForOperator(data, pos) {
     case 60 /* OPEN_ANGLE_BRACKET */:
     case 62 /* CLOSE_ANGLE_BRACKET */:
     case 37 /* PERCENT */:
-    case 46 /* PERIOD */:
     case 124 /* PIPE */:
     case 63 /* QUESTION */:
     case 126 /* TILDE */:
       return curPos;
+    case 46 /* PERIOD */: {
+      const nextPos = lookAheadWhile(isWhitespaceCode, data, pos);
+      return isWordCode(data.charCodeAt(nextPos)) ? nextPos : -1;
+    }
     case 43 /* PLUS */:
     case 45 /* HYPHEN */: {
       if (data.charCodeAt(curPos - 1) === code) {
@@ -1803,8 +1808,10 @@ function lookAheadForOperator(data, pos) {
     case 123 /* OPEN_CURLY_BRACE */:
     case 40 /* OPEN_PAREN */:
       return pos;
-    case 46 /* PERIOD */:
-      return data.charCodeAt(pos + 1) === 46 /* PERIOD */ ? -1 : pos + 1;
+    case 46 /* PERIOD */: {
+      const nextPos = lookAheadWhile(isWhitespaceCode, data, pos + 1);
+      return isWordCode(data.charCodeAt(nextPos)) ? nextPos : -1;
+    }
     default: {
       for (const keyword of binaryKeywords) {
         let nextPos = lookAheadFor(data, pos, keyword);
@@ -1842,7 +1849,7 @@ function canFollowDivision(code) {
   return isWordCode(code) || code === 37 /* PERCENT */ || code === 41 /* CLOSE_PAREN */ || code === 46 /* PERIOD */ || code === 60 /* OPEN_ANGLE_BRACKET */ || code === 93 /* CLOSE_SQUARE_BRACKET */ || code === 125 /* CLOSE_CURLY_BRACE */;
 }
 function isWordCode(code) {
-  return code >= 65 /* UPPER_A */ && code <= 90 /* UPPER_Z */ || code >= 97 /* LOWER_A */ && code <= 122 /* LOWER_Z */ || code >= 48 /* NUMBER_0 */ && code <= 57 /* NUMBER_9 */ || code === 95 /* UNDERSCORE */;
+  return code >= 65 /* UPPER_A */ && code <= 90 /* UPPER_Z */ || code >= 97 /* LOWER_A */ && code <= 122 /* LOWER_Z */ || code >= 48 /* NUMBER_0 */ && code <= 57 /* NUMBER_9 */ || code == 36 /* DOLLAR */ || code === 95 /* UNDERSCORE */;
 }
 function isIndentCode(code) {
   return code === 9 /* TAB */ || code === 32 /* SPACE */;
@@ -2496,7 +2503,7 @@ var TAG_NAME = {
       this.pos += 2;
       this.forward = 0;
       this.enterState(states_exports.EXPRESSION).shouldTerminate = matchesCloseCurlyBrace;
-    } 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 */ || code === 60 /* OPEN_ANGLE_BRACKET */ || (this.isConcise ? code === 59 /* SEMICOLON */ : code === 62 /* CLOSE_ANGLE_BRACKET */)) {
+    } 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 */ || code === 60 /* OPEN_ANGLE_BRACKET */ || code === 44 /* COMMA */ || (this.isConcise ? code === 59 /* SEMICOLON */ : code === 62 /* CLOSE_ANGLE_BRACKET */)) {
       this.activeTag.shorthandEnd = this.pos;
       this.exitState();
     } else if (code === 46 /* PERIOD */ || code === 35 /* NUMBER_SIGN */) {

package/dist/states/OPEN_TAG.d.ts

@@ -17,7 +17,7 @@ export interface OpenTagMeta extends Meta {
     hasArgs: boolean;
     hasAttrs: boolean;
     hasParams: boolean;
-    types: undefined | Ranges.Value;
+    typeParams: undefined | Ranges.Value;
     hasShorthandId: boolean;
     selfClosed: boolean;
     indent: string;

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