@angular-eslint/eslint-plugin 22.0.1-alpha.7 → 22.0.1-alpha.9

package/dist/rules/no-implicit-take-until-destroyed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-implicit-take-until-destroyed.d.ts","sourceRoot":"","sources":["../../src/rules/no-implicit-take-until-destroyed.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,8BAA8B,CAAC;AACxD,eAAO,MAAM,SAAS,qCAAqC,CAAC;;;;AAO5D,wBAgCG;AAqEH,eAAO,MAAM,mBAAmB;;CAE/B,CAAC"}
+{"version":3,"file":"no-implicit-take-until-destroyed.d.ts","sourceRoot":"","sources":["../../src/rules/no-implicit-take-until-destroyed.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,8BAA8B,CAAC;AACxD,eAAO,MAAM,SAAS,qCAAqC,CAAC;;;;AAO5D,wBAgCG;AAwMH,eAAO,MAAM,mBAAmB;;CAE/B,CAAC"}

package/dist/rules/no-implicit-take-until-destroyed.js

@@ -55,6 +55,17 @@ function isInInjectionContext(node) {
                 return true;
             }
         }
+        if (isNonConstructorMethod(current)) {
+            const classDeclaration = utils_1.ASTUtils.getNearestNodeFrom(current, utils_1.ASTUtils.isClassDeclaration);
+            if (classDeclaration) {
+                const decorator = utils_1.ASTUtils.getAngularClassDecorator(classDeclaration);
+                if (decorator &&
+                    decorator !== 'NgModule' &&
+                    isMethodCalledFromInjectionContext(current, classDeclaration)) {
+                    return true;
+                }
+            }
+        }
         current = current.parent;
     }
     return false;
@@ -62,6 +73,78 @@ function isInInjectionContext(node) {
 function isConstructorMethod(node) {
     return (node.type === utils_2.AST_NODE_TYPES.MethodDefinition && node.kind === 'constructor');
 }
+function isNonConstructorMethod(node) {
+    return (node.type === utils_2.AST_NODE_TYPES.MethodDefinition && node.kind !== 'constructor');
+}
+function getMethodName(node) {
+    if (node.key.type === utils_2.AST_NODE_TYPES.Identifier ||
+        node.key.type === utils_2.AST_NODE_TYPES.PrivateIdentifier) {
+        return node.key.name;
+    }
+    return null;
+}
+function isMethodCalledFromInjectionContext(method, classDeclaration) {
+    const methodName = getMethodName(method);
+    if (!methodName) {
+        return false;
+    }
+    const isPrivateField = method.key.type === utils_2.AST_NODE_TYPES.PrivateIdentifier;
+    for (const member of classDeclaration.body.body) {
+        if (!isConstructorMethod(member) &&
+            !utils_1.ASTUtils.isPropertyDefinition(member)) {
+            continue;
+        }
+        if (containsCallToMethod(member, methodName, isPrivateField)) {
+            return true;
+        }
+    }
+    return false;
+}
+function isASTNode(value) {
+    return (value !== null &&
+        typeof value === 'object' &&
+        'type' in value &&
+        typeof value.type === 'string');
+}
+function containsCallToMethod(node, methodName, isPrivateField) {
+    if (node.type === utils_2.AST_NODE_TYPES.CallExpression &&
+        node.callee.type === utils_2.AST_NODE_TYPES.MemberExpression) {
+        const { object, property } = node.callee;
+        if (object.type === utils_2.AST_NODE_TYPES.ThisExpression) {
+            if (isPrivateField &&
+                property.type === utils_2.AST_NODE_TYPES.PrivateIdentifier &&
+                property.name === methodName) {
+                return true;
+            }
+            if (!isPrivateField &&
+                property.type === utils_2.AST_NODE_TYPES.Identifier &&
+                property.name === methodName) {
+                return true;
+            }
+        }
+    }
+    for (const key of Object.keys(node)) {
+        if (key === 'parent')
+            continue;
+        const child = node[key];
+        if (child && typeof child === 'object') {
+            if (Array.isArray(child)) {
+                for (const item of child) {
+                    if (isASTNode(item) &&
+                        containsCallToMethod(item, methodName, isPrivateField)) {
+                        return true;
+                    }
+                }
+            }
+            else if (isASTNode(child)) {
+                if (containsCallToMethod(child, methodName, isPrivateField)) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
 function isInFactoryFunction(node) {
     if (node.type !== utils_2.AST_NODE_TYPES.ArrowFunctionExpression &&
         node.type !== utils_2.AST_NODE_TYPES.FunctionExpression) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin",
-  "version": "22.0.1-alpha.7",
+  "version": "22.0.1-alpha.9",
   "description": "ESLint plugin for Angular applications, following https://angular.dev/style-guide",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,11 +19,11 @@
   ],
   "dependencies": {
     "ts-api-utils": "^2.1.0",
-    "@angular-eslint/utils": "22.0.1-alpha.7",
-    "@angular-eslint/bundled-angular-compiler": "22.0.1-alpha.7"
+    "@angular-eslint/bundled-angular-compiler": "22.0.1-alpha.9",
+    "@angular-eslint/utils": "22.0.1-alpha.9"
   },
   "devDependencies": {
-    "@angular-eslint/test-utils": "22.0.1-alpha.7"
+    "@angular-eslint/test-utils": "22.0.1-alpha.9"
   },
   "peerDependencies": {
     "@typescript-eslint/utils": "^8.0.0",