fix: use typeRoot instead of candidate when resolving types references from config (microsoft#2614)

sammarks-stukent · web-flow · commit eebe33a6ab59 · 2026-01-30T17:52:23.000Z
diff --git a/internal/module/resolver.go b/internal/module/resolver.go
@@ -337,7 +337,7 @@ func (r *resolutionState) resolveTypeReferenceDirective(typeRoots []string, from
 		}
 		for _, typeRoot := range typeRoots {
 			candidate := r.getCandidateFromTypeRoot(typeRoot)
-			directoryExists := r.resolver.host.FS().DirectoryExists(candidate)
+			directoryExists := r.resolver.host.FS().DirectoryExists(typeRoot)
 			if !directoryExists && r.tracer != nil {
 				r.tracer.write(diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot)
 			}
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveScopedPackageCustomTypeRoot.trace.json b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveScopedPackageCustomTypeRoot.trace.json
@@ -7,40 +7,34 @@ Resolving real path for '/types/@scoped/typescache/index.d.ts', result '/types/@
 ======== Type reference directive '@scoped/typescache' was successfully resolved to '/types/@scoped/typescache/index.d.ts', primary: true. ========
 ======== Resolving type reference directive '@scoped/nodemodulescache', containing file '/__inferred type names__.ts', root directory '/types,/node_modules,/node_modules/@types'. ========
 Resolving with primary search path '/types, /node_modules, /node_modules/@types'.
-Directory '/types' does not exist, skipping all lookups in it.
+File '/types/@scoped/nodemodulescache.d.ts' does not exist.
 File '/node_modules/@scoped/nodemodulescache.d.ts' does not exist.
 File '/node_modules/@scoped/nodemodulescache/package.json' does not exist.
 File '/node_modules/@scoped/nodemodulescache/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/node_modules/@scoped/nodemodulescache/index.d.ts', result '/node_modules/@scoped/nodemodulescache/index.d.ts'.
 ======== Type reference directive '@scoped/nodemodulescache' was successfully resolved to '/node_modules/@scoped/nodemodulescache/index.d.ts', primary: true. ========
 ======== Resolving type reference directive '@scoped/attypescache', containing file '/__inferred type names__.ts', root directory '/types,/node_modules,/node_modules/@types'. ========
 Resolving with primary search path '/types, /node_modules, /node_modules/@types'.
-Directory '/types' does not exist, skipping all lookups in it.
-Directory '/node_modules' does not exist, skipping all lookups in it.
+File '/types/@scoped/attypescache.d.ts' does not exist.
+File '/node_modules/@scoped/attypescache.d.ts' does not exist.
 Scoped package detected, looking in 'scoped__attypescache'
-Directory '/node_modules/@types' does not exist, skipping all lookups in it.
+File '/node_modules/@types/scoped__attypescache.d.ts' does not exist.
 Resolving type reference directive for program that specifies custom typeRoots, skipping lookup in 'node_modules' folder.
 ======== Type reference directive '@scoped/attypescache' was not resolved. ========
 ======== Resolving type reference directive '@mangled/typescache', containing file '/__inferred type names__.ts', root directory '/types,/node_modules,/node_modules/@types'. ========
 Resolving with primary search path '/types, /node_modules, /node_modules/@types'.
-Directory '/types' does not exist, skipping all lookups in it.
-Directory '/node_modules' does not exist, skipping all lookups in it.
 Scoped package detected, looking in 'mangled__typescache'
-Directory '/node_modules/@types' does not exist, skipping all lookups in it.
+File '/node_modules/@types/mangled__typescache.d.ts' does not exist.
 Resolving type reference directive for program that specifies custom typeRoots, skipping lookup in 'node_modules' folder.
 ======== Type reference directive '@mangled/typescache' was not resolved. ========
 ======== Resolving type reference directive '@mangled/nodemodulescache', containing file '/__inferred type names__.ts', root directory '/types,/node_modules,/node_modules/@types'. ========
 Resolving with primary search path '/types, /node_modules, /node_modules/@types'.
-Directory '/types' does not exist, skipping all lookups in it.
-Directory '/node_modules' does not exist, skipping all lookups in it.
 Scoped package detected, looking in 'mangled__nodemodulescache'
-Directory '/node_modules/@types' does not exist, skipping all lookups in it.
+File '/node_modules/@types/mangled__nodemodulescache.d.ts' does not exist.
 Resolving type reference directive for program that specifies custom typeRoots, skipping lookup in 'node_modules' folder.
 ======== Type reference directive '@mangled/nodemodulescache' was not resolved. ========
 ======== Resolving type reference directive '@mangled/attypescache', containing file '/__inferred type names__.ts', root directory '/types,/node_modules,/node_modules/@types'. ========
 Resolving with primary search path '/types, /node_modules, /node_modules/@types'.
-Directory '/types' does not exist, skipping all lookups in it.
-Directory '/node_modules' does not exist, skipping all lookups in it.
 Scoped package detected, looking in 'mangled__attypescache'
 File '/node_modules/@types/mangled__attypescache.d.ts' does not exist.
 File '/node_modules/@types/mangled__attypescache/package.json' does not exist.
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithFailedFromTypeRoot.trace.json b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithFailedFromTypeRoot.trace.json
@@ -1,5 +1,5 @@
 ======== Resolving type reference directive 'phaser', containing file '/__inferred type names__.ts', root directory '/typings'. ========
 Resolving with primary search path '/typings'.
-Directory '/typings' does not exist, skipping all lookups in it.
+File '/typings/phaser.d.ts' does not exist.
 Resolving type reference directive for program that specifies custom typeRoots, skipping lookup in 'node_modules' folder.
 ======== Type reference directive 'phaser' was not resolved. ========
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.errors.txt b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.errors.txt
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.errors.txt.diff
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.symbols b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.symbols
@@ -1,6 +1,10 @@
 //// [tests/cases/compiler/typeReferenceDirectiveWithTypeAsFile.ts] ////
 
 === /a.ts ===
-
 a;
+>a : Symbol(a, Decl(phaser.d.ts, 0, 13))
+
+=== /node_modules/phaser/types/phaser.d.ts ===
+declare const a: number;
+>a : Symbol(a, Decl(phaser.d.ts, 0, 13))
 
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.symbols.diff b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.symbols.diff
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.trace.json b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.trace.json
@@ -1,5 +1,6 @@
 ======== Resolving type reference directive 'phaser', containing file '/__inferred type names__.ts', root directory '/node_modules/phaser/types'. ========
 Resolving with primary search path '/node_modules/phaser/types'.
-Directory '/node_modules/phaser/types' does not exist, skipping all lookups in it.
-Resolving type reference directive for program that specifies custom typeRoots, skipping lookup in 'node_modules' folder.
-======== Type reference directive 'phaser' was not resolved. ========
+File '/node_modules/phaser/types/phaser.d.ts' exists - use it as a name resolution result.
+File '/node_modules/phaser/package.json' does not exist.
+Resolving real path for '/node_modules/phaser/types/phaser.d.ts', result '/node_modules/phaser/types/phaser.d.ts'.
+======== Type reference directive 'phaser' was successfully resolved to '/node_modules/phaser/types/phaser.d.ts', primary: true. ========
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.types b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.types
@@ -2,5 +2,9 @@
 
 === /a.ts ===
 a;
->a : any
+>a : number
+
+=== /node_modules/phaser/types/phaser.d.ts ===
+declare const a: number;
+>a : number
 
diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.types.diff b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectiveWithTypeAsFile.types.diff
diff --git a/testdata/baselines/reference/submodule/compiler/typeRootsFromMultipleNodeModulesDirectories.trace.json b/testdata/baselines/reference/submodule/compiler/typeRootsFromMultipleNodeModulesDirectories.trace.json
@@ -90,7 +90,6 @@ Resolving real path for '/foo/node_modules/@types/sneezy/index.d.ts', result '/f
 ======== Resolving type reference directive 'dopey', containing file '/foo/bar/__inferred type names__.ts', root directory '/foo/bar/node_modules/@types,/foo/node_modules/@types,/node_modules/@types'. ========
 Resolving with primary search path '/foo/bar/node_modules/@types, /foo/node_modules/@types, /node_modules/@types'.
 Directory '/foo/bar/node_modules/@types' does not exist, skipping all lookups in it.
-Directory '/foo/node_modules/@types' does not exist, skipping all lookups in it.
 File '/node_modules/@types/dopey/package.json' does not exist.
 File '/node_modules/@types/dopey/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/node_modules/@types/dopey/index.d.ts', result '/node_modules/@types/dopey/index.d.ts'.
diff --git a/testdata/baselines/reference/submodule/conformance/library-reference-4.trace.json b/testdata/baselines/reference/submodule/conformance/library-reference-4.trace.json
@@ -1,6 +1,6 @@
 ======== Resolving type reference directive 'foo', containing file '/src/root.ts', root directory '/src'. ========
 Resolving with primary search path '/src'.
-Directory '/src' does not exist, skipping all lookups in it.
+File '/src/foo.d.ts' does not exist.
 Looking up in 'node_modules' folder, initial location '/src'.
 Searching all ancestor node_modules directories for preferred extensions: Declaration.
 Directory '/src/node_modules' does not exist, skipping all lookups in it.
@@ -12,7 +12,7 @@ Resolving real path for '/node_modules/foo/index.d.ts', result '/node_modules/fo
 ======== 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'.
-Directory '/src' does not exist, skipping all lookups in it.
+File '/src/bar.d.ts' does not exist.
 Looking up in 'node_modules' folder, initial location '/src'.
 Searching all ancestor node_modules directories for preferred extensions: Declaration.
 Directory '/src/node_modules' does not exist, skipping all lookups in it.
@@ -24,7 +24,7 @@ Resolving real path for '/node_modules/bar/index.d.ts', result '/node_modules/ba
 ======== 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'.
-Directory '/src' does not exist, skipping all lookups in it.
+File '/src/alpha.d.ts' does not exist.
 Looking up in 'node_modules' folder, initial location '/node_modules/foo'.
 Searching all ancestor node_modules directories for preferred extensions: Declaration.
 File '/node_modules/foo/node_modules/alpha/package.json' does not exist.
@@ -34,7 +34,7 @@ Resolving real path for '/node_modules/foo/node_modules/alpha/index.d.ts', resul
 ======== 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'.
-Directory '/src' does not exist, skipping all lookups in it.
+File '/src/alpha.d.ts' does not exist according to earlier cached lookups.
 Looking up in 'node_modules' folder, initial location '/node_modules/bar'.
 Searching all ancestor node_modules directories for preferred extensions: Declaration.
 File '/node_modules/bar/node_modules/alpha/package.json' does not exist.
diff --git a/testdata/baselines/reference/submodule/conformance/typingsLookup3.trace.json b/testdata/baselines/reference/submodule/conformance/typingsLookup3.trace.json
@@ -1,6 +1,5 @@
 ======== Resolving type reference directive 'JqUeRy', containing file '/a.ts', root directory '/node_modules/@types'. ========
 Resolving with primary search path '/node_modules/@types'.
-Directory '/node_modules/@types' does not exist, skipping all lookups in it.
 Looking up in 'node_modules' folder, initial location '/'.
 Searching all ancestor node_modules directories for preferred extensions: Declaration.
 File '/node_modules/JqUeRy.d.ts' does not exist.

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ func (r *resolutionState) resolveTypeReferenceDirective(typeRoots []string, from`
`337`	`337`	`}`
`338`	`338`	`for _, typeRoot := range typeRoots {`
`339`	`339`	`candidate := r.getCandidateFromTypeRoot(typeRoot)`
`340`		`- directoryExists := r.resolver.host.FS().DirectoryExists(candidate)`
	`340`	`+ directoryExists := r.resolver.host.FS().DirectoryExists(typeRoot)`
`341`	`341`	`if !directoryExists && r.tracer != nil {`
`342`	`342`	`r.tracer.write(diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, typeRoot)`
`343`	`343`	`}`