Resolve module from typeRoot if the resolution doesnt succeed

sheetalkamat · sheetalkamat · commit a6fed14f5bb2 · 2022-12-01T10:51:42.000-08:00
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -1552,6 +1552,9 @@ function nodeModuleNameResolverWorker(features: NodeResolutionFeatures, moduleNa
                 }
                 resolved = loadModuleFromNearestNodeModulesDirectory(extensions, moduleName, containingDirectory, state, cache, redirectedReference);
             }
+            if (extensions & Extensions.Declaration) {
+                resolved ??= resolveFromTypeRoot(moduleName, state);
+            }
             if (!resolved) return undefined;
 
             let resolvedValue = resolved.value;
@@ -2770,20 +2773,20 @@ export function classicNameResolver(moduleName: string, containingFile: string,
         if (!isExternalModuleNameRelative(moduleName)) {
             const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName, /*mode*/ undefined, redirectedReference);
             // Climb up parent directories looking for a module.
-            const resolved = forEachAncestorDirectory(containingDirectory, directory => {
+            let resolved = forEachAncestorDirectory(containingDirectory, directory => {
                 const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, state);
                 if (resolutionFromCache) {
                     return resolutionFromCache;
                 }
                 const searchName = normalizePath(combinePaths(directory, moduleName));
                 return toSearchResult(loadModuleFromFileNoPackageId(extensions, searchName, /*onlyRecordFailures*/ false, state));
             });
-            if (resolved) {
-                return resolved;
-            }
+            if (resolved) return resolved;
             if (extensions & (Extensions.TypeScript | Extensions.Declaration)) {
                 // If we didn't find the file normally, look it up in @types.
-                return loadModuleFromNearestNodeModulesDirectoryTypesScope(moduleName, containingDirectory, state);
+                resolved = loadModuleFromNearestNodeModulesDirectoryTypesScope(moduleName, containingDirectory, state);
+                if (extensions & Extensions.Declaration) resolved ??= resolveFromTypeRoot(moduleName, state);
+                return resolved;
             }
         }
         else {
@@ -2793,6 +2796,25 @@ export function classicNameResolver(moduleName: string, containingFile: string,
     }
 }
 
+function resolveFromTypeRoot(moduleName: string, state: ModuleResolutionState) {
+    if (!state.compilerOptions.typeRoots) return;
+    for (const typeRoot of state.compilerOptions.typeRoots) {
+        const candidate = combinePaths(typeRoot, moduleName);
+        const directoryExists = directoryProbablyExists(typeRoot, state.host);
+        if (!directoryExists && state.traceEnabled) {
+            trace(state.host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
+        }
+        const resolvedFromFile = loadModuleFromFile(Extensions.Declaration, candidate, !directoryExists, state);
+        if (resolvedFromFile) {
+            const packageDirectory = parseNodeModuleFromPath(resolvedFromFile.path);
+            const packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, state) : undefined;
+            return toSearchResult(withPackageId(packageInfo, resolvedFromFile));
+        }
+        const resolved = loadNodeModuleFromDirectory(Extensions.Declaration, candidate, !directoryExists, state);
+        if (resolved) return toSearchResult(resolved);
+    }
+}
+
 /**
  * A host may load a module from a global cache of typings.
  * This is the minumum code needed to expose that functionality; the rest is in the host.
diff --git a/tests/baselines/reference/moduleResolutionAsTypeReferenceDirective.errors.txt b/tests/baselines/reference/moduleResolutionAsTypeReferenceDirective.errors.txt
diff --git a/tests/baselines/reference/moduleResolutionAsTypeReferenceDirective.trace.json b/tests/baselines/reference/moduleResolutionAsTypeReferenceDirective.trace.json
@@ -3,17 +3,21 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'phaser' from 'node_modules' folder, target file types: TypeScript, Declaration.",
     "Directory '/node_modules' does not exist, skipping all lookups in it.",
-    "Loading module 'phaser' from 'node_modules' folder, target file types: JavaScript.",
-    "Directory '/node_modules' does not exist, skipping all lookups in it.",
-    "======== Module name 'phaser' was not resolved. ========",
-    "======== Resolving type reference directive 'phaser', containing file '/__inferred type names__.ts', root directory '/typings'. ========",
-    "Resolving with primary search path '/typings'.",
     "File '/typings/phaser.d.ts' does not exist.",
     "Found 'package.json' at '/typings/phaser/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'types/phaser.d.ts' that references '/typings/phaser/types/phaser.d.ts'.",
     "File '/typings/phaser/types/phaser.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/typings/phaser/types/phaser.d.ts', result '/typings/phaser/types/phaser.d.ts'.",
+    "======== Module name 'phaser' was successfully resolved to '/typings/phaser/types/phaser.d.ts' with Package ID 'phaser/types/phaser.d.ts@1.2.3'. ========",
+    "======== Resolving type reference directive 'phaser', containing file '/__inferred type names__.ts', root directory '/typings'. ========",
+    "Resolving with primary search path '/typings'.",
+    "File '/typings/phaser.d.ts' does not exist.",
+    "File '/typings/phaser/package.json' exists according to earlier cached lookups.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' has 'types' field 'types/phaser.d.ts' that references '/typings/phaser/types/phaser.d.ts'.",
+    "File '/typings/phaser/types/phaser.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/typings/phaser/types/phaser.d.ts', result '/typings/phaser/types/phaser.d.ts'.",
     "======== Type reference directive 'phaser' was successfully resolved to '/typings/phaser/types/phaser.d.ts' with Package ID 'phaser/types/phaser.d.ts@1.2.3', primary: true. ========"
 ]
diff --git a/tests/baselines/reference/moduleResolutionAsTypeReferenceDirective.types b/tests/baselines/reference/moduleResolutionAsTypeReferenceDirective.types
@@ -1,6 +1,6 @@
 === /a.ts ===
 import { a2 } from "phaser";
->a2 : any
+>a2 : number
 
 === /typings/phaser/types/phaser.d.ts ===
 export const a2: number;
diff --git a/tests/baselines/reference/moduleResolutionAsTypeReferenceDirectiveAmbient.trace.json b/tests/baselines/reference/moduleResolutionAsTypeReferenceDirectiveAmbient.trace.json
@@ -3,17 +3,21 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'phaser' from 'node_modules' folder, target file types: TypeScript, Declaration.",
     "Directory '/node_modules' does not exist, skipping all lookups in it.",
-    "Loading module 'phaser' from 'node_modules' folder, target file types: JavaScript.",
-    "Directory '/node_modules' does not exist, skipping all lookups in it.",
-    "======== Module name 'phaser' was not resolved. ========",
-    "======== Resolving type reference directive 'phaser', containing file '/__inferred type names__.ts', root directory '/typings'. ========",
-    "Resolving with primary search path '/typings'.",
     "File '/typings/phaser.d.ts' does not exist.",
     "Found 'package.json' at '/typings/phaser/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'types/phaser.d.ts' that references '/typings/phaser/types/phaser.d.ts'.",
     "File '/typings/phaser/types/phaser.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/typings/phaser/types/phaser.d.ts', result '/typings/phaser/types/phaser.d.ts'.",
+    "======== Module name 'phaser' was successfully resolved to '/typings/phaser/types/phaser.d.ts' with Package ID 'phaser/types/phaser.d.ts@1.2.3'. ========",
+    "======== Resolving type reference directive 'phaser', containing file '/__inferred type names__.ts', root directory '/typings'. ========",
+    "Resolving with primary search path '/typings'.",
+    "File '/typings/phaser.d.ts' does not exist.",
+    "File '/typings/phaser/package.json' exists according to earlier cached lookups.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' has 'types' field 'types/phaser.d.ts' that references '/typings/phaser/types/phaser.d.ts'.",
+    "File '/typings/phaser/types/phaser.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/typings/phaser/types/phaser.d.ts', result '/typings/phaser/types/phaser.d.ts'.",
     "======== Type reference directive 'phaser' was successfully resolved to '/typings/phaser/types/phaser.d.ts' with Package ID 'phaser/types/phaser.d.ts@1.2.3', primary: true. ========"
 ]
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
@@ -85,11 +85,13 @@ Info 17   [00:00:50.000] DirectoryWatcher:: Added:: WatchInfo: /user/username/pr
 Info 18   [00:00:51.000] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
 Info 19   [00:00:52.000] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
 Info 20   [00:00:53.000] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
-Info 21   [00:00:54.000] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Type roots
-Info 22   [00:00:55.000] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Type roots
-Info 23   [00:00:56.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
-Info 24   [00:00:57.000] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
-Info 25   [00:00:58.000] 	Files (5)
+Info 21   [00:00:54.000] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Info 22   [00:00:55.000] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Info 23   [00:00:56.000] DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Type roots
+Info 24   [00:00:57.000] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Type roots
+Info 25   [00:00:58.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Info 26   [00:00:59.000] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
+Info 27   [00:01:00.000] 	Files (5)
 	/a/lib/lib.d.ts
 	/user/username/projects/myproject/src/somefolder/module1.ts
 	/user/username/projects/myproject/src/somefolder/srcfile.ts
@@ -109,11 +111,11 @@ Info 25   [00:00:58.000] 	Files (5)
 	typings/node.d.ts
 	  Matched by default include pattern '**/*'
 
-Info 26   [00:00:59.000] -----------------------------------------------
-Info 27   [00:01:00.000] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
-Info 27   [00:01:01.000] 	Files (5)
+Info 28   [00:01:01.000] -----------------------------------------------
+Info 29   [00:01:02.000] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
+Info 29   [00:01:03.000] 	Files (5)
 
-Info 27   [00:01:02.000] -----------------------------------------------
-Info 27   [00:01:03.000] Open files: 
-Info 27   [00:01:04.000] 	FileName: /user/username/projects/myproject/src/somefolder/srcfile.ts ProjectRootPath: /user/username/projects/myproject
-Info 27   [00:01:05.000] 		Projects: /user/username/projects/myproject/src/tsconfig.json
+Info 29   [00:01:04.000] -----------------------------------------------
+Info 29   [00:01:05.000] Open files: 
+Info 29   [00:01:06.000] 	FileName: /user/username/projects/myproject/src/somefolder/srcfile.ts ProjectRootPath: /user/username/projects/myproject
+Info 29   [00:01:07.000] 		Projects: /user/username/projects/myproject/src/tsconfig.json
