@ethlete/eslint-plugin 1.0.0-next.23 → 1.0.0-next.25

package/src/rules/no-leading-underscore-class-member.js

@@ -16,6 +16,16 @@ const getDirectMemberName = (node) => {
   return node.key?.type === 'Identifier' ? node.key.name : null;
 };
 
+/**
+ * @param {any} key
+ * @param {boolean} computed
+ */
+const getReferencedName = (key, computed) => {
+  if (!computed && key?.type === 'Identifier') return key.name;
+  if (key?.type === 'Literal' && typeof key.value === 'string') return key.value;
+  return null;
+};
+
 /** @type {import('eslint').Rule.RuleModule} */
 const noLeadingUnderscoreClassMember = {
   meta: {
@@ -36,6 +46,7 @@ const noLeadingUnderscoreClassMember = {
      *   declaredNames: Set<string>,
      *   membersByName: Map<string, any[]>,
      *   memberReads: any[],
+     *   untrackedNames: Set<string>,
      * }>}
      */
     const classStack = [];
@@ -66,6 +77,7 @@ const noLeadingUnderscoreClassMember = {
           declaredNames: new Set(),
           membersByName: new Map(),
           memberReads: [],
+          untrackedNames: new Set(),
         });
       },
 
@@ -85,6 +97,7 @@ const noLeadingUnderscoreClassMember = {
             newName.length > 0 &&
             !frame.declaredNames.has(newName) &&
             targetNameCounts.get(newName) === 1 &&
+            !frame.untrackedNames.has(oldName) &&
             memberNodes.every((memberNode) => memberNode.accessibility === 'private');
 
           for (const memberNode of memberNodes) {
@@ -115,10 +128,20 @@ const noLeadingUnderscoreClassMember = {
       MemberExpression(node) {
         const frame = classStack[classStack.length - 1];
         if (!frame) return;
-        if (node.object?.type !== 'ThisExpression' || node.computed) return;
-        if (node.property?.type !== 'Identifier') return;
 
-        frame.memberReads.push(node);
+        if (node.object?.type === 'ThisExpression' && !node.computed && node.property?.type === 'Identifier') {
+          frame.memberReads.push(node);
+          return;
+        }
+
+        const name = getReferencedName(node.property, node.computed);
+        if (name) frame.untrackedNames.add(name);
+      },
+
+      'ObjectPattern > Property'(node) {
+        const frame = classStack[classStack.length - 1];
+        const name = getReferencedName(node.key, node.computed);
+        if (frame && name) frame.untrackedNames.add(name);
       },
     };
   },

package/src/rules/no-legacy-angular-decorators.js

@@ -1,6 +1,8 @@
 // @ts-check
 'use strict';
 
+const { getAngularDecoratorName } = require('./internals/import-resolution');
+
 /**
  * Disallows legacy Angular decorators in favour of their modern signal-based
  * equivalents and the `host: {}` shorthand.
@@ -25,20 +27,6 @@
  *   → ✅ host: { '[class.active]': 'isActive', '(click)': 'onClick()' }
  */
 
-/**
- * Returns the identifier name of a decorator.
- * Works for both `@Foo` (Identifier) and `@Foo(...)` (CallExpression).
- *
- * @param {any} decorator
- * @returns {string | null}
- */
-const getDecoratorName = (decorator) => {
-  const expr = decorator.expression;
-  if (expr.type === 'Identifier') return expr.name;
-  if (expr.type === 'CallExpression' && expr.callee.type === 'Identifier') return expr.callee.name;
-  return null;
-};
-
 /**
  * Returns the static string key of a class member, or null for computed keys.
  *
@@ -72,11 +60,12 @@ const getIndent = (sourceCode, node) => {
 };
 
 /**
+ * @param {import('eslint').SourceCode} sourceCode
  * @param {any} classNode
  */
-const getAngularMetadata = (classNode) => {
+const getAngularMetadata = (sourceCode, classNode) => {
   for (const decorator of classNode.decorators ?? []) {
-    const decoratorName = getDecoratorName(decorator);
+    const decoratorName = getAngularDecoratorName(sourceCode, decorator);
     if (decoratorName !== 'Component' && decoratorName !== 'Directive') continue;
 
     const expression = decorator.expression;
@@ -106,7 +95,7 @@ const findObjectProperty = (objectExpression, propertyName) =>
  * @param {string} entryText
  */
 const buildObjectTextWithAppendedProperty = (sourceCode, objectExpression, entryText) => {
-  const properties = objectExpression.properties.filter((property) => property.type === 'Property');
+  const properties = objectExpression.properties;
   const isMultiline = Boolean(
     objectExpression.loc && objectExpression.loc.start.line !== objectExpression.loc.end.line,
   );
@@ -138,8 +127,7 @@ ${closingIndent}}`;
  * @param {any} objectExpression
  */
 const hasTrailingComma = (sourceCode, objectExpression) => {
-  const properties = objectExpression.properties.filter((property) => property.type === 'Property');
-  const lastProperty = properties[properties.length - 1];
+  const lastProperty = objectExpression.properties.at(-1);
   if (!lastProperty) return false;
 
   const tokenAfter = sourceCode.getTokenAfter(lastProperty);
@@ -158,7 +146,7 @@ const buildHostBindingFix = (sourceCode, decoratorNode, memberNode, bindingKey,
   const classNode = classBody?.parent;
   if (!classNode) return null;
 
-  const metadata = getAngularMetadata(classNode);
+  const metadata = getAngularMetadata(sourceCode, classNode);
   if (!metadata) return null;
 
   const hostProperty = findObjectProperty(metadata, 'host');
@@ -312,7 +300,7 @@ const rule = {
 
       Decorator(node) {
         const anyNode = /** @type {any} */ (node);
-        const decoratorName = getDecoratorName(anyNode);
+        const decoratorName = getAngularDecoratorName(context.sourceCode, anyNode);
         if (!decoratorName) return;
 
         // Only act on decorators attached to class members, not to the class itself

package/src/rules/no-legacy-query-import.js

@@ -19,6 +19,8 @@
  * the types this rule leaves alone), enable `@typescript-eslint/no-deprecated` alongside it.
  */
 
+const { MODULE_REFERENCE_SELECTOR, getModuleReference } = require('./internals/import-resolution');
+
 const QUERY_PACKAGE = '@ethlete/query';
 const DEFAULT_DOCS_BASE_URL = 'https://ethlete-sdk-docs.web.app';
 
@@ -60,13 +62,6 @@ const V2_SUCCESSORS = {
   V2BearerAuthProvider: { to: '`createBearerAuthProvider` plus the secure creator templates', docs: '/query/auth' },
 };
 
-/** @param {any} specifier */
-const importedName = (specifier) => {
-  if (specifier.type !== 'ImportSpecifier') return null;
-
-  return specifier.imported.name ?? specifier.imported.value ?? null;
-};
-
 /** @param {string} name */
 const isV2Symbol = (name) => /^(V2|AnyV2)[A-Z]/.test(name);
 
@@ -98,16 +93,12 @@ const noLegacyQueryImport = {
     const docsBaseUrl = (options.docsBaseUrl ?? DEFAULT_DOCS_BASE_URL).replace(/\/$/, '');
 
     return {
-      ImportDeclaration(node) {
-        const declaration = /** @type {any} */ (node);
-
-        if (declaration.source.value !== QUERY_PACKAGE) return;
-
-        for (const specifier of declaration.specifiers) {
-          const name = importedName(specifier);
+      [MODULE_REFERENCE_SELECTOR](node) {
+        const reference = getModuleReference(node);
 
-          if (!name) continue;
+        if (reference?.source !== QUERY_PACKAGE) return;
 
+        for (const { name, node: specifier } of reference.named) {
           const successor = V2_SUCCESSORS[name] ?? LEGACY_SYMBOLS[name];
 
           if (successor) {

package/src/rules/no-locale-id.js

@@ -14,6 +14,8 @@
  *   const locale = injectLocale();
  */
 
+const { isImportedAs } = require('./internals/import-resolution');
+
 /** @type {import('eslint').Rule.RuleModule} */
 const noLocaleId = {
   meta: {
@@ -31,10 +33,8 @@ const noLocaleId = {
   create(context) {
     return {
       CallExpression(node) {
-        const { callee } = node;
-        if (callee.type !== 'Identifier' || callee.name !== 'inject') return;
-        const arg = node.arguments[0];
-        if (arg?.type === 'Identifier' && arg.name === 'LOCALE_ID') {
+        if (!isImportedAs(context.sourceCode, node.callee, 'inject')) return;
+        if (isImportedAs(context.sourceCode, node.arguments[0], 'LOCALE_ID')) {
           context.report({ node, messageId: 'noLocaleId' });
         }
       },

package/src/rules/no-member-alias.js

@@ -1,6 +1,8 @@
 // @ts-check
 'use strict';
 
+const { getAngularDecoratorName } = require('./internals/import-resolution');
+
 /**
  * Disallows class members that exist solely as aliases for a nested property or
  * zero-arg method of another class member accessed via `this`.
@@ -81,12 +83,14 @@ const getMethodAliasInfo = (node) => {
 
 const CONTRACT_METHOD_NAMES = new Set(['blur', 'focus', 'reset']);
 
-/** @param {any} methodNode */
-const isInAngularClass = (methodNode) =>
-  methodNode.parent?.parent?.decorators?.some((decorator) => {
-    const expression = decorator.expression;
-    const callee = expression.type === 'CallExpression' ? expression.callee : expression;
-    return callee.type === 'Identifier' && (callee.name === 'Component' || callee.name === 'Directive');
+/**
+ * @param {import('eslint').SourceCode} sourceCode
+ * @param {any} methodNode
+ */
+const isInAngularClass = (sourceCode, methodNode) =>
+  methodNode.parent?.parent?.decorators?.some((/** @type {any} */ decorator) => {
+    const name = getAngularDecoratorName(sourceCode, decorator);
+    return name === 'Component' || name === 'Directive';
   }) ?? false;
 
 /** @type {import('eslint').Rule.RuleModule} */
@@ -149,7 +153,7 @@ const noMemberAlias = {
         if (!info) return;
         const classNode = node.parent?.parent;
         if (node.override || classNode?.superClass || classNode?.implements?.length) return;
-        if (isInAngularClass(node) && CONTRACT_METHOD_NAMES.has(aliasName)) return;
+        if (isInAngularClass(context.sourceCode, node) && CONTRACT_METHOD_NAMES.has(aliasName)) return;
 
         // Only flag when names match — different names indicate an intentional
         // API rename, which is not a pure alias.

package/src/rules/no-native-html-input-name.js

@@ -75,7 +75,7 @@ const rule = {
   create(context) {
     return {
       PropertyDefinition(node) {
-        const io = getReactiveIo(node);
+        const io = getReactiveIo(context.sourceCode, node);
         if (!io) return;
         if (io.kind === 'output') return;
 

package/src/rules/no-pipe-logic.js

@@ -1,23 +1,16 @@
 // @ts-check
 'use strict';
 
+const { getAngularDecoratorName } = require('./internals/import-resolution');
+
 /**
- * Checks whether a class node has a @Pipe decorator.
- * @param {import('eslint').Rule.Node} classNode
+ * @param {import('eslint').SourceCode} sourceCode
+ * @param {any} classNode
  */
-const hasPipeDecorator = (classNode) => {
-  const decorators = /** @type {any} */ (classNode).decorators ?? [];
-  return decorators.some((/** @type {any} */ dec) => {
-    const expr = dec.expression;
-    if (expr.type === 'CallExpression') {
-      return expr.callee.type === 'Identifier' && expr.callee.name === 'Pipe';
-    }
-    if (expr.type === 'Identifier') {
-      return expr.name === 'Pipe';
-    }
-    return false;
-  });
-};
+const hasPipeDecorator = (sourceCode, classNode) =>
+  (classNode.decorators ?? []).some(
+    (/** @type {any} */ decorator) => getAngularDecoratorName(sourceCode, decorator) === 'Pipe',
+  );
 
 /** @type {import('eslint').Rule.RuleModule} */
 const noPipeLogic = {
@@ -47,7 +40,7 @@ const noPipeLogic = {
         const classNode = classBody.parent;
         if (!classNode || (classNode.type !== 'ClassDeclaration' && classNode.type !== 'ClassExpression')) return;
 
-        if (!hasPipeDecorator(classNode)) return;
+        if (!hasPipeDecorator(context.sourceCode, classNode)) return;
 
         context.report({ node, messageId: 'noLogicInTransform' });
       },
@@ -63,7 +56,7 @@ const noPipeLogic = {
         const classNode = classBody.parent;
         if (!classNode || (classNode.type !== 'ClassDeclaration' && classNode.type !== 'ClassExpression')) return;
 
-        if (!hasPipeDecorator(classNode)) return;
+        if (!hasPipeDecorator(context.sourceCode, classNode)) return;
 
         const value = /** @type {any} */ (node).value;
         if (value && (value.type === 'ArrowFunctionExpression' || value.type === 'FunctionExpression')) {

package/src/rules/no-redundant-on-push-change-detection.js

@@ -1,6 +1,8 @@
 // @ts-check
 'use strict';
 
+const { getAngularDecoratorName, isImportedAs } = require('./internals/import-resolution');
+
 const { getMetadataEntryRemovalRange } = require('./internals/angular-metadata-fix');
 
 /**
@@ -70,29 +72,15 @@ const getPropertyName = (key) => {
 };
 
 /**
- * @param {import('eslint').Rule.Node} node
- */
-const isComponentDecorator = (node) => {
-  const decorator = /** @type {any} */ (node);
-  if (decorator.type !== 'Decorator') return false;
-
-  const expression = decorator.expression;
-  if (expression.type === 'CallExpression') {
-    return expression.callee.type === 'Identifier' && expression.callee.name === 'Component';
-  }
-
-  return expression.type === 'Identifier' && expression.name === 'Component';
-};
-
-/**
+ * @param {import('eslint').SourceCode} sourceCode
  * @param {any} value
  */
-const isOnPushValue = (value, localName) =>
+const isOnPushValue = (sourceCode, value) =>
   value.type === 'MemberExpression' &&
-  value.object.type === 'Identifier' &&
-  value.object.name === localName &&
+  !value.computed &&
   value.property.type === 'Identifier' &&
-  value.property.name === 'OnPush';
+  value.property.name === 'OnPush' &&
+  isImportedAs(sourceCode, value.object, 'ChangeDetectionStrategy');
 
 /**
  * Range that removes a single named import specifier together with its comma.
@@ -159,12 +147,11 @@ const noRedundantOnPushChangeDetection = {
     const sourceCode = context.sourceCode;
     /** @type {any} */
     let changeDetectionSpecifier = null;
-    let changeDetectionLocalName = 'ChangeDetectionStrategy';
     const removableIdentifiers = new Set();
 
     return {
       Decorator(node) {
-        if (!isComponentDecorator(node)) return;
+        if (getAngularDecoratorName(sourceCode, node) !== 'Component') return;
 
         const expression = /** @type {any} */ (node).expression;
         if (expression.type !== 'CallExpression' || expression.arguments.length === 0) return;
@@ -175,7 +162,7 @@ const noRedundantOnPushChangeDetection = {
         const property = metadata.properties.find(
           (entry) => entry.type === 'Property' && getPropertyName(entry.key) === 'changeDetection',
         );
-        if (!property || !isOnPushValue(property.value, changeDetectionLocalName)) return;
+        if (!property || !isOnPushValue(sourceCode, property.value)) return;
         removableIdentifiers.add(property.value.object);
 
         context.report({
@@ -195,7 +182,6 @@ const noRedundantOnPushChangeDetection = {
             specifier.imported.name === 'ChangeDetectionStrategy'
           ) {
             changeDetectionSpecifier = specifier;
-            changeDetectionLocalName = specifier.local.name;
             return;
           }
         }

package/src/rules/no-rxjs-in-effect.js

@@ -1,6 +1,8 @@
 // @ts-check
 'use strict';
 
+const { ANGULAR_CORE, getImportedName } = require('./internals/import-resolution');
+
 /**
  * Disallows calling .subscribe() inside Angular's effect() or computed() callbacks.
  *
@@ -22,6 +24,11 @@
  *     .subscribe();
  */
 
+/**
+ * @param {any} node
+ */
+const isStringLiteral = (node) => node?.type === 'Literal' && typeof node.value === 'string';
+
 /** @type {import('eslint').Rule.RuleModule} */
 const noRxjsInEffect = {
   meta: {
@@ -50,13 +57,9 @@ const noRxjsInEffect = {
         if (current.type === 'ArrowFunctionExpression' || current.type === 'FunctionExpression') {
           crossedFunctionBoundary = true;
         }
-        if (
-          crossedFunctionBoundary &&
-          current.type === 'CallExpression' &&
-          current.callee.type === 'Identifier' &&
-          (current.callee.name === 'effect' || current.callee.name === 'computed')
-        ) {
-          return current.callee.name;
+        if (crossedFunctionBoundary && current.type === 'CallExpression') {
+          const calleeName = getImportedName(context.sourceCode, current.callee, ANGULAR_CORE);
+          if (calleeName === 'effect' || calleeName === 'computed') return calleeName;
         }
         current = current.parent;
       }
@@ -69,7 +72,8 @@ const noRxjsInEffect = {
         if (
           callee.type === 'MemberExpression' &&
           callee.property.type === 'Identifier' &&
-          callee.property.name === 'subscribe'
+          callee.property.name === 'subscribe' &&
+          !isStringLiteral(node.arguments[0])
         ) {
           const reactiveContext = getReactiveContext(node);
           if (reactiveContext) {

package/src/rules/no-screaming-case-local.js

@@ -79,6 +79,7 @@ const noScreamingCaseLocal = {
 
         // Only flag inside function bodies
         if (!isInsideFunction(node)) return;
+        if (node.init?.type === 'ArrowFunctionExpression' || node.init?.type === 'FunctionExpression') return;
 
         context.report({
           node: node.id,

package/src/rules/no-standalone-flag.js

@@ -1,6 +1,8 @@
 // @ts-check
 'use strict';
 
+const { getAngularDecoratorName } = require('./internals/import-resolution');
+
 const { getMetadataEntryRemovalRange } = require('./internals/angular-metadata-fix');
 
 /** @typedef {'Component' | 'Directive' | 'Pipe'} TDecoratorName */
@@ -14,22 +16,6 @@ const getPropertyName = (key) => {
   return null;
 };
 
-/**
- * @param {import('eslint').Rule.Node} node
- * @returns {TDecoratorName | null}
- */
-const getDecoratorName = (node) => {
-  const decorator = /** @type {any} */ (node);
-  if (decorator.type !== 'Decorator') return null;
-
-  const expression = decorator.expression;
-  if (expression.type === 'CallExpression') {
-    return expression.callee.type === 'Identifier' ? expression.callee.name : null;
-  }
-
-  return expression.type === 'Identifier' ? expression.name : null;
-};
-
 /** @type {import('eslint').Rule.RuleModule} */
 const noStandaloneFlag = {
   meta: {
@@ -49,7 +35,7 @@ const noStandaloneFlag = {
 
     return {
       Decorator(node) {
-        const decoratorName = getDecoratorName(node);
+        const decoratorName = getAngularDecoratorName(context.sourceCode, node);
         if (decoratorName !== 'Component' && decoratorName !== 'Directive' && decoratorName !== 'Pipe') return;
 
         const decorator = /** @type {any} */ (node);

package/src/rules/no-subscribe-in-pipe.js

@@ -19,6 +19,8 @@
  *   obs$.pipe(...operators).subscribe(); // ✅ subscribe on the result of pipe
  */
 
+const { isImportedAs } = require('./internals/import-resolution');
+
 /** @type {import('eslint').Rule.RuleModule} */
 const noSubscribeInPipe = {
   meta: {
@@ -48,8 +50,7 @@ const noSubscribeInPipe = {
         // be flagged even if the Observable itself is passed into a .pipe() operator.
         if (
           current.type === 'NewExpression' &&
-          current.callee.type === 'Identifier' &&
-          current.callee.name === 'Observable'
+          isImportedAs(context.sourceCode, current.callee, 'Observable', 'rxjs')
         ) {
           return false;
         }

package/src/rules/no-template-literal-before-inline-template.js

@@ -1,6 +1,8 @@
 // @ts-check
 'use strict';
 
+const { getAngularDecoratorName } = require('./internals/import-resolution');
+
 const ts = require('typescript');
 
 /**
@@ -92,19 +94,6 @@ const getPropertyName = (key) => {
   return null;
 };
 
-/**
- * @param {any} node
- */
-const getDecoratorName = (node) => {
-  const expression = node.expression;
-  if (!expression) return null;
-  if (expression.type === 'CallExpression') {
-    return expression.callee.type === 'Identifier' ? expression.callee.name : null;
-  }
-
-  return expression.type === 'Identifier' ? expression.name : null;
-};
-
 /**
  * The inline template text, or null when the property is not a plain non-empty string literal.
  *
@@ -147,7 +136,7 @@ const noTemplateLiteralBeforeInlineTemplate = {
 
       /** @param {import('eslint').Rule.Node} node */
       Decorator(node) {
-        const decoratorName = getDecoratorName(node);
+        const decoratorName = getAngularDecoratorName(context.sourceCode, node);
         if (decoratorName !== 'Component' && decoratorName !== 'Directive') return;
 
         const expression = /** @type {any} */ (node).expression;

package/src/rules/no-trivial-return-type.js

@@ -191,6 +191,7 @@ const noTrivialReturnType = {
     return {
       ArrowFunctionExpression: checkReturnType,
       FunctionExpression: checkReturnType,
+      FunctionDeclaration: checkReturnType,
     };
   },
 };

package/src/rules/no-trivial-wrapper-method.js

@@ -1,6 +1,8 @@
 // @ts-check
 'use strict';
 
+const { getAngularDecoratorName } = require('./internals/import-resolution');
+
 /**
  * Disallows trivial wrapper methods that do nothing but forward all their
  * arguments to another call.
@@ -34,22 +36,14 @@ const CONTRACT_METHOD_NAMES = new Set(['focus', 'blur', 'reset']);
 const isSimpleParam = (param) => param.type === 'Identifier';
 
 /**
- * Whether the class holding this method is an Angular component or directive.
- * @param {import('eslint').Rule.Node} methodNode MethodDefinition node
+ * @param {import('eslint').SourceCode} sourceCode
+ * @param {any} methodNode
  */
-const isInAngularClass = (methodNode) => {
-  const classNode = methodNode.parent?.parent;
-  const decorators = classNode && 'decorators' in classNode ? classNode.decorators : null;
-
-  if (!decorators) return false;
-
-  return decorators.some((decorator) => {
-    const expression = decorator.expression;
-    const callee = expression.type === 'CallExpression' ? expression.callee : expression;
-
-    return callee.type === 'Identifier' && (callee.name === 'Component' || callee.name === 'Directive');
-  });
-};
+const isInAngularClass = (sourceCode, methodNode) =>
+  methodNode.parent?.parent?.decorators?.some((/** @type {any} */ decorator) => {
+    const name = getAngularDecoratorName(sourceCode, decorator);
+    return name === 'Component' || name === 'Directive';
+  }) ?? false;
 
 /**
  * Returns the single CallExpression in the method body when the method is a
@@ -127,7 +121,7 @@ const noTrivialWrapperMethod = {
         const classNode = node.parent?.parent;
         if (node.override || classNode?.superClass || classNode?.implements?.length) return;
         if (node.static && methodName === 'ngTemplateContextGuard') return;
-        if (CONTRACT_METHOD_NAMES.has(methodName) && isInAngularClass(node)) return;
+        if (CONTRACT_METHOD_NAMES.has(methodName) && isInAngularClass(context.sourceCode, node)) return;
 
         const callee = callExpr.callee;
         const targetName =