Merge branch 'master' into autofix/simple-unless

Author: johanrd

README.md

@@ -256,12 +256,12 @@ rules in templates can be disabled with eslint directives with mustache or html
 | [template-no-outlet-outside-routes](docs/rules/template-no-outlet-outside-routes.md)                               | disallow {{outlet}} outside of route templates                               |    |    |    |
 | [template-no-page-title-component](docs/rules/template-no-page-title-component.md)                                 | disallow usage of ember-page-title component                                 |    |    |    |
 | [template-no-passed-in-event-handlers](docs/rules/template-no-passed-in-event-handlers.md)                         | disallow passing event handlers directly as component arguments              |    |    |    |
-| [template-no-positional-data-test-selectors](docs/rules/template-no-positional-data-test-selectors.md)             | disallow positional data-test-* params in curly invocations                  |    |    |    |
+| [template-no-positional-data-test-selectors](docs/rules/template-no-positional-data-test-selectors.md)             | disallow positional data-test-* params in curly invocations                  |    | 🔧 |    |
 | [template-no-potential-path-strings](docs/rules/template-no-potential-path-strings.md)                             | disallow potential path strings in attribute values                          |    |    |    |
-| [template-no-redundant-fn](docs/rules/template-no-redundant-fn.md)                                                 | disallow unnecessary usage of (fn) helper                                    |    |    |    |
+| [template-no-redundant-fn](docs/rules/template-no-redundant-fn.md)                                                 | disallow unnecessary usage of (fn) helper                                    |    | 🔧 |    |
 | [template-no-restricted-invocations](docs/rules/template-no-restricted-invocations.md)                             | disallow certain components, helpers or modifiers from being used            |    |    |    |
 | [template-no-splattributes-with-class](docs/rules/template-no-splattributes-with-class.md)                         | disallow splattributes with class attribute                                  |    |    |    |
-| [template-no-this-in-template-only-components](docs/rules/template-no-this-in-template-only-components.md)         | disallow this in template-only components (gjs/gts)                          |    | 🔧 |    |
+| [template-no-this-in-template-only-components](docs/rules/template-no-this-in-template-only-components.md)         | disallow this in template-only components                                    |    | 🔧 |    |
 | [template-no-trailing-spaces](docs/rules/template-no-trailing-spaces.md)                                           | disallow trailing whitespace at the end of lines in templates                |    | 🔧 |    |
 | [template-no-unavailable-this](docs/rules/template-no-unavailable-this.md)                                         | disallow `this` in templates that are not inside a class or function         |    |    |    |
 | [template-no-unnecessary-component-helper](docs/rules/template-no-unnecessary-component-helper.md)                 | disallow unnecessary component helper                                        |    | 🔧 |    |
@@ -284,7 +284,7 @@ rules in templates can be disabled with eslint directives with mustache or html
 | [template-self-closing-void-elements](docs/rules/template-self-closing-void-elements.md)                           | require self-closing on void elements                                        |    | 🔧 |    |
 | [template-simple-modifiers](docs/rules/template-simple-modifiers.md)                                               | require simple modifier syntax                                               |    |    |    |
 | [template-simple-unless](docs/rules/template-simple-unless.md)                                                     | require simple conditions in unless blocks                                   |    | 🔧 |    |
-| [template-sort-invocations](docs/rules/template-sort-invocations.md)                                               | require sorted attributes and modifiers                                      |    |    |    |
+| [template-sort-invocations](docs/rules/template-sort-invocations.md)                                               | require sorted attributes and modifiers                                      |    | 🔧 |    |
 | [template-splat-attributes-only](docs/rules/template-splat-attributes-only.md)                                     | disallow ...spread other than ...attributes                                  |    |    |    |
 | [template-style-concatenation](docs/rules/template-style-concatenation.md)                                         | disallow string concatenation in inline styles                               |    |    |    |
 

docs/rules/template-no-positional-data-test-selectors.md

@@ -1,5 +1,7 @@
 # ember/template-no-positional-data-test-selectors
 
