From f2a28a5975825042efae1d52a0428d013c5cbffb Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Mon, 9 Feb 2015 08:51:55 -0800
Subject: [PATCH] Declaration emit for NamedImport syntax

---
 src/compiler/checker.ts                       |   8 +-
 src/compiler/emitter.ts                       |  14 ++
 .../reference/es6ImportNamedImport.js         |  85 +++++++++++-
 .../reference/es6ImportNamedImport.types      |  73 +++++++++++
 .../reference/es6ImportNamedImportAmd.js      | 105 +++++++++++++++
 .../reference/es6ImportNamedImportAmd.types   | 123 ++++++++++++++++++
 .../reference/es6ImportNamedImportInEs5.js    |  85 +++++++++++-
 .../reference/es6ImportNamedImportInEs5.types |  73 +++++++++++
 .../es6ImportNamedImportInExportAssignment.js |  16 +++
 ...6ImportNamedImportInExportAssignment.types |  12 ++
 ...rtNamedImportInIndirectExportAssignment.js |  29 +++++
 ...amedImportInIndirectExportAssignment.types |  21 +++
 ...es6ImportNamedImportMergeErrors.errors.txt |  33 +++++
 .../es6ImportNamedImportMergeErrors.js        |  30 +++++
 ...ImportNamedImportNoExportMember.errors.txt |  16 +++
 .../es6ImportNamedImportNoExportMember.js     |  15 +++
 ...ImportNamedImportNoNamedExports.errors.txt |  16 +++
 .../es6ImportNamedImportNoNamedExports.js     |  15 +++
 tests/cases/compiler/es6ImportNamedImport.ts  |  25 +++-
 .../cases/compiler/es6ImportNamedImportAmd.ts |  41 ++++++
 .../compiler/es6ImportNamedImportInEs5.ts     |  25 +++-
 .../es6ImportNamedImportInExportAssignment.ts |   9 ++
 ...rtNamedImportInIndirectExportAssignment.ts |  13 ++
 .../es6ImportNamedImportMergeErrors.ts        |  20 +++
 .../es6ImportNamedImportNoExportMember.ts     |  10 ++
 .../es6ImportNamedImportNoNamedExports.ts     |  10 ++
 26 files changed, 917 insertions(+), 5 deletions(-)
 create mode 100644 tests/baselines/reference/es6ImportNamedImportAmd.js
 create mode 100644 tests/baselines/reference/es6ImportNamedImportAmd.types
 create mode 100644 tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
 create mode 100644 tests/baselines/reference/es6ImportNamedImportInExportAssignment.types
 create mode 100644 tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
 create mode 100644 tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types
 create mode 100644 tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportNamedImportMergeErrors.js
 create mode 100644 tests/baselines/reference/es6ImportNamedImportNoExportMember.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportNamedImportNoExportMember.js
 create mode 100644 tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
 create mode 100644 tests/cases/compiler/es6ImportNamedImportAmd.ts
 create mode 100644 tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts
 create mode 100644 tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
 create mode 100644 tests/cases/compiler/es6ImportNamedImportMergeErrors.ts
 create mode 100644 tests/cases/compiler/es6ImportNamedImportNoExportMember.ts
 create mode 100644 tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 61cf3298fd8..864e9551721 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4912,7 +4912,13 @@ module ts {
                     getSymbolLinks(rightSide).referenced = true;
                     Debug.assert((rightSide.flags & SymbolFlags.Import) !== 0);
 
-                    nodeLinks = getNodeLinks(getDeclarationOfKind(rightSide, SyntaxKind.ImportEqualsDeclaration))
+                    var importEqualsDeclaration = getDeclarationOfKind(rightSide, SyntaxKind.ImportEqualsDeclaration);
+                    if (importEqualsDeclaration) {
+                        nodeLinks = getNodeLinks(importEqualsDeclaration);
+                    }
+                    else {
+                        break;
+                    }
                 }
             }
         }
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index db174b70596..60cde0743d0 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -780,6 +780,11 @@ module ts {
                         writeTextOfNode(currentSourceFile,(<NamespaceImport>node.importClause.namedBindings).name);
                         write(" ");
                     }
+                    else {
+                        write("{");
+                        emitCommaList((<NamedImports>node.importClause.namedBindings).elements, emitImportSpecifier);
+                        write(" } ");
+                    }
                 }
                 write("from ");
             }
@@ -788,6 +793,15 @@ module ts {
             writer.writeLine();
         }
 
