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

vladima · vladima · commit 202452b521c5 · 2016-02-02T15:53:20.000-08:00
diff --git a/src/compiler/declarationEmitter.ts b/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 ");
diff --git a/tests/baselines/reference/es6ImportWithoutFromClause.js b/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";
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/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";
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/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";
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js b/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js
@@ -17,3 +17,4 @@ import "es6ImportWithoutFromClauseNonInstantiatedModule_0";
 export interface i {
 }
 //// [es6ImportWithoutFromClauseNonInstantiatedModule_1.d.ts]
+import "es6ImportWithoutFromClauseNonInstantiatedModule_0";
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
@@ -73,3 +73,5 @@ declare module "./observable" {
 }
 export {};
 //// [main.d.ts]
+import "./map1";
+import "./map2";
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
@@ -66,3 +66,4 @@ declare module "./observable" {
 }
 export {};
 //// [main.d.ts]
+import "./map";
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
@@ -71,3 +71,4 @@ declare module "./observable" {
 }
 export {};
 //// [main.d.ts]
+import "./map";
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
@@ -63,3 +63,4 @@ declare module "observable" {
 export {};
 //// [main.d.ts]
 /// <reference path="observable.d.ts" />
+import "./map";
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js
@@ -50,3 +50,4 @@ declare global  {
 }
 export {};
 //// [f3.d.ts]
+import "./f2";
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js
@@ -45,3 +45,5 @@ declare global  {
 export {  };
 export {};
 //// [f3.d.ts]
+import "./f1";
+import "./f2";
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js
@@ -32,3 +32,5 @@ require("B");
 //// [f3.d.ts]
 /// <reference path="f1.d.ts" />
 /// <reference path="f2.d.ts" />
+import "A";
+import "B";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
@@ -69,3 +69,4 @@ declare module "./f1" {
     }
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -74,3 +74,4 @@ export declare class B {
     n: number;
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -72,3 +72,4 @@ export declare class B {
     n: number;
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -76,3 +76,4 @@ export declare class B {
     n: number;
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
@@ -95,3 +95,4 @@ declare module "./f1" {
     }
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
@@ -33,3 +33,4 @@ var y = x.getA().x;
 
 //// [f.d.ts]
 /// <reference path="array.d.ts" />
+import "array";
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
@@ -139,4 +139,6 @@ declare module "m4" {
     }
 }
 declare module "test" {
+    import "m2";
+    import "m4";
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -101,4 +101,5 @@ declare module "d" {
     }
 }
 declare module "main" {
+    import "d";
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -111,4 +111,6 @@ declare module "e" {
     }
 }
 declare module "main" {
+    import "d";
+    import "e";
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -98,4 +98,6 @@ declare module "e" {
     }
 }
 declare module "main" {
+    import "D";
+    import "e";
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -87,4 +87,6 @@ declare module "b" {
     }
 }
 declare module "main" {
+    import "D";
+    import "E";
 }

Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,4 @@ import "es6ImportWithoutFromClauseNonInstantiatedModule_0";`
`17`	`17`	`export interface i {`
`18`	`18`	`}`
`19`	`19`	`//// [es6ImportWithoutFromClauseNonInstantiatedModule_1.d.ts]`
	`20`	`+import "es6ImportWithoutFromClauseNonInstantiatedModule_0";`
Original file line number	Diff line number	Diff line change
`@@ -73,3 +73,5 @@ declare module "./observable" {`
`73`	`73`	`}`
`74`	`74`	`export {};`
`75`	`75`	`//// [main.d.ts]`
	`76`	`+import "./map1";`
	`77`	`+import "./map2";`
Original file line number	Diff line number	Diff line change
`@@ -66,3 +66,4 @@ declare module "./observable" {`
`66`	`66`	`}`
`67`	`67`	`export {};`
`68`	`68`	`//// [main.d.ts]`
	`69`	`+import "./map";`
Original file line number	Diff line number	Diff line change
`@@ -71,3 +71,4 @@ declare module "./observable" {`
`71`	`71`	`}`
`72`	`72`	`export {};`
`73`	`73`	`//// [main.d.ts]`
	`74`	`+import "./map";`
Original file line number	Diff line number	Diff line change
`@@ -50,3 +50,4 @@ declare global {`
`50`	`50`	`}`
`51`	`51`	`export {};`
`52`	`52`	`//// [f3.d.ts]`
	`53`	`+import "./f2";`