Corrected codegen to support shadowed module names.

src/compiler/emitter.ts

@@ -1755,16 +1755,13 @@ module ts {
                 if (!isInstantiated(node)) {
                     return emitPinnedOrTripleSlashComments(node);
                 }
-
                 emitLeadingComments(node);
-                if (!(node.flags & NodeFlags.Export)) {
-                    emitStart(node);
-                    write("var ");
-                    emit(node.name);
-                    write(";");
-                    emitEnd(node);
-                    writeLine();
-                }
+                emitStart(node);
+                write("var ");
+                emit(node.name);
+                write(";");
+                emitEnd(node);
+                writeLine();
                 emitStart(node);
                 write("(function (");
                 emitStart(node.name);
@@ -1788,21 +1785,15 @@ module ts {
                     scopeEmitEnd();
                 }
                 write(")(");
+                if (node.flags & NodeFlags.Export) {
+                    emit(node.name);
+                    write(" = ");
+                }
                 emitModuleMemberName(node);
                 write(" || (");
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (node.flags & NodeFlags.Export) {
-                    writeLine();
-                    emitStart(node);
-                    write("var ");
-                    emit(node.name);
-                    write(" = ");
-                    emitModuleMemberName(node);
-                    emitEnd(node);
-                    write(";");
-                }
                 emitTrailingComments(node);
             }
 

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js

@@ -53,11 +53,11 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var Point;
     (function (Point) {
         function Origin() {
             return "";
         }
         Point.Origin = Origin; //expected duplicate identifier error
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js

@@ -52,10 +52,10 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var Point;
     (function (Point) {
         function Origin() {
             return "";
         } // not an error since not exported
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js

@@ -46,8 +46,8 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var Point;
     (function (Point) {
         Point.Origin = ""; //expected duplicate identifier error
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js

@@ -46,8 +46,8 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var Point;
     (function (Point) {
         var Origin = ""; // not an error since not exported
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js

@@ -43,6 +43,7 @@ var a: { id: string };
 //// [class.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
         var Point = (function () {
             function Point(x, y) {
@@ -52,19 +53,18 @@ var X;
             return Point;
         })();
         Y.Point = Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 //// [module.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Point;
         (function (Point) {
             Point.Origin = new Point(0, 0);
-        })(Y.Point || (Y.Point = {}));
-        var Point = Y.Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Point = Y.Point || (Y.Point = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 //// [test.js]
 //var cl: { x: number; y: number; }

tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js

@@ -31,6 +31,7 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var B;
     (function (B) {
         B.Origin = new Point(0, 0);
         var Line = (function () {
@@ -42,6 +43,5 @@ var A;
             return Line;
         })();
         B.Line = Line;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));

tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js

@@ -54,10 +54,10 @@ var A;
 //// [module.js]
 var A;
 (function (A) {
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));
 //// [test.js]
 var fn;
@@ -72,10 +72,10 @@ var B;
         return { x: 0, y: 0 };
     }
     B.Point = Point;
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(B.Point || (B.Point = {}));
-    var Point = B.Point;
+    })(Point = B.Point || (B.Point = {}));
 })(B || (B = {}));
 var fn;
 var fn = B.Point; // not expected to be an error. bug 840000: [corelang] Function of fundule not assignalbe as expected

tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js

@@ -33,10 +33,10 @@ var A;
 //// [module.js]
 var B;
 (function (B) {
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(B.Point || (B.Point = {}));
-    var Point = B.Point;
+    })(Point = B.Point || (B.Point = {}));
 })(B || (B = {}));
 //// [test.js]
 var fn;

tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js

@@ -34,17 +34,18 @@ class A {
 //// [module.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Point;
         (function (Point) {
             Point.Origin = new Point(0, 0);
-        })(Y.Point || (Y.Point = {}));
-        var Point = Y.Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Point = Y.Point || (Y.Point = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 //// [classPoint.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
         // duplicate identifier
         var Point = (function () {
@@ -55,8 +56,7 @@ var X;
             return Point;
         })();
         Y.Point = Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 //// [simple.js]
 var A;

tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js

@@ -32,10 +32,10 @@ module B {
 //// [module.js]
 var A;
 (function (A) {
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));
 //// [function.js]
 var A;
@@ -49,10 +49,10 @@ var A;
 //// [simple.js]
 var B;
 (function (B) {
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(B.Point || (B.Point = {}));
-    var Point = B.Point;
+    })(Point = B.Point || (B.Point = {}));
     // duplicate identifier error
     function Point() {
         return { x: 0, y: 0 };

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js

@@ -66,7 +66,9 @@ var p;
 var p;
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             var Line = (function () {
                 function Line() {
@@ -74,24 +76,22 @@ var X;
                 return Line;
             })();
             Z.Line = Line;
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             var Line = (function () {
                 function Line() {
                 }
                 return Line;
             })();
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 // ensure merges as expected
 var l;

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js

@@ -44,13 +44,13 @@ var p = new A.Utils.Plane(o, { x: 1, y: 1 });
 //// [part1.js]
 var A;
 (function (A) {
+    var Utils;
     (function (Utils) {
         function mirror(p) {
             return { x: p.y, y: p.x };
         }
         Utils.mirror = mirror;
-    })(A.Utils || (A.Utils = {}));
-    var Utils = A.Utils;
+    })(Utils = A.Utils || (A.Utils = {}));
     A.Origin = { x: 0, y: 0 };
 })(A || (A = {}));
 //// [part2.js]
@@ -58,6 +58,7 @@ var A;
 (function (A) {
     // not a collision, since we don't export
     var Origin = "0,0";
+    var Utils;
     (function (Utils) {
         var Plane = (function () {
             function Plane(tl, br) {
@@ -67,8 +68,7 @@ var A;
             return Plane;
         })();
         Utils.Plane = Plane;
-    })(A.Utils || (A.Utils = {}));
-    var Utils = A.Utils;
+    })(Utils = A.Utils || (A.Utils = {}));
 })(A || (A = {}));
 //// [part3.js]
 // test the merging actually worked

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js

@@ -54,7 +54,9 @@ var A;
 })(A || (A = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             var Line = (function () {
                 function Line() {
@@ -62,14 +64,14 @@ var X;
                 return Line;
             })();
             Z.Line = Line;
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             // expected error
             var Line = (function () {
@@ -78,8 +80,6 @@ var X;
                 return Line;
             })();
             Z.Line = Line;
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js

@@ -37,10 +37,10 @@ var l: X.Y.Z.Line;
 //// [TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
         B.x;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var A;
 (function (A) {
@@ -54,7 +54,9 @@ var x;
 var x = A.B.x;
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             var Line = (function () {
                 function Line() {
@@ -62,13 +64,12 @@ var X;
                 return Line;
             })();
             Z.Line = Line;
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
         var Z;
         (function (Z) {
@@ -79,8 +80,7 @@ var X;
             })();
             Z.Line = Line;
         })(Z || (Z = {}));
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 // make sure merging works as expected
 var l;

tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js

@@ -33,23 +33,25 @@ module otherRoot {
 //// [part1.js]
 var Root;
 (function (Root) {
+    var A;
     (function (A) {
+        var Utils;
         (function (Utils) {
             function mirror(p) {
                 return { x: p.y, y: p.x };
             }
             Utils.mirror = mirror;
-        })(A.Utils || (A.Utils = {}));
-        var Utils = A.Utils;
-    })(Root.A || (Root.A = {}));
-    var A = Root.A;
+        })(Utils = A.Utils || (A.Utils = {}));
+    })(A = Root.A || (Root.A = {}));
 })(Root || (Root = {}));
 //// [part2.js]
 var otherRoot;
 (function (otherRoot) {
+    var A;
     (function (A) {
         // have to be fully qualified since in different root
         A.Origin = { x: 0, y: 0 };
+        var Utils;
         (function (Utils) {
             var Plane = (function () {
                 function Plane(tl, br) {
@@ -59,8 +61,6 @@ var otherRoot;
                 return Plane;
             })();
             Utils.Plane = Plane;
-        })(A.Utils || (A.Utils = {}));
-        var Utils = A.Utils;
-    })(otherRoot.A || (otherRoot.A = {}));
-    var A = otherRoot.A;
+        })(Utils = A.Utils || (A.Utils = {}));
+    })(A = otherRoot.A || (otherRoot.A = {}));
 })(otherRoot || (otherRoot = {}));

tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js

@@ -42,18 +42,19 @@ var p = new A.Utils.Plane(o, { x: 1, y: 1 });
 //// [part1.js]
 var A;
 (function (A) {
+    var Utils;
     (function (Utils) {
         function mirror(p) {
             return { x: p.y, y: p.x };
         }
         Utils.mirror = mirror;
-    })(A.Utils || (A.Utils = {}));
-    var Utils = A.Utils;
+    })(Utils = A.Utils || (A.Utils = {}));
 })(A || (A = {}));
 //// [part2.js]
 var A;
 (function (A) {
     A.Origin = { x: 0, y: 0 };
+    var Utils;
     (function (Utils) {
         var Plane = (function () {
             function Plane(tl, br) {
@@ -63,8 +64,7 @@ var A;
             return Plane;
         })();
         Utils.Plane = Plane;
-    })(A.Utils || (A.Utils = {}));
-    var Utils = A.Utils;
+    })(Utils = A.Utils || (A.Utils = {}));
 })(A || (A = {}));
 //// [part3.js]
 // test the merging actually worked

tests/baselines/reference/aliasBug.js

@@ -29,7 +29,9 @@ var foo;
         return Provide;
     })();
     foo.Provide = Provide;
+    var bar;
     (function (bar) {
+        var baz;
         (function (baz) {
             var boo = (function () {
                 function boo() {
@@ -37,10 +39,8 @@ var foo;
                 return boo;
             })();
             baz.boo = boo;
-        })(bar.baz || (bar.baz = {}));
-        var baz = bar.baz;
-    })(foo.bar || (foo.bar = {}));
-    var bar = foo.bar;
+        })(baz = bar.baz || (bar.baz = {}));
+    })(bar = foo.bar || (foo.bar = {}));
 })(foo || (foo = {}));
 var provide = foo;
 var booz = foo.bar.baz;

