Merge pull request #6858 from Microsoft/emitImportsInDts

emit import declarations without import clause in .d.ts files

Author: vladima

src/compiler/declarationEmitter.ts

@@ -698,10 +698,6 @@ namespace ts {
         }
 
         function writeImportDeclaration(node: ImportDeclaration) {
-            if (!node.importClause && !(node.flags & NodeFlags.Export)) {
-                // do not write non-exported import declarations that don't have import clauses
-                return;
-            }
             emitJsDocComments(node);
             if (node.flags & NodeFlags.Export) {
                 write("export ");

tests/baselines/reference/es6ImportWithoutFromClause.js

@@ -17,3 +17,4 @@ import "es6ImportWithoutFromClause_0";
 //// [es6ImportWithoutFromClause_0.d.ts]
 export declare var a: number;
 //// [es6ImportWithoutFromClause_1.d.ts]
+import "es6ImportWithoutFromClause_0";

tests/baselines/reference/es6ImportWithoutFromClauseAmd.js

@@ -36,3 +36,5 @@ export declare var a: number;
 //// [es6ImportWithoutFromClauseAmd_1.d.ts]
 export declare var b: number;
 //// [es6ImportWithoutFromClauseAmd_2.d.ts]
+import "es6ImportWithoutFromClauseAmd_0";
+import "es6ImportWithoutFromClauseAmd_2";

tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js

@@ -18,3 +18,4 @@ require("es6ImportWithoutFromClauseInEs5_0");
 //// [es6ImportWithoutFromClauseInEs5_0.d.ts]
 export declare var a: number;
 //// [es6ImportWithoutFromClauseInEs5_1.d.ts]
+import "es6ImportWithoutFromClauseInEs5_0";

tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js

@@ -17,3 +17,4 @@ import "es6ImportWithoutFromClauseNonInstantiatedModule_0";
 export interface i {
 }
 //// [es6ImportWithoutFromClauseNonInstantiatedModule_1.d.ts]
+import "es6ImportWithoutFromClauseNonInstantiatedModule_0";

tests/baselines/reference/keepImportsInDts1.js

@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/keepImportsInDts1.ts] ////
+
+//// [test.d.ts]
+
+export {}; 
+//// [main.ts]
+import "test"
+
+//// [main.js]
+define(["require", "exports", "test"], function (require, exports) {
+    "use strict";
+});
+
+
+//// [main.d.ts]
+import "test";

tests/baselines/reference/keepImportsInDts1.symbols

@@ -0,0 +1,6 @@
+=== c:/test.d.ts ===
+
+No type information for this code.export {}; 
+No type information for this code.=== c:/app/main.ts ===
+import "test"
+No type information for this code.

tests/baselines/reference/keepImportsInDts1.types

@@ -0,0 +1,6 @@
+=== c:/test.d.ts ===
+
+No type information for this code.export {}; 
+No type information for this code.=== c:/app/main.ts ===
+import "test"
+No type information for this code.

tests/baselines/reference/keepImportsInDts2.js

@@ -0,0 +1,22 @@
+//// [tests/cases/compiler/keepImportsInDts2.ts] ////
+
+//// [test.ts]
+
+export {};
+//// [main.ts]
+import "./folder/test"
+
+//// [test.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+});
+//// [main.js]
+define(["require", "exports", "./folder/test"], function (require, exports) {
+    "use strict";
+});
+
+
+//// [test.d.ts]
+export {  };
+//// [main.d.ts]
+import "./folder/test";

tests/baselines/reference/keepImportsInDts2.symbols

@@ -0,0 +1,6 @@
+=== tests/cases/compiler/folder/test.ts ===
+
+No type information for this code.export {};
+No type information for this code.=== tests/cases/compiler/main.ts ===
+import "./folder/test"
+No type information for this code.