htmljs-parser 3.2.2 → 3.3.1

package/dist/index.js

@@ -1097,9 +1097,9 @@ var EXPRESSION = {
   }
 };
 function buildOperatorPattern(isConcise) {
-  const binary = `[!~*%&^|?:]+|(?<=[!=<>&^~|/*?%+-])=|=(?=[!=<>&^~|/*?%+-])|(?<!\\+)\\s*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!^\\s*|-)-${isConcise ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${isConcise ? "" : ">"}])|(?<!${isConcise ? "^\\s*|" : ""}\\.)\\.(?!\\.)|<${isConcise ? "{2,}|(?<!^\\s*)<" : "+"}|>${isConcise ? "+" : "{2,}"}|\\bin(?:stanceof)?(?=\\s+[^=/,;:>])`;
-  const unary = "\\b(?:a(?:sync|wait)|class|function|new|typeof|void)\\b";
-  const lookAheadPattern = "\\s*(?:" + binary + `)\\s*|\\s+(?=[${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]+(?=[{(])`;
   const lookBehindPattern = `(?<=${unary}|${binary})`;
   return new RegExp(`${lookAheadPattern}|${lookBehindPattern}`, "ym");
 }
@@ -1107,7 +1107,7 @@ function checkForOperators(parser, expression) {
   if (expression.skipOperators) {
     return false;
   }
-  const pattern = parser.isConcise ? conciseOperatorPattern : htmlOperatorPattern;
+  const pattern = parser.isConcise || expression.terminatedByEOL ? conciseOperatorPattern : htmlOperatorPattern;
   pattern.lastIndex = parser.pos;
   const matches = pattern.exec(parser.data);
   if (matches) {

package/dist/index.mjs

@@ -1076,9 +1076,9 @@ var EXPRESSION = {
   }
 };
 function buildOperatorPattern(isConcise) {
-  const binary = `[!~*%&^|?:]+|(?<=[!=<>&^~|/*?%+-])=|=(?=[!=<>&^~|/*?%+-])|(?<!\\+)\\s*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!^\\s*|-)-${isConcise ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${isConcise ? "" : ">"}])|(?<!${isConcise ? "^\\s*|" : ""}\\.)\\.(?!\\.)|<${isConcise ? "{2,}|(?<!^\\s*)<" : "+"}|>${isConcise ? "+" : "{2,}"}|\\bin(?:stanceof)?(?=\\s+[^=/,;:>])`;
-  const unary = "\\b(?:a(?:sync|wait)|class|function|new|typeof|void)\\b";
-  const lookAheadPattern = "\\s*(?:" + binary + `)\\s*|\\s+(?=[${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]+(?=[{(])`;
   const lookBehindPattern = `(?<=${unary}|${binary})`;
   return new RegExp(`${lookAheadPattern}|${lookBehindPattern}`, "ym");
 }
@@ -1086,7 +1086,7 @@ function checkForOperators(parser, expression) {
   if (expression.skipOperators) {
     return false;
   }
-  const pattern = parser.isConcise ? conciseOperatorPattern : htmlOperatorPattern;
+  const pattern = parser.isConcise || expression.terminatedByEOL ? conciseOperatorPattern : htmlOperatorPattern;
   pattern.lastIndex = parser.pos;
   const matches = pattern.exec(parser.data);
   if (matches) {

package/package.json

@@ -1,34 +1,32 @@
 {
   "name": "htmljs-parser",
   "description": "An HTML parser recognizes content and string placeholders and allows JavaScript expressions as attribute values",
-  "version": "3.2.2",
-  "author": "Phillip Gates-Idem <phillip.idem@gmail.com>",
+  "version": "3.3.1",
   "devDependencies": {
-    "@commitlint/cli": "^16.2.3",
-    "@commitlint/config-conventional": "^16.2.1",
+    "@changesets/changelog-github": "^0.4.4",
+    "@changesets/cli": "^2.22.0",
     "@types/benchmark": "^2.1.1",
     "@types/degit": "^2.8.3",
-    "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.22",
-    "@typescript-eslint/eslint-plugin": "^5.16.0",
-    "@typescript-eslint/parser": "^5.16.0",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^17.0.27",
+    "@typescript-eslint/eslint-plugin": "^5.21.0",
+    "@typescript-eslint/parser": "^5.21.0",
     "benchmark": "^2.1.4",
     "cross-env": "^7.0.3",
     "degit": "^2.8.4",
-    "esbuild": "0.14.27",
+    "esbuild": "0.14.38",
     "esbuild-register": "^3.3.2",
-    "eslint": "^8.11.0",
+    "eslint": "^8.14.0",
     "eslint-config-prettier": "^8.5.0",
     "fast-glob": "^3.2.11",
     "fixpack": "^4.0.0",
     "husky": "^7.0.4",
-    "lint-staged": "^12.3.7",
+    "lint-staged": "^12.4.1",
     "mocha": "^9.2.2",
     "mocha-snap": "^4.3.0",
     "nyc": "^15.1.0",
-    "prettier": "^2.6.0",
-    "semantic-release": "^19.0.2",
-    "typescript": "^4.6.2"
+    "prettier": "^2.6.2",
+    "typescript": "^4.6.3"
   },
   "exports": {
     ".": {
@@ -71,11 +69,12 @@
     "mocha": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
     "prepare": "husky install",
     "prepublishOnly": "npm run build",
-    "release": "semantic-release",
+    "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"
+    "test:update": "npm run mocha -- --update",
+    "version": "changeset version"
   },
   "types": "dist/index.d.ts"
 }