only emit /// types reference for a symbol in d.ts file if all declarations of a symbol come from type reference directives (#11872)

* only emit /// types reference for a symbol in d.ts file if all declarations of a symbol come from type reference directives

* pass proper value for current directory when compiling .d.ts files

Author: vladima

src/compiler/checker.ts

@@ -19505,6 +19505,10 @@ namespace ts {
                         if (typeReferenceDirective) {
                             (typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
                         }
+                        else {
+                            // found at least one entry that does not originate from type reference directive 
+                            return undefined;
+                        }
                     }
                 }
                 return typeReferenceDirectives;

src/harness/harness.ts

@@ -1238,7 +1238,7 @@ namespace Harness {
             if (options.declaration && result.errors.length === 0 && result.declFilesCode.length > 0) {
                 ts.forEach(inputFiles, file => addDtsFile(file, declInputFiles));
                 ts.forEach(otherFiles, file => addDtsFile(file, declOtherFiles));
-                const output = compileFiles(declInputFiles, declOtherFiles, harnessSettings, options, currentDirectory);
+                const output = compileFiles(declInputFiles, declOtherFiles, harnessSettings, options, currentDirectory || harnessSettings["currentDirectory"]);
                 return { declInputFiles, declOtherFiles, declResult: output.result };
             }
 

tests/baselines/reference/declarationFilesWithTypeReferences1.js

@@ -0,0 +1,22 @@
+//// [tests/cases/compiler/declarationFilesWithTypeReferences1.ts] ////
+
+//// [index.d.ts]
+
+interface Error {
+    stack2: string;
+}
+
+//// [app.ts]
+
+function foo(): Error {
+    return undefined;
+}
+
+//// [app.js]
+function foo() {
+    return undefined;
+}
+
+
+//// [app.d.ts]
+declare function foo(): Error;

tests/baselines/reference/declarationFilesWithTypeReferences1.symbols

@@ -0,0 +1,18 @@
+=== /node_modules/@types/node/index.d.ts ===
+
+interface Error {
+>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(index.d.ts, 0, 0))
+
+    stack2: string;
+>stack2 : Symbol(Error.stack2, Decl(index.d.ts, 1, 17))
+}
+
+=== /app.ts ===
+
+function foo(): Error {
+>foo : Symbol(foo, Decl(app.ts, 0, 0))
+>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(index.d.ts, 0, 0))
+
+    return undefined;
+>undefined : Symbol(undefined)
+}

tests/baselines/reference/declarationFilesWithTypeReferences1.types

@@ -0,0 +1,18 @@
+=== /node_modules/@types/node/index.d.ts ===
+
+interface Error {
+>Error : Error
+
+    stack2: string;
+>stack2 : string
+}
+
+=== /app.ts ===
+
+function foo(): Error {
+>foo : () => Error
+>Error : Error
+
+    return undefined;
+>undefined : undefined
+}

tests/baselines/reference/declarationFilesWithTypeReferences2.js

@@ -0,0 +1,23 @@
+//// [tests/cases/compiler/declarationFilesWithTypeReferences2.ts] ////
+
+//// [index.d.ts]
+
+interface Error2 {
+    stack2: string;
+}
+
+//// [app.ts]
+
+function foo(): Error2 {
+    return undefined;
+}
+
+//// [app.js]
+function foo() {
+    return undefined;
+}
+
+
+//// [app.d.ts]
+/// <reference types="node" />
+declare function foo(): Error2;

tests/baselines/reference/declarationFilesWithTypeReferences2.symbols

@@ -0,0 +1,18 @@
+=== /node_modules/@types/node/index.d.ts ===
+
+interface Error2 {
+>Error2 : Symbol(Error2, Decl(index.d.ts, 0, 0))
+
+    stack2: string;
+>stack2 : Symbol(Error2.stack2, Decl(index.d.ts, 1, 18))
+}
+
+=== /app.ts ===
+
+function foo(): Error2 {
+>foo : Symbol(foo, Decl(app.ts, 0, 0))
+>Error2 : Symbol(Error2, Decl(index.d.ts, 0, 0))
+
+    return undefined;
+>undefined : Symbol(undefined)
+}

tests/baselines/reference/declarationFilesWithTypeReferences2.types

@@ -0,0 +1,18 @@
+=== /node_modules/@types/node/index.d.ts ===
+
+interface Error2 {
+>Error2 : Error2
+
+    stack2: string;
+>stack2 : string
+}
+
+=== /app.ts ===
+
+function foo(): Error2 {
+>foo : () => Error2
+>Error2 : Error2
+
+    return undefined;
+>undefined : undefined
+}

tests/baselines/reference/declarationFilesWithTypeReferences3.js