+        function emitImportSpecifier(node: ImportSpecifier) {
+            write(" ");
+            if (node.propertyName) {
+                writeTextOfNode(currentSourceFile, node.propertyName);
+                write(" as ");
+            }
+            writeTextOfNode(currentSourceFile, node.name);
+        }
+
         function emitModuleDeclaration(node: ModuleDeclaration) {
             if (resolver.isDeclarationVisible(node)) {
                 emitJsDocComments(node);
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index c52499ef994..9a1eba42598 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -7,16 +7,39 @@ export var x = a;
 export var m = a;
 export var a1 = 10;
 export var x1 = 10;
+export var z1 = 10;
+export var z2 = 10;
+export var aaaa = 10;
 
 //// [es6ImportNamedImport_1.ts]
 import { } from "es6ImportNamedImport_0";
 import { a } from "es6ImportNamedImport_0";
+var xxxx = a;
 import { a as b } from "es6ImportNamedImport_0";
+var xxxx = b;
 import { x, a as y } from "es6ImportNamedImport_0";
+var xxxx = x;
+var xxxx = y;
 import { x as z,  } from "es6ImportNamedImport_0";
+var xxxx = z;
 import { m,  } from "es6ImportNamedImport_0";
+var xxxx = m;
 import { a1, x1 } from "es6ImportNamedImport_0";
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
+var xxxx = a1;
+var xxxx = x1;
+import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
+var xxxx = a11;
+var xxxx = x11;
+import { z1 } from "es6ImportNamedImport_0";
+var z111 = z1;
+import { z2 as z3 } from "es6ImportNamedImport_0";
+var z2 = z3; // z2 shouldn't give redeclare error
+
+// These are elided
+import { aaaa } from "es6ImportNamedImport_0";
+// These are elided
+import { aaaa as bbbb } from "es6ImportNamedImport_0";
+
 
 //// [es6ImportNamedImport_0.js]
 exports.a = 10;
@@ -24,4 +47,64 @@ exports.x = exports.a;
 exports.m = exports.a;
 exports.a1 = 10;
 exports.x1 = 10;
+exports.z1 = 10;
+exports.z2 = 10;
+exports.aaaa = 10;
 //// [es6ImportNamedImport_1.js]
+var _a = require("es6ImportNamedImport_0");
+var a = _a.a;
+var xxxx = a;
+var _b = require("es6ImportNamedImport_0");
+var b = _b.a;
+var xxxx = b;
+var _c = require("es6ImportNamedImport_0");
+var x = _c.x;
+var y = _c.a;
+var xxxx = x;
+var xxxx = y;
+var _d = require("es6ImportNamedImport_0");
+var z = _d.x;
+var xxxx = z;
+var _e = require("es6ImportNamedImport_0");
+var m = _e.m;
+var xxxx = m;
+var _f = require("es6ImportNamedImport_0");
+var a1 = _f.a1;
+var x1 = _f.x1;
+var xxxx = a1;
+var xxxx = x1;
+var _g = require("es6ImportNamedImport_0");
+var a11 = _g.a1;
+var x11 = _g.x1;
+var xxxx = a11;
+var xxxx = x11;
+var _h = require("es6ImportNamedImport_0");
+var z1 = _h.z1;
+var z111 = z1;
+var _j = require("es6ImportNamedImport_0");
+var z3 = _j.z2;
+var z2 = z3; // z2 shouldn't give redeclare error
+
+
+//// [es6ImportNamedImport_0.d.ts]
+export declare var a: number;
+export declare var x: number;
+export declare var m: number;
+export declare var a1: number;
+export declare var x1: number;
+export declare var z1: number;
+export declare var z2: number;
+export declare var aaaa: number;
+//// [es6ImportNamedImport_1.d.ts]
+import { } from "es6ImportNamedImport_0";
+import { a } from "es6ImportNamedImport_0";
+import { a as b } from "es6ImportNamedImport_0";
+import { x,  a as y } from "es6ImportNamedImport_0";
+import { x as z } from "es6ImportNamedImport_0";
+import { m } from "es6ImportNamedImport_0";
+import { a1,  x1 } from "es6ImportNamedImport_0";
+import { a1 as a11,  x1 as x11 } from "es6ImportNamedImport_0";
+import { z1 } from "es6ImportNamedImport_0";
+import { z2 as z3 } from "es6ImportNamedImport_0";
+import { aaaa } from "es6ImportNamedImport_0";
+import { aaaa as bbbb } from "es6ImportNamedImport_0";
diff --git a/tests/baselines/reference/es6ImportNamedImport.types b/tests/baselines/reference/es6ImportNamedImport.types
index e86955b3c96..80a7fccbd28 100644
--- a/tests/baselines/reference/es6ImportNamedImport.types
+++ b/tests/baselines/reference/es6ImportNamedImport.types
@@ -17,34 +17,107 @@ export var a1 = 10;
 export var x1 = 10;
 >x1 : number
 
+export var z1 = 10;
+>z1 : number
+
+export var z2 = 10;
+>z2 : number
+
+export var aaaa = 10;
+>aaaa : number
+
 === tests/cases/compiler/es6ImportNamedImport_1.ts ===
 import { } from "es6ImportNamedImport_0";
 import { a } from "es6ImportNamedImport_0";
 >a : number
 
+var xxxx = a;
+>xxxx : number
+>a : number
+
 import { a as b } from "es6ImportNamedImport_0";
 >a : unknown
 >b : number
 
+var xxxx = b;
+>xxxx : number
+>b : number
+
 import { x, a as y } from "es6ImportNamedImport_0";
 >x : number
 >a : unknown
 >y : number
 
+var xxxx = x;
+>xxxx : number
+>x : number
+
+var xxxx = y;
+>xxxx : number
+>y : number
+
 import { x as z,  } from "es6ImportNamedImport_0";
 >x : unknown
 >z : number
 
+var xxxx = z;
+>xxxx : number
+>z : number
+
 import { m,  } from "es6ImportNamedImport_0";
 >m : number
 
+var xxxx = m;
+>xxxx : number
+>m : number
+
 import { a1, x1 } from "es6ImportNamedImport_0";
 >a1 : number
 >x1 : number
 
+var xxxx = a1;
+>xxxx : number
+>a1 : number
+
+var xxxx = x1;
+>xxxx : number
+>x1 : number
+
 import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
 >a1 : unknown
 >a11 : number
 >x1 : unknown
 >x11 : number
 
+var xxxx = a11;
+>xxxx : number
+>a11 : number
+
+var xxxx = x11;
+>xxxx : number
+>x11 : number
+
+import { z1 } from "es6ImportNamedImport_0";
+>z1 : number
+
+var z111 = z1;
+>z111 : number
+>z1 : number
+
+import { z2 as z3 } from "es6ImportNamedImport_0";
+>z2 : unknown
+>z3 : number
+
+var z2 = z3; // z2 shouldn't give redeclare error
+>z2 : number
+>z3 : number
+
+// These are elided
+import { aaaa } from "es6ImportNamedImport_0";
+>aaaa : number
+
+// These are elided
+import { aaaa as bbbb } from "es6ImportNamedImport_0";
+>aaaa : unknown
+>bbbb : number
+
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js
new file mode 100644
index 00000000000..7510c8aeb6b
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.js
@@ -0,0 +1,105 @@
+//// [tests/cases/compiler/es6ImportNamedImportAmd.ts] ////
+
+//// [es6ImportNamedImportAmd_0.ts]
+
+export var a = 10;
+export var x = a;
+export var m = a;
+export var a1 = 10;
+export var x1 = 10;
+export var z1 = 10;
+export var z2 = 10;
+export var aaaa = 10;
+
+//// [es6ImportNamedImportAmd_1.ts]
+import { } from "es6ImportNamedImportAmd_0";
+import { a } from "es6ImportNamedImportAmd_0";
+var xxxx = a;
+import { a as b } from "es6ImportNamedImportAmd_0";
+var xxxx = b;
+import { x, a as y } from "es6ImportNamedImportAmd_0";
+var xxxx = x;
+var xxxx = y;
+import { x as z,  } from "es6ImportNamedImportAmd_0";
+var xxxx = z;
+import { m,  } from "es6ImportNamedImportAmd_0";
+var xxxx = m;
+import { a1, x1 } from "es6ImportNamedImportAmd_0";
+var xxxx = a1;
+var xxxx = x1;
+import { a1 as a11, x1 as x11 } from "es6ImportNamedImportAmd_0";
+var xxxx = a11;
+var xxxx = x11;
+import { z1 } from "es6ImportNamedImportAmd_0";
+var z111 = z1;
+import { z2 as z3 } from "es6ImportNamedImportAmd_0";
+var z2 = z3; // z2 shouldn't give redeclare error
+
+// These are elided
+import { aaaa } from "es6ImportNamedImportAmd_0";
+// These are elided
+import { aaaa as bbbb } from "es6ImportNamedImportAmd_0";
+
+
+//// [es6ImportNamedImportAmd_0.js]
+define(["require", "exports"], function (require, exports) {
+    exports.a = 10;
+    exports.x = exports.a;
+    exports.m = exports.a;
+    exports.a1 = 10;
+    exports.x1 = 10;
+    exports.z1 = 10;
+    exports.z2 = 10;
+    exports.aaaa = 10;
+});
+//// [es6ImportNamedImportAmd_1.js]
+define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, _a, _b, _c, _d, _e, _f, _g, _h, _j) {
+    var a = _a.a;
+    var xxxx = a;
+    var b = _b.a;
+    var xxxx = b;
+    var x = _c.x;
+    var y = _c.a;
+    var xxxx = x;
+    var xxxx = y;
+    var z = _d.x;
+    var xxxx = z;
+    var m = _e.m;
+    var xxxx = m;
+    var a1 = _f.a1;
+    var x1 = _f.x1;
+    var xxxx = a1;
+    var xxxx = x1;
+    var a11 = _g.a1;
+    var x11 = _g.x1;
+    var xxxx = a11;
+    var xxxx = x11;
+    var z1 = _h.z1;
+    var z111 = z1;
+    var z3 = _j.z2;
+    var z2 = z3; // z2 shouldn't give redeclare error
+});
+
+
+//// [es6ImportNamedImportAmd_0.d.ts]
+export declare var a: number;
+export declare var x: number;
+export declare var m: number;
+export declare var a1: number;
+export declare var x1: number;
+export declare var z1: number;
+export declare var z2: number;
+export declare var aaaa: number;
+//// [es6ImportNamedImportAmd_1.d.ts]
+import { } from "es6ImportNamedImportAmd_0";
+import { a } from "es6ImportNamedImportAmd_0";
+import { a as b } from "es6ImportNamedImportAmd_0";
+import { x,  a as y } from "es6ImportNamedImportAmd_0";
+import { x as z } from "es6ImportNamedImportAmd_0";
+import { m } from "es6ImportNamedImportAmd_0";
+import { a1,  x1 } from "es6ImportNamedImportAmd_0";
+import { a1 as a11,  x1 as x11 } from "es6ImportNamedImportAmd_0";
+import { z1 } from "es6ImportNamedImportAmd_0";
+import { z2 as z3 } from "es6ImportNamedImportAmd_0";
+import { aaaa } from "es6ImportNamedImportAmd_0";
+import { aaaa as bbbb } from "es6ImportNamedImportAmd_0";
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.types b/tests/baselines/reference/es6ImportNamedImportAmd.types
new file mode 100644
index 00000000000..3a68df656fe
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.types
@@ -0,0 +1,123 @@
+=== tests/cases/compiler/es6ImportNamedImportAmd_0.ts ===
+
+export var a = 10;
+>a : number
+
+export var x = a;
+>x : number
+>a : number
+
+export var m = a;
+>m : number
+>a : number
+
+export var a1 = 10;
+>a1 : number
+
+export var x1 = 10;
+>x1 : number
+
+export var z1 = 10;
+>z1 : number
+
+export var z2 = 10;
+>z2 : number
+
+export var aaaa = 10;
+>aaaa : number
+
+=== tests/cases/compiler/es6ImportNamedImportAmd_1.ts ===
+import { } from "es6ImportNamedImportAmd_0";
+import { a } from "es6ImportNamedImportAmd_0";
+>a : number
+
+var xxxx = a;
+>xxxx : number
+>a : number
+
+import { a as b } from "es6ImportNamedImportAmd_0";
+>a : unknown
+>b : number
+
+var xxxx = b;
+>xxxx : number
+>b : number
+
+import { x, a as y } from "es6ImportNamedImportAmd_0";
+>x : number
+>a : unknown
+>y : number
+
+var xxxx = x;
+>xxxx : number
+>x : number
+
+var xxxx = y;
+>xxxx : number
+>y : number
+
+import { x as z,  } from "es6ImportNamedImportAmd_0";
+>x : unknown
+>z : number
+
+var xxxx = z;
+>xxxx : number
+>z : number
+
+import { m,  } from "es6ImportNamedImportAmd_0";
+>m : number
+
+var xxxx = m;
+>xxxx : number
+>m : number
+
+import { a1, x1 } from "es6ImportNamedImportAmd_0";
+>a1 : number
+>x1 : number
+
+var xxxx = a1;
+>xxxx : number
+>a1 : number
+
+var xxxx = x1;
+>xxxx : number
+>x1 : number
+
+import { a1 as a11, x1 as x11 } from "es6ImportNamedImportAmd_0";
+>a1 : unknown
+>a11 : number
+>x1 : unknown
+>x11 : number
+
+var xxxx = a11;
+>xxxx : number
+>a11 : number
+
+var xxxx = x11;
+>xxxx : number
+>x11 : number
+
+import { z1 } from "es6ImportNamedImportAmd_0";
+>z1 : number
+
+var z111 = z1;
+>z111 : number
+>z1 : number
+
+import { z2 as z3 } from "es6ImportNamedImportAmd_0";
+>z2 : unknown
+>z3 : number
+
+var z2 = z3; // z2 shouldn't give redeclare error
+>z2 : number
+>z3 : number
+
+// These are elided
+import { aaaa } from "es6ImportNamedImportAmd_0";
+>aaaa : number
+
+// These are elided
+import { aaaa as bbbb } from "es6ImportNamedImportAmd_0";
+>aaaa : unknown
+>bbbb : number
+
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index 66f8ce0ef92..79cbafeff2f 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -7,16 +7,39 @@ export var x = a;
 export var m = a;
 export var a1 = 10;
 export var x1 = 10;
