Skip to content

Commit fdb2124

Browse files
andrewbranchsnovader
authored andcommitted
Fix export path patterns with .d.ts target extensions in AutoImportProvider (microsoft#55815)
1 parent 89caf30 commit fdb2124

File tree

2 files changed

+56
-1
lines changed

2 files changed

+56
-1
lines changed

src/compiler/moduleNameResolver.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2237,7 +2237,11 @@ function loadEntrypointsFromExportMap(
22372237
scope.packageDirectory,
22382238
extensionsToExtensionsArray(extensions),
22392239
/*excludes*/ undefined,
2240-
[changeAnyExtension(target.replace("*", "**/*"), getDeclarationEmitExtensionForPath(target))],
2240+
[
2241+
isDeclarationFileName(target)
2242+
? target.replace("*", "**/*")
2243+
: changeAnyExtension(target.replace("*", "**/*"), getDeclarationEmitExtensionForPath(target)),
2244+
],
22412245
).forEach(entry => {
22422246
entrypoints = appendIfUnique(entrypoints, {
22432247
path: entry,
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/// <reference path="../fourslash.ts" />
2+
3+
// @Filename: /node_modules/pkg/package.json
4+
//// {
5+
//// "name": "pkg",
6+
//// "version": "1.0.0",
7+
//// "exports": {
8+
//// "./core/*": {
9+
//// "types": "./lib/core/*.d.ts",
10+
//// "default": "./lib/core/*.js"
11+
//// }
12+
//// }
13+
//// }
14+
15+
// @Filename: /node_modules/pkg/lib/core/test.d.ts
16+
//// export function test(): void;
17+
18+
// @Filename: /package.json
19+
//// {
20+
//// "type": "module",
21+
//// "dependencies": {
22+
//// "pkg": "1.0.0"
23+
//// }
24+
//// }
25+
26+
// @Filename: /tsconfig.json
27+
//// {
28+
//// "compilerOptions": {
29+
//// "module": "nodenext"
30+
//// }
31+
//// }
32+
33+
// @Filename: /main.ts
34+
//// /**/
35+
36+
verify.completions({
37+
marker: "",
38+
includes: [
39+
{
40+
name: "test",
41+
source: "pkg/core/test",
42+
sourceDisplay: "pkg/core/test",
43+
hasAction: true,
44+
sortText: completion.SortText.AutoImportSuggestions
45+
},
46+
],
47+
preferences: {
48+
includeCompletionsForModuleExports: true,
49+
allowIncompleteCompletions: true
50+
}
51+
});

0 commit comments

Comments
 (0)