@@ -0,0 +1,24 @@
+//// [tests/cases/compiler/declarationFilesWithTypeReferences3.ts] ////
+
+//// [index.d.ts]
+
+interface Error2 {
+    stack2: string;
+}
+
+//// [app.ts]
+/// <reference types="node"/>
+function foo(): Error2 {
+    return undefined;
+}
+
+//// [app.js]
+/// <reference types="node"/>
+function foo() {
+    return undefined;
+}
+
+
+//// [app.d.ts]
+/// <reference types="node" />
+declare function foo(): Error2;

tests/baselines/reference/declarationFilesWithTypeReferences3.symbols

@@ -0,0 +1,18 @@
+=== /a/node_modules/@types/node/index.d.ts ===
+
+interface Error2 {
+>Error2 : Symbol(Error2, Decl(index.d.ts, 0, 0))
+
+    stack2: string;
+>stack2 : Symbol(Error2.stack2, Decl(index.d.ts, 1, 18))
+}
+
+=== /a/app.ts ===
+/// <reference types="node"/>
+function foo(): Error2 {
+>foo : Symbol(foo, Decl(app.ts, 0, 0))
+>Error2 : Symbol(Error2, Decl(index.d.ts, 0, 0))
+
+    return undefined;
+>undefined : Symbol(undefined)
+}

tests/baselines/reference/declarationFilesWithTypeReferences3.types

@@ -0,0 +1,18 @@
+=== /a/node_modules/@types/node/index.d.ts ===
+
+interface Error2 {
+>Error2 : Error2
+
+    stack2: string;
+>stack2 : string
+}
+
+=== /a/app.ts ===
+/// <reference types="node"/>
+function foo(): Error2 {
+>foo : () => Error2
+>Error2 : Error2
+
+    return undefined;
+>undefined : undefined
+}

tests/baselines/reference/declarationFilesWithTypeReferences4.js

@@ -0,0 +1,23 @@
+//// [tests/cases/compiler/declarationFilesWithTypeReferences4.ts] ////
+
+//// [index.d.ts]
+
+interface Error {
+    stack2: string;
+}
+
+//// [app.ts]
+/// <reference types="node"/>
+function foo(): Error {
+    return undefined;
+}
+
+//// [app.js]
+/// <reference types="node"/>
+function foo() {
+    return undefined;
+}
+
+
+//// [app.d.ts]
+declare function foo(): Error;

tests/baselines/reference/declarationFilesWithTypeReferences4.symbols

@@ -0,0 +1,18 @@
+=== /a/node_modules/@types/node/index.d.ts ===
+
+interface Error {
+>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(index.d.ts, 0, 0))
+
+    stack2: string;
+>stack2 : Symbol(Error.stack2, Decl(index.d.ts, 1, 17))
+}
+
+=== /a/app.ts ===
+/// <reference types="node"/>
+function foo(): Error {
+>foo : Symbol(foo, Decl(app.ts, 0, 0))
+>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(index.d.ts, 0, 0))
+
+    return undefined;
+>undefined : Symbol(undefined)
+}

tests/baselines/reference/declarationFilesWithTypeReferences4.types

@@ -0,0 +1,18 @@
+=== /a/node_modules/@types/node/index.d.ts ===
+
+interface Error {
+>Error : Error
+
+    stack2: string;
+>stack2 : string
+}
+
+=== /a/app.ts ===
+/// <reference types="node"/>
+function foo(): Error {
+>foo : () => Error
+>Error : Error
+
+    return undefined;
+>undefined : undefined
+}

tests/cases/compiler/declarationFilesWithTypeReferences1.ts

@@ -0,0 +1,14 @@
+// @types: node
+// @declaration: true
+// @currentDirectory: /
+
+// @filename: /node_modules/@types/node/index.d.ts
+interface Error {
+    stack2: string;
+}
+
+// @filename: /app.ts
+
+function foo(): Error {
+    return undefined;
+}

tests/cases/compiler/declarationFilesWithTypeReferences2.ts

@@ -0,0 +1,14 @@
+// @types: node
+// @declaration: true
+// @currentDirectory: /
+
+// @filename: /node_modules/@types/node/index.d.ts
+interface Error2 {
+    stack2: string;
+}
+
+// @filename: /app.ts
+
+function foo(): Error2 {
+    return undefined;
+}

tests/cases/compiler/declarationFilesWithTypeReferences3.ts

@@ -0,0 +1,12 @@
+// @declaration: true
+
+// @filename: /a/node_modules/@types/node/index.d.ts
+interface Error2 {
+    stack2: string;
+}
+
+// @filename: /a/app.ts
+/// <reference types="node"/>
+function foo(): Error2 {
+    return undefined;
+}

tests/cases/compiler/declarationFilesWithTypeReferences4.ts

@@ -0,0 +1,12 @@
+// @declaration: true
+
+// @filename: /a/node_modules/@types/node/index.d.ts
+interface Error {
+    stack2: string;
+}
+
+// @filename: /a/app.ts
+/// <reference types="node"/>
+function foo(): Error {
+    return undefined;
+}