tests/baselines/reference/assignmentToParenthesizedIdentifiers.js

@@ -91,10 +91,10 @@ M = { y: 3 }; // Error
 (M) = { y: 3 }; // Error
 var M2;
 (function (M2) {
+    var M3;
     (function (M3) {
         M3.x;
-    })(M2.M3 || (M2.M3 = {}));
-    var M3 = M2.M3;
+    })(M3 = M2.M3 || (M2.M3 = {}));
     M3 = { x: 3 }; // Error
 })(M2 || (M2 = {}));
 M2.M3 = { x: 3 }; // OK

tests/baselines/reference/chainedImportAlias.js

@@ -12,12 +12,12 @@ y.m.foo();
 
 
 //// [chainedImportAlias_file0.js]
+var m;
 (function (m) {
     function foo() {
     }
     m.foo = foo;
-})(exports.m || (exports.m = {}));
-var m = exports.m;
+})(m = exports.m || (exports.m = {}));
 //// [chainedImportAlias_file1.js]
 var x = require('chainedImportAlias_file0');
 var y = x;

tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js

@@ -26,10 +26,10 @@ var M;
         return N;
     })();
     M.N = N;
+    var N;
     (function (N) {
         N.v = 0;
-    })(M.N || (M.N = {}));
-    var N = M.N;
+    })(N = M.N || (M.N = {}));
 })(M || (M = {}));
 var M;
 (function (M) {

tests/baselines/reference/cloduleAcrossModuleDefinitions.js

@@ -31,9 +31,9 @@ var A;
 })(A || (A = {}));
 var A;
 (function (A) {
+    var B;
     (function (B) {
         B.x = 1;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var b; // ok

tests/baselines/reference/cloduleWithRecursiveReference.js

@@ -16,8 +16,8 @@ var M;
         return C;
     })();
     M.C = C;
+    var C;
     (function (_C) {
         _C.C = M.C;
-    })(M.C || (M.C = {}));
-    var C = M.C;
+    })(C = M.C || (M.C = {}));
 })(M || (M = {}));

tests/baselines/reference/clodulesDerivedClasses.js

@@ -36,13 +36,13 @@ var Shape = (function () {
 })();
 var Shape;
 (function (Shape) {
+    var Utils;
     (function (Utils) {
         function convert() {
             return null;
         }
         Utils.convert = convert;
-    })(Shape.Utils || (Shape.Utils = {}));
-    var Utils = Shape.Utils;
+    })(Utils = Shape.Utils || (Shape.Utils = {}));
 })(Shape || (Shape = {}));
 var Path = (function (_super) {
     __extends(Path, _super);
@@ -53,11 +53,11 @@ var Path = (function (_super) {
 })(Shape);
 var Path;
 (function (Path) {
+    var Utils;
     (function (Utils) {
         function convert2() {
             return null;
         }
         Utils.convert2 = convert2;
-    })(Path.Utils || (Path.Utils = {}));
-    var Utils = Path.Utils;
+    })(Utils = Path.Utils || (Path.Utils = {}));
 })(Path || (Path = {}));

tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js

@@ -24,6 +24,7 @@ module m2 {
 
 //// [collisionExportsRequireAndInternalModuleAlias.js]
 define(["require", "exports"], function (require, exports) {
+    var m;
     (function (m) {
         var c = (function () {
             function c() {
@@ -31,8 +32,7 @@ define(["require", "exports"], function (require, exports) {
             return c;
         })();
         m.c = c;
-    })(exports.m || (exports.m = {}));
-    var m = exports.m;
+    })(m = exports.m || (exports.m = {}));
     var exports = m.c;
     var require = m.c;
     new exports();

tests/baselines/reference/collisionExportsRequireAndModule.js

@@ -93,6 +93,7 @@ module m4 {
 
 //// [collisionExportsRequireAndModule_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
+    var require;
     (function (require) {
         var C = (function () {
             function C() {
@@ -100,12 +101,12 @@ define(["require", "exports"], function (require, exports) {
             return C;
         })();
         require.C = C;
-    })(exports.require || (exports.require = {}));
-    var require = exports.require;
+    })(require = exports.require || (exports.require = {}));
     function foo() {
         return null;
     }
     exports.foo = foo;
+    var exports;
     (function (exports) {
         var C = (function () {
             function C() {
@@ -113,8 +114,7 @@ define(["require", "exports"], function (require, exports) {
             return C;
         })();
         exports.C = C;
-    })(exports.exports || (exports.exports = {}));
-    var exports = exports.exports;
+    })(exports = exports.exports || (exports.exports = {}));
     function foo2() {
         return null;
     }
@@ -142,6 +142,7 @@ define(["require", "exports"], function (require, exports) {
     })(m1 || (m1 = {}));
     var m2;
     (function (m2) {
+        var require;
         (function (require) {
             var C = (function () {
                 function C() {
@@ -149,8 +150,8 @@ define(["require", "exports"], function (require, exports) {
                 return C;
             })();
             require.C = C;
-        })(m2.require || (m2.require = {}));
-        var require = m2.require;
+        })(require = m2.require || (m2.require = {}));
+        var exports;
         (function (exports) {
             var C = (function () {
                 function C() {
@@ -158,8 +159,7 @@ define(["require", "exports"], function (require, exports) {
                 return C;
             })();
             exports.C = C;
-        })(m2.exports || (m2.exports = {}));
-        var exports = m2.exports;
+        })(exports = m2.exports || (m2.exports = {}));
     })(m2 || (m2 = {}));
 });
 //// [collisionExportsRequireAndModule_globalFile.js]
@@ -204,6 +204,7 @@ var m3;
 })(m3 || (m3 = {}));
 var m4;
 (function (m4) {
+    var require;
     (function (require) {
         var C = (function () {
             function C() {
@@ -211,8 +212,8 @@ var m4;
             return C;
         })();
         require.C = C;
-    })(m4.require || (m4.require = {}));
-    var require = m4.require;
+    })(require = m4.require || (m4.require = {}));
+    var exports;
     (function (exports) {
         var C = (function () {
             function C() {
@@ -220,6 +221,5 @@ var m4;
             return C;
         })();
         exports.C = C;
-    })(m4.exports || (m4.exports = {}));
-    var exports = m4.exports;
+    })(exports = m4.exports || (m4.exports = {}));
 })(m4 || (m4 = {}));

tests/baselines/reference/commentsDottedModuleName.js

@@ -10,7 +10,9 @@ export module outerModule.InnerModule {
 //// [commentsDottedModuleName.js]
 define(["require", "exports"], function (require, exports) {
     /** this is multi declare module*/
+    var outerModule;
     (function (outerModule) {
+        var InnerModule;
         (function (InnerModule) {
             /// class b comment
             var b = (function () {
@@ -19,10 +21,8 @@ define(["require", "exports"], function (require, exports) {
                 return b;
             })();
             InnerModule.b = b;
-        })(outerModule.InnerModule || (outerModule.InnerModule = {}));
-        var InnerModule = outerModule.InnerModule;
-    })(exports.outerModule || (exports.outerModule = {}));
-    var outerModule = exports.outerModule;
+        })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {}));
+    })(outerModule = exports.outerModule || (exports.outerModule = {}));
 });
 
 

tests/baselines/reference/commentsExternalModules.js