+🔧 This rule is automatically fixable by the [`--fix` CLI option](https://eslint.org/docs/latest/user-guide/command-line-interface#--fix).
+
 <!-- end auto-generated rule header -->
 
 ## Motivation

docs/rules/template-no-redundant-fn.md

@@ -1,5 +1,7 @@
 # ember/template-no-redundant-fn
 
+🔧 This rule is automatically fixable by the [`--fix` CLI option](https://eslint.org/docs/latest/user-guide/command-line-interface#--fix).
+
 <!-- end auto-generated rule header -->
 
 The `fn` helper can be used to bind arguments to another function. Using it without any arguments is redundant because then the inner function could just be used directly.

docs/rules/template-sort-invocations.md

@@ -1,5 +1,7 @@
 # ember/template-sort-invocations
 
+🔧 This rule is automatically fixable by the [`--fix` CLI option](https://eslint.org/docs/latest/user-guide/command-line-interface#--fix).
+
 <!-- end auto-generated rule header -->
 
 ## Why use it?

lib/rules/template-no-positional-data-test-selectors.js

@@ -50,6 +50,13 @@ function checkNode(node, context) {
       context.report({
         node,
         messageId: 'noPositionalDataTest',
+        fix(fixer) {
+          // Convert the positional param to a hash pair by appending =true.
+          // e.g. `data-test-foo` becomes `data-test-foo=true`
+          const sourceCode = context.sourceCode;
+          const paramText = sourceCode.getText(param);
+          return fixer.replaceText(param, `${paramText}=true`);
+        },
       });
       return;
     }
@@ -66,7 +73,7 @@ module.exports = {
       url: 'https://github.com/ember-cli/eslint-plugin-ember/tree/master/docs/rules/template-no-positional-data-test-selectors.md',
       templateMode: 'both',
     },
-    fixable: null,
+    fixable: 'code',
     schema: [],
     messages: {
       noPositionalDataTest:

lib/rules/template-no-quoteless-attributes.js

@@ -21,28 +21,27 @@ module.exports = {
     },
   },
   create(context) {
+    const sourceCode = context.sourceCode;
     return {
       GlimmerAttrNode(node) {
-        // Check if attribute has text value without quotes
-        if (node.value?.type === 'GlimmerTextNode' && !/^["']/.test(node.value.chars)) {
-          const sourceCode = context.sourceCode;
-          const attrText = sourceCode.getText(node);
+        if (node.value?.type !== 'GlimmerTextNode') {
+          return;
+        }
 
-          // If value looks unquoted (no = or =value without quotes)
-          if (/=\s*[^"'{]/.test(attrText)) {
-            const type = node.name?.startsWith('@') ? 'Argument' : 'Attribute';
-            context.report({
-              node,
-              messageId: 'missing',
-              data: { type, name: node.name },
-              fix(fixer) {
-                const valueText = node.value.chars;
-                const replacementText = `${node.name}="${valueText}"`;
-                return fixer.replaceText(node, replacementText);
-              },
-            });
-          }
+        const valueSource = sourceCode.getText(node.value);
+        if (valueSource.length === 0 || valueSource[0] === '"' || valueSource[0] === "'") {
+          return;
         }
+
+        const type = node.name?.startsWith('@') ? 'Argument' : 'Attribute';
+        context.report({
+          node,
+          messageId: 'missing',
+          data: { type, name: node.name },
+          fix(fixer) {
+            return fixer.replaceText(node, `${node.name}="${node.value.chars}"`);
+          },
+        });
       },
     };
   },

lib/rules/template-no-redundant-fn.js

@@ -8,7 +8,7 @@ module.exports = {
       url: 'https://github.com/ember-cli/eslint-plugin-ember/tree/master/docs/rules/template-no-redundant-fn.md',
       templateMode: 'both',
     },
-    fixable: null,
+    fixable: 'code',
     schema: [],
     messages: {
       redundant:
@@ -66,6 +66,13 @@ module.exports = {
           data: {
             suggestion: paramText,
           },
+          fix(fixer) {
+            if (node.type === 'GlimmerMustacheStatement') {
+              return fixer.replaceTextRange(node.range, `{{${paramText}}}`);
+            }
+            // GlimmerSubExpression: (fn this.handleClick) → this.handleClick
+            return fixer.replaceTextRange(node.range, paramText);
+          },
         });
       }
     }

lib/rules/template-no-this-in-template-only-components.js

@@ -1,9 +1,68 @@
+const { existsSync } = require('node:fs');
+const path = require('node:path');
+
+const VALID_COMPONENT_EXTENSIONS = ['.js', '.ts'];
+const GLIMMER_SCRIPT_EXTENSIONS = ['.gjs', '.gts'];
+
+function componentClassExists(pathWithoutExtension) {
+  return VALID_COMPONENT_EXTENSIONS.some((ext) => existsSync(pathWithoutExtension + ext));
+}
+
+// Port of ember-template-lint's no-this-in-template-only-components#isTemplateOnlyComponent.
+// Returns true when the template has no backing component class file on disk.
+function isTemplateOnlyComponent(templateFilePath) {
+  // .gjs/.gts files always have JS context, so they cannot be template-only.
+  if (GLIMMER_SCRIPT_EXTENSIONS.some((ext) => templateFilePath.endsWith(ext))) {
+    return false;
+  }
+
+  const allSegments = path.normalize(templateFilePath).split(path.sep);
+
+  const appIndex = allSegments.findIndex((seg) => seg === 'app' || seg === 'addon');
+  if (appIndex === -1) {
+    // No app/addon directory found — cannot determine layout, don't flag.
+    return false;
+  }
+  // Preserve everything before `app`/`addon` as a prefix so we can rebuild
+  // absolute class file paths (upstream uses relative paths, which only
+  // works when the cwd happens to contain `app/`).
+  const prefix = allSegments.slice(0, appIndex).join(path.sep);
+  const segments = allSegments.slice(appIndex);
+
+  if (segments[1] === 'templates') {
+    if (segments[2] === 'components') {
+      // Classic structure: app/templates/components/foo.hbs => app/components/foo.{js,ts}
+      const moduleName = path.basename(templateFilePath, '.hbs');
+      const classFilePath = path.join(
+        prefix,
+        segments[0],
+        'components',
+        ...segments.slice(3, -1),
+        moduleName
+      );
+      return !componentClassExists(classFilePath);
+    }
+    // Route template — always has a backing controller/route context.
+    return false;
+  }
+
+  if (segments[1] === 'components') {
+    // Co-located structure: app/components/foo.hbs => app/components/foo.{js,ts}
+    const moduleName = path.basename(templateFilePath, '.hbs');
+    const classFilePath = path.join(path.dirname(templateFilePath), moduleName);
+    return !componentClassExists(classFilePath);
+  }
+
+  // Unknown layout (e.g. pods) — assume template-only.
+  return true;
+}
+
 /** @type {import('eslint').Rule.RuleModule} */
 module.exports = {
   meta: {
     type: 'suggestion',
     docs: {
-      description: 'disallow this in template-only components (gjs/gts)',
+      description: 'disallow this in template-only components',
       category: 'Best Practices',
       url: 'https://github.com/ember-cli/eslint-plugin-ember/tree/master/docs/rules/template-no-this-in-template-only-components.md',
       templateMode: 'both',
@@ -40,22 +99,34 @@ module.exports = {
       'isDestroyed',
     ]);
 
+    const filename = context.filename;
+    const isHbs = filename.endsWith('.hbs');
+
+    // For .hbs files, check the filesystem for a companion class file.
+    // If one exists, this is NOT a template-only component — skip entirely.
+    if (isHbs && !isTemplateOnlyComponent(filename)) {
+      return {};
+    }
+
     return {
       GlimmerPathExpression(node) {
-        // Only flag template-only components, not class components.
-        // Walk ancestors to check if the <template> is inside a class body.
-        const sourceCode = context.sourceCode;
-        const ancestors = sourceCode.getAncestors
-          ? sourceCode.getAncestors(node)
-          : context.getAncestors();
-        const isInsideClass = ancestors.some(
-          (ancestor) => ancestor.type === 'ClassBody' || ancestor.type === 'ClassDeclaration'
-        );
-        if (isInsideClass) {
-          return;
+        // For .gjs/.gts files: walk ancestors to check if <template> is inside a class body.
+        // If so, the component has a backing class — skip.
+        // .hbs files are already handled above via the filesystem check.
+        if (!isHbs) {
+          const sourceCode = context.sourceCode;
+          const ancestors = sourceCode.getAncestors
+            ? sourceCode.getAncestors(node)
+            : context.getAncestors();
+          const isInsideClass = ancestors.some(
+            (ancestor) => ancestor.type === 'ClassBody' || ancestor.type === 'ClassDeclaration'
+          );
+          if (isInsideClass) {
+            return;
+          }
         }
 
-        // In gjs/gts files with <template> tags, check for this.* usage
+        // Check for this.* usage
         if (node.head?.type === 'ThisHead' && node.tail?.length > 0) {
           const original = node.original;
           const firstPart = node.tail[0];

lib/rules/template-sort-invocations.js

@@ -9,7 +9,7 @@ module.exports = {
       url: 'https://github.com/ember-cli/eslint-plugin-ember/tree/master/docs/rules/template-sort-invocations.md',
       templateMode: 'both',
     },
-    fixable: null,
+    fixable: 'code',
     schema: [],
     messages: {
       attributeOrder: '`{{attributeName}}` must appear after `{{expectedAfter}}`',
@@ -26,6 +26,24 @@ module.exports = {
   },
 
   create(context) {
+    const sourceCode = context.sourceCode;
+
+    // Glimmer attribute and modifier nodes can have trailing whitespace
+    // absorbed into their range, so we strip the trailing whitespace from
+    // each side and re-append it at the end of the swapped output.
+    function createSwapFix(fixer, nodeA, nodeB) {
+      const rawA = sourceCode.getText(nodeA);
+      const rawB = sourceCode.getText(nodeB);
+      const contentA = rawA.trimEnd();
+      const contentB = rawB.trimEnd();
+      const separator = sourceCode.text.slice(nodeA.range[0] + contentA.length, nodeB.range[0]);
+      const trailing = rawB.slice(contentB.length);
+      return fixer.replaceTextRange(
+        [nodeA.range[0], nodeB.range[1]],
+        contentB + separator + contentA + trailing
+      );
+    }
+
     function getAttributeName(node) {
       return node.name;
     }
@@ -171,6 +189,9 @@ module.exports = {
                 attributeName: getAttributeName(attributes[index]),
                 expectedAfter: getAttributeName(attributes[index + 1]),
               },
+              fix(fixer) {
+                return createSwapFix(fixer, attributes[index], attributes[index + 1]);
+              },
             });
           }
         }
@@ -186,13 +207,28 @@ module.exports = {
                 modifierName: getModifierName(modifiers[index]),
                 expectedAfter: getModifierName(modifiers[index + 1]),
               },
+              fix(fixer) {
+                return createSwapFix(fixer, modifiers[index], modifiers[index + 1]);
+              },
             });
           }
         }
 
         if (!canSkipSplattributesLast(node)) {
           const splattributes = attributes.at(-1);
 
+          // Swap ...attributes past the first modifier that appears after it;
+          // ESLint's fix loop continues until splattributes is fully sorted.
+          // canSkipSplattributesLast guarantees at least one such modifier exists.
+          const firstModifierAfter = modifiers.find(
+            (mod) =>
+              mod.loc.start.line > splattributes.loc.start.line ||
+              (mod.loc.start.line === splattributes.loc.start.line &&
+                mod.loc.start.column > splattributes.loc.start.column)
+          );
+
+          const splatFixFn = (fixer) => createSwapFix(fixer, splattributes, firstModifierAfter);
+
           // When ...attributes is the only attribute, report as attributeOrder
           // (the ordering issue is that ...attributes should appear after modifiers)
           if (attributes.length === 1) {
@@ -203,11 +239,13 @@ module.exports = {
                 attributeName: '...attributes',
                 expectedAfter: 'modifiers',
               },
+              fix: splatFixFn,
             });
           } else {
             context.report({
               node: splattributes,
               messageId: 'splattributesOrder',
+              fix: splatFixFn,
             });
           }
         }
@@ -225,6 +263,9 @@ module.exports = {
                 hashPairName: getHashPairName(node.hash.pairs[index]),
                 expectedAfter: getHashPairName(node.hash.pairs[index + 1]),
               },
+              fix(fixer) {
+                return createSwapFix(fixer, node.hash.pairs[index], node.hash.pairs[index + 1]);
+              },
             });
           }
         }
