Triple slash references must resolve against the resolved file name (.d.ts and not original source file) since they are rewritten in the .d.ts emit

src/compiler/checker.ts

@@ -37470,7 +37470,7 @@ namespace ts {
                 if (fileToDirective.has(file.path)) return;
                 fileToDirective.set(file.path, key);
                 for (const { fileName } of file.referencedFiles) {
-                    const resolvedFile = resolveTripleslashReference(fileName, file.originalFileName);
+                    const resolvedFile = resolveTripleslashReference(fileName, file.fileName);
                     const referencedFile = host.getSourceFile(resolvedFile);
                     if (referencedFile) {
                         addReferencedFilesToTypeDirective(referencedFile, key);

src/compiler/program.ts

@@ -2667,7 +2667,7 @@ namespace ts {
                 return;
             }
             forEach(file.referencedFiles, (ref, index) => {
-                const referencedFileName = resolveTripleslashReference(ref.fileName, file.originalFileName);
+                const referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName);
                 processSourceFile(
                     referencedFileName,
                     isDefaultLib,

src/testRunner/tsconfig.json

@@ -110,6 +110,7 @@
         "unittests/tsbuild/amdModulesWithOut.ts",
         "unittests/tsbuild/configFileErrors.ts",
         "unittests/tsbuild/containerOnlyReferenced.ts",
+        "unittests/tsbuild/declarationEmit.ts",
         "unittests/tsbuild/demo.ts",
         "unittests/tsbuild/emitDeclarationOnly.ts",
         "unittests/tsbuild/emptyFiles.ts",

src/testRunner/unittests/tsbuild/declarationEmit.ts

@@ -0,0 +1,93 @@
+namespace ts {
+    describe("unittests:: tsbuild:: declarationEmit", () => {
+        function getFiles(): vfs.FileSet {
+            return {
+                "/src/solution/tsconfig.base.json": JSON.stringify({
+                    compilerOptions: {
+                        rootDir: "./",
+                        outDir: "lib"
+                    }
+                }),
+                "/src/solution/tsconfig.json": JSON.stringify({
+                    compilerOptions: { composite: true },
+                    references: [{ path: "./src" }],
+                    include: []
+                }),
+                "/src/solution/src/tsconfig.json": JSON.stringify({
+                    compilerOptions: { composite: true },
+                    references: [{ path: "./subProject" }, { path: "./subProject2" }],
+                    include: []
+                }),
+                "/src/solution/src/subProject/tsconfig.json": JSON.stringify({
+                    extends: "../../tsconfig.base.json",
+                    compilerOptions: { composite: true },
+                    references: [{ path: "../common" }],
+                    include: ["./index.ts"]
+                }),
+                "/src/solution/src/subProject/index.ts": Utils.dedent`
+import { Nominal } from '../common/nominal';
+export type MyNominal = Nominal<string, 'MyNominal'>;`,
+                "/src/solution/src/subProject2/tsconfig.json": JSON.stringify({
+                    extends: "../../tsconfig.base.json",
+                    compilerOptions: { composite: true },
+                    references: [{ path: "../subProject" }],
+                    include: ["./index.ts"]
+                }),
+                "/src/solution/src/subProject2/index.ts": Utils.dedent`
+import { MyNominal } from '../subProject/index';
+const variable = {
+    key: 'value' as MyNominal,
+};
+export function getVar(): keyof typeof variable {
+    return 'key';
+}`,
+                "/src/solution/src/common/tsconfig.json": JSON.stringify({
+                    extends: "../../tsconfig.base.json",
+                    compilerOptions: { composite: true },
+                    include: ["./nominal.ts"]
+                }),
+                "/src/solution/src/common/nominal.ts": Utils.dedent`
+/// <reference path="./types.d.ts" />
+export declare type Nominal<T, Name extends string> = MyNominal<T, Name>;`,
+                "/src/solution/src/common/types.d.ts": Utils.dedent`
+declare type MyNominal<T, Name extends string> = T & {
+    specialKey: Name;
+};`,
+            };
+        }
+        verifyTsc({
+            scenario: "declarationEmit",
+            subScenario: "when declaration file is referenced through triple slash",
+            fs: () => loadProjectFromFiles(getFiles()),
+            commandLineArgs: ["--b", "/src/solution/tsconfig.json", "--verbose"]
+        });
+
+        verifyTsc({
+            scenario: "declarationEmit",
+            subScenario: "when declaration file is referenced through triple slash and uses baseUrl",
+            fs: () => loadProjectFromFiles({
+                ...getFiles(),
+                "/src/solution/src/common/tsconfig.json": JSON.stringify({
+                    extends: "../../tsconfig.base.json",
+                    compilerOptions: { composite: true, baseUrl: "./" },
+                    include: ["./nominal.ts"]
+                }),
+            }),
+            commandLineArgs: ["--b", "/src/solution/tsconfig.json", "--verbose"]
+        });
+
+        verifyTsc({
+            scenario: "declarationEmit",
+            subScenario: "when declaration file is referenced through triple slash but uses no references",
+            fs: () => loadProjectFromFiles({
+                ...getFiles(),
+                "/src/solution/tsconfig.json": JSON.stringify({
+                    extends: "./tsconfig.base.json",
+                    compilerOptions: { composite: true },
+                    include: ["./src/**/*.ts"]
+                }),
+            }),
+            commandLineArgs: ["--b", "/src/solution/tsconfig.json", "--verbose"]
+        });
+    });
+}

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

@@ -0,0 +1,209 @@
+Input::
+//// [/lib/lib.d.ts]
+/// <reference no-default-lib="true"/>
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+interface ReadonlyArray<T> {}
+declare const console: { log(msg: any): void; };
+
+//// [/src/solution/src/common/nominal.ts]
+/// <reference path="./types.d.ts" />
+export declare type Nominal<T, Name extends string> = MyNominal<T, Name>;
+
+//// [/src/solution/src/common/tsconfig.json]
+{"extends":"../../tsconfig.base.json","compilerOptions":{"composite":true,"baseUrl":"./"},"include":["./nominal.ts"]}
+
+//// [/src/solution/src/common/types.d.ts]
+declare type MyNominal<T, Name extends string> = T & {
+    specialKey: Name;
+};
+
+//// [/src/solution/src/subProject/index.ts]
+import { Nominal } from '../common/nominal';
+export type MyNominal = Nominal<string, 'MyNominal'>;
+
+//// [/src/solution/src/subProject/tsconfig.json]
+{"extends":"../../tsconfig.base.json","compilerOptions":{"composite":true},"references":[{"path":"../common"}],"include":["./index.ts"]}
+
+//// [/src/solution/src/subProject2/index.ts]
+
+
+//// [/src/solution/src/subProject2/tsconfig.json]
+{"extends":"../../tsconfig.base.json","compilerOptions":{"composite":true},"references":[{"path":"../subProject"}],"include":["./index.ts"]}
+
+//// [/src/solution/src/tsconfig.json]
+{"compilerOptions":{"composite":true},"references":[{"path":"./subProject"},{"path":"./subProject2"}],"include":[]}
+
+//// [/src/solution/tsconfig.base.json]
+{"compilerOptions":{"rootDir":"./","outDir":"lib"}}
+
+//// [/src/solution/tsconfig.json]
+{"compilerOptions":{"composite":true},"references":[{"path":"./src"}],"include":[]}
+
+
+
+Output::
+/lib/tsc --b /src/solution/tsconfig.json --verbose
+[12:00:00 AM] Projects in this build: 
+    * src/solution/src/common/tsconfig.json
+    * src/solution/src/subProject/tsconfig.json
+    * src/solution/src/subProject2/tsconfig.json
+    * src/solution/src/tsconfig.json
+    * src/solution/tsconfig.json
+
+[12:00:00 AM] Project 'src/solution/src/common/tsconfig.json' is out of date because output file 'src/solution/lib/src/common/nominal.js' does not exist
+
+[12:00:00 AM] Building project '/src/solution/src/common/tsconfig.json'...
+
+[12:00:00 AM] Project 'src/solution/src/subProject/tsconfig.json' is out of date because output file 'src/solution/lib/src/subProject/index.js' does not exist
+
+[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] Skipping build of project '/src/solution/src/subProject2/tsconfig.json' because its dependency '/src/solution/src/subProject' has errors
+
+
+Found 2 errors.
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+
+
+//// [/src/solution/lib/src/common/nominal.d.ts]
+/// <reference types="types" />
+export declare type Nominal<T, Name extends string> = MyNominal<T, Name>;
+
+
+//// [/src/solution/lib/src/common/nominal.js]
+"use strict";
+exports.__esModule = true;
+/// <reference path="./types.d.ts" />
+
+
+//// [/src/solution/lib/src/common/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
+      },
+      "../../../src/common/nominal.ts": {
+        "version": "4107369137-/// <reference path=\"./types.d.ts\" />\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;",
+        "signature": "-2060908103-/// <reference types=\"types\" />\r\nexport declare type Nominal<T, Name extends string> = MyNominal<T, Name>;\r\n",
+        "affectsGlobalScope": false
+      }
+    },
+    "options": {
+      "rootDir": "../../..",
+      "outDir": "../..",
+      "composite": true,
+      "baseUrl": "../../../src/common",
+      "configFilePath": "../../../src/common/tsconfig.json"
+    },
+    "referencedMap": {
+      "../../../src/common/nominal.ts": [
+        "../../../src/common/types.d.ts"
+      ]
+    },
+    "exportedModulesMap": {},
+    "semanticDiagnosticsPerFile": [
+      "../../../../../lib/lib.d.ts",
+      "../../../src/common/nominal.ts",
+      "../../../src/common/types.d.ts"
+    ]
+  },
+  "version": "FakeTSVersion"
+}
+
+//// [/src/solution/lib/src/subProject/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
+      },
+      "../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
+      },
+      "../../../src/subproject/index.ts": {
+        "version": "-25117049605-import { Nominal } from '../common/nominal';\nexport type MyNominal = Nominal<string, 'MyNominal'>;",
+        "signature": "-21416888433-import { Nominal } from '../common/nominal';\r\nexport declare type MyNominal = Nominal<string, 'MyNominal'>;\r\n",
+        "affectsGlobalScope": false
+      }
+    },
+    "options": {
+      "rootDir": "../../..",
+      "outDir": "../..",
+      "composite": true,
+      "configFilePath": "../../../src/subProject/tsconfig.json"
+    },
+    "referencedMap": {
+      "../../../src/subproject/index.ts": [
+        "../common/nominal.d.ts"
+      ]
+    },
+    "exportedModulesMap": {
+      "../../../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
+          }
+        ]
+      ],
+      "../../../src/subproject/index.ts"
+    ],
+    "affectedFilesPendingEmit": [
+      [
+        "../common/nominal.d.ts",
+        1
+      ],
+      [
+        "../../../src/subproject/index.ts",
+        1
+      ]
+    ]
+  },
+  "version": "FakeTSVersion"
+}
+