@@ -64,6 +64,7 @@ var newVar2 = new extMod.m4.m2.c();
 //// [commentsExternalModules_0.js]
 define(["require", "exports"], function (require, exports) {
     /** Module comment*/
+    var m1;
     (function (m1) {
         /** b's comment*/
         m1.b;
@@ -72,6 +73,7 @@ define(["require", "exports"], function (require, exports) {
             return m1.b;
         }
         /** m2 comments*/
+        var m2;
         (function (m2) {
             /** class comment;*/
             var c = (function () {
@@ -83,18 +85,17 @@ define(["require", "exports"], function (require, exports) {
             ;
             /** i*/
             m2.i = new c();
-        })(m1.m2 || (m1.m2 = {}));
-        var m2 = m1.m2;
+        })(m2 = m1.m2 || (m1.m2 = {}));
         /** exported function*/
         function fooExport() {
             return foo();
         }
         m1.fooExport = fooExport;
-    })(exports.m1 || (exports.m1 = {}));
-    var m1 = exports.m1;
+    })(m1 = exports.m1 || (exports.m1 = {}));
     m1.fooExport();
     var myvar = new m1.m2.c();
     /** Module comment */
+    var m4;
     (function (m4) {
         /** b's comment */
         m4.b;
@@ -105,6 +106,7 @@ define(["require", "exports"], function (require, exports) {
         }
         /** m2 comments
         */
+        var m2;
         (function (m2) {
             /** class comment; */
             var c = (function () {
@@ -116,15 +118,13 @@ define(["require", "exports"], function (require, exports) {
             ;
             /** i */
             m2.i = new c();
-        })(m4.m2 || (m4.m2 = {}));
-        var m2 = m4.m2;
+        })(m2 = m4.m2 || (m4.m2 = {}));
         /** exported function */
         function fooExport() {
             return foo();
         }
         m4.fooExport = fooExport;
-    })(exports.m4 || (exports.m4 = {}));
-    var m4 = exports.m4;
+    })(m4 = exports.m4 || (exports.m4 = {}));
     m4.fooExport();
     var myvar2 = new m4.m2.c();
 });

tests/baselines/reference/commentsExternalModules2.js

@@ -64,6 +64,7 @@ export var newVar2 = new extMod.m4.m2.c();
 //// [commentsExternalModules2_0.js]
 define(["require", "exports"], function (require, exports) {
     /** Module comment*/
+    var m1;
     (function (m1) {
         /** b's comment*/
         m1.b;
@@ -72,6 +73,7 @@ define(["require", "exports"], function (require, exports) {
             return m1.b;
         }
         /** m2 comments*/
+        var m2;
         (function (m2) {
             /** class comment;*/
             var c = (function () {
@@ -83,18 +85,17 @@ define(["require", "exports"], function (require, exports) {
             ;
             /** i*/
             m2.i = new c();
-        })(m1.m2 || (m1.m2 = {}));
-        var m2 = m1.m2;
+        })(m2 = m1.m2 || (m1.m2 = {}));
         /** exported function*/
         function fooExport() {
             return foo();
         }
         m1.fooExport = fooExport;
-    })(exports.m1 || (exports.m1 = {}));
-    var m1 = exports.m1;
+    })(m1 = exports.m1 || (exports.m1 = {}));
     m1.fooExport();
     var myvar = new m1.m2.c();
     /** Module comment */
+    var m4;
     (function (m4) {
         /** b's comment */
         m4.b;
@@ -105,6 +106,7 @@ define(["require", "exports"], function (require, exports) {
         }
         /** m2 comments
         */
+        var m2;
         (function (m2) {
             /** class comment; */
             var c = (function () {
@@ -116,15 +118,13 @@ define(["require", "exports"], function (require, exports) {
             ;
             /** i */
             m2.i = new c();
-        })(m4.m2 || (m4.m2 = {}));
-        var m2 = m4.m2;
+        })(m2 = m4.m2 || (m4.m2 = {}));
         /** exported function */
         function fooExport() {
             return foo();
         }
         m4.fooExport = fooExport;
-    })(exports.m4 || (exports.m4 = {}));
-    var m4 = exports.m4;
+    })(m4 = exports.m4 || (exports.m4 = {}));
     m4.fooExport();
     var myvar2 = new m4.m2.c();
 });

tests/baselines/reference/commentsExternalModules3.js

@@ -63,6 +63,7 @@ export var newVar2 = new extMod.m4.m2.c();
 
 //// [commentsExternalModules2_0.js]
 /** Module comment*/
+var m1;
 (function (m1) {
     /** b's comment*/
     m1.b;
@@ -71,6 +72,7 @@ export var newVar2 = new extMod.m4.m2.c();
         return m1.b;
     }
     /** m2 comments*/
+    var m2;
     (function (m2) {
         /** class comment;*/
         var c = (function () {
@@ -82,18 +84,17 @@ export var newVar2 = new extMod.m4.m2.c();
         ;
         /** i*/
         m2.i = new c();
-    })(m1.m2 || (m1.m2 = {}));
-    var m2 = m1.m2;
+    })(m2 = m1.m2 || (m1.m2 = {}));
     /** exported function*/
     function fooExport() {
         return foo();
     }
     m1.fooExport = fooExport;
-})(exports.m1 || (exports.m1 = {}));
-var m1 = exports.m1;
+})(m1 = exports.m1 || (exports.m1 = {}));
 m1.fooExport();
 var myvar = new m1.m2.c();
 /** Module comment */
+var m4;
 (function (m4) {
     /** b's comment */
     m4.b;
@@ -104,6 +105,7 @@ var myvar = new m1.m2.c();
     }
     /** m2 comments
     */
+    var m2;
     (function (m2) {
         /** class comment; */
         var c = (function () {
@@ -115,15 +117,13 @@ var myvar = new m1.m2.c();
         ;
         /** i */
         m2.i = new c();
-    })(m4.m2 || (m4.m2 = {}));
-    var m2 = m4.m2;
+    })(m2 = m4.m2 || (m4.m2 = {}));
     /** exported function */
     function fooExport() {
         return foo();
     }
     m4.fooExport = fooExport;
-})(exports.m4 || (exports.m4 = {}));
-var m4 = exports.m4;
+})(m4 = exports.m4 || (exports.m4 = {}));
 m4.fooExport();
 var myvar2 = new m4.m2.c();
 //// [commentsExternalModules_1.js]

tests/baselines/reference/commentsModules.js

@@ -108,6 +108,7 @@ var m1;
         return m1.b;
     }
     /** m2 comments*/
+    var m2;
     (function (m2) {
         /** class comment;*/
         var c = (function () {
@@ -119,8 +120,7 @@ var m1;
         ;
         /** i*/
         m2.i = new c();
-    })(m1.m2 || (m1.m2 = {}));
-    var m2 = m1.m2;
+    })(m2 = m1.m2 || (m1.m2 = {}));
     /** exported function*/
     function fooExport() {
         return foo();
@@ -147,6 +147,7 @@ var myvar = new m1.m2.c();
 /** module comment of m2.m3*/
 var m2;
 (function (m2) {
+    var m3;
     (function (m3) {
         /** Exported class comment*/
         var c = (function () {
@@ -155,14 +156,15 @@ var m2;
             return c;
         })();
         m3.c = c;
-    })(m2.m3 || (m2.m3 = {}));
-    var m3 = m2.m3;
+    })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 || (m2 = {})); /* trailing dotted module comment*/
 new m2.m3.c();
 /** module comment of m3.m4.m5*/
 var m3;
 (function (m3) {
+    var m4;
     (function (m4) {
+        var m5;
         (function (m5) {
             /** Exported class comment*/
             var c = (function () {
@@ -171,17 +173,18 @@ var m3;
                 return c;
             })();
             m5.c = c;
-        })(m4.m5 || (m4.m5 = {}));
-        var m5 = m4.m5;
-    })(m3.m4 || (m3.m4 = {}));
-    var m4 = m3.m4;
+        })(m5 = m4.m5 || (m4.m5 = {}));
+    })(m4 = m3.m4 || (m3.m4 = {}));
 })(m3 || (m3 = {})); // trailing dotted module 2
 new m3.m4.m5.c();
 /** module comment of m4.m5.m6*/
 var m4;
 (function (m4) {
+    var m5;
     (function (m5) {
+        var m6;
         (function (m6) {
+            var m7;
             (function (m7) {
                 /** Exported class comment*/
                 var c = (function () {
@@ -190,20 +193,20 @@ var m4;
                     return c;
                 })();
                 m7.c = c;
-            })(m6.m7 || (m6.m7 = {}));
-            var m7 = m6.m7; /* trailing inner module */ /* multiple comments*/
-        })(m5.m6 || (m5.m6 = {}));
-        var m6 = m5.m6;
-    })(m4.m5 || (m4.m5 = {}));
-    var m5 = m4.m5;
+            })(m7 = m6.m7 || (m6.m7 = {})); /* trailing inner module */ /* multiple comments*/
+        })(m6 = m5.m6 || (m5.m6 = {}));
+    })(m5 = m4.m5 || (m4.m5 = {}));
 })(m4 || (m4 = {}));
 new m4.m5.m6.m7.c();
 /** module comment of m5.m6.m7*/
 var m5;
 (function (m5) {
+    var m6;
     (function (m6) {
+        var m7;
         (function (m7) {
             /** module m8 comment*/
+            var m8;
             (function (m8) {
                 /** Exported class comment*/
                 var c = (function () {
@@ -212,17 +215,16 @@ var m5;
                     return c;
                 })();
                 m8.c = c;
-            })(m7.m8 || (m7.m8 = {}));
-            var m8 = m7.m8;
-        })(m6.m7 || (m6.m7 = {}));
-        var m7 = m6.m7;
-    })(m5.m6 || (m5.m6 = {}));
-    var m6 = m5.m6;
+            })(m8 = m7.m8 || (m7.m8 = {}));
+        })(m7 = m6.m7 || (m6.m7 = {}));
+    })(m6 = m5.m6 || (m5.m6 = {}));
 })(m5 || (m5 = {}));
 new m5.m6.m7.m8.c();
 var m6;
 (function (m6) {
+    var m7;
     (function (m7) {
+        var m8;
         (function (m8) {
             /** Exported class comment*/
             var c = (function () {
@@ -231,16 +233,16 @@ var m6;
                 return c;
             })();
             m8.c = c;
-        })(m7.m8 || (m7.m8 = {}));
-        var m8 = m7.m8;
-    })(m6.m7 || (m6.m7 = {}));
-    var m7 = m6.m7;
+        })(m8 = m7.m8 || (m7.m8 = {}));
+    })(m7 = m6.m7 || (m6.m7 = {}));
 })(m6 || (m6 = {}));
 new m6.m7.m8.c();
 var m7;
 (function (m7) {
+    var m8;
     (function (m8) {
         /** module m9 comment*/
+        var m9;
         (function (m9) {
             /** Exported class comment*/
             var c = (function () {
@@ -262,10 +264,8 @@ var m7;
                 return e;
             })();
             m9.e = e;
-        })(m8.m9 || (m8.m9 = {}));
-        var m9 = m8.m9;
-    })(m7.m8 || (m7.m8 = {}));
-    var m8 = m7.m8;
+        })(m9 = m8.m9 || (m8.m9 = {}));
+    })(m8 = m7.m8 || (m7.m8 = {}));
 })(m7 || (m7 = {}));
 new m7.m8.m9.c();
 

tests/baselines/reference/commentsMultiModuleMultiFile.js

@@ -39,6 +39,7 @@ new multiM.d();
 //// [commentsMultiModuleMultiFile_0.js]
 define(["require", "exports"], function (require, exports) {
     /** this is multi declare module*/
+    var multiM;
     (function (multiM) {
         /// class b comment
         var b = (function () {
@@ -47,9 +48,9 @@ define(["require", "exports"], function (require, exports) {
             return b;
         })();
         multiM.b = b;
-    })(exports.multiM || (exports.multiM = {}));
-    var multiM = exports.multiM;
+    })(multiM = exports.multiM || (exports.multiM = {}));
     /** thi is multi module 2*/
+    var multiM;
     (function (multiM) {
         /** class c comment*/
         var c = (function () {
@@ -65,14 +66,14 @@ define(["require", "exports"], function (require, exports) {
             return e;
         })();
         multiM.e = e;
-    })(exports.multiM || (exports.multiM = {}));
-    var multiM = exports.multiM;
+    })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.b();
     new multiM.c();
 });
 //// [commentsMultiModuleMultiFile_1.js]
 define(["require", "exports"], function (require, exports) {
     /** this is multi module 3 comment*/
+    var multiM;
     (function (multiM) {
         /** class d comment*/
         var d = (function () {
@@ -88,8 +89,7 @@ define(["require", "exports"], function (require, exports) {
             return f;
         })();
         multiM.f = f;
-    })(exports.multiM || (exports.multiM = {}));
-    var multiM = exports.multiM;
+    })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.d();
 });
 

