Also handle named imports from root '@ember/render-modifiers' package

Author: johanrd

lib/rules/template-no-at-ember-render-modifiers.js

@@ -1,12 +1,19 @@
-// Map of `@ember/render-modifiers` sub-path → canonical kebab-case modifier name.
-// Default-imported names are user-chosen, so we track local names to canonical.
+// Sub-path → canonical kebab-case modifier name (default import).
 const RENDER_MODIFIER_IMPORT_PATHS = {
   '@ember/render-modifiers/modifiers/did-insert': 'did-insert',
   '@ember/render-modifiers/modifiers/did-update': 'did-update',
   '@ember/render-modifiers/modifiers/will-destroy': 'will-destroy',
 };
 
+// Named exports of the root package `@ember/render-modifiers` → canonical kebab name.
+const ROOT_NAMED_EXPORTS = {
+  didInsert: 'did-insert',
+  didUpdate: 'did-update',
+  willDestroy: 'will-destroy',
+};
+
 const KEBAB_NAMES = new Set(['did-insert', 'did-update', 'will-destroy']);
+const ROOT_PACKAGE = '@ember/render-modifiers';
 
 /** @type {import('eslint').Rule.RuleModule} */
 module.exports = {
@@ -56,11 +63,27 @@ module.exports = {
         if (!isStrictMode) {
           return;
         }
-        const canonical = RENDER_MODIFIER_IMPORT_PATHS[node.source.value];
+        const source = node.source.value;
+
+        if (source === ROOT_PACKAGE) {
+          // `import { didInsert, didUpdate as x } from '@ember/render-modifiers'`
+          for (const specifier of node.specifiers) {
+            if (specifier.type === 'ImportSpecifier') {
+              const exportedName = specifier.imported.name;
+              const canonical = ROOT_NAMED_EXPORTS[exportedName];
+              if (canonical) {
+                importedModifiers.set(specifier.local.name, canonical);
+              }
+            }
+          }
+          return;
+        }
+
+        // Sub-path: `import didInsert from '@ember/render-modifiers/modifiers/did-insert'`
+        const canonical = RENDER_MODIFIER_IMPORT_PATHS[source];
         if (!canonical) {
           return;
         }
-        // Default import (`import didInsert from '...'`) is the supported form
         for (const specifier of node.specifiers) {
           if (specifier.type === 'ImportDefaultSpecifier') {
             importedModifiers.set(specifier.local.name, canonical);

tests/lib/rules/template-no-at-ember-render-modifiers.js

@@ -45,6 +45,12 @@ ruleTester.run('template-no-at-ember-render-modifiers', rule, {
       code: `import didInsert from './my-lib';
         <template><div {{didInsert this.setup}}></div></template>`,
     },
+    // Root-package import of an unknown named export is not a render modifier
+    {
+      filename: 'test.gjs',
+      code: `import { somethingElse } from '@ember/render-modifiers';
+        <template><div {{somethingElse this.setup}}></div></template>`,
+    },
   ],
 
   invalid: [
@@ -131,6 +137,37 @@ ruleTester.run('template-no-at-ember-render-modifiers', rule, {
       output: null,
       errors: [{ messageId: 'noRenderModifier' }],
     },
+
+    // Root-package named imports — all three modifiers
+    {
+      filename: 'test.gjs',
+      code: `import { didInsert } from '@ember/render-modifiers';
+        <template><div {{didInsert this.setup}}></div></template>`,
+      output: null,
+      errors: [{ messageId: 'noRenderModifier' }],
+    },
+    {
+      filename: 'test.gjs',
+      code: `import { didUpdate } from '@ember/render-modifiers';
+        <template><div {{didUpdate this.update}}></div></template>`,
+      output: null,
+      errors: [{ messageId: 'noRenderModifier' }],
+    },
+    {
+      filename: 'test.gjs',
+      code: `import { willDestroy } from '@ember/render-modifiers';
+        <template><div {{willDestroy this.cleanup}}></div></template>`,
+      output: null,
+      errors: [{ messageId: 'noRenderModifier' }],
+    },
+    // Aliased root-package import still flags
+    {
+      filename: 'test.gjs',
+      code: `import { didInsert as myModifier } from '@ember/render-modifiers';
+        <template><div {{myModifier this.setup}}></div></template>`,
+      output: null,
+      errors: [{ messageId: 'noRenderModifier' }],
+    },
   ],
 });