htmljs-parser 5.2.3 → 5.3.0

package/dist/index.js

@@ -420,7 +420,7 @@ var OPEN_TAG = {
       hasArgs: false,
       hasAttrs: false,
       hasParams: false,
-      types: void 0,
+      typeParams: void 0,
       selfClosed: false,
       shorthandEnd: -1,
       tagName: void 0,
@@ -668,7 +668,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 +691,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 +700,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 +710,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 +727,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 +737,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: {
@@ -780,6 +780,8 @@ function shouldTerminateConciseTagVar(code, data, pos) {
     case 59 /* SEMICOLON */:
     case 60 /* OPEN_ANGLE_BRACKET */:
       return true;
+    case 45 /* HYPHEN */:
+      return data.charCodeAt(pos + 1) === 45 /* HYPHEN */;
     case 58 /* COLON */:
       return data.charCodeAt(pos + 1) === 61 /* EQUAL */;
     default:

package/dist/index.mjs

@@ -395,7 +395,7 @@ var OPEN_TAG = {
       hasArgs: false,
       hasAttrs: false,
       hasParams: false,
-      types: void 0,
+      typeParams: void 0,
       selfClosed: false,
       shorthandEnd: -1,
       tagName: void 0,
@@ -643,7 +643,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 +666,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 +675,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 +685,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 +702,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 +712,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: {
@@ -755,6 +755,8 @@ function shouldTerminateConciseTagVar(code, data, pos) {
     case 59 /* SEMICOLON */:
     case 60 /* OPEN_ANGLE_BRACKET */:
       return true;
+    case 45 /* HYPHEN */:
+      return data.charCodeAt(pos + 1) === 45 /* HYPHEN */;
     case 58 /* COLON */:
       return data.charCodeAt(pos + 1) === 61 /* EQUAL */;
     default:

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