Resolve with -lib in TypeScript lib node lookup (microsoft#46046)

Orta Therox · web-flow · commit 90e83adb44df · 2021-09-24T17:46:29.000+01:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -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;
@@ -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;
             }
diff --git a/tests/baselines/reference/libTypeScriptOverrideSimple.errors.txt b/tests/baselines/reference/libTypeScriptOverrideSimple.errors.txt
@@ -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" />
diff --git a/tests/baselines/reference/libTypeScriptOverrideSimple.symbols b/tests/baselines/reference/libTypeScriptOverrideSimple.symbols
@@ -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))
diff --git a/tests/baselines/reference/libTypeScriptOverrideSimple.types b/tests/baselines/reference/libTypeScriptOverrideSimple.types
@@ -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
 
diff --git a/tests/baselines/reference/libTypeScriptSubfileResolving.errors.txt b/tests/baselines/reference/libTypeScriptSubfileResolving.errors.txt
@@ -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" />
diff --git a/tests/baselines/reference/libTypeScriptSubfileResolving.symbols b/tests/baselines/reference/libTypeScriptSubfileResolving.symbols
@@ -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))
diff --git a/tests/baselines/reference/libTypeScriptSubfileResolving.types b/tests/baselines/reference/libTypeScriptSubfileResolving.types
@@ -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
 
diff --git a/tests/cases/compiler/libTypeScriptOverrideSimple.ts b/tests/cases/compiler/libTypeScriptOverrideSimple.ts
@@ -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" />
diff --git a/tests/cases/compiler/libTypeScriptSubfileResolving.ts b/tests/cases/compiler/libTypeScriptSubfileResolving.ts
@@ -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" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-=== /node_modules/@typescript/dom/index.d.ts ===`
	`1`	`+=== /node_modules/@typescript/lib-dom/index.d.ts ===`
`2`	`2`	`interface ABC { abc: string }`
`3`	`3`	`>ABC : Symbol(ABC, Decl(index.d.ts, 0, 0))`
`4`	`4`	`>abc : Symbol(ABC.abc, Decl(index.d.ts, 0, 15))`
Original file line number	Diff line number	Diff 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`
`2`	`2`	`interface ABC { abc: string }`
`3`	`3`	`// @Filename: index.ts`
`4`	`4`	`/// <reference lib="dom" />`