@html-eslint/eslint-plugin 0.33.1 → 0.34.0

package/lib/rules/id-naming-convention.js

@@ -12,11 +12,7 @@ const {
   isPascalCase,
   isKebabCase,
 } = require("./utils/naming");
-const {
-  findAttr,
-  isAttributesEmpty,
-  isExpressionInTemplate,
-} = require("./utils/node");
+const { findAttr, isAttributesEmpty, hasTemplate } = require("./utils/node");
 const { createVisitors } = require("./utils/visitors");
 
 const MESSAGE_IDS = {
@@ -94,7 +90,12 @@ module.exports = {
         return;
       }
       const idAttr = findAttr(node, "id");
-      if (idAttr && idAttr.value && !checkNaming(idAttr.value.value)) {
+      if (
+        idAttr &&
+        idAttr.value &&
+        !hasTemplate(idAttr.value) &&
+        !checkNaming(idAttr.value.value)
+      ) {
         context.report({
           node: idAttr,
           data: {
@@ -117,7 +118,7 @@ module.exports = {
       if (
         idAttr &&
         idAttr.value &&
-        !isExpressionInTemplate(idAttr.value) &&
+        !hasTemplate(idAttr.value) &&
         !checkNaming(idAttr.value.value)
       ) {
         context.report({

package/lib/rules/lowercase.js

@@ -9,6 +9,7 @@ const { NODE_TYPES } = require("@html-eslint/parser");
 const { RULE_CATEGORY } = require("../constants");
 const SVG_CAMEL_CASE_ATTRIBUTES = require("../constants/svg-camel-case-attributes");
 const { createVisitors } = require("./utils/visitors");
+const { hasTemplate } = require("./utils/node");
 
 const MESSAGE_IDS = {
   UNEXPECTED: "unexpected",
@@ -102,6 +103,9 @@ module.exports = {
           if (isAllowedAttributeKey(attribute.key.value)) {
             return;
           }
+          if (hasTemplate(attribute.key)) {
+            return;
+          }
           if (attribute.key.value !== attribute.key.value.toLowerCase()) {
             context.report({
               node: attribute.key,

package/lib/rules/no-duplicate-attrs.js

@@ -41,7 +41,7 @@ module.exports = {
       if (Array.isArray(node.attributes)) {
         const attrsSet = new Set();
         node.attributes.forEach((attr) => {
-          if (attr.key && attrsSet.has(attr.key.value)) {
+          if (attr.key && attrsSet.has(attr.key.value.toLowerCase())) {
             context.report({
               node: attr,
               data: {
@@ -50,7 +50,7 @@ module.exports = {
               messageId: MESSAGE_IDS.DUPLICATE_ATTRS,
             });
           } else {
-            attrsSet.add(attr.key.value);
+            attrsSet.add(attr.key.value.toLowerCase());
           }
         });
       }

package/lib/rules/sort-attrs.js

@@ -5,6 +5,7 @@
  * @typedef { import("../types").Text } Text
  */
 
+const { hasTemplate } = require("./utils/node");
 const { RULE_CATEGORY } = require("../constants");
 const { getSourceCode } = require("./utils/source-code");
 const { createVisitors } = require("./utils/visitors");
@@ -62,6 +63,7 @@ module.exports = {
     function compare(attrA, attrB) {
       const keyA = attrA.key.value;
       const keyB = attrB.key.value;
+
       const keyAReservedValue = priority.indexOf(keyA);
       const keyBReservedValue = priority.indexOf(keyB);
       if (keyAReservedValue >= 0 && keyBReservedValue >= 0) {
@@ -122,6 +124,30 @@ module.exports = {
       return false;
     }
 
+    /**
+     * @param {Attribute[]} attributes
+     * @return {Attribute[][]}
+     */
+    function groupAttributes(attributes) {
+      /**
+       * @type {Attribute[][]}
+       */
+      const attributesList = [];
+      let index = 0;
+
+      for (const attribute of attributes) {
+        if (hasTemplate(attribute.key)) {
+          index = attributesList.length;
+          continue;
+        }
+        if (!attributesList[index]) {
+          attributesList[index] = [];
+        }
+        attributesList[index].push(attribute);
+      }
+      return attributesList;
+    }
+
     /**
      * @param {Attribute[]} unsorted
      */
@@ -129,26 +155,28 @@ module.exports = {
       if (unsorted.length <= 1) {
         return;
       }
+      const grouped = groupAttributes(unsorted);
+      grouped.forEach((unsorted) => {
+        const sorted = [...unsorted].sort(compare);
 
-      const sorted = [...unsorted].sort(compare);
-
-      if (!isChanged(unsorted, sorted)) {
-        return;
-      }
-      const first = unsorted[0];
-      const last = unsorted[unsorted.length - 1];
-      context.report({
-        node: {
-          range: [first.range[0], last.range[1]],
-          loc: {
-            start: first.loc.start,
-            end: last.loc.end,
+        if (!isChanged(unsorted, sorted)) {
+          return;
+        }
+        const first = unsorted[0];
+        const last = unsorted[unsorted.length - 1];
+        context.report({
+          node: {
+            range: [first.range[0], last.range[1]],
+            loc: {
+              start: first.loc.start,
+              end: last.loc.end,
+            },
           },
-        },
-        messageId: MESSAGE_IDS.UNSORTED,
-        fix(fixer) {
-          return fix(fixer, unsorted, sorted);
-        },
+          messageId: MESSAGE_IDS.UNSORTED,
+          fix(fixer) {
+            return fix(fixer, unsorted, sorted);
+          },
+        });
       });
     }
 

package/lib/rules/utils/node.js

@@ -9,6 +9,7 @@
  * @typedef { import("../../types").Comment } Comment
  * @typedef { import("../../types").AnyNode } AnyNode
  * @typedef { import("../../types").AttributeValue } AttributeValue
+ * @typedef { import("../../types").AttributeKey } AttributeKey
  * @typedef { import("eslint").AST.Range } Range
  * @typedef { import("eslint").AST.SourceLocation } SourceLocation
  * @typedef { import("es-html-parser").AnyToken } AnyToken
@@ -67,6 +68,14 @@ function isOverlapWithTemplates(templates, range) {
     .some((template) => isRangesOverlap(template.range, range));
 }
 
+/**
+ * @param {AttributeKey | AttributeValue} node
+ * @returns {boolean}
+ */
+function hasTemplate(node) {
+  return node.templates.some((template) => template.isTemplate);
+}
+
 /**
  *
  * @param {Text | CommentContent} node
@@ -141,17 +150,6 @@ function getLocBetween(before, after) {
   };
 }
 
-/**
- * @param {AttributeValue} node
- * @return {boolean}
- */
-function isExpressionInTemplate(node) {
-  if (node.type === NODE_TYPES.AttributeValue) {
-    return node.value.indexOf("${") === 0;
-  }
-  return false;
-}
-
 /**
  * @param {AnyNode} node
  * @returns {node is Tag}
@@ -248,7 +246,6 @@ module.exports = {
   splitToLineNodes,
   getLocBetween,
   findParent,
-  isExpressionInTemplate,
   isTag,
   isComment,
   isText,
@@ -258,4 +255,5 @@ module.exports = {
   codeToLines,
   isRangesOverlap,
   getTemplateTokens,
+  hasTemplate,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@html-eslint/eslint-plugin",
-  "version": "0.33.1",
+  "version": "0.34.0",
   "description": "ESLint plugin for html",
   "author": "yeonjuan",
   "homepage": "https://github.com/yeonjuan/html-eslint#readme",
@@ -45,15 +45,17 @@
     "accessibility"
   ],
   "dependencies": {
-    "@html-eslint/template-parser": "^0.33.0"
+    "@html-eslint/template-parser": "^0.34.0",
+    "@html-eslint/template-syntax-parser": "^0.34.0"
   },
   "devDependencies": {
-    "@html-eslint/parser": "^0.33.0",
+    "@html-eslint/parser": "^0.34.0",
     "@types/eslint": "^9.6.1",
     "@types/estree": "^0.0.47",
     "es-html-parser": "^1.0.0-alpha.4",
+    "eslint": "^8",
     "espree": "^10.3.0",
     "typescript": "^5.7.2"
   },
-  "gitHead": "808869fd592b2e773afef1cad2f2fc998221f0c4"
+  "gitHead": "f0401cc30d1510d6f5c7511280c0a6b9779fea0c"
 }

package/types/rules/id-naming-convention.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"id-naming-convention.d.ts","sourceRoot":"","sources":["../../lib/rules/id-naming-convention.js"],"names":[],"mappings":";;;wBAyCU,UAAU;;kBAxCN,OAAO,UAAU,EAAE,UAAU;WAC7B,OAAO,UAAU,EAAE,GAAG;iBACtB,OAAO,UAAU,EAAE,SAAS;gBAC5B,OAAO,UAAU,EAAE,QAAQ"}
+{"version":3,"file":"id-naming-convention.d.ts","sourceRoot":"","sources":["../../lib/rules/id-naming-convention.js"],"names":[],"mappings":";;;wBAqCU,UAAU;;kBApCN,OAAO,UAAU,EAAE,UAAU;WAC7B,OAAO,UAAU,EAAE,GAAG;iBACtB,OAAO,UAAU,EAAE,SAAS;gBAC5B,OAAO,UAAU,EAAE,QAAQ"}

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

@@ -1 +1 @@
-{"version":3,"file":"lowercase.d.ts","sourceRoot":"","sources":["../../lib/rules/lowercase.js"],"names":[],"mappings":";;;wBAiBU,UAAU;;kBAhBN,OAAO,UAAU,EAAE,UAAU;WAC7B,OAAO,UAAU,EAAE,GAAG;gBACtB,OAAO,UAAU,EAAE,QAAQ;iBAC3B,OAAO,UAAU,EAAE,SAAS"}
+{"version":3,"file":"lowercase.d.ts","sourceRoot":"","sources":["../../lib/rules/lowercase.js"],"names":[],"mappings":";;;wBAkBU,UAAU;;kBAjBN,OAAO,UAAU,EAAE,UAAU;WAC7B,OAAO,UAAU,EAAE,GAAG;gBACtB,OAAO,UAAU,EAAE,QAAQ;iBAC3B,OAAO,UAAU,EAAE,SAAS"}

package/types/rules/sort-attrs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort-attrs.d.ts","sourceRoot":"","sources":["../../lib/rules/sort-attrs.js"],"names":[],"mappings":";;;wBAgBU,UAAU;;iBAfN,OAAO,QAAQ,EAAE,IAAI,CAAC,SAAS;kBAC/B,OAAO,UAAU,EAAE,UAAU;iBAC7B,OAAO,UAAU,EAAE,SAAS;YAC5B,OAAO,UAAU,EAAE,IAAI"}
+{"version":3,"file":"sort-attrs.d.ts","sourceRoot":"","sources":["../../lib/rules/sort-attrs.js"],"names":[],"mappings":";;;wBAiBU,UAAU;;iBAhBN,OAAO,QAAQ,EAAE,IAAI,CAAC,SAAS;kBAC/B,OAAO,UAAU,EAAE,UAAU;iBAC7B,OAAO,UAAU,EAAE,SAAS;YAC5B,OAAO,UAAU,EAAE,IAAI"}

package/types/rules/utils/node.d.ts

@@ -8,6 +8,7 @@ export type CommentContent = import("../../types").CommentContent;
 export type Comment = import("../../types").Comment;
 export type AnyNode = import("../../types").AnyNode;
 export type AttributeValue = import("../../types").AttributeValue;
+export type AttributeKey = import("../../types").AttributeKey;
 export type Range = import("eslint").AST.Range;
 export type SourceLocation = import("eslint").AST.SourceLocation;
 export type AnyToken = import("es-html-parser").AnyToken;
@@ -52,11 +53,6 @@ export function getLocBetween(before: {
  * @returns {null | AnyNode}
  */
 export function findParent(node: Exclude<AnyNode, Line>, predicate: (node: AnyNode) => boolean): null | AnyNode;
-/**
- * @param {AttributeValue} node
- * @return {boolean}
- */
-export function isExpressionInTemplate(node: AttributeValue): boolean;
 /**
  * @param {AnyNode} node
  * @returns {node is Tag}
@@ -106,4 +102,9 @@ export function isRangesOverlap(rangeA: Range, rangeB: Range): boolean;
  * @returns {((CommentContent | Text)['templates'][number])[]}
  */
 export function getTemplateTokens(tokens: AnyToken[]): ((CommentContent | Text)["templates"][number])[];
+/**
+ * @param {AttributeKey | AttributeValue} node
+ * @returns {boolean}
+ */
+export function hasTemplate(node: AttributeKey | AttributeValue): boolean;
 //# sourceMappingURL=node.d.ts.map

package/types/rules/utils/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../lib/rules/utils/node.js"],"names":[],"mappings":"wBACc,OAAO,aAAa,EAAE,SAAS;kBAC/B,OAAO,aAAa,EAAE,GAAG;wBACzB,OAAO,aAAa,EAAE,SAAS;uBAC/B,OAAO,aAAa,EAAE,QAAQ;mBAC9B,OAAO,aAAa,EAAE,IAAI;mBAC1B,OAAO,aAAa,EAAE,IAAI;6BAC1B,OAAO,aAAa,EAAE,cAAc;sBACpC,OAAO,aAAa,EAAE,OAAO;sBAC7B,OAAO,aAAa,EAAE,OAAO;6BAC7B,OAAO,aAAa,EAAE,cAAc;oBACpC,OAAO,QAAQ,EAAE,GAAG,CAAC,KAAK;6BAC1B,OAAO,QAAQ,EAAE,GAAG,CAAC,cAAc;uBACnC,OAAO,gBAAgB,EAAE,QAAQ;AAM/C;;;;GAIG;AACH,+BAJW,GAAG,GAAG,SAAS,GAAG,QAAQ,OAC1B,MAAM,GACJ,SAAS,GAAG,SAAS,CAMjC;AAED;;;;GAIG;AACH,wCAHW,GAAG,GAAG,SAAS,GAAG,QAAQ,GACxB,OAAO,CAInB;AAED;;;;GAIG;AACH,6CAHW,OAAO,GACL,OAAO,CAInB;AAuBD;;;;GAIG;AACH,uCAHW,IAAI,GAAG,cAAc,GACnB,IAAI,EAAE,CAwDlB;AAED;;;;;GAKG;AACH,sCAJW;IAAC,GAAG,EAAE,cAAc,CAAA;CAAC,SACrB;IAAC,GAAG,EAAE,cAAc,CAAA;CAAC,GACnB,cAAc,CAO1B;AA+DD;;;;GAIG;AACH,iCAJW,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,aACtB,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,GACxB,IAAI,GAAG,OAAO,CAgB1B;AAhFD;;;GAGG;AACH,6CAHW,cAAc,GACb,OAAO,CAOlB;AAED;;;GAGG;AACH,4BAHW,OAAO,GACL,IAAI,IAAI,GAAG,CAIvB;AAUD;;;GAGG;AACH,gCAHW,OAAO,GACL,IAAI,IAAI,OAAO,CAI3B;AAED;;;GAGG;AACH,6BAHW,OAAO,GACL,IAAI,IAAI,IAAI,CAIxB;AAED;;;GAGG;AACH,6BAHW,OAAO,GAAG,IAAI,GACZ,IAAI,IAAI,IAAI,CAIxB;AA9BD;;;GAGG;AACH,+BAHW,OAAO,GACL,IAAI,IAAI,SAAS,CAI7B;AA9GD;;;;GAIG;AACH,kDAJW,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC,WAAW,CAAC,SACpC,KAAK,GACH,OAAO,CAMnB;AAiID;;;GAGG;AACH,oCAHW,MAAM,GACJ,MAAM,EAAE,CAIpB;AA1JD;;;;;GAKG;AACH,wCAJW,KAAK,UACL,KAAK,GACH,OAAO,CAInB;AAyKD;;;;GAIG;AACH,0CAHW,QAAQ,EAAE,GACR,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAa5D"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../lib/rules/utils/node.js"],"names":[],"mappings":"wBACc,OAAO,aAAa,EAAE,SAAS;kBAC/B,OAAO,aAAa,EAAE,GAAG;wBACzB,OAAO,aAAa,EAAE,SAAS;uBAC/B,OAAO,aAAa,EAAE,QAAQ;mBAC9B,OAAO,aAAa,EAAE,IAAI;mBAC1B,OAAO,aAAa,EAAE,IAAI;6BAC1B,OAAO,aAAa,EAAE,cAAc;sBACpC,OAAO,aAAa,EAAE,OAAO;sBAC7B,OAAO,aAAa,EAAE,OAAO;6BAC7B,OAAO,aAAa,EAAE,cAAc;2BACpC,OAAO,aAAa,EAAE,YAAY;oBAClC,OAAO,QAAQ,EAAE,GAAG,CAAC,KAAK;6BAC1B,OAAO,QAAQ,EAAE,GAAG,CAAC,cAAc;uBACnC,OAAO,gBAAgB,EAAE,QAAQ;AAM/C;;;;GAIG;AACH,+BAJW,GAAG,GAAG,SAAS,GAAG,QAAQ,OAC1B,MAAM,GACJ,SAAS,GAAG,SAAS,CAMjC;AAED;;;;GAIG;AACH,wCAHW,GAAG,GAAG,SAAS,GAAG,QAAQ,GACxB,OAAO,CAInB;AAED;;;;GAIG;AACH,6CAHW,OAAO,GACL,OAAO,CAInB;AA+BD;;;;GAIG;AACH,uCAHW,IAAI,GAAG,cAAc,GACnB,IAAI,EAAE,CAwDlB;AAED;;;;;GAKG;AACH,sCAJW;IAAC,GAAG,EAAE,cAAc,CAAA;CAAC,SACrB;IAAC,GAAG,EAAE,cAAc,CAAA;CAAC,GACnB,cAAc,CAO1B;AAoDD;;;;GAIG;AACH,iCAJW,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,aACtB,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,GACxB,IAAI,GAAG,OAAO,CAgB1B;AArED;;;GAGG;AACH,4BAHW,OAAO,GACL,IAAI,IAAI,GAAG,CAIvB;AAUD;;;GAGG;AACH,gCAHW,OAAO,GACL,IAAI,IAAI,OAAO,CAI3B;AAED;;;GAGG;AACH,6BAHW,OAAO,GACL,IAAI,IAAI,IAAI,CAIxB;AAED;;;GAGG;AACH,6BAHW,OAAO,GAAG,IAAI,GACZ,IAAI,IAAI,IAAI,CAIxB;AA9BD;;;GAGG;AACH,+BAHW,OAAO,GACL,IAAI,IAAI,SAAS,CAI7B;AA3GD;;;;GAIG;AACH,kDAJW,CAAC,IAAI,GAAG,cAAc,CAAC,CAAC,WAAW,CAAC,SACpC,KAAK,GACH,OAAO,CAMnB;AA8HD;;;GAGG;AACH,oCAHW,MAAM,GACJ,MAAM,EAAE,CAIpB;AAvJD;;;;;GAKG;AACH,wCAJW,KAAK,UACL,KAAK,GACH,OAAO,CAInB;AAsKD;;;;GAIG;AACH,0CAHW,QAAQ,EAAE,GACR,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAa5D;AAzKD;;;GAGG;AACH,kCAHW,YAAY,GAAG,cAAc,GAC3B,OAAO,CAInB"}