tests/baselines/reference/crashRegressionTest.js

@@ -28,7 +28,9 @@ module MsPortal.Util.TemplateEngine {
 //// [crashRegressionTest.js]
 var MsPortal;
 (function (MsPortal) {
+    var Util;
     (function (Util) {
+        var TemplateEngine;
         (function (TemplateEngine) {
             "use strict";
             var StringTemplate = (function () {
@@ -48,8 +50,6 @@ var MsPortal;
                 return TemplateStorage;
             })();
             TemplateEngine.TemplateStorage = TemplateStorage;
-        })(Util.TemplateEngine || (Util.TemplateEngine = {}));
-        var TemplateEngine = Util.TemplateEngine;
-    })(MsPortal.Util || (MsPortal.Util = {}));
-    var Util = MsPortal.Util;
+        })(TemplateEngine = Util.TemplateEngine || (Util.TemplateEngine = {}));
+    })(Util = MsPortal.Util || (MsPortal.Util = {}));
 })(MsPortal || (MsPortal = {}));

tests/baselines/reference/declFileExportImportChain.js

@@ -28,6 +28,7 @@ export var x: c.b1.a.m2.c1;
 define(["require", "exports"], function (require, exports) {
     var m1;
     (function (m1) {
+        var m2;
         (function (m2) {
             var c1 = (function () {
                 function c1() {
@@ -35,8 +36,7 @@ define(["require", "exports"], function (require, exports) {
                 return c1;
             })();
             m2.c1 = c1;
-        })(m1.m2 || (m1.m2 = {}));
-        var m2 = m1.m2;
+        })(m2 = m1.m2 || (m1.m2 = {}));
     })(m1 || (m1 = {}));
     return m1;
 });

tests/baselines/reference/declFileExportImportChain2.js

@@ -25,6 +25,7 @@ export var x: c.b.m2.c1;
 define(["require", "exports"], function (require, exports) {
     var m1;
     (function (m1) {
+        var m2;
         (function (m2) {
             var c1 = (function () {
                 function c1() {
@@ -32,8 +33,7 @@ define(["require", "exports"], function (require, exports) {
                 return c1;
             })();
             m2.c1 = c1;
-        })(m1.m2 || (m1.m2 = {}));
-        var m2 = m1.m2;
+        })(m2 = m1.m2 || (m1.m2 = {}));
     })(m1 || (m1 = {}));
     return m1;
 });

tests/baselines/reference/declFileGenericType.js

@@ -46,6 +46,7 @@ var __extends = this.__extends || function (d, b) {
     __.prototype = b.prototype;
     d.prototype = new __();
 };
+var C;
 (function (C) {
     var A = (function () {
         function A() {
@@ -90,8 +91,7 @@ var __extends = this.__extends || function (d, b) {
         return D;
     })();
     C.D = D;
-})(exports.C || (exports.C = {}));
-var C = exports.C;
+})(C = exports.C || (exports.C = {}));
 exports.a;
 exports.b = C.F;
 exports.c = C.F2;

tests/baselines/reference/declFileGenericType2.js

@@ -52,7 +52,9 @@ var __extends = this.__extends || function (d, b) {
 // Module
 var templa;
 (function (templa) {
+    var dom;
     (function (dom) {
+        var mvc;
         (function (mvc) {
             var AbstractElementController = (function (_super) {
                 __extends(AbstractElementController, _super);
@@ -62,16 +64,17 @@ var templa;
                 return AbstractElementController;
             })(templa.mvc.AbstractController);
             mvc.AbstractElementController = AbstractElementController;
-        })(dom.mvc || (dom.mvc = {}));
-        var mvc = dom.mvc;
-    })(templa.dom || (templa.dom = {}));
-    var dom = templa.dom;
+        })(mvc = dom.mvc || (dom.mvc = {}));
+    })(dom = templa.dom || (templa.dom = {}));
 })(templa || (templa = {}));
 // Module
 var templa;
 (function (templa) {
+    var dom;
     (function (dom) {
+        var mvc;
         (function (mvc) {
+            var composite;
             (function (composite) {
                 var AbstractCompositeElementController = (function (_super) {
                     __extends(AbstractCompositeElementController, _super);
@@ -82,12 +85,9 @@ var templa;
                     return AbstractCompositeElementController;
                 })(templa.dom.mvc.AbstractElementController);
                 composite.AbstractCompositeElementController = AbstractCompositeElementController;
-            })(mvc.composite || (mvc.composite = {}));
-            var composite = mvc.composite;
-        })(dom.mvc || (dom.mvc = {}));
-        var mvc = dom.mvc;
-    })(templa.dom || (templa.dom = {}));
-    var dom = templa.dom;
+            })(composite = mvc.composite || (mvc.composite = {}));
+        })(mvc = dom.mvc || (dom.mvc = {}));
+    })(dom = templa.dom || (templa.dom = {}));
 })(templa || (templa = {}));
 
 

tests/baselines/reference/declFileImportChainInExportAssignment.js

@@ -12,6 +12,7 @@ export = b;
 //// [declFileImportChainInExportAssignment.js]
 var m;
 (function (m) {
+    var c;
     (function (_c) {
         var c = (function () {
             function c() {
@@ -19,8 +20,7 @@ var m;
             return c;
         })();
         _c.c = c;
-    })(m.c || (m.c = {}));
-    var c = m.c;
+    })(c = m.c || (m.c = {}));
 })(m || (m = {}));
 var a = m.c;
 var b = a;

tests/baselines/reference/declFileModuleContinuation.js

@@ -12,7 +12,9 @@ module A.B.C {
 //// [declFileModuleContinuation.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
+        var C;
         (function (C) {
             var W = (function () {
                 function W() {
@@ -20,10 +22,8 @@ var A;
                 return W;
             })();
             C.W = W;
-        })(B.C || (B.C = {}));
-        var C = B.C;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+        })(C = B.C || (B.C = {}));
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 
 

tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js

@@ -29,7 +29,9 @@ var __extends = this.__extends || function (d, b) {
 };
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var base;
         (function (base) {
             var W = (function (_super) {
                 __extends(W, _super);
@@ -39,15 +41,16 @@ var X;
                 return W;
             })(A.B.Base.W);
             base.W = W;
-        })(Y.base || (Y.base = {}));
-        var base = Y.base;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(base = Y.base || (Y.base = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var base;
         (function (base) {
+            var Z;
             (function (Z) {
                 var W = (function (_super) {
                     __extends(W, _super);
@@ -57,12 +60,9 @@ var X;
                     return W;
                 })(X.Y.base.W);
                 Z.W = W;
-            })(base.Z || (base.Z = {}));
-            var Z = base.Z;
-        })(Y.base || (Y.base = {}));
-        var base = Y.base;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+            })(Z = base.Z || (base.Z = {}));
+        })(base = Y.base || (Y.base = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js

@@ -27,6 +27,7 @@ var __extends = this.__extends || function (d, b) {
 };
 var A;
 (function (A) {
+    var B;
     (function (B) {
         var EventManager = (function () {
             function EventManager() {
@@ -34,12 +35,13 @@ var A;
             return EventManager;
         })();
         B.EventManager = EventManager;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var A;
 (function (A) {
+    var B;
     (function (B) {
+        var C;
         (function (C) {
             var ContextMenu = (function (_super) {
                 __extends(ContextMenu, _super);
@@ -49,10 +51,8 @@ var A;
                 return ContextMenu;
             })(B.EventManager);
             C.ContextMenu = ContextMenu;
-        })(B.C || (B.C = {}));
-        var C = B.C;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+        })(C = B.C || (B.C = {}));
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 
 

tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js

@@ -14,8 +14,11 @@ module X.A.B.C {
 //// [declFileWithInternalModuleNameConflictsInExtendsClause1.js]
 var X;
 (function (X) {
+    var A;
     (function (A) {
+        var B;
         (function (B) {
+            var C;
             (function (C) {
                 var W = (function () {
                     function W() {
@@ -23,12 +26,9 @@ var X;
                     return W;
                 })();
                 C.W = W;
-            })(B.C || (B.C = {}));
-            var C = B.C;
-        })(A.B || (A.B = {}));
-        var B = A.B;
-    })(X.A || (X.A = {}));
-    var A = X.A;
+            })(C = B.C || (B.C = {}));
+        })(B = A.B || (A.B = {}));
+    })(A = X.A || (X.A = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js

@@ -17,8 +17,11 @@ module X.A.B.C {
 //// [declFileWithInternalModuleNameConflictsInExtendsClause2.js]
 var X;
 (function (X) {
+    var A;
     (function (A) {
+        var B;
         (function (B) {
+            var C;
             (function (C) {
                 var W = (function () {
                     function W() {
@@ -26,12 +29,9 @@ var X;
                     return W;
                 })();
                 C.W = W;
-            })(B.C || (B.C = {}));
-            var C = B.C;
-        })(A.B || (A.B = {}));
-        var B = A.B;
-    })(X.A || (X.A = {}));
-    var A = X.A;
+            })(C = B.C || (B.C = {}));
+        })(B = A.B || (A.B = {}));
+    })(A = X.A || (X.A = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js

@@ -17,8 +17,11 @@ module X.A.B.C {
 //// [declFileWithInternalModuleNameConflictsInExtendsClause3.js]
 var X;
 (function (X) {
+    var A;
     (function (A) {
+        var B;
         (function (B) {
+            var C;
             (function (C) {
                 var W = (function () {
                     function W() {
@@ -26,12 +29,9 @@ var X;
                     return W;
                 })();
                 C.W = W;
-            })(B.C || (B.C = {}));
-            var C = B.C;
-        })(A.B || (A.B = {}));
-        var B = A.B;
-    })(X.A || (X.A = {}));
-    var A = X.A;
+            })(C = B.C || (B.C = {}));
+        })(B = A.B || (A.B = {}));
+    })(A = X.A || (X.A = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declarationEmit_nameConflicts.js

@@ -62,6 +62,7 @@ var f;
 module.exports = f;
 //// [declarationEmit_nameConflicts_0.js]
 var im = require('declarationEmit_nameConflicts_1');
+var M;
 (function (M) {
     function f() {
     }
@@ -72,20 +73,21 @@ var im = require('declarationEmit_nameConflicts_1');
         return C;
     })();
     M.C = C;
+    var N;
     (function (N) {
         function g() {
         }
         N.g = g;
         ;
-    })(M.N || (M.N = {}));
-    var N = M.N;
+    })(N = M.N || (M.N = {}));
     M.a = M.f;
     M.b = M.C;
     M.c = N;
     M.d = im;
-})(exports.M || (exports.M = {}));
-var M = exports.M;
+})(M = exports.M || (exports.M = {}));
+var M;
 (function (M) {
+    var P;
     (function (P) {
         function f() {
         }
@@ -96,24 +98,24 @@ var M = exports.M;
             return C;
         })();
         P.C = C;
+        var N;
         (function (N) {
             function g() {
             }
             N.g = g;
             ;
-        })(P.N || (P.N = {}));
-        var N = P.N;
+        })(N = P.N || (P.N = {}));
         P.im = M.P.f;
         P.a = M.a; // emitted incorrectly as typeof f
         P.b = M.b; // ok
         P.c = M.c; // ok
         P.g = M.c.g; // ok
         P.d = M.d; // emitted incorrectly as typeof im
-    })(M.P || (M.P = {}));
-    var P = M.P;
-})(exports.M || (exports.M = {}));
-var M = exports.M;
+    })(P = M.P || (M.P = {}));
+})(M = exports.M || (exports.M = {}));
+var M;
 (function (M) {
+    var Q;
     (function (Q) {
         function f() {
         }
@@ -124,17 +126,15 @@ var M = exports.M;
             return C;
         })();
         Q.C = C;
+        var N;
         (function (N) {
             function g() {
             }
             N.g = g;
             ;
-        })(Q.N || (Q.N = {}));
-        var N = Q.N;
-    })(M.Q || (M.Q = {}));
-    var Q = M.Q;
-})(exports.M || (exports.M = {}));
-var M = exports.M;
+        })(N = Q.N || (Q.N = {}));
+    })(Q = M.Q || (M.Q = {}));
+})(M = exports.M || (exports.M = {}));
 
 
 //// [declarationEmit_nameConflicts_1.d.ts]