+export var z1 = 10;
+export var z2 = 10;
+export var aaaa = 10;
 
 //// [es6ImportNamedImportInEs5_1.ts]
 import { } from "es6ImportNamedImportInEs5_0";
 import { a } from "es6ImportNamedImportInEs5_0";
+var xxxx = a;
 import { a as b } from "es6ImportNamedImportInEs5_0";
+var xxxx = b;
 import { x, a as y } from "es6ImportNamedImportInEs5_0";
+var xxxx = x;
+var xxxx = y;
 import { x as z,  } from "es6ImportNamedImportInEs5_0";
+var xxxx = z;
 import { m,  } from "es6ImportNamedImportInEs5_0";
+var xxxx = m;
 import { a1, x1 } from "es6ImportNamedImportInEs5_0";
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImportInEs5_0";
+var xxxx = a1;
+var xxxx = x1;
+import { a1 as a11, x1 as x11 } from "es6ImportNamedImportInEs5_0";
+var xxxx = a11;
+var xxxx = x11;
+import { z1 } from "es6ImportNamedImportInEs5_0";
+var z111 = z1;
+import { z2 as z3 } from "es6ImportNamedImportInEs5_0";
+var z2 = z3; // z2 shouldn't give redeclare error
+
+// These are elided
+import { aaaa } from "es6ImportNamedImportInEs5_0";
+// These are elided
+import { aaaa as bbbb } from "es6ImportNamedImportInEs5_0";
+
 
 //// [es6ImportNamedImportInEs5_0.js]
 exports.a = 10;
