Skip to content

Commit 90e83ad

Browse files
author
Orta Therox
authored
Resolve with -lib in TypeScript lib node lookup (#46046)
1 parent 27bbdf1 commit 90e83ad

9 files changed

+16
-16
lines changed

src/compiler/program.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2884,9 +2884,9 @@ namespace ts {
28842884
}
28852885

28862886
function pathForLibFile(libFileName: string): string {
2887-
// Support resolving to lib.dom.d.ts -> @typescript/dom, and
2888-
// lib.dom.iterable.d.ts -> @typescript/dom/iterable
2889-
// lib.es2015.symbol.wellknown.d.ts -> @typescript/es2015/symbol-wellknown
2887+
// Support resolving to lib.dom.d.ts -> @typescript/lib-dom, and
2888+
// lib.dom.iterable.d.ts -> @typescript/lib-dom/iterable
2889+
// lib.es2015.symbol.wellknown.d.ts -> @typescript/lib-es2015/symbol-wellknown
28902890
const components = libFileName.split(".");
28912891
let path = components[1];
28922892
let i = 2;
@@ -2895,7 +2895,7 @@ namespace ts {
28952895
i++;
28962896
}
28972897
const resolveFrom = combinePaths(currentDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
2898-
const localOverrideModuleResult = resolveModuleName("@typescript/" + path, resolveFrom, { moduleResolution: ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
2898+
const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
28992899
if (localOverrideModuleResult?.resolvedModule) {
29002900
return localOverrideModuleResult.resolvedModule.resolvedFileName;
29012901
}

tests/baselines/reference/libTypeScriptOverrideSimple.errors.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/compiler/index.ts(6,1): error TS2304: Cannot find name 'window'.
22

33

4-
==== /node_modules/@typescript/dom/index.d.ts (0 errors) ====
4+
==== /node_modules/@typescript/lib-dom/index.d.ts (0 errors) ====
55
interface ABC { abc: string }
66
==== tests/cases/compiler/index.ts (1 errors) ====
77
/// <reference lib="dom" />

tests/baselines/reference/libTypeScriptOverrideSimple.symbols

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
=== /node_modules/@typescript/dom/index.d.ts ===
1+
=== /node_modules/@typescript/lib-dom/index.d.ts ===
22
interface ABC { abc: string }
33
>ABC : Symbol(ABC, Decl(index.d.ts, 0, 0))
44
>abc : Symbol(ABC.abc, Decl(index.d.ts, 0, 15))

tests/baselines/reference/libTypeScriptOverrideSimple.types

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
=== /node_modules/@typescript/dom/index.d.ts ===
1+
=== /node_modules/@typescript/lib-dom/index.d.ts ===
22
interface ABC { abc: string }
33
>abc : string
44

tests/baselines/reference/libTypeScriptSubfileResolving.errors.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
tests/cases/compiler/index.ts(6,1): error TS2304: Cannot find name 'window'.
22

33

4-
==== /node_modules/@typescript/dom/index.d.ts (0 errors) ====
4+
==== /node_modules/@typescript/lib-dom/index.d.ts (0 errors) ====
55
// NOOP
6-
==== /node_modules/@typescript/dom/iterable.d.ts (0 errors) ====
6+
==== /node_modules/@typescript/lib-dom/iterable.d.ts (0 errors) ====
77
interface DOMIterable { abc: string }
88
==== tests/cases/compiler/index.ts (1 errors) ====
99
/// <reference lib="dom.iterable" />

tests/baselines/reference/libTypeScriptSubfileResolving.symbols

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
=== /node_modules/@typescript/dom/index.d.ts ===
1+
=== /node_modules/@typescript/lib-dom/index.d.ts ===
22
// NOOP
3-
No type information for this code.=== /node_modules/@typescript/dom/iterable.d.ts ===
3+
No type information for this code.=== /node_modules/@typescript/lib-dom/iterable.d.ts ===
44
interface DOMIterable { abc: string }
55
>DOMIterable : Symbol(DOMIterable, Decl(iterable.d.ts, 0, 0))
66
>abc : Symbol(DOMIterable.abc, Decl(iterable.d.ts, 0, 23))

tests/baselines/reference/libTypeScriptSubfileResolving.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
=== /node_modules/@typescript/dom/index.d.ts ===
1+
=== /node_modules/@typescript/lib-dom/index.d.ts ===
22
// NOOP
3-
No type information for this code.=== /node_modules/@typescript/dom/iterable.d.ts ===
3+
No type information for this code.=== /node_modules/@typescript/lib-dom/iterable.d.ts ===
44
interface DOMIterable { abc: string }
55
>abc : string
66

tests/cases/compiler/libTypeScriptOverrideSimple.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// @Filename: /node_modules/@typescript/dom/index.d.ts
1+
// @Filename: /node_modules/@typescript/lib-dom/index.d.ts
22
interface ABC { abc: string }
33
// @Filename: index.ts
44
/// <reference lib="dom" />

tests/cases/compiler/libTypeScriptSubfileResolving.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// @Filename: /node_modules/@typescript/dom/index.d.ts
1+
// @Filename: /node_modules/@typescript/lib-dom/index.d.ts
22
// NOOP
3-
// @Filename: /node_modules/@typescript/dom/iterable.d.ts
3+
// @Filename: /node_modules/@typescript/lib-dom/iterable.d.ts
44
interface DOMIterable { abc: string }
55
// @Filename: index.ts
66
/// <reference lib="dom.iterable" />

0 commit comments

Comments
 (0)