@typescript-eslint/type-utils 8.71.2-alpha.4 → 8.71.2-alpha.6

package/dist/typeOrValueSpecifiers/typeDeclaredInPackageDeclarationFile.js

@@ -32,8 +32,12 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeDeclaredInPackageDeclarationFile = typeDeclaredInPackageDeclarationFile;
+const node_path_1 = __importDefault(require("node:path"));
 const tsutils = __importStar(require("ts-api-utils"));
 const ts = __importStar(require("typescript"));
 function findParentModuleDeclaration(node) {
@@ -85,17 +89,57 @@ function typeDeclaredInDeclarationFile(packageName, declarationFiles, program) {
     // Handle scoped packages: if the name starts with @, remove it and replace / with __
     const typesPackageName = packageName.replace(/^@([^/]+)\//, '$1__');
     return declarationFiles.some(declaration => {
+        if (!program.isSourceFileFromExternalLibrary(declaration)) {
+            return false;
+        }
         // A package id name is a path within the package, such as
         // `typescript/lib/typescript.d.ts` or `@types/semver/classes/semver.d.ts`.
-        const packageIdName = program.sourceFileToPackageName.get(declaration.path);
+        const packageIdName = program.sourceFileToPackageName.get(declaration.path) ??
+            resolvePackageIdName(declaration.fileName);
         if (packageIdName == null) {
             return false;
         }
-        return ((pathIsInPackage(packageIdName, packageName) ||
-            pathIsInPackage(packageIdName.replace(/^@types\//, ''), typesPackageName)) &&
-            program.isSourceFileFromExternalLibrary(declaration));
+        return (pathIsInPackage(packageIdName, packageName) ||
+            pathIsInPackage(packageIdName.replace(/^@types\//, ''), typesPackageName));
     });
 }
+/**
+ * TypeScript's `sourceFileToPackageName` doesn't include (1) files in linked
+ * packages (e.g., workspace packages) that are reached through relative
+ * imports, rather than by package name, or (2) any files of packages without
+ * `version` in their `package.json`.
+ *
+ * So we're looking for the nearest `package.json` that has a `name` field,
+ * starting from the directory of the declaration file, and using that as the
+ * package name.
+ */
+function resolvePackageIdName(fileName) {
+    const packageRoot = findPackageRoot(node_path_1.default.dirname(fileName));
+    if (!packageRoot) {
+        return undefined;
+    }
+    const fileRelativeToPackage = fileName.slice(packageRoot.directory.length);
+    return `${packageRoot.name}${fileRelativeToPackage}`;
+}
+const packageRoots = new Map();
+function findPackageRoot(directory) {
+    if (!packageRoots.has(directory)) {
+        const parentDir = node_path_1.default.dirname(directory);
+        const packageName = getPackageName(directory);
+        const packageRoot = packageName
+            ? { directory, name: packageName }
+            : parentDir === directory
+                ? undefined
+                : findPackageRoot(parentDir);
+        packageRoots.set(directory, packageRoot);
+    }
+    return packageRoots.get(directory);
+}
+function getPackageName(directory) {
+    const result = ts.readConfigFile(node_path_1.default.join(directory, 'package.json'), ts.sys.readFile);
+    const config = result.config;
+    return typeof config?.name === 'string' ? config.name : undefined;
+}
 function typeDeclaredInPackageDeclarationFile(packageName, symbol, declarations, declarationFiles, program) {
     return (typeDeclaredInDeclareModule(packageName, declarations) ||
         typeDeclaredInDeclarationFile(packageName, declarationFiles, program) ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/type-utils",
-  "version": "8.71.2-alpha.4",
+  "version": "8.71.2-alpha.6",
   "description": "Type utilities for working with TypeScript + ESLint together",
   "files": [
     "dist",
@@ -34,9 +34,9 @@
     "estree"
   ],
   "dependencies": {
-    "@typescript-eslint/types": "8.71.2-alpha.4",
-    "@typescript-eslint/typescript-estree": "8.71.2-alpha.4",
-    "@typescript-eslint/utils": "8.71.2-alpha.4",
+    "@typescript-eslint/types": "8.71.2-alpha.6",
+    "@typescript-eslint/typescript-estree": "8.71.2-alpha.6",
+    "@typescript-eslint/utils": "8.71.2-alpha.6",
     "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.2-alpha.4",
+    "@typescript-eslint/parser": "8.71.2-alpha.6",
     "@typescript/native": "npm:typescript@^7.0.2",
     "@vitest/coverage-v8": "^4.0.18",
     "ajv": "^6.12.6",