tests/baselines/reference/declarationEmit_nameConflicts2.js

@@ -18,7 +18,9 @@ module X.Y.base.Z {
 //// [declarationEmit_nameConflicts2.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var base;
         (function (base) {
             function f() {
             }
@@ -29,33 +31,31 @@ var X;
                 return C;
             })();
             base.C = C;
+            var M;
             (function (M) {
                 M.v;
-            })(base.M || (base.M = {}));
-            var M = base.M;
+            })(M = base.M || (base.M = {}));
             (function (E) {
             })(base.E || (base.E = {}));
             var E = base.E;
-        })(Y.base || (Y.base = {}));
-        var base = Y.base;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(base = Y.base || (Y.base = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var base;
         (function (base) {
+            var Z;
             (function (Z) {
                 Z.f = X.Y.base.f; // Should be base.f
                 Z.C = X.Y.base.C; // Should be base.C
                 Z.M = X.Y.base.M; // Should be base.M
                 Z.E = X.Y.base.E; // Should be base.E
-            })(base.Z || (base.Z = {}));
-            var Z = base.Z;
-        })(Y.base || (Y.base = {}));
-        var base = Y.base;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+            })(Z = base.Z || (base.Z = {}));
+        })(base = Y.base || (Y.base = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declarationEmit_nameConflicts3.js

@@ -35,27 +35,28 @@ var __extends = this.__extends || function (d, b) {
 };
 var M;
 (function (M) {
+    var D;
     (function (D) {
         function f() {
         }
         D.f = f;
-    })(M.D || (M.D = {}));
-    var D = M.D;
+    })(D = M.D || (M.D = {}));
+    var C;
     (function (C) {
         function f() {
         }
         C.f = f;
-    })(M.C || (M.C = {}));
-    var C = M.C;
+    })(C = M.C || (M.C = {}));
+    var E;
     (function (E) {
         function f() {
         }
         E.f = f;
-    })(M.E || (M.E = {}));
-    var E = M.E;
+    })(E = M.E || (M.E = {}));
 })(M || (M = {}));
 var M;
 (function (M) {
+    var P;
     (function (P) {
         var C = (function () {
             function C() {
@@ -81,8 +82,7 @@ var M;
         P.w = M.D.f; // error, should be typeof M.D.f
         P.x = M.C.f; // error, should be typeof M.C.f
         P.x = M.E.f; // error, should be typeof M.E.f
-    })(M.P || (M.P = {}));
-    var P = M.P;
+    })(P = M.P || (M.P = {}));
 })(M || (M = {}));
 
 

tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js

@@ -7,10 +7,10 @@ export module M {
 }
 
 //// [declarationEmit_nameConflictsWithAlias.js]
+var M;
 (function (M) {
     M.w; // Gets emitted as C.I, which is the wrong interface
-})(exports.M || (exports.M = {}));
-var M = exports.M;
+})(M = exports.M || (exports.M = {}));
 
 
 //// [declarationEmit_nameConflictsWithAlias.d.ts]

tests/baselines/reference/dottedModuleName2.js

@@ -46,27 +46,27 @@ module M
 //// [dottedModuleName2.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
         B.x = 1;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var AA;
 (function (AA) {
+    var B;
     (function (B) {
         B.x = 1;
-    })(AA.B || (AA.B = {}));
-    var B = AA.B;
+    })(B = AA.B || (AA.B = {}));
 })(AA || (AA = {}));
 var tmpOK = AA.B.x;
 var tmpError = A.B.x;
 var A;
 (function (A) {
+    var B;
     (function (B) {
+        var C;
         (function (C) {
             C.x = 1;
-        })(B.C || (B.C = {}));
-        var C = B.C;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+        })(C = B.C || (B.C = {}));
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));

tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js

@@ -124,8 +124,8 @@ var Foo;
 })(Foo || (Foo = {}));
 var N;
 (function (N) {
+    var F;
     (function (F) {
         var t;
-    })(N.F || (N.F = {}));
-    var F = N.F;
+    })(F = N.F || (N.F = {}));
 })(N || (N = {}));

tests/baselines/reference/duplicateSymbolsExportMatching.js

@@ -74,10 +74,10 @@ define(["require", "exports"], function (require, exports) {
         (function (inst) {
             var t;
         })(inst || (inst = {}));
+        var inst;
         (function (inst) {
             var t;
-        })(M.inst || (M.inst = {}));
-        var inst = M.inst;
+        })(inst = M.inst || (M.inst = {}));
     })(M || (M = {}));
     // Variables of the same / different type
     var M2;
@@ -104,9 +104,9 @@ define(["require", "exports"], function (require, exports) {
             }
             return C;
         })();
+        var C;
         (function (C) {
             var t;
-        })(M.C || (M.C = {}));
-        var C = M.C;
+        })(C = M.C || (M.C = {}));
     })(M || (M = {}));
 });

tests/baselines/reference/emitMemberAccessExpression.js

@@ -29,7 +29,9 @@ module Microsoft.PeopleAtWork.Model {
 "use strict";
 var Microsoft;
 (function (Microsoft) {
+    var PeopleAtWork;
     (function (PeopleAtWork) {
+        var Model;
         (function (Model) {
             var _Person = (function () {
                 function _Person() {
@@ -40,10 +42,8 @@ var Microsoft;
                 return _Person;
             })();
             Model._Person = _Person;
-        })(PeopleAtWork.Model || (PeopleAtWork.Model = {}));
-        var Model = PeopleAtWork.Model;
-    })(Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
-    var PeopleAtWork = Microsoft.PeopleAtWork;
+        })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {}));
+    })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
 })(Microsoft || (Microsoft = {}));
 //// [emitMemberAccessExpression_file1.js]
 /// <reference path="emitMemberAccessExpression_file3.ts" />
@@ -53,7 +53,9 @@ var Microsoft;
 /// <reference path="emitMemberAccessExpression_file1.ts" />
 var Microsoft;
 (function (Microsoft) {
+    var PeopleAtWork;
     (function (PeopleAtWork) {
+        var Model;
         (function (Model) {
             var KnockoutExtentions = (function () {
                 function KnockoutExtentions() {
@@ -61,8 +63,6 @@ var Microsoft;
                 return KnockoutExtentions;
             })();
             Model.KnockoutExtentions = KnockoutExtentions;
-        })(PeopleAtWork.Model || (PeopleAtWork.Model = {}));
-        var Model = PeopleAtWork.Model;
-    })(Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
-    var PeopleAtWork = Microsoft.PeopleAtWork;
+        })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {}));
+    })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
 })(Microsoft || (Microsoft = {}));

tests/baselines/reference/enumMerging.js