@@ -24,4 +47,64 @@ exports.x = exports.a;
 exports.m = exports.a;
 exports.a1 = 10;
 exports.x1 = 10;
+exports.z1 = 10;
+exports.z2 = 10;
+exports.aaaa = 10;
 //// [es6ImportNamedImportInEs5_1.js]
+var _a = require("es6ImportNamedImportInEs5_0");
+var a = _a.a;
+var xxxx = a;
+var _b = require("es6ImportNamedImportInEs5_0");
+var b = _b.a;
+var xxxx = b;
+var _c = require("es6ImportNamedImportInEs5_0");
+var x = _c.x;
+var y = _c.a;
+var xxxx = x;
+var xxxx = y;
+var _d = require("es6ImportNamedImportInEs5_0");
+var z = _d.x;
+var xxxx = z;
+var _e = require("es6ImportNamedImportInEs5_0");
+var m = _e.m;
+var xxxx = m;
+var _f = require("es6ImportNamedImportInEs5_0");
+var a1 = _f.a1;
+var x1 = _f.x1;
+var xxxx = a1;
+var xxxx = x1;
+var _g = require("es6ImportNamedImportInEs5_0");
+var a11 = _g.a1;
+var x11 = _g.x1;
+var xxxx = a11;
+var xxxx = x11;
+var _h = require("es6ImportNamedImportInEs5_0");
+var z1 = _h.z1;
+var z111 = z1;
+var _j = require("es6ImportNamedImportInEs5_0");
+var z3 = _j.z2;
+var z2 = z3; // z2 shouldn't give redeclare error
+
+
+//// [es6ImportNamedImportInEs5_0.d.ts]
+export declare var a: number;
+export declare var x: number;
+export declare var m: number;
+export declare var a1: number;
+export declare var x1: number;
+export declare var z1: number;
+export declare var z2: number;
+export declare var aaaa: number;
+//// [es6ImportNamedImportInEs5_1.d.ts]
+import { } from "es6ImportNamedImportInEs5_0";
+import { a } from "es6ImportNamedImportInEs5_0";
+import { a as b } from "es6ImportNamedImportInEs5_0";
+import { x,  a as y } from "es6ImportNamedImportInEs5_0";
+import { x as z } from "es6ImportNamedImportInEs5_0";
+import { m } from "es6ImportNamedImportInEs5_0";
+import { a1,  x1 } from "es6ImportNamedImportInEs5_0";
+import { a1 as a11,  x1 as x11 } from "es6ImportNamedImportInEs5_0";
+import { z1 } from "es6ImportNamedImportInEs5_0";
+import { z2 as z3 } from "es6ImportNamedImportInEs5_0";
+import { aaaa } from "es6ImportNamedImportInEs5_0";
+import { aaaa as bbbb } from "es6ImportNamedImportInEs5_0";
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.types b/tests/baselines/reference/es6ImportNamedImportInEs5.types
index 4f96b8a4dfa..217b6e3b178 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.types
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.types
@@ -17,34 +17,107 @@ export var a1 = 10;
 export var x1 = 10;
 >x1 : number
 
