Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve with -lib in TypeScript lib lookup via node-style resolution #46046

Merged
merged 1 commit into from
Sep 24, 2021
Merged

Resolve with -lib in TypeScript lib lookup via node-style resolution #46046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2884,9 +2884,9 @@ namespace ts {
}

function pathForLibFile(libFileName: string): string {
// Support resolving to lib.dom.d.ts -> @typescript/dom, and
// lib.dom.iterable.d.ts -> @typescript/dom/iterable
// lib.es2015.symbol.wellknown.d.ts -> @typescript/es2015/symbol-wellknown
// Support resolving to lib.dom.d.ts -> @typescript/lib-dom, and
// lib.dom.iterable.d.ts -> @typescript/lib-dom/iterable
// lib.es2015.symbol.wellknown.d.ts -> @typescript/lib-es2015/symbol-wellknown
const components = libFileName.split(".");
let path = components[1];
let i = 2;
Expand All @@ -2895,7 +2895,7 @@ namespace ts {
i++;
}
const resolveFrom = combinePaths(currentDirectory, `__lib_node_modules_lookup_${libFileName}__.ts`);
const localOverrideModuleResult = resolveModuleName("@typescript/" + path, resolveFrom, { moduleResolution: ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
const localOverrideModuleResult = resolveModuleName("@typescript/lib-" + path, resolveFrom, { moduleResolution: ModuleResolutionKind.NodeJs }, host, moduleResolutionCache);
if (localOverrideModuleResult?.resolvedModule) {
return localOverrideModuleResult.resolvedModule.resolvedFileName;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/libTypeScriptOverrideSimple.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
tests/cases/compiler/index.ts(6,1): error TS2304: Cannot find name 'window'.


==== /node_modules/@typescript/dom/index.d.ts (0 errors) ====
==== /node_modules/@typescript/lib-dom/index.d.ts (0 errors) ====
interface ABC { abc: string }
==== tests/cases/compiler/index.ts (1 errors) ====
/// <reference lib="dom" />
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/libTypeScriptOverrideSimple.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
=== /node_modules/@typescript/dom/index.d.ts ===
=== /node_modules/@typescript/lib-dom/index.d.ts ===
interface ABC { abc: string }
>ABC : Symbol(ABC, Decl(index.d.ts, 0, 0))
>abc : Symbol(ABC.abc, Decl(index.d.ts, 0, 15))
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/libTypeScriptOverrideSimple.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
=== /node_modules/@typescript/dom/index.d.ts ===
=== /node_modules/@typescript/lib-dom/index.d.ts ===
interface ABC { abc: string }
>abc : string

Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/libTypeScriptSubfileResolving.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
tests/cases/compiler/index.ts(6,1): error TS2304: Cannot find name 'window'.


==== /node_modules/@typescript/dom/index.d.ts (0 errors) ====
==== /node_modules/@typescript/lib-dom/index.d.ts (0 errors) ====
// NOOP
==== /node_modules/@typescript/dom/iterable.d.ts (0 errors) ====
==== /node_modules/@typescript/lib-dom/iterable.d.ts (0 errors) ====
interface DOMIterable { abc: string }
==== tests/cases/compiler/index.ts (1 errors) ====
/// <reference lib="dom.iterable" />
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/libTypeScriptSubfileResolving.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=== /node_modules/@typescript/dom/index.d.ts ===
=== /node_modules/@typescript/lib-dom/index.d.ts ===
// NOOP
No type information for this code.=== /node_modules/@typescript/dom/iterable.d.ts ===
No type information for this code.=== /node_modules/@typescript/lib-dom/iterable.d.ts ===
interface DOMIterable { abc: string }
>DOMIterable : Symbol(DOMIterable, Decl(iterable.d.ts, 0, 0))
>abc : Symbol(DOMIterable.abc, Decl(iterable.d.ts, 0, 23))
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/libTypeScriptSubfileResolving.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=== /node_modules/@typescript/dom/index.d.ts ===
=== /node_modules/@typescript/lib-dom/index.d.ts ===
// NOOP
No type information for this code.=== /node_modules/@typescript/dom/iterable.d.ts ===
No type information for this code.=== /node_modules/@typescript/lib-dom/iterable.d.ts ===
interface DOMIterable { abc: string }
>abc : string

Expand Down
2 changes: 1 addition & 1 deletion tests/cases/compiler/libTypeScriptOverrideSimple.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// @Filename: /node_modules/@typescript/dom/index.d.ts
// @Filename: /node_modules/@typescript/lib-dom/index.d.ts
interface ABC { abc: string }
// @Filename: index.ts
/// <reference lib="dom" />
Expand Down
4 changes: 2 additions & 2 deletions tests/cases/compiler/libTypeScriptSubfileResolving.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @Filename: /node_modules/@typescript/dom/index.d.ts
// @Filename: /node_modules/@typescript/lib-dom/index.d.ts
// NOOP
// @Filename: /node_modules/@typescript/dom/iterable.d.ts
// @Filename: /node_modules/@typescript/lib-dom/iterable.d.ts
interface DOMIterable { abc: string }
// @Filename: index.ts
/// <reference lib="dom.iterable" />
Expand Down