@@ -150,6 +150,7 @@ var M5;
 })(M5 || (M5 = {}));
 var M6;
 (function (M6) {
+    var A;
     (function (A) {
         (function (Color) {
             Color[Color["Red"] = 0] = "Red";
@@ -157,18 +158,17 @@ var M6;
             Color[Color["Blue"] = 2] = "Blue";
         })(A.Color || (A.Color = {}));
         var Color = A.Color;
-    })(M6.A || (M6.A = {}));
-    var A = M6.A;
+    })(A = M6.A || (M6.A = {}));
 })(M6 || (M6 = {}));
 var M6;
 (function (M6) {
+    var A;
     (function (A) {
         (function (Color) {
             Color[Color["Yellow"] = 1] = "Yellow";
         })(A.Color || (A.Color = {}));
         var Color = A.Color;
-    })(M6.A || (M6.A = {}));
-    var A = M6.A;
+    })(A = M6.A || (M6.A = {}));
     var t = 1 /* Yellow */;
     t = 0 /* Red */;
 })(M6 || (M6 = {}));

tests/baselines/reference/exportAssignmentMergedModule.js

@@ -39,10 +39,10 @@ var Foo;
         return a;
     }
     Foo.c = c;
+    var Test;
     (function (Test) {
         Test.answer = 42;
-    })(Foo.Test || (Foo.Test = {}));
-    var Test = Foo.Test;
+    })(Test = Foo.Test || (Foo.Test = {}));
 })(Foo || (Foo = {}));
 module.exports = Foo;
 //// [foo_1.js]

tests/baselines/reference/exportCodeGen.js

@@ -103,10 +103,10 @@ var E;
         return C;
     })();
     E.C = C;
+    var M;
     (function (M) {
         M.x = 42;
-    })(E.M || (E.M = {}));
-    var M = E.M;
+    })(M = E.M || (E.M = {}));
 })(E || (E = {}));
 // validate all exportable statements,
 // which are not exported

tests/baselines/reference/exportImportAlias.js

@@ -96,6 +96,7 @@ var X;
         return 42;
     }
     X.Y = Y;
+    var Y;
     (function (Y) {
         var Point = (function () {
             function Point(x, y) {
@@ -105,8 +106,7 @@ var X;
             return Point;
         })();
         Y.Point = Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var Z;
 (function (Z) {
@@ -124,10 +124,10 @@ var K;
         return L;
     })();
     K.L = L;
+    var L;
     (function (L) {
         L.y = 12;
-    })(K.L || (K.L = {}));
-    var L = K.L;
+    })(L = K.L || (K.L = {}));
 })(K || (K = {}));
 var M;
 (function (M) {

tests/baselines/reference/exportImportAndClodule.js

@@ -29,10 +29,10 @@ var K;
         return L;
     })();
     K.L = L;
+    var L;
     (function (L) {
         L.y = 12;
-    })(K.L || (K.L = {}));
-    var L = K.L;
+    })(L = K.L || (K.L = {}));
 })(K || (K = {}));
 var M;
 (function (M) {

tests/baselines/reference/functionMergedWithModule.js

@@ -20,20 +20,20 @@ function foo(title) {
 }
 var foo;
 (function (foo) {
+    var Bar;
     (function (Bar) {
         function f() {
         }
         Bar.f = f;
-    })(foo.Bar || (foo.Bar = {}));
-    var Bar = foo.Bar;
+    })(Bar = foo.Bar || (foo.Bar = {}));
 })(foo || (foo = {}));
 var foo;
 (function (foo) {
+    var Baz;
     (function (Baz) {
         function g() {
             foo.Bar.f();
         }
         Baz.g = g;
-    })(foo.Baz || (foo.Baz = {}));
-    var Baz = foo.Baz;
+    })(Baz = foo.Baz || (foo.Baz = {}));
 })(foo || (foo = {}));

tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js

@@ -84,7 +84,9 @@ var __extends = this.__extends || function (d, b) {
 };
 var Portal;
 (function (Portal) {
+    var Controls;
     (function (Controls) {
+        var Validators;
         (function (Validators) {
             var Validator = (function () {
                 function Validator(message) {
@@ -97,15 +99,16 @@ var Portal;
                 return Validator;
             })();
             Validators.Validator = Validator;
-        })(Controls.Validators || (Controls.Validators = {}));
-        var Validators = Controls.Validators;
-    })(Portal.Controls || (Portal.Controls = {}));
-    var Controls = Portal.Controls;
+        })(Validators = Controls.Validators || (Controls.Validators = {}));
+    })(Controls = Portal.Controls || (Portal.Controls = {}));
 })(Portal || (Portal = {}));
 var PortalFx;
 (function (PortalFx) {
+    var ViewModels;
     (function (ViewModels) {
+        var Controls;
         (function (Controls) {
+            var Validators;
             (function (Validators) {
                 var Validator = (function (_super) {
                     __extends(Validator, _super);
@@ -115,12 +118,9 @@ var PortalFx;
                     return Validator;
                 })(Portal.Controls.Validators.Validator);
                 Validators.Validator = Validator;
-            })(Controls.Validators || (Controls.Validators = {}));
-            var Validators = Controls.Validators;
-        })(ViewModels.Controls || (ViewModels.Controls = {}));
-        var Controls = ViewModels.Controls;
-    })(PortalFx.ViewModels || (PortalFx.ViewModels = {}));
-    var ViewModels = PortalFx.ViewModels;
+            })(Validators = Controls.Validators || (Controls.Validators = {}));
+        })(Controls = ViewModels.Controls || (ViewModels.Controls = {}));
+    })(ViewModels = PortalFx.ViewModels || (PortalFx.ViewModels = {}));
 })(PortalFx || (PortalFx = {}));
 var ViewModel = (function () {
     function ViewModel() {

tests/baselines/reference/genericCloduleInModule.js

@@ -25,10 +25,10 @@ var A;
         return B;
     })();
     A.B = B;
+    var B;
     (function (B) {
         B.x = 1;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var b;
 b.foo();

tests/baselines/reference/genericCloduleInModule2.js

@@ -31,10 +31,10 @@ var A;
 })(A || (A = {}));
 var A;
 (function (A) {
+    var B;
     (function (B) {
         B.x = 1;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var b;
 b.foo();

tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js

@@ -35,6 +35,7 @@ var __extends = this.__extends || function (d, b) {
 };
 var EndGate;
 (function (EndGate) {
+    var Tweening;
     (function (Tweening) {
         var Tween = (function () {
             function Tween(from) {
@@ -43,11 +44,11 @@ var EndGate;
             return Tween;
         })();
         Tweening.Tween = Tween;
-    })(EndGate.Tweening || (EndGate.Tweening = {}));
-    var Tweening = EndGate.Tweening;
+    })(Tweening = EndGate.Tweening || (EndGate.Tweening = {}));
 })(EndGate || (EndGate = {}));
 var EndGate;
 (function (EndGate) {
+    var Tweening;
     (function (Tweening) {
         var NumberTween = (function (_super) {
             __extends(NumberTween, _super);
@@ -57,6 +58,5 @@ var EndGate;
             return NumberTween;
         })(Tweening.Tween);
         Tweening.NumberTween = NumberTween;
-    })(EndGate.Tweening || (EndGate.Tweening = {}));
-    var Tweening = EndGate.Tweening;
+    })(Tweening = EndGate.Tweening || (EndGate.Tweening = {}));
 })(EndGate || (EndGate = {}));

tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js

@@ -34,6 +34,7 @@ var __extends = this.__extends || function (d, b) {
 };
 var EndGate;
 (function (EndGate) {
+    var Tweening;
     (function (Tweening) {
         var Tween = (function () {
             function Tween(from) {
@@ -42,11 +43,11 @@ var EndGate;
             return Tween;
         })();
         Tweening.Tween = Tween;
-    })(EndGate.Tweening || (EndGate.Tweening = {}));
-    var Tweening = EndGate.Tweening;
+    })(Tweening = EndGate.Tweening || (EndGate.Tweening = {}));
 })(EndGate || (EndGate = {}));
 var EndGate;
 (function (EndGate) {
+    var Tweening;
     (function (Tweening) {
         var NumberTween = (function (_super) {
             __extends(NumberTween, _super);
@@ -56,6 +57,5 @@ var EndGate;
             return NumberTween;
         })(Tweening.Tween);
         Tweening.NumberTween = NumberTween;
-    })(EndGate.Tweening || (EndGate.Tweening = {}));
-    var Tweening = EndGate.Tweening;
+    })(Tweening = EndGate.Tweening || (EndGate.Tweening = {}));
 })(EndGate || (EndGate = {}));

tests/baselines/reference/genericFunduleInModule.js

@@ -16,10 +16,10 @@ var A;
         return x;
     }
     A.B = B;
+    var B;
     (function (B) {
         B.x = 1;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var b;
 A.B(1);

tests/baselines/reference/genericFunduleInModule2.js

@@ -22,10 +22,10 @@ var A;
 })(A || (A = {}));
 var A;
 (function (A) {
+    var B;
     (function (B) {
         B.x = 1;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var b;
 A.B(1);

tests/baselines/reference/genericOfACloduleType1.js

@@ -31,6 +31,7 @@ var M;
         return C;
     })();
     M.C = C;
+    var C;
     (function (C) {
         var X = (function () {
             function X() {
@@ -38,8 +39,7 @@ var M;
             return X;
         })();
         C.X = X;
-    })(M.C || (M.C = {}));
-    var C = M.C;
+    })(C = M.C || (M.C = {}));
     var g1 = new G();
     g1.bar(null).foo();
 })(M || (M = {}));

tests/baselines/reference/genericOfACloduleType2.js

@@ -34,6 +34,7 @@ var M;
         return C;
     })();
     M.C = C;
+    var C;
     (function (C) {
         var X = (function () {
             function X() {
@@ -41,8 +42,7 @@ var M;
             return X;
         })();
         C.X = X;
-    })(M.C || (M.C = {}));
-    var C = M.C;
+    })(C = M.C || (M.C = {}));
     var g1 = new G();
     g1.bar(null).foo(); // no error
 })(M || (M = {}));

tests/baselines/reference/importAliasWithDottedName.js