+export var z1 = 10;
+>z1 : number
+
+export var z2 = 10;
+>z2 : number
+
+export var aaaa = 10;
+>aaaa : number
+
 === tests/cases/compiler/es6ImportNamedImportInEs5_1.ts ===
 import { } from "es6ImportNamedImportInEs5_0";
 import { a } from "es6ImportNamedImportInEs5_0";
 >a : number
 
+var xxxx = a;
+>xxxx : number
+>a : number
+
 import { a as b } from "es6ImportNamedImportInEs5_0";
 >a : unknown
 >b : number
 
+var xxxx = b;
+>xxxx : number
+>b : number
+
 import { x, a as y } from "es6ImportNamedImportInEs5_0";
 >x : number
 >a : unknown
 >y : number
 
+var xxxx = x;
+>xxxx : number
+>x : number
+
+var xxxx = y;
+>xxxx : number
+>y : number
+
 import { x as z,  } from "es6ImportNamedImportInEs5_0";
 >x : unknown
 >z : number
 
+var xxxx = z;
+>xxxx : number
+>z : number
+
 import { m,  } from "es6ImportNamedImportInEs5_0";
 >m : number
 
+var xxxx = m;
+>xxxx : number
+>m : number
+
 import { a1, x1 } from "es6ImportNamedImportInEs5_0";
 >a1 : number
 >x1 : number
 
+var xxxx = a1;
+>xxxx : number
+>a1 : number
+
+var xxxx = x1;
+>xxxx : number
+>x1 : number
+
 import { a1 as a11, x1 as x11 } from "es6ImportNamedImportInEs5_0";
 >a1 : unknown
 >a11 : number
 >x1 : unknown
 >x11 : number
 
