@angular-eslint/eslint-plugin 20.5.1-alpha.4 → 20.5.1-alpha.6

package/dist/rules/no-uncalled-signals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-uncalled-signals.d.ts","sourceRoot":"","sources":["../../src/rules/no-uncalled-signals.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EAGZ,MAAM,0BAA0B,CAAC;AAIlC,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AACnE,eAAO,MAAM,SAAS,wBAAwB,CAAC;;AAE/C,wBA0DG"}
+{"version":3,"file":"no-uncalled-signals.d.ts","sourceRoot":"","sources":["../../src/rules/no-uncalled-signals.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EAGZ,MAAM,0BAA0B,CAAC;AAIlC,MAAM,MAAM,OAAO,GAAG,EAAE,CAAC;AACzB,MAAM,MAAM,UAAU,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AACnE,eAAO,MAAM,SAAS,wBAAwB,CAAC;;AAW/C,wBAwEG"}

package/dist/rules/no-uncalled-signals.js

@@ -5,6 +5,14 @@ const utils_1 = require("@typescript-eslint/utils");
 const create_eslint_rule_1 = require("../utils/create-eslint-rule");
 const signals_1 = require("../utils/signals");
 exports.RULE_NAME = 'no-uncalled-signals';
+const CONDITIONAL_SELECTOR = [
+    utils_1.AST_NODE_TYPES.ConditionalExpression,
+    utils_1.AST_NODE_TYPES.DoWhileStatement,
+    utils_1.AST_NODE_TYPES.ForStatement,
+    utils_1.AST_NODE_TYPES.IfStatement,
+    utils_1.AST_NODE_TYPES.SwitchCase,
+    utils_1.AST_NODE_TYPES.WhileStatement,
+].join(',');
 exports.default = (0, create_eslint_rule_1.createESLintRule)({
     name: exports.RULE_NAME,
     meta: {
@@ -22,34 +30,42 @@ exports.default = (0, create_eslint_rule_1.createESLintRule)({
     defaultOptions: [],
     create(context) {
         const services = utils_1.ESLintUtils.getParserServices(context);
+        function checkForUncalledSignal(node) {
+            // Unwrap negated expressions so that
+            // we look at what was being negated.
+            if (node.type === utils_1.AST_NODE_TYPES.UnaryExpression &&
+                node.operator === '!') {
+                node = node.argument;
+            }
+            const type = services.getTypeAtLocation(node);
+            const identifierType = type.getSymbol()?.name;
+            if (identifierType && signals_1.KNOWN_SIGNAL_TYPES.has(identifierType)) {
+                context.report({
+                    node,
+                    messageId: 'noUncalledSignals',
+                    suggest: [
+                        {
+                            messageId: 'suggestCallSignal',
+                            fix: (fixer) => fixer.insertTextAfter(node, '()'),
+                        },
+                    ],
+                });
+            }
+        }
         return {
-            '*.test[type=Identifier],*.test Identifier,[type=LogicalExpression] Identifier'(node) {
-                if (node.parent.type === utils_1.AST_NODE_TYPES.CallExpression) {
-                    return;
-                }
-                // Check if this identifier is the property or object in a MemberExpression that's being called.
-                // If the identifier is a signal and it's being called, then the signal's value is being read.
-                // If it's the object, then a method on the signal (most likely the `set` method) is being called.
-                if (node.parent.type === utils_1.AST_NODE_TYPES.MemberExpression &&
-                    (node.parent.object === node || node.parent.property === node) &&
-                    node.parent.parent?.type === utils_1.AST_NODE_TYPES.CallExpression) {
-                    return;
-                }
-                const type = services.getTypeAtLocation(node);
-                const identifierType = type.getSymbol()?.name;
-                if (identifierType && signals_1.KNOWN_SIGNAL_TYPES.has(identifierType)) {
-                    context.report({
-                        node,
-                        messageId: 'noUncalledSignals',
-                        suggest: [
-                            {
-                                messageId: 'suggestCallSignal',
-                                fix: (fixer) => fixer.replaceText(node, `${node.name}()`),
-                            },
-                        ],
-                    });
+            [CONDITIONAL_SELECTOR](node) {
+                if (node.test) {
+                    checkForUncalledSignal(node.test);
                 }
             },
+            LogicalExpression(node) {
+                checkForUncalledSignal(node.left);
+                checkForUncalledSignal(node.right);
+            },
+            BinaryExpression(node) {
+                checkForUncalledSignal(node.left);
+                checkForUncalledSignal(node.right);
+            },
         };
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin",
-  "version": "20.5.1-alpha.4",
+  "version": "20.5.1-alpha.6",
   "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/bundled-angular-compiler": "20.5.1-alpha.4",
-    "@angular-eslint/utils": "20.5.1-alpha.4"
+    "@angular-eslint/bundled-angular-compiler": "20.5.1-alpha.6",
+    "@angular-eslint/utils": "20.5.1-alpha.6"
   },
   "devDependencies": {
-    "@angular-eslint/test-utils": "20.5.1-alpha.4"
+    "@angular-eslint/test-utils": "20.5.1-alpha.6"
   },
   "peerDependencies": {
     "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",