@@ -16,10 +16,10 @@ module A {
 var M;
 (function (M) {
     M.x = 1;
+    var N;
     (function (N) {
         N.y = 2;
-    })(M.N || (M.N = {}));
-    var N = M.N;
+    })(N = M.N || (M.N = {}));
 })(M || (M = {}));
 var A;
 (function (A) {

tests/baselines/reference/importDecl.js

@@ -144,6 +144,7 @@ var m4 = require("importDecl_require"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
 exports.f4 = m4.foo();
+var m1;
 (function (m1) {
     m1.x2 = m4.x;
     m1.d2 = m4.d;
@@ -151,8 +152,7 @@ exports.f4 = m4.foo();
     var x3 = m4.x;
     var d3 = m4.d;
     var f3 = m4.foo();
-})(exports.m1 || (exports.m1 = {}));
-var m1 = exports.m1;
+})(m1 = exports.m1 || (exports.m1 = {}));
 //Emit global only usage
 var glo_m4 = require("importDecl_require1");
 exports.useGlo_m4_d4 = glo_m4.d;
@@ -162,12 +162,12 @@ var fncOnly_m4 = require("importDecl_require2");
 exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
 // only used privately no need to emit
 var private_m4 = require("importDecl_require3");
+var usePrivate_m4_m1;
 (function (usePrivate_m4_m1) {
     var x3 = private_m4.x;
     var d3 = private_m4.d;
     var f3 = private_m4.foo();
-})(exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
-var usePrivate_m4_m1 = exports.usePrivate_m4_m1;
+})(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
 // Do not emit unused import
 var m5 = require("importDecl_require4");
 exports.d = m5.foo2();

tests/baselines/reference/import_reference-exported-alias.js

@@ -25,6 +25,7 @@ var x = new UserServices().getUserName();
 define(["require", "exports"], function (require, exports) {
     var App;
     (function (App) {
+        var Services;
         (function (Services) {
             var UserServices = (function () {
                 function UserServices() {
@@ -35,8 +36,7 @@ define(["require", "exports"], function (require, exports) {
                 return UserServices;
             })();
             Services.UserServices = UserServices;
-        })(App.Services || (App.Services = {}));
-        var Services = App.Services;
+        })(Services = App.Services || (App.Services = {}));
     })(App || (App = {}));
     var Mod = App;
     return Mod;

tests/baselines/reference/import_reference-to-type-alias.js

@@ -19,7 +19,9 @@ var x = new Services.UserServices().getUserName();
 
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
+    var App;
     (function (App) {
+        var Services;
         (function (Services) {
             var UserServices = (function () {
                 function UserServices() {
@@ -30,10 +32,8 @@ define(["require", "exports"], function (require, exports) {
                 return UserServices;
             })();
             Services.UserServices = UserServices;
-        })(App.Services || (App.Services = {}));
-        var Services = App.Services;
-    })(exports.App || (exports.App = {}));
-    var App = exports.App;
+        })(Services = App.Services || (App.Services = {}));
+    })(App = exports.App || (exports.App = {}));
 });
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {

tests/baselines/reference/innerAliases.js

@@ -26,7 +26,9 @@ c = new D.inner.Class1();
 //// [innerAliases.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
+        var C;
         (function (C) {
             var Class1 = (function () {
                 function Class1() {
@@ -34,15 +36,14 @@ var A;
                 return Class1;
             })();
             C.Class1 = Class1;
-        })(B.C || (B.C = {}));
-        var C = B.C;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+        })(C = B.C || (B.C = {}));
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var D;
 (function (D) {
     var inner = A.B.C;
     var c1 = new inner.Class1();
+    var E;
     (function (E) {
         var Class2 = (function () {
             function Class2() {
@@ -50,8 +51,7 @@ var D;
             return Class2;
         })();
         E.Class2 = Class2;
-    })(D.E || (D.E = {}));
-    var E = D.E;
+    })(E = D.E || (D.E = {}));
 })(D || (D = {}));
 var c;
 c = new D.inner.Class1();

tests/baselines/reference/innerExtern.js

@@ -16,6 +16,7 @@ module A {
 //// [innerExtern.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
         var C = (function () {
             function C() {
@@ -24,6 +25,5 @@ var A;
             return C;
         })();
         B.C = C;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));

tests/baselines/reference/interMixingModulesInterfaces0.js

@@ -18,12 +18,12 @@ var x: A.B = A.B.createB();
 //// [interMixingModulesInterfaces0.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
         function createB() {
             return null;
         }
         B.createB = createB;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var x = A.B.createB();

tests/baselines/reference/interMixingModulesInterfaces1.js

@@ -18,12 +18,12 @@ var x: A.B = A.B.createB();
 //// [interMixingModulesInterfaces1.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
         function createB() {
             return null;
         }
         B.createB = createB;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var x = A.B.createB();

tests/baselines/reference/interMixingModulesInterfaces4.js

@@ -18,12 +18,12 @@ var x : number = A.B.createB();
 //// [interMixingModulesInterfaces4.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
         function createB() {
             return null;
         }
         B.createB = createB;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var x = A.B.createB();

tests/baselines/reference/interMixingModulesInterfaces5.js

@@ -18,12 +18,12 @@ var x: number = A.B.createB();
 //// [interMixingModulesInterfaces5.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
         function createB() {
             return null;
         }
         B.createB = createB;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var x = A.B.createB();

tests/baselines/reference/interfaceDeclaration3.js

@@ -85,6 +85,7 @@ define(["require", "exports"], function (require, exports) {
             return C5;
         })();
     })(M1 || (M1 = {}));
+    var M2;
     (function (M2) {
         var C1 = (function () {
             function C1() {
@@ -101,8 +102,7 @@ define(["require", "exports"], function (require, exports) {
             }
             return C3;
         })();
-    })(exports.M2 || (exports.M2 = {}));
-    var M2 = exports.M2;
+    })(M2 = exports.M2 || (exports.M2 = {}));
     var C1 = (function () {
         function C1() {
         }

tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js

@@ -18,6 +18,7 @@ export module m2 {
 export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithExport.js]
+var x;
 (function (x) {
     var c = (function () {
         function c() {
@@ -28,17 +29,16 @@ export var d = new m2.m3.c();
         return c;
     })();
     x.c = c;
-})(exports.x || (exports.x = {}));
-var x = exports.x;
+})(x = exports.x || (exports.x = {}));
+var m2;
 (function (m2) {
+    var m3;
     (function (m3) {
         m3.c = x.c;
         m3.cProp = new m3.c();
         var cReturnVal = m3.cProp.foo(10);
-    })(m2.m3 || (m2.m3 = {}));
-    var m3 = m2.m3;
-})(exports.m2 || (exports.m2 = {}));
-var m2 = exports.m2;
+    })(m3 = m2.m3 || (m2.m3 = {}));
+})(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
 
 

tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js

@@ -16,6 +16,7 @@ export module m2 {
 }
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.js]
+var x;
 (function (x) {
     var c = (function () {
         function c() {
@@ -26,17 +27,16 @@ export module m2 {
         return c;
     })();
     x.c = c;
-})(exports.x || (exports.x = {}));
-var x = exports.x;
+})(x = exports.x || (exports.x = {}));
+var m2;
 (function (m2) {
+    var m3;
     (function (m3) {
         var c = x.c;
         m3.cProp = new c();
         var cReturnVal = m3.cProp.foo(10);
-    })(m2.m3 || (m2.m3 = {}));
-    var m3 = m2.m3;
-})(exports.m2 || (exports.m2 = {}));
-var m2 = exports.m2;
+    })(m3 = m2.m3 || (m2.m3 = {}));
+})(m2 = exports.m2 || (exports.m2 = {}));
 
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts]

tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js

@@ -18,6 +18,7 @@ export module m2 {
 export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.js]
+var x;
 (function (x) {
     var c = (function () {
         function c() {
@@ -28,15 +29,14 @@ export var d = new m2.m3.c();
         return c;
     })();
     x.c = c;
-})(exports.x || (exports.x = {}));
-var x = exports.x;
+})(x = exports.x || (exports.x = {}));
+var m2;
 (function (m2) {
+    var m3;
     (function (m3) {
         var c = x.c;
         m3.cProp = new c();
         var cReturnVal = m3.cProp.foo(10);
-    })(m2.m3 || (m2.m3 = {}));
-    var m3 = m2.m3;
-})(exports.m2 || (exports.m2 = {}));
-var m2 = exports.m2;
+    })(m3 = m2.m3 || (m2.m3 = {}));
+})(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();

tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js

@@ -12,6 +12,7 @@ export var cProp = new xc();
 var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.js]
+var x;
 (function (x) {
     var c = (function () {
         function c() {
@@ -22,8 +23,7 @@ var cReturnVal = cProp.foo(10);
         return c;
     })();
     x.c = c;
-})(exports.x || (exports.x = {}));
-var x = exports.x;
+})(x = exports.x || (exports.x = {}));
 exports.xc = x.c;
 exports.cProp = new exports.xc();
 var cReturnVal = exports.cProp.foo(10);

tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js

@@ -12,6 +12,7 @@ export var cProp = new xc();
 var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.js]
+var x;
 (function (x) {
     var c = (function () {
         function c() {
@@ -22,8 +23,7 @@ var cReturnVal = cProp.foo(10);
         return c;
     })();
     x.c = c;
-})(exports.x || (exports.x = {}));
-var x = exports.x;
+})(x = exports.x || (exports.x = {}));
 var xc = x.c;
 exports.cProp = new xc();
 var cReturnVal = exports.cProp.foo(10);

tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js

