@html-eslint/eslint-plugin 0.40.0-alpha.0 → 0.40.1

package/lib/rules/no-invalid-role.js

@@ -2,6 +2,7 @@
  * @typedef { import("../types").RuleModule<[]> } RuleModule
  */
 
+const { NodeTypes } = require("es-html-parser");
 const { RULE_CATEGORY } = require("../constants");
 const { findAttr } = require("./utils/node");
 const { createVisitors } = require("./utils/visitors");
@@ -252,6 +253,17 @@ module.exports = {
         if (!role) {
           return;
         }
+        /**
+         * Allow template expression.
+         * ex: html`<div role=${role}></div>`
+         */
+        if (
+          role.value &&
+          role.value.parts.some((part) => part.type === NodeTypes.Template)
+        ) {
+          return;
+        }
+
         const roleValue = (
           (role.value && role.value.value) ||
           ""

package/lib/rules/no-trailing-spaces.js

@@ -44,29 +44,32 @@ module.exports = {
     /**
      * @param {string} source
      * @param {string[]} lines
-     * @param {number} rangeOffset
+     * @param {Object} offset
+     * @param {number} offset.range
+     * @param {number} offset.line
+     * @param {number} offset.column
      * @param {((CommentContent | Text)['parts'][number])[]} tokens
      */
-    function check(source, lines, rangeOffset, tokens) {
-      let rangeIndex = rangeOffset;
+    function check(source, lines, offset, tokens) {
       const lineBreaks = source.match(/\r\n|[\r\n\u2028\u2029]/gu);
+
       lines.forEach((line, index) => {
-        const lineNumber = index + 1;
+        const lineNumber = index + offset.line;
         const match = line.match(/[ \t\u00a0\u2000-\u200b\u3000]+$/);
         const lineBreakLength =
           lineBreaks && lineBreaks[index] ? lineBreaks[index].length : 1;
         const lineLength = line.length + lineBreakLength;
-
+        const columnOffset = index === 0 ? offset.column : 0;
         if (match) {
           if (typeof match.index === "number" && match.index > 0) {
             const loc = {
               start: {
                 line: lineNumber,
-                column: match.index,
+                column: match.index + columnOffset,
               },
               end: {
                 line: lineNumber,
-                column: lineLength - lineBreakLength,
+                column: lineLength - lineBreakLength + columnOffset,
               },
             };
             const start = sourceCode.getIndexFromLoc(loc.start);
@@ -80,21 +83,26 @@ module.exports = {
               messageId: MESSAGE_IDS.TRAILING_SPACE,
               loc,
               fix(fixer) {
-                return fixer.removeRange([
-                  rangeIndex + loc.start.column,
-                  rangeIndex + loc.end.column,
-                ]);
+                return fixer.removeRange([start, end]);
               },
             });
           }
         }
-        rangeIndex += lineLength;
       });
     }
 
     return {
       Document() {
-        check(sourceCode.getText(), sourceCode.getLines(), 0, []);
+        check(
+          sourceCode.getText(),
+          sourceCode.getLines(),
+          {
+            range: 0,
+            line: 1,
+            column: 0,
+          },
+          []
+        );
       },
       TaggedTemplateExpression(node) {
         if (shouldCheckTaggedTemplateExpression(node, context)) {
@@ -107,8 +115,11 @@ module.exports = {
           check(
             html,
             lines,
-            // @ts-ignore
-            node.quasi.range[0] + 1,
+            {
+              range: node.quasi.range[0] + 1,
+              line: node.quasi.loc.start.line,
+              column: node.quasi.loc.start.column + 1,
+            },
             getTemplateTokens(tokens)
           );
         }
@@ -120,8 +131,11 @@ module.exports = {
           check(
             html,
             lines,
-            // @ts-ignore
-            node.range[0] + 1,
+            {
+              range: node.range[0] + 1,
+              line: node.loc.start.line,
+              column: node.loc.start.column + 1,
+            },
             getTemplateTokens(tokens)
           );
         }

package/lib/rules/quotes.js

@@ -9,6 +9,7 @@
  * @typedef { import("../types").RuleModule<[Option]> } RuleModule
  */
 
+const { NodeTypes } = require("es-html-parser");
 const { RULE_CATEGORY } = require("../constants");
 const { getSourceCode } = require("./utils/source-code");
 const { createVisitors } = require("./utils/visitors");
@@ -87,6 +88,13 @@ module.exports = {
       if (!attr.value || attr.value.value.includes(expectedQuote)) {
         return;
       }
+      /**
+       * Allow template expression.
+       * ex: html`<div foo=${foo}></div>`
+       */
+      if (attr.value.parts.some((part) => part.type === NodeTypes.Template)) {
+        return;
+      }
 
       if (attr.startWrapper && attr.endWrapper) {
         const [opening, closing] = getQuotes(attr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@html-eslint/eslint-plugin",
-  "version": "0.40.0-alpha.0",
+  "version": "0.40.1",
   "description": "ESLint plugin for html",
   "author": "yeonjuan",
   "homepage": "https://github.com/yeonjuan/html-eslint#readme",
@@ -39,13 +39,13 @@
   ],
   "dependencies": {
     "@eslint/plugin-kit": "0.2.8",
-    "@html-eslint/template-parser": "^0.40.0-alpha.0",
-    "@html-eslint/template-syntax-parser": "^0.40.0-alpha.0"
+    "@html-eslint/template-parser": "^0.40.0",
+    "@html-eslint/template-syntax-parser": "^0.40.0"
   },
   "devDependencies": {
     "@eslint/core": "0.13.0",
-    "@html-eslint/parser": "^0.40.0-alpha.0",
-    "@html-eslint/types": "^0.40.0-alpha.0",
+    "@html-eslint/parser": "^0.40.0",
+    "@html-eslint/types": "^0.40.0",
     "@types/eslint": "^9.6.1",
     "@types/estree": "^0.0.47",
     "es-html-parser": "0.2.0",
@@ -53,5 +53,5 @@
     "espree": "^10.3.0",
     "typescript": "^5.7.2"
   },
-  "gitHead": "f62545e1268c688f79026b078fcdc013aa4a462d"
+  "gitHead": "595b1231bd0876792b229170edaecd4a7239d7fb"
 }

package/types/rules/no-invalid-role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-invalid-role.d.ts","sourceRoot":"","sources":["../../lib/rules/no-invalid-role.js"],"names":[],"mappings":";;;wBAkOU,UAAU;;kBAjON,OAAO,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC"}
+{"version":3,"file":"no-invalid-role.d.ts","sourceRoot":"","sources":["../../lib/rules/no-invalid-role.js"],"names":[],"mappings":";;;wBAmOU,UAAU;;kBAlON,OAAO,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC"}

package/types/rules/quotes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../lib/rules/quotes.js"],"names":[],"mappings":";;;wBA4BU,UAAU;;aA3BN,OAAO,QAAQ,EAAE,GAAG,CAAC,KAAK;iBAC1B,OAAO,oBAAoB,EAAE,SAAS;WACtC,OAAO,oBAAoB,EAAE,GAAG;iBAChC,OAAO,oBAAoB,EAAE,SAAS;gBACtC,OAAO,oBAAoB,EAAE,QAAQ;cAEtC,QAAQ,GAAG,QAAQ;kBAClB,OAAO,UAAU,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"quotes.d.ts","sourceRoot":"","sources":["../../lib/rules/quotes.js"],"names":[],"mappings":";;;wBA6BU,UAAU;;aA5BN,OAAO,QAAQ,EAAE,GAAG,CAAC,KAAK;iBAC1B,OAAO,oBAAoB,EAAE,SAAS;WACtC,OAAO,oBAAoB,EAAE,GAAG;iBAChC,OAAO,oBAAoB,EAAE,SAAS;gBACtC,OAAO,oBAAoB,EAAE,QAAQ;cAEtC,QAAQ,GAAG,QAAQ;kBAClB,OAAO,UAAU,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC"}