htmljs-parser 5.7.1 → 5.7.3

package/dist/index.js

@@ -673,11 +673,15 @@ var OPEN_TAG = {
             this.pos++;
             this.enterState(states_exports.EXPRESSION).shouldTerminate = matchesPipe;
             break;
-          case 60 /* OPEN_ANGLE_BRACKET */:
+          case 60 /* OPEN_ANGLE_BRACKET */: {
             tag.stage = 3 /* TYPES */;
             this.pos++;
-            this.enterState(states_exports.EXPRESSION).shouldTerminate = matchesCloseAngleBracket;
+            const expr = this.enterState(states_exports.EXPRESSION);
+            expr.inType = true;
+            expr.forceType = true;
+            expr.shouldTerminate = matchesCloseAngleBracket;
             break;
+          }
           default:
             tag.hasAttrs = true;
             this.enterState(states_exports.ATTRIBUTE);
@@ -885,7 +889,10 @@ var ATTRIBUTE = {
       attr.stage = 4 /* TYPE_PARAMS */;
       this.pos++;
       this.forward = 0;
-      this.enterState(states_exports.EXPRESSION).shouldTerminate = matchesCloseAngleBracket;
+      const expr = this.enterState(states_exports.EXPRESSION);
+      expr.inType = true;
+      expr.forceType = true;
+      expr.shouldTerminate = matchesCloseAngleBracket;
     } else if (code === 123 /* OPEN_CURLY_BRACE */ && attr.args) {
       ensureAttrName(this, attr);
       attr.stage = 5 /* BLOCK */;
@@ -1620,19 +1627,22 @@ var DTD = {
 // src/states/EXPRESSION.ts
 var shouldTerminate = () => false;
 var unaryKeywords = [
-  "asserts",
   "async",
   "await",
   "class",
   "function",
+  "new",
+  "typeof",
+  "void"
+];
+var tsUnaryKeywords = [
+  ...unaryKeywords,
+  "asserts",
   "infer",
   "is",
   "keyof",
-  "new",
   "readonly",
-  "typeof",
-  "unique",
-  "void"
+  "unique"
 ];
 var binaryKeywords = [
   "as",
@@ -1727,6 +1737,9 @@ var EXPRESSION = {
       case 61 /* EQUAL */:
         if (expression.operators) {
           if (this.lookAtCharCodeAhead(1) === 62 /* CLOSE_ANGLE_BRACKET */) {
+            if (expression.inType && !expression.forceType && this.getPreviousNonWhitespaceCharCode() !== 41 /* CLOSE_PAREN */) {
+              expression.inType = false;
+            }
             this.pos++;
           } else if (!(expression.forceType || expression.groupStack.length)) {
             expression.inType = false;
@@ -1918,7 +1931,7 @@ function lookBehindForOperator(expression, data, pos) {
       return curPos;
     }
     default: {
-      for (const keyword of unaryKeywords) {
+      for (const keyword of expression.inType ? tsUnaryKeywords : unaryKeywords) {
         const keywordPos = lookBehindFor(data, curPos, keyword);
         if (keywordPos !== -1) {
           return isWordOrPeriodCode(data.charCodeAt(keywordPos - 1)) ? -1 : keywordPos;

package/dist/index.mjs

@@ -648,11 +648,15 @@ var OPEN_TAG = {
             this.pos++;
             this.enterState(states_exports.EXPRESSION).shouldTerminate = matchesPipe;
             break;
-          case 60 /* OPEN_ANGLE_BRACKET */:
+          case 60 /* OPEN_ANGLE_BRACKET */: {
             tag.stage = 3 /* TYPES */;
             this.pos++;
-            this.enterState(states_exports.EXPRESSION).shouldTerminate = matchesCloseAngleBracket;
+            const expr = this.enterState(states_exports.EXPRESSION);
+            expr.inType = true;
+            expr.forceType = true;
+            expr.shouldTerminate = matchesCloseAngleBracket;
             break;
+          }
           default:
             tag.hasAttrs = true;
             this.enterState(states_exports.ATTRIBUTE);
@@ -860,7 +864,10 @@ var ATTRIBUTE = {
       attr.stage = 4 /* TYPE_PARAMS */;
       this.pos++;
       this.forward = 0;
-      this.enterState(states_exports.EXPRESSION).shouldTerminate = matchesCloseAngleBracket;
+      const expr = this.enterState(states_exports.EXPRESSION);
+      expr.inType = true;
+      expr.forceType = true;
+      expr.shouldTerminate = matchesCloseAngleBracket;
     } else if (code === 123 /* OPEN_CURLY_BRACE */ && attr.args) {
       ensureAttrName(this, attr);
       attr.stage = 5 /* BLOCK */;
@@ -1595,19 +1602,22 @@ var DTD = {
 // src/states/EXPRESSION.ts
 var shouldTerminate = () => false;
 var unaryKeywords = [
-  "asserts",
   "async",
   "await",
   "class",
   "function",
+  "new",
+  "typeof",
+  "void"
+];
+var tsUnaryKeywords = [
+  ...unaryKeywords,
+  "asserts",
   "infer",
   "is",
   "keyof",
-  "new",
   "readonly",
-  "typeof",
-  "unique",
-  "void"
+  "unique"
 ];
 var binaryKeywords = [
   "as",
@@ -1702,6 +1712,9 @@ var EXPRESSION = {
       case 61 /* EQUAL */:
         if (expression.operators) {
           if (this.lookAtCharCodeAhead(1) === 62 /* CLOSE_ANGLE_BRACKET */) {
+            if (expression.inType && !expression.forceType && this.getPreviousNonWhitespaceCharCode() !== 41 /* CLOSE_PAREN */) {
+              expression.inType = false;
+            }
             this.pos++;
           } else if (!(expression.forceType || expression.groupStack.length)) {
             expression.inType = false;
@@ -1893,7 +1906,7 @@ function lookBehindForOperator(expression, data, pos) {
       return curPos;
     }
     default: {
-      for (const keyword of unaryKeywords) {
+      for (const keyword of expression.inType ? tsUnaryKeywords : unaryKeywords) {
         const keywordPos = lookBehindFor(data, curPos, keyword);
         if (keywordPos !== -1) {
           return isWordOrPeriodCode(data.charCodeAt(keywordPos - 1)) ? -1 : keywordPos;

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.7.1",
+  "version": "5.7.3",
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.1",