@@ -14,6 +14,7 @@ export module c {
 
 
 //// [internalAliasEnumInsideLocalModuleWithExport.js]
+var a;
 (function (a) {
     (function (weekend) {
         weekend[weekend["Friday"] = 0] = "Friday";
@@ -21,13 +22,12 @@ export module c {
         weekend[weekend["Sunday"] = 2] = "Sunday";
     })(a.weekend || (a.weekend = {}));
     var weekend = a.weekend;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+})(a = exports.a || (exports.a = {}));
+var c;
 (function (c) {
     c.b = a.weekend;
     c.bVal = 2 /* Sunday */;
-})(exports.c || (exports.c = {}));
-var c = exports.c;
+})(c = exports.c || (exports.c = {}));
 
 
 //// [internalAliasEnumInsideLocalModuleWithExport.d.ts]

tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js

@@ -14,6 +14,7 @@ export module c {
 
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.js]
+var a;
 (function (a) {
     (function (weekend) {
         weekend[weekend["Friday"] = 0] = "Friday";
@@ -21,13 +22,12 @@ export module c {
         weekend[weekend["Sunday"] = 2] = "Sunday";
     })(a.weekend || (a.weekend = {}));
     var weekend = a.weekend;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+})(a = exports.a || (exports.a = {}));
+var c;
 (function (c) {
     var b = a.weekend;
     c.bVal = 2 /* Sunday */;
-})(exports.c || (exports.c = {}));
-var c = exports.c;
+})(c = exports.c || (exports.c = {}));
 
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts]

tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js

@@ -15,6 +15,7 @@ export module c {
 var happyFriday = c.b.Friday;
 
 //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.js]
+var a;
 (function (a) {
     (function (weekend) {
         weekend[weekend["Friday"] = 0] = "Friday";
@@ -22,11 +23,10 @@ var happyFriday = c.b.Friday;
         weekend[weekend["Sunday"] = 2] = "Sunday";
     })(a.weekend || (a.weekend = {}));
     var weekend = a.weekend;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+})(a = exports.a || (exports.a = {}));
+var c;
 (function (c) {
     var b = a.weekend;
     c.bVal = 2 /* Sunday */;
-})(exports.c || (exports.c = {}));
-var c = exports.c;
+})(c = exports.c || (exports.c = {}));
 var happyFriday = c.b.Friday;

tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js

@@ -13,6 +13,7 @@ export var bVal: b = b.Sunday;
 
 //// [internalAliasEnumInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
+    var a;
     (function (a) {
         (function (weekend) {
             weekend[weekend["Friday"] = 0] = "Friday";
@@ -20,8 +21,7 @@ define(["require", "exports"], function (require, exports) {
             weekend[weekend["Sunday"] = 2] = "Sunday";
         })(a.weekend || (a.weekend = {}));
         var weekend = a.weekend;
-    })(exports.a || (exports.a = {}));
-    var a = exports.a;
+    })(a = exports.a || (exports.a = {}));
     exports.b = a.weekend;
     exports.bVal = 2 /* Sunday */;
 });

tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js

@@ -13,6 +13,7 @@ export var bVal: b = b.Sunday;
 
 //// [internalAliasEnumInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
+    var a;
     (function (a) {
         (function (weekend) {
             weekend[weekend["Friday"] = 0] = "Friday";
@@ -20,8 +21,7 @@ define(["require", "exports"], function (require, exports) {
             weekend[weekend["Sunday"] = 2] = "Sunday";
         })(a.weekend || (a.weekend = {}));
         var weekend = a.weekend;
-    })(exports.a || (exports.a = {}));
-    var a = exports.a;
+    })(a = exports.a || (exports.a = {}));
     var b = a.weekend;
     exports.bVal = 2 /* Sunday */;
 });

tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js

@@ -13,19 +13,19 @@ export module c {
 
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.js]
+var a;
 (function (a) {
     function foo(x) {
         return x;
     }
     a.foo = foo;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+})(a = exports.a || (exports.a = {}));
+var c;
 (function (c) {
     c.b = a.foo;
     c.bVal = c.b(10);
     c.bVal2 = c.b;
-})(exports.c || (exports.c = {}));
-var c = exports.c;
+})(c = exports.c || (exports.c = {}));
 
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts]

tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js

@@ -13,19 +13,19 @@ export module c {
 
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.js]
+var a;
 (function (a) {
     function foo(x) {
         return x;
     }
     a.foo = foo;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+})(a = exports.a || (exports.a = {}));
+var c;
 (function (c) {
     var b = a.foo;
     var bVal = b(10);
     c.bVal2 = b;
-})(exports.c || (exports.c = {}));
-var c = exports.c;
+})(c = exports.c || (exports.c = {}));
 
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts]

tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js

@@ -13,17 +13,17 @@ export module c {
 var d = c.b(11);
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js]
+var a;
 (function (a) {
     function foo(x) {
         return x;
     }
     a.foo = foo;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+})(a = exports.a || (exports.a = {}));
+var c;
 (function (c) {
     var b = a.foo;
     var bVal = b(10);
     c.bVal2 = b;
-})(exports.c || (exports.c = {}));
-var c = exports.c;
+})(c = exports.c || (exports.c = {}));
 var d = c.b(11);

tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js

@@ -12,13 +12,13 @@ export var bVal2 = b;
 
 //// [internalAliasFunctionInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
+    var a;
     (function (a) {
         function foo(x) {
             return x;
         }
         a.foo = foo;
-    })(exports.a || (exports.a = {}));
-    var a = exports.a;
+    })(a = exports.a || (exports.a = {}));
     exports.b = a.foo;
     exports.bVal = exports.b(10);
     exports.bVal2 = exports.b;

tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js

@@ -11,13 +11,13 @@ export var bVal2 = b;
 
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.js]
+var a;
 (function (a) {
     function foo(x) {
         return x;
     }
     a.foo = foo;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+})(a = exports.a || (exports.a = {}));
 var b = a.foo;
 exports.bVal = b(10);
 exports.bVal2 = b;

tests/baselines/reference/internalAliasInitializedModule.js

@@ -14,6 +14,7 @@ module c {
 //// [internalAliasInitializedModule.js]
 var a;
 (function (a) {
+    var b;
     (function (b) {
         var c = (function () {
             function c() {
@@ -21,8 +22,7 @@ var a;
             return c;
         })();
         b.c = c;
-    })(a.b || (a.b = {}));
-    var b = a.b;
+    })(b = a.b || (a.b = {}));
 })(a || (a = {}));
 var c;
 (function (c) {

tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js

@@ -13,7 +13,9 @@ export module c {
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
+    var a;
     (function (a) {
+        var b;
         (function (b) {
             var c = (function () {
                 function c() {
@@ -21,15 +23,13 @@ define(["require", "exports"], function (require, exports) {
                 return c;
             })();
             b.c = c;
-        })(a.b || (a.b = {}));
-        var b = a.b;
-    })(exports.a || (exports.a = {}));
-    var a = exports.a;
+        })(b = a.b || (a.b = {}));
+    })(a = exports.a || (exports.a = {}));
+    var c;
     (function (c) {
         c.b = a.b;
         c.x = new c.b.c();
-    })(exports.c || (exports.c = {}));
-    var c = exports.c;
+    })(c = exports.c || (exports.c = {}));
 });
 
 

tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js

@@ -12,7 +12,9 @@ export module c {
 }
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.js]
+var a;
 (function (a) {
+    var b;
     (function (b) {
         var c = (function () {
             function c() {
@@ -20,15 +22,13 @@ export module c {
             return c;
         })();
         b.c = c;
-    })(a.b || (a.b = {}));
-    var b = a.b;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+    })(b = a.b || (a.b = {}));
+})(a = exports.a || (exports.a = {}));
+var c;
 (function (c) {
     var b = a.b;
     c.x = new b.c();
-})(exports.c || (exports.c = {}));
-var c = exports.c;
+})(c = exports.c || (exports.c = {}));
 
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts]

tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js

@@ -14,7 +14,9 @@ export module c {
 export var d = new c.b.c();
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js]
+var a;
 (function (a) {
+    var b;
     (function (b) {
         var c = (function () {
             function c() {
@@ -22,13 +24,11 @@ export var d = new c.b.c();
             return c;
         })();
         b.c = c;
-    })(a.b || (a.b = {}));
-    var b = a.b;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+    })(b = a.b || (a.b = {}));
+})(a = exports.a || (exports.a = {}));
+var c;
 (function (c) {
     var b = a.b;
     c.x = new b.c();
-})(exports.c || (exports.c = {}));
-var c = exports.c;
+})(c = exports.c || (exports.c = {}));
 exports.d = new c.b.c();

tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js

@@ -10,7 +10,9 @@ export import b = a.b;
 export var x: b.c = new b.c();
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.js]
+var a;
 (function (a) {
+    var b;
     (function (b) {
         var c = (function () {
             function c() {
@@ -18,10 +20,8 @@ export var x: b.c = new b.c();
             return c;
         })();
         b.c = c;
-    })(a.b || (a.b = {}));
-    var b = a.b;
-})(exports.a || (exports.a = {}));
-var a = exports.a;
+    })(b = a.b || (a.b = {}));
+})(a = exports.a || (exports.a = {}));
 exports.b = a.b;
 exports.x = new exports.b.c();
 

tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js

@@ -11,7 +11,9 @@ export var x: b.c = new b.c();
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
+    var a;
     (function (a) {
+        var b;
         (function (b) {
             var c = (function () {
                 function c() {
@@ -19,10 +21,8 @@ define(["require", "exports"], function (require, exports) {
                 return c;
             })();
             b.c = c;
-        })(a.b || (a.b = {}));
-        var b = a.b;
-    })(exports.a || (exports.a = {}));
-    var a = exports.a;
+        })(b = a.b || (a.b = {}));
+    })(a = exports.a || (exports.a = {}));
     var b = a.b;
     exports.x = new b.c();
 });

tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js

@@ -12,10 +12,10 @@ export module c {
 
 //// [internalAliasInterfaceInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
+    var c;
     (function (c) {
         c.x;
-    })(exports.c || (exports.c = {}));
-    var c = exports.c;
+    })(c = exports.c || (exports.c = {}));
 });