+var xxxx = a11;
+>xxxx : number
+>a11 : number
+
+var xxxx = x11;
+>xxxx : number
+>x11 : number
+
+import { z1 } from "es6ImportNamedImportInEs5_0";
+>z1 : number
+
+var z111 = z1;
+>z111 : number
+>z1 : number
+
+import { z2 as z3 } from "es6ImportNamedImportInEs5_0";
+>z2 : unknown
+>z3 : number
+
+var z2 = z3; // z2 shouldn't give redeclare error
+>z2 : number
+>z3 : number
+
+// These are elided
+import { aaaa } from "es6ImportNamedImportInEs5_0";
+>aaaa : number
+
+// These are elided
+import { aaaa as bbbb } from "es6ImportNamedImportInEs5_0";
+>aaaa : unknown
+>bbbb : number
+
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
new file mode 100644
index 00000000000..dd79b2f1cfa
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts] ////
+
+//// [es6ImportNamedImportInExportAssignment_0.ts]
+
+export var a = 10;
+
+//// [es6ImportNamedImportInExportAssignment_1.ts]
+import { a } from "es6ImportNamedImportInExportAssignment_0";
+export = a;
+
+//// [es6ImportNamedImportInExportAssignment_0.js]
+exports.a = 10;
+//// [es6ImportNamedImportInExportAssignment_1.js]
+var _a = require("es6ImportNamedImportInExportAssignment_0");
+var a = _a.a;
+module.exports = a;
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.types b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.types
new file mode 100644
index 00000000000..cd72f35c8bf
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/es6ImportNamedImportInExportAssignment_0.ts ===
+
+export var a = 10;
+>a : number
+
+=== tests/cases/compiler/es6ImportNamedImportInExportAssignment_1.ts ===
+import { a } from "es6ImportNamedImportInExportAssignment_0";
+>a : number
+
+export = a;
+>a : number
+
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
new file mode 100644
index 00000000000..982209df189
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts] ////
+
+//// [es6ImportNamedImportInIndirectExportAssignment_0.ts]
+
+export module a {
+    export class c {
+    }
+}
+
+//// [es6ImportNamedImportInIndirectExportAssignment_1.ts]
+import { a } from "es6ImportNamedImportInIndirectExportAssignment_0";
+import x = a;
+export = x;
+
+//// [es6ImportNamedImportInIndirectExportAssignment_0.js]
+var a;
+(function (a) {
+    var c = (function () {
+        function c() {
+        }
+        return c;
+    })();
+    a.c = c;
+})(a = exports.a || (exports.a = {}));
+//// [es6ImportNamedImportInIndirectExportAssignment_1.js]
+var _a = require("es6ImportNamedImportInIndirectExportAssignment_0");
+var a = _a.a;
+var x = a;
+module.exports = x;
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types
new file mode 100644
index 00000000000..36792ece82e
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment_0.ts ===
+
+export module a {
+>a : typeof a
+
+    export class c {
+>c : c
+    }
+}
+
+=== tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment_1.ts ===
+import { a } from "es6ImportNamedImportInIndirectExportAssignment_0";
+>a : typeof a
+
+import x = a;
+>x : typeof a
+>a : typeof a
+
+export = x;
+>x : typeof a
+
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt b/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt
new file mode 100644
index 00000000000..b9461b6caca
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt
@@ -0,0 +1,33 @@
+tests/cases/compiler/es6ImportNamedImportMergeErrors_1.ts(5,10): error TS2440: Import declaration conflicts with local declaration of 'x'
+tests/cases/compiler/es6ImportNamedImportMergeErrors_1.ts(7,10): error TS2440: Import declaration conflicts with local declaration of 'x44'
+tests/cases/compiler/es6ImportNamedImportMergeErrors_1.ts(9,10): error TS2300: Duplicate identifier 'z'.
+tests/cases/compiler/es6ImportNamedImportMergeErrors_1.ts(10,16): error TS2300: Duplicate identifier 'z'.
+
+
+==== tests/cases/compiler/es6ImportNamedImportMergeErrors_0.ts (0 errors) ====
+    
+    export var a = 10;
+    export var x = a;
+    export var z = a;
+    export var z1 = a;
+    
+==== tests/cases/compiler/es6ImportNamedImportMergeErrors_1.ts (4 errors) ====
+    import { a } from "es6ImportNamedImportMergeErrors_0";
+    interface a { } // shouldnt be error
+    import { x as x1 } from "es6ImportNamedImportMergeErrors_0";
+    interface x1 { } // shouldnt be error
+    import { x } from "es6ImportNamedImportMergeErrors_0"; // should be error
+             ~
+!!! error TS2440: Import declaration conflicts with local declaration of 'x'
+    var x = 10; 
+    import { x as x44 } from "es6ImportNamedImportMergeErrors_0"; // should be error
+             ~~~~~~~~
+!!! error TS2440: Import declaration conflicts with local declaration of 'x44'
+    var x44 = 10; 
+    import { z } from "es6ImportNamedImportMergeErrors_0"; // should be error
+             ~
+!!! error TS2300: Duplicate identifier 'z'.
+    import { z1 as z } from "es6ImportNamedImportMergeErrors_0"; // should be error
+                   ~
+!!! error TS2300: Duplicate identifier 'z'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
new file mode 100644
index 00000000000..fad411f557d
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
@@ -0,0 +1,30 @@
+//// [tests/cases/compiler/es6ImportNamedImportMergeErrors.ts] ////
+
+//// [es6ImportNamedImportMergeErrors_0.ts]
+
+export var a = 10;
+export var x = a;
+export var z = a;
+export var z1 = a;
+
+//// [es6ImportNamedImportMergeErrors_1.ts]
+import { a } from "es6ImportNamedImportMergeErrors_0";
+interface a { } // shouldnt be error
+import { x as x1 } from "es6ImportNamedImportMergeErrors_0";
+interface x1 { } // shouldnt be error
+import { x } from "es6ImportNamedImportMergeErrors_0"; // should be error
+var x = 10; 
+import { x as x44 } from "es6ImportNamedImportMergeErrors_0"; // should be error
+var x44 = 10; 
+import { z } from "es6ImportNamedImportMergeErrors_0"; // should be error
+import { z1 as z } from "es6ImportNamedImportMergeErrors_0"; // should be error
+
+
+//// [es6ImportNamedImportMergeErrors_0.js]
+exports.a = 10;
+exports.x = exports.a;
+exports.z = exports.a;
+exports.z1 = exports.a;
+//// [es6ImportNamedImportMergeErrors_1.js]
+var x = 10;
+var x44 = 10;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.errors.txt b/tests/baselines/reference/es6ImportNamedImportNoExportMember.errors.txt
new file mode 100644
index 00000000000..57a77410cb2
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/compiler/es6ImportNamedImport_1.ts(1,10): error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
+tests/cases/compiler/es6ImportNamedImport_1.ts(2,10): error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
+
+
+==== tests/cases/compiler/es6ImportNamedImportNoExportMember_0.ts (0 errors) ====
+    
+    export var a = 10;
+    export var x = a;
+    
+==== tests/cases/compiler/es6ImportNamedImport_1.ts (2 errors) ====
+    import { a1 } from "es6ImportNamedImportNoExportMember_0";
+             ~~
+!!! error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
+    import { x1 as x } from "es6ImportNamedImportNoExportMember_0";
+             ~~
+!!! error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
new file mode 100644
index 00000000000..da473fa42a3
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
@@ -0,0 +1,15 @@
+//// [tests/cases/compiler/es6ImportNamedImportNoExportMember.ts] ////
+
+//// [es6ImportNamedImportNoExportMember_0.ts]
+
+export var a = 10;
+export var x = a;
+
+//// [es6ImportNamedImport_1.ts]
+import { a1 } from "es6ImportNamedImportNoExportMember_0";
+import { x1 as x } from "es6ImportNamedImportNoExportMember_0";
+
+//// [es6ImportNamedImportNoExportMember_0.js]
+exports.a = 10;
+exports.x = exports.a;
+//// [es6ImportNamedImport_1.js]
diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
new file mode 100644
index 00000000000..a5abd986ee8
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/compiler/es6ImportNamedImportNoNamedExports_1.ts(1,10): error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoNamedExports_0"' has no exported member 'a'.
+tests/cases/compiler/es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoNamedExports_0"' has no exported member 'a'.
+
+
+==== tests/cases/compiler/es6ImportNamedImportNoNamedExports_0.ts (0 errors) ====
+    
+    var a = 10;
+    export = a;
+    
+==== tests/cases/compiler/es6ImportNamedImportNoNamedExports_1.ts (2 errors) ====
+    import { a } from "es6ImportNamedImportNoNamedExports_0";
+             ~
+!!! error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoNamedExports_0"' has no exported member 'a'.
+    import { a as x } from "es6ImportNamedImportNoNamedExports_0";
+             ~
+!!! error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoNamedExports_0"' has no exported member 'a'.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
new file mode 100644
index 00000000000..524860827e6
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
@@ -0,0 +1,15 @@
+//// [tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts] ////
+
+//// [es6ImportNamedImportNoNamedExports_0.ts]
+
+var a = 10;
+export = a;
+
+//// [es6ImportNamedImportNoNamedExports_1.ts]
+import { a } from "es6ImportNamedImportNoNamedExports_0";
+import { a as x } from "es6ImportNamedImportNoNamedExports_0";
+
+//// [es6ImportNamedImportNoNamedExports_0.js]
+var a = 10;
+module.exports = a;
+//// [es6ImportNamedImportNoNamedExports_1.js]
diff --git a/tests/cases/compiler/es6ImportNamedImport.ts b/tests/cases/compiler/es6ImportNamedImport.ts
index ed34434bd29..0a12e10169b 100644
--- a/tests/cases/compiler/es6ImportNamedImport.ts
+++ b/tests/cases/compiler/es6ImportNamedImport.ts
@@ -1,5 +1,6 @@
 // @target: es6
 // @module: commonjs
