@typescript-eslint/eslint-plugin 8.68.1-alpha.4 → 8.68.1-alpha.6

package/dist/rules/no-mixed-enums.js

@@ -62,14 +62,40 @@ exports.default = (0, util_1.createRule)({
     create(context) {
         const parserServices = (0, util_1.getParserServices)(context);
         const typeChecker = parserServices.program.getTypeChecker();
+        function getModuleName(id) {
+            if (id.type === utils_1.AST_NODE_TYPES.Literal) {
+                return JSON.stringify(id.value);
+            }
+            let qualifiers = '';
+            let current = id;
+            while (current.type === utils_1.AST_NODE_TYPES.TSQualifiedName) {
+                qualifiers = `.${current.right.name}${qualifiers}`;
+                current = current.left;
+            }
+            return context.sourceCode.getText(current) + qualifiers;
+        }
+        function getMergedScopes(scope) {
+            const { block } = scope;
+            if (block.type !== utils_1.AST_NODE_TYPES.TSModuleDeclaration) {
+                return [scope];
+            }
+            const name = getModuleName(block.id);
+            return getEnclosingScopes(block).flatMap(enclosing => enclosing.childScopes.filter(childScope => childScope.block.type === utils_1.AST_NODE_TYPES.TSModuleDeclaration &&
+                getModuleName(childScope.block.id) === name));
+        }
+        function getEnclosingScopes(node) {
+            const enclosing = (0, util_1.nullThrows)(context.sourceCode.getScope(node).upper, util_1.NullThrowsReasons.MissingParent);
+            return node.parent.type === utils_1.AST_NODE_TYPES.ExportNamedDeclaration
+                ? getMergedScopes(enclosing)
+                : [enclosing];
+        }
         function collectNodeDefinitions(node) {
             const { name } = node.id;
             const found = {
                 imports: [],
                 previousSibling: undefined,
             };
-            let scope = context.sourceCode.getScope(node);
-            for (const definition of scope.upper?.set.get(name)?.defs ?? []) {
+            for (const definition of getEnclosingScopes(node).flatMap(enclosing => enclosing.set.get(name)?.defs ?? [])) {
                 if (definition.node.type === utils_1.AST_NODE_TYPES.TSEnumDeclaration &&
                     definition.node.range[0] < node.range[0] &&
                     definition.node.body.members.length > 0) {
@@ -77,6 +103,7 @@ exports.default = (0, util_1.createRule)({
                     break;
                 }
             }
+            let scope = context.sourceCode.getScope(node);
             while (scope) {
                 scope.set.get(name)?.defs.forEach(definition => {
                     if (definition.type === scope_manager_1.DefinitionType.ImportBinding) {
@@ -138,33 +165,16 @@ exports.default = (0, util_1.createRule)({
             // Case: Multiple enum declarations in the same file
             // enum MyEnum { A }
             // enum MyEnum { B }
-            if (previousSibling) {
-                return getMemberType(previousSibling.body.members[0]);
-            }
-            // Case: Namespace declaration merging
+            //
+            // ...including ones merged across namespace declarations
             // namespace MyNamespace {
             //   export enum MyEnum { A }
             // }
             // namespace MyNamespace {
             //   export enum MyEnum { B }
             // }
-            if (node.parent.type === utils_1.AST_NODE_TYPES.ExportNamedDeclaration &&
-                node.parent.parent.type === utils_1.AST_NODE_TYPES.TSModuleBlock) {
-                // https://github.com/typescript-eslint/typescript-eslint/issues/8352
-                // TODO: We don't need to dip into the TypeScript type checker here!
-                // Merged namespaces must all exist in the same file.
-                // We could instead compare this file's nodes to find the merges.
-                const tsNode = parserServices.esTreeNodeToTSNodeMap.get(node.id);
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                const declarations = typeChecker
-                    .getSymbolAtLocation(tsNode)
-                    .getDeclarations();
-                const [{ initializer }] = declarations[0]
-                    .members;
-                return initializer &&
-                    tsutils.isTypeFlagSet(typeChecker.getTypeAtLocation(initializer), ts.TypeFlags.StringLike)
-                    ? AllowedType.String
-                    : AllowedType.Number;
+            if (previousSibling) {
+                return getMemberType(previousSibling.body.members[0]);
             }
             // Finally, we default to the type of the first enum member
             return getMemberType(node.body.members[0]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/eslint-plugin",
-  "version": "8.68.1-alpha.4",
+  "version": "8.68.1-alpha.6",
   "description": "TypeScript plugin for ESLint",
   "files": [
     "dist",
@@ -47,10 +47,10 @@
   ],
   "dependencies": {
     "@eslint-community/regexpp": "^4.12.2",
-    "@typescript-eslint/scope-manager": "8.68.1-alpha.4",
-    "@typescript-eslint/type-utils": "8.68.1-alpha.4",
-    "@typescript-eslint/utils": "8.68.1-alpha.4",
-    "@typescript-eslint/visitor-keys": "8.68.1-alpha.4",
+    "@typescript-eslint/scope-manager": "8.68.1-alpha.6",
+    "@typescript-eslint/type-utils": "8.68.1-alpha.6",
+    "@typescript-eslint/utils": "8.68.1-alpha.6",
+    "@typescript-eslint/visitor-keys": "8.68.1-alpha.6",
     "ignore": "^7.0.5",
     "natural-compare": "^1.4.0",
     "ts-api-utils": "^2.5.0"
@@ -60,8 +60,8 @@
     "@types/mdast": "^4.0.4",
     "@types/natural-compare": "^1.4.3",
     "@types/react": "^18.3.21",
-    "@typescript-eslint/rule-schema-to-typescript-types": "8.68.1-alpha.4",
-    "@typescript-eslint/rule-tester": "8.68.1-alpha.4",
+    "@typescript-eslint/rule-schema-to-typescript-types": "8.68.1-alpha.6",
+    "@typescript-eslint/rule-tester": "8.68.1-alpha.6",
     "@typescript/native": "npm:typescript@^7.0.2",
     "@vitest/coverage-v8": "^4.0.18",
     "ajv": "^6.12.6",
@@ -81,7 +81,7 @@
     "vitest": "^4.0.18"
   },
   "peerDependencies": {
-    "@typescript-eslint/parser": "^8.68.1-alpha.4",
+    "@typescript-eslint/parser": "^8.68.1-alpha.6",
     "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
     "typescript": ">=4.8.4 <6.1.0"
   },