Resolve typeReferenceDirective as fileOrDirectory instead of just directory when its not default typeRoots

Fixes #37708
Bug 2 part of the issue

Author: sheetalkamat

src/compiler/moduleNameResolver.ts

@@ -549,10 +549,18 @@ export function resolveTypeReferenceDirective(typeReferenceDirectiveName: string
             }
             return firstDefined(typeRoots, typeRoot => {
                 const candidate = combinePaths(typeRoot, typeReferenceDirectiveName);
-                const candidateDirectory = getDirectoryPath(candidate);
-                const directoryExists = directoryProbablyExists(candidateDirectory, host);
+                const directoryExists = directoryProbablyExists(typeRoot, host);
                 if (!directoryExists && traceEnabled) {
-                    trace(host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, candidateDirectory);
+                    trace(host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot);
+                }
+                if (options.typeRoots) {
+                    // Custom typeRoots resolve as file or directory just like we do modules
+                    const resolvedFromFile = loadModuleFromFile(Extensions.Declaration, candidate, !directoryExists, moduleResolutionState);
+                    if (resolvedFromFile) {
+                        const packageDirectory = parseNodeModuleFromPath(resolvedFromFile.path);
+                        const packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, moduleResolutionState) : undefined;
+                        return resolvedTypeScriptOnly(withPackageId(packageInfo, resolvedFromFile));
+                    }
                 }
                 return resolvedTypeScriptOnly(
                     loadNodeModuleFromDirectory(Extensions.Declaration, candidate,

tests/baselines/reference/library-reference-1.trace.json

@@ -1,6 +1,7 @@
 [
     "======== Resolving type reference directive 'jquery', containing file '/src/consumer.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'.",
+    "File 'types/jquery.d.ts' does not exist.",
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'types/jquery/index.d.ts', result '/src/types/jquery/index.d.ts'.",

tests/baselines/reference/library-reference-10.trace.json

@@ -1,6 +1,7 @@
 [
     "======== Resolving type reference directive 'jquery', containing file '/foo/consumer.ts', root directory './types'. ========",
     "Resolving with primary search path './types'.",
+    "File './types/jquery.d.ts' does not exist.",
     "Found 'package.json' at './types/jquery/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",

tests/baselines/reference/library-reference-13.trace.json

@@ -1,6 +1,7 @@
 [
     "======== Resolving type reference directive 'jquery', containing file '/a/__inferred type names__.ts', root directory '/a/types'. ========",
     "Resolving with primary search path '/a/types'.",
+    "File '/a/types/jquery.d.ts' does not exist.",
     "File '/a/types/jquery/package.json' does not exist.",
     "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/a/types/jquery/index.d.ts', result '/a/types/jquery/index.d.ts'.",

tests/baselines/reference/library-reference-14.trace.json

@@ -1,6 +1,7 @@
 [
     "======== Resolving type reference directive 'jquery', containing file '/a/__inferred type names__.ts', root directory '/a/types'. ========",
     "Resolving with primary search path '/a/types'.",
+    "File '/a/types/jquery.d.ts' does not exist.",
     "File '/a/types/jquery/package.json' does not exist.",
     "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/a/types/jquery/index.d.ts', result '/a/types/jquery/index.d.ts'.",

tests/baselines/reference/library-reference-15.trace.json

@@ -1,6 +1,7 @@
 [
     "======== Resolving type reference directive 'jquery', containing file '/a/__inferred type names__.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'.",
+    "File 'types/jquery.d.ts' does not exist.",
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'types/jquery/index.d.ts', result '/a/types/jquery/index.d.ts'.",

tests/baselines/reference/library-reference-2.trace.json

@@ -1,6 +1,7 @@
 [
     "======== Resolving type reference directive 'jquery', containing file '/consumer.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'.",
+    "File '/types/jquery.d.ts' does not exist.",
     "Found 'package.json' at '/types/jquery/package.json'.",
     "'package.json' does not have a 'typesVersions' field.",
     "'package.json' does not have a 'typings' field.",
@@ -10,6 +11,7 @@
     "======== Type reference directive 'jquery' was successfully resolved to '/types/jquery/jquery.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'jquery', containing file '/test/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'.",
+    "File '/types/jquery.d.ts' does not exist.",
     "File '/types/jquery/package.json' exists according to earlier cached lookups.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",

tests/baselines/reference/library-reference-4.trace.json

@@ -1,6 +1,7 @@
 [
     "======== Resolving type reference directive 'foo', containing file '/src/root.ts', root directory '/src'. ========",
     "Resolving with primary search path '/src'.",
+    "File '/src/foo.d.ts' does not exist.",
     "Looking up in 'node_modules' folder, initial location '/src'.",
     "Directory '/src/node_modules' does not exist, skipping all lookups in it.",
     "File '/node_modules/foo/package.json' does not exist.",
@@ -10,6 +11,7 @@
     "======== Type reference directive 'foo' was successfully resolved to '/node_modules/foo/index.d.ts', primary: false. ========",
     "======== Resolving type reference directive 'bar', containing file '/src/root.ts', root directory '/src'. ========",
     "Resolving with primary search path '/src'.",
+    "File '/src/bar.d.ts' does not exist.",
     "Looking up in 'node_modules' folder, initial location '/src'.",
     "Directory '/src/node_modules' does not exist, skipping all lookups in it.",
     "File '/node_modules/bar/package.json' does not exist.",
@@ -19,6 +21,7 @@
     "======== Type reference directive 'bar' was successfully resolved to '/node_modules/bar/index.d.ts', primary: false. ========",
     "======== Resolving type reference directive 'alpha', containing file '/node_modules/foo/index.d.ts', root directory '/src'. ========",
     "Resolving with primary search path '/src'.",
+    "File '/src/alpha.d.ts' does not exist.",
     "Looking up in 'node_modules' folder, initial location '/node_modules/foo'.",
     "File '/node_modules/foo/node_modules/alpha/package.json' does not exist.",
     "File '/node_modules/foo/node_modules/alpha.d.ts' does not exist.",
@@ -27,6 +30,7 @@
     "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/foo/node_modules/alpha/index.d.ts', primary: false. ========",
     "======== Resolving type reference directive 'alpha', containing file '/node_modules/bar/index.d.ts', root directory '/src'. ========",
     "Resolving with primary search path '/src'.",
+    "File '/src/alpha.d.ts' does not exist.",
     "Looking up in 'node_modules' folder, initial location '/node_modules/bar'.",
     "File '/node_modules/bar/node_modules/alpha/package.json' does not exist.",
     "File '/node_modules/bar/node_modules/alpha.d.ts' does not exist.",

tests/baselines/reference/library-reference-8.trace.json

@@ -1,24 +1,28 @@
 [
     "======== Resolving type reference directive 'alpha', containing file '/test/foo.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'.",
+    "File '/test/types/alpha.d.ts' does not exist.",
     "File '/test/types/alpha/package.json' does not exist.",
     "File '/test/types/alpha/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/test/types/alpha/index.d.ts', result '/test/types/alpha/index.d.ts'.",
     "======== Type reference directive 'alpha' was successfully resolved to '/test/types/alpha/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'beta', containing file '/test/foo.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'.",
+    "File '/test/types/beta.d.ts' does not exist.",
     "File '/test/types/beta/package.json' does not exist.",
     "File '/test/types/beta/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/test/types/beta/index.d.ts', result '/test/types/beta/index.d.ts'.",
     "======== Type reference directive 'beta' was successfully resolved to '/test/types/beta/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'beta', containing file '/test/types/alpha/index.d.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'.",
+    "File '/test/types/beta.d.ts' does not exist.",
     "File '/test/types/beta/package.json' does not exist according to earlier cached lookups.",
     "File '/test/types/beta/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/test/types/beta/index.d.ts', result '/test/types/beta/index.d.ts'.",
     "======== Type reference directive 'beta' was successfully resolved to '/test/types/beta/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'alpha', containing file '/test/types/beta/index.d.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'.",
+    "File '/test/types/alpha.d.ts' does not exist.",
     "File '/test/types/alpha/package.json' does not exist according to earlier cached lookups.",
     "File '/test/types/alpha/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/test/types/alpha/index.d.ts', result '/test/types/alpha/index.d.ts'.",

tests/baselines/reference/library-reference-scoped-packages.trace.json

@@ -1,7 +1,7 @@
 [
     "======== Resolving type reference directive '@beep/boop', containing file '/a.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'.",
-    "Directory 'types/@beep' does not exist, skipping all lookups in it.",
+    "Directory 'types' does not exist, skipping all lookups in it.",
     "Looking up in 'node_modules' folder, initial location '/'.",
     "Scoped package detected, looking in 'beep__boop'",
     "File '/node_modules/@types/beep__boop/package.json' does not exist.",