+// @declaration: true
 
 // @filename: es6ImportNamedImport_0.ts
 export var a = 10;
@@ -7,13 +8,35 @@ export var x = a;
 export var m = a;
 export var a1 = 10;
 export var x1 = 10;
+export var z1 = 10;
+export var z2 = 10;
+export var aaaa = 10;
 
 // @filename: es6ImportNamedImport_1.ts
 import { } from "es6ImportNamedImport_0";
 import { a } from "es6ImportNamedImport_0";
+var xxxx = a;
 import { a as b } from "es6ImportNamedImport_0";
+var xxxx = b;
 import { x, a as y } from "es6ImportNamedImport_0";
+var xxxx = x;
+var xxxx = y;
 import { x as z,  } from "es6ImportNamedImport_0";
+var xxxx = z;
 import { m,  } from "es6ImportNamedImport_0";
+var xxxx = m;
 import { a1, x1 } from "es6ImportNamedImport_0";
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
\ No newline at end of file
+var xxxx = a1;
+var xxxx = x1;
+import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
+var xxxx = a11;
+var xxxx = x11;
+import { z1 } from "es6ImportNamedImport_0";
+var z111 = z1;
+import { z2 as z3 } from "es6ImportNamedImport_0";
+var z2 = z3; // z2 shouldn't give redeclare error
+
+// These are elided
+import { aaaa } from "es6ImportNamedImport_0";
+// These are elided
+import { aaaa as bbbb } from "es6ImportNamedImport_0";
diff --git a/tests/cases/compiler/es6ImportNamedImportAmd.ts b/tests/cases/compiler/es6ImportNamedImportAmd.ts
new file mode 100644
index 00000000000..3ddf1a4cf52
--- /dev/null
+++ b/tests/cases/compiler/es6ImportNamedImportAmd.ts
@@ -0,0 +1,41 @@
+// @module: amd
+// @declaration: true
+
+// @filename: es6ImportNamedImportAmd_0.ts
+export var a = 10;
+export var x = a;
+export var m = a;
+export var a1 = 10;
+export var x1 = 10;
+export var z1 = 10;
+export var z2 = 10;
+export var aaaa = 10;
+
+// @filename: es6ImportNamedImportAmd_1.ts
+import { } from "es6ImportNamedImportAmd_0";
+import { a } from "es6ImportNamedImportAmd_0";
+var xxxx = a;
+import { a as b } from "es6ImportNamedImportAmd_0";
+var xxxx = b;
+import { x, a as y } from "es6ImportNamedImportAmd_0";
+var xxxx = x;
+var xxxx = y;
+import { x as z,  } from "es6ImportNamedImportAmd_0";
+var xxxx = z;
+import { m,  } from "es6ImportNamedImportAmd_0";
+var xxxx = m;
+import { a1, x1 } from "es6ImportNamedImportAmd_0";
+var xxxx = a1;
+var xxxx = x1;
+import { a1 as a11, x1 as x11 } from "es6ImportNamedImportAmd_0";
+var xxxx = a11;
+var xxxx = x11;
+import { z1 } from "es6ImportNamedImportAmd_0";
+var z111 = z1;
+import { z2 as z3 } from "es6ImportNamedImportAmd_0";
+var z2 = z3; // z2 shouldn't give redeclare error
+
+// These are elided
+import { aaaa } from "es6ImportNamedImportAmd_0";
+// These are elided
+import { aaaa as bbbb } from "es6ImportNamedImportAmd_0";
diff --git a/tests/cases/compiler/es6ImportNamedImportInEs5.ts b/tests/cases/compiler/es6ImportNamedImportInEs5.ts
index 22e66bc95fa..e12a8d032d3 100644
--- a/tests/cases/compiler/es6ImportNamedImportInEs5.ts
+++ b/tests/cases/compiler/es6ImportNamedImportInEs5.ts
@@ -1,5 +1,6 @@
 // @target: es5
 // @module: commonjs
