feat: check template indent (#283)

* feat: check template indent

* update es-html-parser

* fix

* Update indent.test.js

* fix types

* update

* t

* t

* Update integration.test.js

* Update indent.test.js

* Update indent.test.js

* update versions

Author: yeonjuan

packages/eslint-plugin/lib/rules/indent/indent.js

@@ -5,6 +5,7 @@
  * @typedef { import("../../types").Tag } Tag
  * @typedef { import("../../types").RuleListener } RuleListener
  * @typedef { import("../../types").Context } Context
+ * @typedef { import("../../types").TemplateText } TemplateText
  * @typedef { import("eslint").AST.Token } Token
  * @typedef { import("eslint").SourceCode } SourceCode
  * @typedef { import("eslint").AST.Range } Range
@@ -24,8 +25,14 @@
  */
 
 const { parse } = require("@html-eslint/template-parser");
+const { NodeTypes } = require("es-html-parser");
 const { RULE_CATEGORY } = require("../../constants");
-const { splitToLineNodes, isLine, isTag } = require("../utils/node");
+const {
+  splitToLineNodes,
+  isLine,
+  isTag,
+  hasTemplate,
+} = require("../utils/node");
 const {
   shouldCheckTaggedTemplateExpression,
   shouldCheckTemplateLiteral,
@@ -173,7 +180,7 @@ module.exports = {
       let parentIgnoringChildCount = 0;
 
       /**
-       * @param {AnyNode | Line} node
+       * @param {AnyNode | Line | TemplateText} node
        * @returns {string}
        */
       function getActualIndent(node) {
@@ -228,7 +235,7 @@ module.exports = {
       }
 
       /**
-       * @param {AnyNode | Line} node
+       * @param {AnyNode | Line | TemplateText} node
        */
       function checkIndent(node) {
         if (parentIgnoringChildCount > 0) {
@@ -303,10 +310,23 @@ module.exports = {
         },
         Text(node) {
           indentLevel.indent(node);
+          if (hasTemplate(node)) {
+            node.parts.forEach((part) => {
+              if (part.type !== NodeTypes.Part) {
+                if (part.open) {
+                  checkIndent(part.open);
+                }
+                if (part.close) {
+                  checkIndent(part.close);
+                }
+              }
+            });
+          }
+
           const lineNodes = splitToLineNodes(node);
 
           lineNodes.forEach((lineNode) => {
-            if (lineNode.skipIndentCheck) {
+            if (lineNode.hasTemplate) {
               return;
             }
             if (lineNode.value.trim().length) {
@@ -323,9 +343,22 @@ module.exports = {
         CommentOpen: checkIndent,
         CommentContent(node) {
           indentLevel.indent(node);
+          if (hasTemplate(node)) {
+            node.parts.forEach((part) => {
+              if (part.type !== NodeTypes.Part) {
+                if (part.open) {
+                  checkIndent(part.open);
+                }
+                if (part.close) {
+                  checkIndent(part.close);
+                }
+              }
+            });
+          }
+
           const lineNodes = splitToLineNodes(node);
           lineNodes.forEach((lineNode) => {
-            if (lineNode.skipIndentCheck) {
+            if (lineNode.hasTemplate) {
               return;
             }
             if (lineNode.value.trim().length) {
@@ -363,7 +396,7 @@ module.exports = {
 };
 
 /**
- * @param {AnyNode | Line} node
+ * @param {AnyNode | Line | TemplateText} node
  * @param {string} actualIndent
  * @return {{range: Range; loc: SourceLocation}}
  */

packages/eslint-plugin/lib/rules/no-aria-hidden-body.js

@@ -41,7 +41,7 @@ module.exports = {
         if (!ariaHiddenAttr) {
           return;
         }
-        if (ariaHiddenAttr.value && ariaHiddenAttr.value.templates.length) {
+        if (ariaHiddenAttr.value && ariaHiddenAttr.value.parts.length) {
           return;
         }
 

packages/eslint-plugin/lib/rules/no-extra-spacing-text.js

@@ -98,7 +98,7 @@ module.exports = {
         const indexStart = node.range[0] + matcher.lastIndex - space.length;
         const indexEnd = indexStart + space.length;
 
-        const hasOverlap = isOverlapWithTemplates(node.templates, [
+        const hasOverlap = isOverlapWithTemplates(node.parts, [
           indexStart,
           indexEnd,
         ]);

packages/eslint-plugin/lib/rules/no-multiple-empty-lines.js

@@ -62,7 +62,7 @@ module.exports = {
     /**
      * @param {string[]} lines
      * @param {number} lineOffset
-     * @param {((CommentContent | Text)['templates'][number])[]} tokens
+     * @param {((CommentContent | Text)['parts'][number])[]} tokens
      */
     function check(lines, lineOffset, tokens) {
       /** @type {number[]} */

packages/eslint-plugin/lib/rules/no-positive-tabindex.js

@@ -42,7 +42,7 @@ module.exports = {
       if (
         tabIndexAttr &&
         tabIndexAttr.value &&
-        !tabIndexAttr.value.templates.length &&
+        !tabIndexAttr.value.parts.length &&
         parseInt(tabIndexAttr.value.value, 10) > 0
       ) {
         context.report({

packages/eslint-plugin/lib/rules/no-target-blank.js

@@ -50,7 +50,7 @@ module.exports = {
           const href = findAttr(node, "href");
           if (href && href.value && isExternalLink(href.value.value)) {
             const rel = findAttr(node, "rel");
-            if (rel && rel.value && rel.value.templates.length) {
+            if (rel && rel.value && rel.value.parts.length) {
               return;
             }
 

packages/eslint-plugin/lib/rules/no-trailing-spaces.js

@@ -45,7 +45,7 @@ module.exports = {
      * @param {string} source
      * @param {string[]} lines
      * @param {number} rangeOffset
-     * @param {((CommentContent | Text)['templates'][number])[]} tokens
+     * @param {((CommentContent | Text)['parts'][number])[]} tokens
      */
     function check(source, lines, rangeOffset, tokens) {
       let rangeIndex = rangeOffset;

packages/eslint-plugin/lib/rules/prefer-https.js

@@ -88,7 +88,7 @@ module.exports = {
      */
     function check(node) {
       const attributeValue = getResourceAttributeValue(node);
-      if (attributeValue && !attributeValue.templates.length) {
+      if (attributeValue && !attributeValue.parts.length) {
         const protocol = getProtocol(attributeValue.value);
         if (protocol === "http:") {
           context.report({

packages/eslint-plugin/lib/rules/require-button-type.js

@@ -49,7 +49,7 @@ module.exports = {
           });
         } else if (
           !VALID_BUTTON_TYPES_SET.has(typeAttr.value.value) &&
-          !typeAttr.value.templates.length
+          !typeAttr.value.parts.length
         ) {
           context.report({
             node: typeAttr,

packages/eslint-plugin/lib/rules/require-form-method.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");
@@ -63,8 +64,8 @@ module.exports = {
         }
 
         if (
-          method.value.templates &&
-          method.value.templates.some((template) => template.isTemplate)
+          method.value.parts &&
+          method.value.parts.some((part) => part.type !== NodeTypes.Part)
         ) {
           return;
         }