When resolving type reference directive, try optional resolution settings eg. baseUrl

Fixes #37928

Author: sheetalkamat

src/compiler/moduleNameResolver.ts

@@ -365,18 +365,27 @@ namespace ts {
             const initialLocationForSecondaryLookup = containingFile && getDirectoryPath(containingFile);
 
             if (initialLocationForSecondaryLookup !== undefined) {
-                // check secondary locations
-                if (traceEnabled) {
-                    trace(host, Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
-                }
-                let result: Resolved | undefined;
-                if (!isExternalModuleNameRelative(typeReferenceDirectiveName)) {
-                    const searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined);
-                    result = searchResult && searchResult.value;
-                }
-                else {
-                    const { path: candidate } = normalizePathAndParts(combinePaths(initialLocationForSecondaryLookup, typeReferenceDirectiveName));
-                    result = nodeLoadModuleByRelativeName(Extensions.DtsOnly, candidate, /*onlyRecordFailures*/ false, moduleResolutionState, /*considerPackageJson*/ true);
+                // Try using baseUrl resolution
+                let result = tryLoadModuleUsingOptionalResolutionSettings(
+                    Extensions.DtsOnly,
+                    typeReferenceDirectiveName,
+                    initialLocationForSecondaryLookup,
+                    (extensions, candidate, onlyRecordFailures, state) => nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures, state, /*considerPackageJson*/ true),
+                    moduleResolutionState
+                );
+                if (!result) {
+                    // check secondary locations
+                    if (traceEnabled) {
+                        trace(host, Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
+                    }
+                    if (!isExternalModuleNameRelative(typeReferenceDirectiveName)) {
+                        const searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined);
+                        result = searchResult && searchResult.value;
+                    }
+                    else {
+                        const { path: candidate } = normalizePathAndParts(combinePaths(initialLocationForSecondaryLookup, typeReferenceDirectiveName));
+                        result = nodeLoadModuleByRelativeName(Extensions.DtsOnly, candidate, /*onlyRecordFailures*/ false, moduleResolutionState, /*considerPackageJson*/ true);
+                    }
                 }
                 const resolvedFile = resolvedTypeScriptOnly(result);
                 if (!resolvedFile && traceEnabled) {

tests/baselines/reference/tsbuild/declarationEmit/initial-build/when-declaration-file-is-referenced-through-triple-slash-and-uses-baseUrl.js

@@ -34,7 +34,13 @@ export type MyNominal = Nominal<string, 'MyNominal'>;
 {"extends":"../../tsconfig.base.json","compilerOptions":{"composite":true},"references":[{"path":"../common"}],"include":["./index.ts"]}
 
 //// [/src/solution/src/subProject2/index.ts]
-
+import { MyNominal } from '../subProject/index';
+const variable = {
+    key: 'value' as MyNominal,
+};
+export function getVar(): keyof typeof variable {
+    return 'key';
+}
 
 //// [/src/solution/src/subProject2/tsconfig.json]
 {"extends":"../../tsconfig.base.json","compilerOptions":{"composite":true},"references":[{"path":"../subProject"}],"include":["./index.ts"]}
@@ -67,24 +73,11 @@ Output::
 
 [12:00:00 AM] Building project '/src/solution/src/subProject/tsconfig.json'...
 
-src/solution/lib/src/common/nominal.d.ts:2:55 - error TS2304: Cannot find name 'MyNominal'.
-
-2 export declare type Nominal<T, Name extends string> = MyNominal<T, Name>;
-                                                        ~~~~~~~~~
-
-src/solution/lib/src/common/nominal.d.ts:1:23 - error TS2688: Cannot find type definition file for 'types'.
-
-1 /// <reference types="types" />
-                        ~~~~~
-
-[12:00:00 AM] Project 'src/solution/src/subProject2/tsconfig.json' can't be built because its dependency 'src/solution/src/subProject' has errors
+[12:00:00 AM] Project 'src/solution/src/subProject2/tsconfig.json' is out of date because output file 'src/solution/lib/src/subProject2/index.js' does not exist
 
-[[90m12:00:00 AM[0m] Skipping build of project '/src/solution/src/subProject2/tsconfig.json' because its dependency '/src/solution/src/subProject' has errors
+[[90m12:00:00 AM[0m] Building project '/src/solution/src/subProject2/tsconfig.json'...
 
-
-Found 2 errors.
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
 
 
 //// [/src/solution/lib/src/common/nominal.d.ts]
@@ -140,6 +133,16 @@ exports.__esModule = true;
   "version": "FakeTSVersion"
 }
 
+//// [/src/solution/lib/src/subProject/index.d.ts]
+import { Nominal } from '../common/nominal';
+export declare type MyNominal = Nominal<string, 'MyNominal'>;
+
+
+//// [/src/solution/lib/src/subProject/index.js]
+"use strict";
+exports.__esModule = true;
+
+
 //// [/src/solution/lib/src/subProject/tsconfig.tsbuildinfo]
 {
   "program": {
@@ -149,6 +152,11 @@ exports.__esModule = true;
         "signature": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
         "affectsGlobalScope": true
       },
+      "../../../src/common/types.d.ts": {
+        "version": "23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};",
+        "signature": "23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};",
+        "affectsGlobalScope": true
+      },
       "../common/nominal.d.ts": {
         "version": "-2060908103-/// <reference types=\"types\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n",
         "signature": "-2060908103-/// <reference types=\"types\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n",
@@ -167,41 +175,114 @@ exports.__esModule = true;
       "configFilePath": "../../../src/subProject/tsconfig.json"
     },
     "referencedMap": {
+      "../common/nominal.d.ts": [
+        "../../../src/common/types.d.ts"
+      ],
       "../../../src/subproject/index.ts": [
         "../common/nominal.d.ts"
       ]
     },
     "exportedModulesMap": {
+      "../common/nominal.d.ts": [
+        "../../../src/common/types.d.ts"
+      ],
       "../../../src/subproject/index.ts": [
         "../common/nominal.d.ts"
       ]
     },
     "semanticDiagnosticsPerFile": [
       "../../../../../lib/lib.d.ts",
-      [
-        "../common/nominal.d.ts",
-        [
-          {
-            "file": "../common/nominal.d.ts",
-            "start": 87,
-            "length": 9,
-            "messageText": "Cannot find name 'MyNominal'.",
-            "category": 1,
-            "code": 2304
-          }
-        ]
-      ],
+      "../common/nominal.d.ts",
+      "../../../src/common/types.d.ts",
       "../../../src/subproject/index.ts"
-    ],
-    "affectedFilesPendingEmit": [
-      [
-        "../common/nominal.d.ts",
-        1
+    ]
+  },
+  "version": "FakeTSVersion"
+}
+
+//// [/src/solution/lib/src/subProject2/index.d.ts]
+/// <reference types="types" />
+declare const variable: {
+    key: globalThis.MyNominal<string, "MyNominal">;
+};
+export declare function getVar(): keyof typeof variable;
+export {};
+
+
+//// [/src/solution/lib/src/subProject2/index.js]
+"use strict";
+exports.__esModule = true;
+exports.getVar = void 0;
+var variable = {
+    key: 'value'
+};
+function getVar() {
+    return 'key';
+}
+exports.getVar = getVar;
+
+
+//// [/src/solution/lib/src/subProject2/tsconfig.tsbuildinfo]
+{
+  "program": {
+    "fileInfos": {
+      "../../../../../lib/lib.d.ts": {
+        "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+        "signature": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+        "affectsGlobalScope": true
+      },
+      "../../../src/common/types.d.ts": {
+        "version": "23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};",
+        "signature": "23815050294-declare type MyNominal<T, Name extends string> = T & {\n    specialKey: Name;\n};",
+        "affectsGlobalScope": true
+      },
+      "../common/nominal.d.ts": {
+        "version": "-2060908103-/// <reference types=\"types\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n",
+        "signature": "-2060908103-/// <reference types=\"types\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n",
+        "affectsGlobalScope": false
+      },
+      "../subproject/index.d.ts": {
+        "version": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n",
+        "signature": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n",
+        "affectsGlobalScope": false
+      },
+      "../../../src/subproject2/index.ts": {
+        "version": "2747033208-import { MyNominal } from '../subProject/index';\nconst variable = {\n    key: 'value' as MyNominal,\n};\nexport function getVar(): keyof typeof variable {\n    return 'key';\n}",
+        "signature": "-8779403458-/// <reference types=\"types\" />\r\ndeclare const variable: {\r\n    key: globalThis.MyNominal<string, \"MyNominal\">;\r\n};\r\nexport declare function getVar(): keyof typeof variable;\r\nexport {};\r\n",
+        "affectsGlobalScope": false
+      }
+    },
+    "options": {
+      "rootDir": "../../..",
+      "outDir": "../..",
+      "composite": true,
+      "configFilePath": "../../../src/subProject2/tsconfig.json"
+    },
+    "referencedMap": {
+      "../common/nominal.d.ts": [
+        "../../../src/common/types.d.ts"
+      ],
+      "../subproject/index.d.ts": [
+        "../common/nominal.d.ts"
+      ],
+      "../../../src/subproject2/index.ts": [
+        "../subproject/index.d.ts"
+      ]
+    },
+    "exportedModulesMap": {
+      "../common/nominal.d.ts": [
+        "../../../src/common/types.d.ts"
       ],
-      [
-        "../../../src/subproject/index.ts",
-        1
+      "../subproject/index.d.ts": [
+        "../common/nominal.d.ts"
       ]
+    },
+    "semanticDiagnosticsPerFile": [
+      "../../../../../lib/lib.d.ts",
+      "../common/nominal.d.ts",
+      "../subproject/index.d.ts",
+      "../../../src/common/types.d.ts",
+      "../../../src/subproject2/index.ts"
     ]
   },
   "version": "FakeTSVersion"