+// @declaration: true
 
 // @filename: es6ImportNamedImportInEs5_0.ts
 export var a = 10;
@@ -7,13 +8,35 @@ export var x = a;
 export var m = a;
 export var a1 = 10;
 export var x1 = 10;
+export var z1 = 10;
+export var z2 = 10;
+export var aaaa = 10;
 
 // @filename: es6ImportNamedImportInEs5_1.ts
 import { } from "es6ImportNamedImportInEs5_0";
 import { a } from "es6ImportNamedImportInEs5_0";
+var xxxx = a;
 import { a as b } from "es6ImportNamedImportInEs5_0";
+var xxxx = b;
 import { x, a as y } from "es6ImportNamedImportInEs5_0";
+var xxxx = x;
+var xxxx = y;
 import { x as z,  } from "es6ImportNamedImportInEs5_0";
+var xxxx = z;
 import { m,  } from "es6ImportNamedImportInEs5_0";
+var xxxx = m;
 import { a1, x1 } from "es6ImportNamedImportInEs5_0";
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImportInEs5_0";
\ No newline at end of file
+var xxxx = a1;
+var xxxx = x1;
+import { a1 as a11, x1 as x11 } from "es6ImportNamedImportInEs5_0";
+var xxxx = a11;
+var xxxx = x11;
+import { z1 } from "es6ImportNamedImportInEs5_0";
+var z111 = z1;
+import { z2 as z3 } from "es6ImportNamedImportInEs5_0";
+var z2 = z3; // z2 shouldn't give redeclare error
+
+// These are elided
+import { aaaa } from "es6ImportNamedImportInEs5_0";
+// These are elided
+import { aaaa as bbbb } from "es6ImportNamedImportInEs5_0";
diff --git a/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts b/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts
new file mode 100644
index 00000000000..9976f20f080
--- /dev/null
+++ b/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts
@@ -0,0 +1,9 @@
+// @target: es6
+// @module: commonjs
+
+// @filename: es6ImportNamedImportInExportAssignment_0.ts
+export var a = 10;
+
+// @filename: es6ImportNamedImportInExportAssignment_1.ts
+import { a } from "es6ImportNamedImportInExportAssignment_0";
+export = a;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts b/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
new file mode 100644
index 00000000000..c9e85bbbd65
--- /dev/null
+++ b/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
@@ -0,0 +1,13 @@
+// @target: es6
+// @module: commonjs
+
+// @filename: es6ImportNamedImportInIndirectExportAssignment_0.ts
+export module a {
+    export class c {
+    }
+}
+
+// @filename: es6ImportNamedImportInIndirectExportAssignment_1.ts
+import { a } from "es6ImportNamedImportInIndirectExportAssignment_0";
+import x = a;
+export = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts b/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts
new file mode 100644
index 00000000000..950554b971d
--- /dev/null
+++ b/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts
@@ -0,0 +1,20 @@
+// @target: es6
+// @module: commonjs
+
+// @filename: es6ImportNamedImportMergeErrors_0.ts
+export var a = 10;
+export var x = a;
+export var z = a;
+export var z1 = a;
+
+// @filename: es6ImportNamedImportMergeErrors_1.ts
+import { a } from "es6ImportNamedImportMergeErrors_0";
+interface a { } // shouldnt be error
+import { x as x1 } from "es6ImportNamedImportMergeErrors_0";
+interface x1 { } // shouldnt be error
+import { x } from "es6ImportNamedImportMergeErrors_0"; // should be error
+var x = 10; 
+import { x as x44 } from "es6ImportNamedImportMergeErrors_0"; // should be error
+var x44 = 10; 
+import { z } from "es6ImportNamedImportMergeErrors_0"; // should be error
+import { z1 as z } from "es6ImportNamedImportMergeErrors_0"; // should be error
diff --git a/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts b/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts
new file mode 100644
index 00000000000..2dcb2364660
--- /dev/null
+++ b/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts
@@ -0,0 +1,10 @@
+// @target: es6
+// @module: commonjs
+
+// @filename: es6ImportNamedImportNoExportMember_0.ts
+export var a = 10;
+export var x = a;
+
+// @filename: es6ImportNamedImport_1.ts
+import { a1 } from "es6ImportNamedImportNoExportMember_0";
+import { x1 as x } from "es6ImportNamedImportNoExportMember_0";
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts b/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts
new file mode 100644
index 00000000000..a51d70ad50e
--- /dev/null
+++ b/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts
@@ -0,0 +1,10 @@
+// @target: es6
+// @module: commonjs
+
+// @filename: es6ImportNamedImportNoNamedExports_0.ts
+var a = 10;
+export = a;
+
+// @filename: es6ImportNamedImportNoNamedExports_1.ts
+import { a } from "es6ImportNamedImportNoNamedExports_0";
+import { a as x } from "es6ImportNamedImportNoNamedExports_0";
\ No newline at end of file