@@ -244,6 +285,10 @@ module.exports = {
               node.params.length > 0 &&
               node.params[0].type === 'GlimmerStringLiteral';
 
+            const fixFn = function (fixer) {
+              return createSwapFix(fixer, node.hash.pairs[index], node.hash.pairs[index + 1]);
+            };
+
             if (isComponentInvocation) {
               context.report({
                 node: node.hash.pairs[index],
@@ -252,6 +297,7 @@ module.exports = {
                   attributeName: getHashPairName(node.hash.pairs[index]),
                   expectedAfter: getHashPairName(node.hash.pairs[index + 1]),
                 },
+                fix: fixFn,
               });
             } else {
               context.report({
@@ -261,6 +307,7 @@ module.exports = {
                   hashPairName: getHashPairName(node.hash.pairs[index]),
                   expectedAfter: getHashPairName(node.hash.pairs[index + 1]),
                 },
+                fix: fixFn,
               });
             }
           }
@@ -279,6 +326,9 @@ module.exports = {
                 hashPairName: getHashPairName(node.hash.pairs[index]),
                 expectedAfter: getHashPairName(node.hash.pairs[index + 1]),
               },
+              fix(fixer) {
+                return createSwapFix(fixer, node.hash.pairs[index], node.hash.pairs[index + 1]);
+              },
             });
           }
         }

tests/fixtures/template-no-this-in-template-only-components/app/components/classic-with-class.js

@@ -0,0 +1,3 @@
+// Fixture for template-no-this-in-template-only-components rule tests.
+// Only needs to exist on disk; the rule's filesystem check uses fs.existsSync.
+module.exports = {};