@typescript-eslint/eslint-plugin 8.60.1-alpha.5 → 8.60.1-alpha.7

package/dist/rules/naming-convention.js

@@ -457,6 +457,7 @@ exports.default = (0, util_1.createRule)({
             return [
                 selector,
                 (node) => {
+                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                     handler(node, validator);
                 },
             ];

package/dist/rules/no-shadow.js

@@ -322,29 +322,59 @@ exports.default = (0, util_1.createRule)({
             return false;
         }
         /**
-         * Checks if a variable is inside the initializer of scopeVar.
+         * Finds the uppermost expression node that can evaluate to the given one,
+         * unwrapping through LogicalExpression and non-test ConditionalExpression branches.
+         * @param node The node to unwrap.
+         * @returns The topmost unwrapped node.
+         */
+        function unwrapExpression(node) {
+            const { parent } = node;
+            if (parent?.type === utils_1.AST_NODE_TYPES.LogicalExpression ||
+                (parent?.type === utils_1.AST_NODE_TYPES.ConditionalExpression &&
+                    parent.test !== node)) {
+                return unwrapExpression(parent);
+            }
+            return node;
+        }
+        /**
+         * Checks if a variable is the name of a function or class expression that is
+         * directly assigned (or transparently through `||`/`?:`) as the initializer
+         * of scopeVar.
          *
-         * To avoid reporting at declarations such as `var a = function a() {};`.
-         * But it should report `var a = function(a) {};` or `var a = function() { function a() {} };`.
+         * Allows `var a = function a() {}` but reports `var a = wrap(function a() {})`.
          * @param variable The variable to check.
          * @param scopeVar The scope variable to look for.
-         * @returns Whether or not the variable is inside initializer of scopeVar.
+         * @returns Whether or not the variable is the direct initializer name of scopeVar.
          */
         function isOnInitializer(variable, scopeVar) {
-            const outerScope = scopeVar.scope;
             const outerDef = scopeVar.defs.at(0);
-            const outer = outerDef?.parent?.range;
-            const innerScope = variable.scope;
             const innerDef = variable.defs.at(0);
-            const inner = innerDef?.name.range;
-            return !!(outer &&
-                inner &&
-                outer[0] < inner[0] &&
-                inner[1] < outer[1] &&
-                ((innerDef.type === scope_manager_1.DefinitionType.FunctionName &&
-                    innerDef.node.type === utils_1.AST_NODE_TYPES.FunctionExpression) ||
-                    innerDef.node.type === utils_1.AST_NODE_TYPES.ClassExpression) &&
-                outerScope === innerScope.upper);
+            if (!outerDef || !innerDef) {
+                return false;
+            }
+            if (!((innerDef.type === scope_manager_1.DefinitionType.FunctionName &&
+                innerDef.node.type === utils_1.AST_NODE_TYPES.FunctionExpression) ||
+                (innerDef.type === scope_manager_1.DefinitionType.ClassName &&
+                    innerDef.node.type === utils_1.AST_NODE_TYPES.ClassExpression))) {
+                return false;
+            }
+            const outerIdentifier = outerDef.name;
+            let initializerNode;
+            if (outerIdentifier.parent.type === utils_1.AST_NODE_TYPES.VariableDeclarator) {
+                initializerNode = outerIdentifier.parent.init;
+            }
+            else if (outerIdentifier.parent.type === utils_1.AST_NODE_TYPES.AssignmentPattern) {
+                initializerNode = outerIdentifier.parent.right;
+            }
+            if (!initializerNode) {
+                return false;
+            }
+            const nodeToCheck = innerDef.node;
+            if (!(initializerNode.range[0] <= nodeToCheck.range[0] &&
+                nodeToCheck.range[1] <= initializerNode.range[1])) {
+                return false;
+            }
+            return initializerNode === unwrapExpression(nodeToCheck);
         }
         /**
          * Get a range of a variable's identifier node.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/eslint-plugin",
-  "version": "8.60.1-alpha.5",
+  "version": "8.60.1-alpha.7",
   "description": "TypeScript plugin for ESLint",
   "files": [
     "dist",
@@ -52,16 +52,17 @@
     "ignore": "^7.0.5",
     "natural-compare": "^1.4.0",
     "ts-api-utils": "^2.5.0",
-    "@typescript-eslint/scope-manager": "8.60.1-alpha.5",
-    "@typescript-eslint/type-utils": "8.60.1-alpha.5",
-    "@typescript-eslint/visitor-keys": "8.60.1-alpha.5",
-    "@typescript-eslint/utils": "8.60.1-alpha.5"
+    "@typescript-eslint/scope-manager": "8.60.1-alpha.7",
+    "@typescript-eslint/type-utils": "8.60.1-alpha.7",
+    "@typescript-eslint/utils": "8.60.1-alpha.7",
+    "@typescript-eslint/visitor-keys": "8.60.1-alpha.7"
   },
   "devDependencies": {
     "@types/json-schema": "^7.0.15",
     "@types/mdast": "^4.0.4",
     "@types/natural-compare": "^1.4.3",
     "@types/react": "^18.3.21",
+    "@typescript/native-preview": "7.0.0-dev.20260518.1",
     "@vitest/coverage-v8": "^4.0.18",
     "ajv": "^6.12.6",
     "eslint": "^10.0.0",
@@ -78,13 +79,13 @@
     "typescript": ">=4.8.4 <6.1.0",
     "unist-util-visit": "^5.0.0",
     "vitest": "^4.0.18",
-    "@typescript-eslint/rule-schema-to-typescript-types": "8.60.1-alpha.5",
-    "@typescript-eslint/rule-tester": "8.60.1-alpha.5"
+    "@typescript-eslint/rule-schema-to-typescript-types": "8.60.1-alpha.7",
+    "@typescript-eslint/rule-tester": "8.60.1-alpha.7"
   },
   "peerDependencies": {
     "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
     "typescript": ">=4.8.4 <6.1.0",
-    "@typescript-eslint/parser": "^8.60.1-alpha.5"
+    "@typescript-eslint/parser": "^8.60.1-alpha.7"
   },
   "funding": {
     "type": "opencollective",
@@ -107,7 +108,8 @@
       },
       "lint": {
         "command": "eslint"
-      }
+      },
+      "typecheck:tsgo": {}
     }
   },
   "scripts": {
@@ -118,6 +120,7 @@
     "generate-configs": "pnpm -w run generate-configs",
     "lint": "pnpm -w exec nx lint",
     "test": "pnpm -w exec nx test",
-    "typecheck": "pnpm -w exec nx typecheck"
+    "typecheck": "pnpm -w exec nx typecheck",
+    "typecheck:tsgo": "pnpm -w exec nx typecheck:tsgo"
   }
 }