Skip to content

Commit 1da4725

Browse files
andrewbranchandrewbranch
authored
Fix auto-imports of aliased packages with exports (#52538)
1 parent fb70d44 commit 1da4725

File tree

3 files changed

+79
-11
lines changed

3 files changed

+79
-11
lines changed

‎src/compiler/moduleSpecifiers.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -948,9 +948,14 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }: ModulePath, { getCan
948948
const packageJsonContent = cachedPackageJson?.contents.packageJsonContent || JSON.parse(host.readFile!(packageJsonPath)!);
949949
const importMode = overrideMode || importingSourceFile.impliedNodeFormat;
950950
if (getResolvePackageJsonExports(options)) {
951+
// The package name that we found in node_modules could be different from the package
952+
// name in the package.json content via url/filepath dependency specifiers. We need to
953+
// use the actual directory name, so don't look at `packageJsonContent.name` here.
954+
const nodeModulesDirectoryName = packageRootPath.substring(parts.topLevelPackageNameIndex + 1);
955+
const packageName = getPackageNameFromTypesPackageName(nodeModulesDirectoryName);
951956
const conditions = getConditions(options, importMode === ModuleKind.ESNext);
952-
const fromExports = packageJsonContent.exports && typeof packageJsonContent.name === "string"
953-
? tryGetModuleNameFromExports(options, path, packageRootPath, getPackageNameFromTypesPackageName(packageJsonContent.name), packageJsonContent.exports, conditions)
957+
const fromExports = packageJsonContent.exports
958+
? tryGetModuleNameFromExports(options, path, packageRootPath, packageName, packageJsonContent.exports, conditions)
954959
: undefined;
955960
if (fromExports) {
956961
const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry)

‎tests/baselines/reference/tsbuild/moduleSpecifiers/synthesized-module-specifiers-across-projects-resolve-correctly.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export const LASSIE_CONFIG = { name: 'Lassie' };
190190
//// [/src/src-dogs/lassie/lassiedog.d.ts]
191191
import { Dog } from '../dog.js';
192192
export declare class LassieDog extends Dog {
193-
protected static getDogConfig: () => import("../index.js").DogConfig;
193+
protected static getDogConfig: () => import("src-types").DogConfig;
194194
}
195195

196196

@@ -204,7 +204,7 @@ export { LassieDog };
204204

205205

206206
//// [/src/src-dogs/tsconfig.tsbuildinfo]
207-
{"program":{"fileNames":["../../lib/lib.es2022.full.d.ts","../src-types/dogconfig.d.ts","../src-types/index.d.ts","./dogconfig.ts","./dog.ts","./lassie/lassieconfig.ts","./lassie/lassiedog.ts","./index.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true,"impliedFormat":1},{"version":"-3612551765-export interface DogConfig {\n name: string;\n}\n","impliedFormat":99},{"version":"-6677489680-export * from './dogconfig.js';\n","impliedFormat":99},{"version":"1966273863-import { DogConfig } from 'src-types';\n\nexport const DOG_CONFIG: DogConfig = {\n name: 'Default dog',\n};\n","signature":"15679103984-import { DogConfig } from 'src-types';\nexport declare const DOG_CONFIG: DogConfig;\n","impliedFormat":99},{"version":"6091345804-import { DogConfig } from 'src-types';\nimport { DOG_CONFIG } from './dogconfig.js';\n\nexport abstract class Dog {\n\n public static getCapabilities(): DogConfig {\n return DOG_CONFIG;\n }\n}\n","signature":"26984075437-import { DogConfig } from 'src-types';\nexport declare abstract class Dog {\n static getCapabilities(): DogConfig;\n}\n","impliedFormat":99},{"version":"4440579024-import { DogConfig } from 'src-types';\n\nexport const LASSIE_CONFIG: DogConfig = { name: 'Lassie' };\n","signature":"17379560247-import { DogConfig } from 'src-types';\nexport declare const LASSIE_CONFIG: DogConfig;\n","impliedFormat":99},{"version":"-32303727812-import { Dog } from '../dog.js';\nimport { LASSIE_CONFIG } from './lassieconfig.js';\n\nexport class LassieDog extends Dog {\n protected static getDogConfig = () => LASSIE_CONFIG;\n}\n","signature":"-19295250986-import { Dog } from '../dog.js';\nexport declare class LassieDog extends Dog {\n protected static getDogConfig: () => import(\"../index.js\").DogConfig;\n}\n","impliedFormat":99},{"version":"-15974991320-export * from 'src-types';\nexport * from './lassie/lassiedog.js';\n","impliedFormat":99}],"root":[[4,8]],"options":{"composite":true,"declaration":true,"module":100},"fileIdsList":[[3,4],[3],[3,7],[5,6],[2],[5,8]],"referencedMap":[[5,1],[4,2],[8,3],[6,2],[7,4],[3,5]],"exportedModulesMap":[[5,2],[4,2],[8,3],[6,2],[7,6],[3,5]],"semanticDiagnosticsPerFile":[1,5,4,8,6,7,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
207+
{"program":{"fileNames":["../../lib/lib.es2022.full.d.ts","../src-types/dogconfig.d.ts","../src-types/index.d.ts","./dogconfig.ts","./dog.ts","./lassie/lassieconfig.ts","./lassie/lassiedog.ts","./index.ts"],"fileInfos":[{"version":"-7698705165-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }","affectsGlobalScope":true,"impliedFormat":1},{"version":"-3612551765-export interface DogConfig {\n name: string;\n}\n","impliedFormat":99},{"version":"-6677489680-export * from './dogconfig.js';\n","impliedFormat":99},{"version":"1966273863-import { DogConfig } from 'src-types';\n\nexport const DOG_CONFIG: DogConfig = {\n name: 'Default dog',\n};\n","signature":"15679103984-import { DogConfig } from 'src-types';\nexport declare const DOG_CONFIG: DogConfig;\n","impliedFormat":99},{"version":"6091345804-import { DogConfig } from 'src-types';\nimport { DOG_CONFIG } from './dogconfig.js';\n\nexport abstract class Dog {\n\n public static getCapabilities(): DogConfig {\n return DOG_CONFIG;\n }\n}\n","signature":"26984075437-import { DogConfig } from 'src-types';\nexport declare abstract class Dog {\n static getCapabilities(): DogConfig;\n}\n","impliedFormat":99},{"version":"4440579024-import { DogConfig } from 'src-types';\n\nexport const LASSIE_CONFIG: DogConfig = { name: 'Lassie' };\n","signature":"17379560247-import { DogConfig } from 'src-types';\nexport declare const LASSIE_CONFIG: DogConfig;\n","impliedFormat":99},{"version":"-32303727812-import { Dog } from '../dog.js';\nimport { LASSIE_CONFIG } from './lassieconfig.js';\n\nexport class LassieDog extends Dog {\n protected static getDogConfig = () => LASSIE_CONFIG;\n}\n","signature":"-10239718190-import { Dog } from '../dog.js';\nexport declare class LassieDog extends Dog {\n protected static getDogConfig: () => import(\"src-types\").DogConfig;\n}\n","impliedFormat":99},{"version":"-15974991320-export * from 'src-types';\nexport * from './lassie/lassiedog.js';\n","impliedFormat":99}],"root":[[4,8]],"options":{"composite":true,"declaration":true,"module":100},"fileIdsList":[[3,4],[3],[3,7],[5,6],[2],[3,5]],"referencedMap":[[5,1],[4,2],[8,3],[6,2],[7,4],[3,5]],"exportedModulesMap":[[5,2],[4,2],[8,3],[6,2],[7,6],[3,5]],"semanticDiagnosticsPerFile":[1,5,4,8,6,7,2,3],"latestChangedDtsFile":"./index.d.ts"},"version":"FakeTSVersion"}
208208

209209
//// [/src/src-dogs/tsconfig.tsbuildinfo.readable.baseline.txt]
210210
{
@@ -239,8 +239,8 @@ export { LassieDog };
239239
"../src-types/dogconfig.d.ts"
240240
],
241241
[
242-
"./dog.ts",
243-
"./index.ts"
242+
"../src-types/index.d.ts",
243+
"./dog.ts"
244244
]
245245
],
246246
"fileInfos": {
@@ -306,11 +306,11 @@ export { LassieDog };
306306
"./lassie/lassiedog.ts": {
307307
"original": {
308308
"version": "-32303727812-import { Dog } from '../dog.js';\nimport { LASSIE_CONFIG } from './lassieconfig.js';\n\nexport class LassieDog extends Dog {\n protected static getDogConfig = () => LASSIE_CONFIG;\n}\n",
309-
"signature": "-19295250986-import { Dog } from '../dog.js';\nexport declare class LassieDog extends Dog {\n protected static getDogConfig: () => import(\"../index.js\").DogConfig;\n}\n",
309+
"signature": "-10239718190-import { Dog } from '../dog.js';\nexport declare class LassieDog extends Dog {\n protected static getDogConfig: () => import(\"src-types\").DogConfig;\n}\n",
310310
"impliedFormat": 99
311311
},
312312
"version": "-32303727812-import { Dog } from '../dog.js';\nimport { LASSIE_CONFIG } from './lassieconfig.js';\n\nexport class LassieDog extends Dog {\n protected static getDogConfig = () => LASSIE_CONFIG;\n}\n",
313-
"signature": "-19295250986-import { Dog } from '../dog.js';\nexport declare class LassieDog extends Dog {\n protected static getDogConfig: () => import(\"../index.js\").DogConfig;\n}\n",
313+
"signature": "-10239718190-import { Dog } from '../dog.js';\nexport declare class LassieDog extends Dog {\n protected static getDogConfig: () => import(\"src-types\").DogConfig;\n}\n",
314314
"impliedFormat": "esnext"
315315
},
316316
"./index.ts": {
@@ -381,8 +381,8 @@ export { LassieDog };
381381
"../src-types/index.d.ts"
382382
],
383383
"./lassie/lassiedog.ts": [
384-
"./dog.ts",
385-
"./index.ts"
384+
"../src-types/index.d.ts",
385+
"./dog.ts"
386386
],
387387
"../src-types/index.d.ts": [
388388
"../src-types/dogconfig.d.ts"
@@ -401,7 +401,7 @@ export { LassieDog };
401401
"latestChangedDtsFile": "./index.d.ts"
402402
},
403403
"version": "FakeTSVersion",
404-
"size": 2634
404+
"size": 2632
405405
}
406406

407407
//// [/src/src-types/dogconfig.d.ts]

‎tests/cases/fourslash/server/autoImportNodeModuleSymlinkRenamed.ts

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/// <reference path="../fourslash.ts" />
2+
3+
// @Filename: /package.json
4+
//// {
5+
//// "name": "monorepo",
6+
//// "workspaces": ["packages/*"]
7+
//// }
8+
9+
// @Filename: /packages/utils/package.json
10+
//// {
11+
//// "name": "utils",
12+
//// "version": "1.0.0",
13+
//// "exports": "./dist/index.js"
14+
//// }
15+
16+
// @Filename: /packages/utils/tsconfig.json
17+
//// {
18+
//// "compilerOptions": {
19+
//// "composite": true,
20+
//// "module": "nodenext",
21+
//// "rootDir": "src",
22+
//// "outDir": "dist"
23+
//// },
24+
//// "include": ["src"]
25+
//// }
26+
27+
// @Filename: /packages/utils/src/index.ts
28+
//// export function gainUtility() { return 0; }
29+
30+
// @Filename: /packages/web/package.json
31+
//// {
32+
//// "name": "web",
33+
//// "version": "1.0.0",
34+
//// "dependencies": {
35+
//// "@monorepo/utils": "file:../utils"
36+
//// }
37+
//// }
38+
39+
// @Filename: /packages/web/tsconfig.json
40+
//// {
41+
//// "compilerOptions": {
42+
//// "composite": true,
43+
//// "module": "esnext",
44+
//// "moduleResolution": "bundler",
45+
//// "rootDir": "src",
46+
//// "outDir": "dist",
47+
//// "emitDeclarationOnly": true
48+
//// },
49+
//// "include": ["src"],
50+
//// "references": [
51+
//// { "path": "../utils" }
52+
//// ]
53+
//// }
54+
55+
// @Filename: /packages/web/src/index.ts
56+
//// gainUtility/**/
57+
58+
// @link: /packages/utils -> /node_modules/utils
59+
// @link: /packages/utils -> /node_modules/@monorepo/utils
60+
// @link: /packages/web -> /node_modules/web
61+
62+
goTo.marker("");
63+
verify.importFixModuleSpecifiers("", ["@monorepo/utils"]);

0 commit comments

Comments
 (0)