fix(type-utils): use typescript's isSourceFileFromExternalLibrary

typescript-eslint · Jun 15, 2023 · 58728a8 · 58728a8
1 parent e6235bf
commit 58728a8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/packages/type-utils/src/TypeOrValueSpecifier.ts b/packages/type-utils/src/TypeOrValueSpecifier.ts
@@ -1,6 +1,6 @@
 import type { JSONSchema4 } from '@typescript-eslint/utils/json-schema';
 import path from 'path';
-import type * as ts from 'typescript';
+import * as ts from 'typescript';
 
 interface FileSpecifier {
   from: 'file';
@@ -150,16 +150,18 @@ function typeDeclaredInFile(
 function typeDeclaredInPackage(
   packageName: string,
   declarationFiles: ts.SourceFile[],
+  program: ts.Program,
 ): boolean {
   // Handle scoped packages - if the name starts with @, remove it and replace / with __
-  const typesPackageName =
-    '@types/' + packageName.replace(/^@([^/]+)\//, '$1__');
+  const typesPackageName = packageName.replace(/^@([^/]+)\//, '$1__');
+
   const matcher = new RegExp(
-    `node_modules/(?:${packageName}|${typesPackageName})/`,
-  );
-  return declarationFiles.some(declaration =>
-    matcher.test(declaration.fileName),
+    `${packageName}|${typesPackageName}`,
   );
+  return declarationFiles.some(declaration => {
+    const packageIdName = program.sourceFileToPackageName.get(declaration.path);
+    return packageIdName !== undefined && matcher.test(packageIdName) && program.isSourceFileFromExternalLibrary(declaration)
+  });
 }
 
 export function typeMatchesSpecifier(
@@ -186,6 +188,10 @@ export function typeMatchesSpecifier(
         program.isSourceFileDefaultLibrary(declaration),
       );
     case 'package':
-      return typeDeclaredInPackage(specifier.package, declarationFiles);
+      return typeDeclaredInPackage(
+        specifier.package,
+        declarationFiles,
+        program,
+      );
   }
 }
diff --git a/packages/type-utils/typings/typescript.d.ts b/packages/type-utils/typings/typescript.d.ts
@@ -30,4 +30,15 @@ declare module 'typescript' {
      */
     intrinsicName?: string;
   }
+
+  interface Program {
+    /**
+     * Maps from a SourceFile's `.path` to the name of the package it was imported with.
+     */
+    readonly sourceFileToPackageName: ReadonlyMap<Path, string>;
+  }
+
+  interface SourceFile extends Declaration, LocalsContainer {
+    path: Path;
+  }
 }