@typescript-eslint/type-utils 8.71.1-alpha.1 → 8.71.1-alpha.10

package/dist/TypeOrValueSpecifier.js

@@ -159,7 +159,7 @@ function typeMatchesSpecifier(type, specifier, program) {
             case 'lib':
                 return (0, typeDeclaredInLib_1.typeDeclaredInLib)(declarationFiles, program);
             case 'package':
-                return (0, typeDeclaredInPackageDeclarationFile_1.typeDeclaredInPackageDeclarationFile)(specifier.package, declarations, declarationFiles, program);
+                return (0, typeDeclaredInPackageDeclarationFile_1.typeDeclaredInPackageDeclarationFile)(specifier.package, symbol, declarations, declarationFiles, program);
         }
     })();
     if (wholeTypeMatches) {
@@ -204,7 +204,7 @@ function valueMatchesSpecifier(node, specifier, program, type) {
         const symbol = type.getSymbol() ?? type.aliasSymbol;
         const declarations = symbol?.getDeclarations() ?? [];
         const declarationFiles = declarations.map(declaration => declaration.getSourceFile());
-        return (0, typeDeclaredInPackageDeclarationFile_1.typeDeclaredInPackageDeclarationFile)(specifier.package, declarations, declarationFiles, program);
+        return (0, typeDeclaredInPackageDeclarationFile_1.typeDeclaredInPackageDeclarationFile)(specifier.package, symbol, declarations, declarationFiles, program);
     }
     return true;
 }

package/dist/typeOrValueSpecifiers/typeDeclaredInPackageDeclarationFile.d.ts

@@ -1,2 +1,2 @@
 import * as ts from 'typescript';
-export declare function typeDeclaredInPackageDeclarationFile(packageName: string, declarations: ts.Node[], declarationFiles: ts.SourceFile[], program: ts.Program): boolean;
+export declare function typeDeclaredInPackageDeclarationFile(packageName: string, symbol: ts.Symbol | undefined, declarations: ts.Node[], declarationFiles: ts.SourceFile[], program: ts.Program): boolean;

package/dist/typeOrValueSpecifiers/typeDeclaredInPackageDeclarationFile.js

@@ -34,12 +34,14 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeDeclaredInPackageDeclarationFile = typeDeclaredInPackageDeclarationFile;
+const tsutils = __importStar(require("ts-api-utils"));
 const ts = __importStar(require("typescript"));
 function findParentModuleDeclaration(node) {
     switch (node.kind) {
         case ts.SyntaxKind.ModuleDeclaration:
-            // "namespace x {...}" should be ignored here
-            if (node.flags & ts.NodeFlags.Namespace) {
+            // "namespace x {...}" and "global {...}" should be ignored here
+            if (node.flags &
+                (ts.NodeFlags.Namespace | ts.NodeFlags.GlobalAugmentation)) {
                 break;
             }
             return ts.isStringLiteral(node.name)
@@ -53,6 +55,24 @@ function findParentModuleDeclaration(node) {
 function typeDeclaredInDeclareModule(packageName, declarations) {
     return declarations.some(declaration => findParentModuleDeclaration(declaration)?.name.text === packageName);
 }
+function typeExportedFromDeclareModule(packageName, symbol, program) {
+    if (!symbol) {
+        return false;
+    }
+    const checker = program.getTypeChecker();
+    const moduleSymbol = checker
+        .getAmbientModules()
+        .find(ambientModule => ambientModule.name === `"${packageName}"`);
+    if (!moduleSymbol) {
+        return false;
+    }
+    return checker.getExportsOfModule(moduleSymbol).some(exportedSymbol => {
+        const resolvedSymbol = tsutils.isSymbolFlagSet(exportedSymbol, ts.SymbolFlags.Alias)
+            ? checker.getAliasedSymbol(exportedSymbol)
+            : exportedSymbol;
+        return resolvedSymbol === symbol;
+    });
+}
 /**
  * Whether `packagePath` is `packageName` itself or something inside it, comparing
  * whole path components: `semver` covers `semver` and `semver/classes/semver.d.ts`,
@@ -76,8 +96,9 @@ function typeDeclaredInDeclarationFile(packageName, declarationFiles, program) {
             program.isSourceFileFromExternalLibrary(declaration));
     });
 }
-function typeDeclaredInPackageDeclarationFile(packageName, declarations, declarationFiles, program) {
+function typeDeclaredInPackageDeclarationFile(packageName, symbol, declarations, declarationFiles, program) {
     return (typeDeclaredInDeclareModule(packageName, declarations) ||
-        typeDeclaredInDeclarationFile(packageName, declarationFiles, program));
+        typeDeclaredInDeclarationFile(packageName, declarationFiles, program) ||
+        typeExportedFromDeclareModule(packageName, symbol, program));
 }
 //# sourceMappingURL=typeDeclaredInPackageDeclarationFile.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/type-utils",
-  "version": "8.71.1-alpha.1",
+  "version": "8.71.1-alpha.10",
   "description": "Type utilities for working with TypeScript + ESLint together",
   "files": [
     "dist",
@@ -34,9 +34,9 @@
     "estree"
   ],
   "dependencies": {
-    "@typescript-eslint/types": "8.71.1-alpha.1",
-    "@typescript-eslint/typescript-estree": "8.71.1-alpha.1",
-    "@typescript-eslint/utils": "8.71.1-alpha.1",
+    "@typescript-eslint/types": "8.71.1-alpha.10",
+    "@typescript-eslint/typescript-estree": "8.71.1-alpha.10",
+    "@typescript-eslint/utils": "8.71.1-alpha.10",
     "debug": "^4.4.3",
     "ts-api-utils": "^2.5.0"
   },
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.6",
-    "@typescript-eslint/parser": "8.71.1-alpha.1",
+    "@typescript-eslint/parser": "8.71.1-alpha.10",
     "@typescript/native": "npm:typescript@^7.0.2",
     "@vitest/coverage-v8": "^4.0.18",
     "ajv": "^6.12.6",