Emit "__esModule" before other statments

src/compiler/transformers/module/module.ts

@@ -83,15 +83,16 @@ namespace ts {
 
             const statements: Statement[] = [];
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
-            append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
-            addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
-            addRange(statements, endLexicalEnvironment());
-            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
 
             if (!currentModuleInfo.exportEquals) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
 
+            append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
+            addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
+            addRange(statements, endLexicalEnvironment());
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
+
             const updated = updateSourceFileNode(node, setTextRange(createNodeArray(statements), node.statements));
             if (currentModuleInfo.hasExportStarsToExportValues) {
                 addEmitHelper(updated, exportStarHelper);
@@ -374,6 +375,10 @@ namespace ts {
             const statements: Statement[] = [];
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
 
+            if (!currentModuleInfo.exportEquals) {
+                append(statements, createUnderscoreUnderscoreESModule());
+            }
+
             // Visit each statement of the module body.
             append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
             addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
@@ -385,10 +390,6 @@ namespace ts {
             // Append the 'export =' statement if provided.
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
 
-            if (!currentModuleInfo.exportEquals) {
-                append(statements, createUnderscoreUnderscoreESModule());
-            }
-
             const body = createBlock(statements, /*multiLine*/ true);
             if (currentModuleInfo.hasExportStarsToExportValues) {
                 // If we have any `export * from ...` declarations

tests/baselines/reference/APISample_compile.js

@@ -41,6 +41,7 @@ compile(process.argv.slice(2), {
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function compile(fileNames, options) {
     var program = ts.createProgram(fileNames, options);
@@ -60,4 +61,3 @@ compile(process.argv.slice(2), {
     noEmitOnError: true, noImplicitAny: true,
     target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS
 });
-exports.__esModule = true;

tests/baselines/reference/APISample_linter.js

@@ -71,6 +71,7 @@ fileNames.forEach(fileName => {
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function delint(sourceFile) {
     delintNode(sourceFile);
@@ -117,4 +118,3 @@ fileNames.forEach(function (fileName) {
     // delint it
     delint(sourceFile);
 });
-exports.__esModule = true;

tests/baselines/reference/APISample_parseConfig.js

@@ -43,6 +43,7 @@ export function createProgram(rootFiles: string[], compilerOptionsJson: string):
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function printError(error) {
     if (!error) {
@@ -68,4 +69,3 @@ function createProgram(rootFiles, compilerOptionsJson) {
     return ts.createProgram(rootFiles, settings.options);
 }
 exports.createProgram = createProgram;
-exports.__esModule = true;

tests/baselines/reference/APISample_transform.js

@@ -23,8 +23,8 @@ console.log(JSON.stringify(result));
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 var source = "let x: string  = 'string'";
 var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS });
 console.log(JSON.stringify(result));
-exports.__esModule = true;

tests/baselines/reference/APISample_watcher.js

@@ -116,6 +116,7 @@ watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS });
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function watch(rootFileNames, options) {
     var files = {};
@@ -189,4 +190,3 @@ var currentDirectoryFiles = fs.readdirSync(process.cwd()).
     filter(function (fileName) { return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; });
 // Start the watcher
 watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS });
-exports.__esModule = true;

tests/baselines/reference/aliasAssignments.js

@@ -15,18 +15,18 @@ y = moduleA; // should be error
 
 //// [aliasAssignments_moduleA.js]
 "use strict";
+exports.__esModule = true;
 var someClass = (function () {
     function someClass() {
     }
     return someClass;
 }());
 exports.someClass = someClass;
-exports.__esModule = true;
 //// [aliasAssignments_1.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasAssignments_moduleA");
 var x = moduleA;
 x = 1; // Should be error
 var y = 1;
 y = moduleA; // should be error
-exports.__esModule = true;

tests/baselines/reference/aliasOnMergedModuleInterface.js

@@ -24,7 +24,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
 //// [aliasOnMergedModuleInterface_0.js]
 //// [aliasOnMergedModuleInterface_1.js]
 "use strict";
+exports.__esModule = true;
 var z;
 z.bar("hello"); // This should be ok
 var x = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
-exports.__esModule = true;

tests/baselines/reference/aliasUsageInAccessorsOfClass.js

@@ -29,13 +29,13 @@ class C2 {
 
 //// [aliasUsage1_backbone.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aliasUsage1_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -48,6 +48,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var Backbone = require("./aliasUsage1_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -57,9 +58,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aliasUsage1_main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var moduleA = require("./aliasUsage1_moduleA");
 var C2 = (function () {
     function C2() {
@@ -76,4 +77,3 @@ var C2 = (function () {
     });
     return C2;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });

tests/baselines/reference/aliasUsageInArray.js

@@ -23,13 +23,13 @@ var xs2: typeof moduleA[] = [moduleA];
 
 //// [aliasUsageInArray_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInArray_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -42,6 +42,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInArray_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -51,10 +52,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInArray_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInArray_moduleA");
 var xs = [moduleA];
 var xs2 = [moduleA];
-exports.__esModule = true;

tests/baselines/reference/aliasUsageInFunctionExpression.js

@@ -22,13 +22,13 @@ f = (x) => moduleA;
 
 //// [aliasUsageInFunctionExpression_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInFunctionExpression_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -41,6 +41,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInFunctionExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -50,10 +51,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInFunctionExpression_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 var f = function (x) { return x; };
 f = function (x) { return moduleA; };
-exports.__esModule = true;

tests/baselines/reference/aliasUsageInGenericFunction.js

@@ -26,13 +26,13 @@ var r2 = foo({ a: <IHasVisualizationModel>null });
 
 //// [aliasUsageInGenericFunction_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInGenericFunction_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInGenericFunction_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -54,13 +55,12 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInGenericFunction_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInGenericFunction_moduleA");
 function foo(x) {
     return x;
 }
 var r = foo({ a: moduleA });
 var r2 = foo({ a: null });
-exports.__esModule = true;

tests/baselines/reference/aliasUsageInIndexerOfClass.js

@@ -28,13 +28,13 @@ class N2 {
 
 //// [aliasUsageInIndexerOfClass_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInIndexerOfClass_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -47,6 +47,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -56,9 +57,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInIndexerOfClass_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 var N = (function () {
     function N() {
@@ -71,4 +72,3 @@ var N2 = (function () {
     }
     return N2;
 }());
-exports.__esModule = true;

tests/baselines/reference/aliasUsageInObjectLiteral.js

@@ -23,13 +23,13 @@ var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } };
 
 //// [aliasUsageInObjectLiteral_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInObjectLiteral_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -42,6 +42,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInObjectLiteral_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -51,11 +52,10 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInObjectLiteral_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 var a = { x: moduleA };
 var b = { x: moduleA };
 var c = { y: { z: moduleA } };
-exports.__esModule = true;

tests/baselines/reference/aliasUsageInOrExpression.js

@@ -26,13 +26,13 @@ var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x
 
 //// [aliasUsageInOrExpression_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInOrExpression_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInOrExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -54,9 +55,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInOrExpression_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInOrExpression_moduleA");
 var i;
 var d1 = i || moduleA;
@@ -64,4 +65,3 @@ var d2 = i || moduleA;
 var d2 = moduleA || i;
 var e = null || { x: moduleA };
 var f = null ? { x: moduleA } : null;
-exports.__esModule = true;

tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js

@@ -26,13 +26,13 @@ class D extends C<IHasVisualizationModel> {
 
 //// [aliasUsageInTypeArgumentOfExtendsClause_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -54,7 +55,6 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInTypeArgumentOfExtendsClause_main.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -67,6 +67,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 var C = (function () {
     function C() {
@@ -82,4 +83,3 @@ var D = (function (_super) {
     }
     return D;
 }(C));
-exports.__esModule = true;

tests/baselines/reference/aliasUsageInVarAssignment.js

@@ -22,13 +22,13 @@ var m: typeof moduleA = i;
 
 //// [aliasUsageInVarAssignment_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInVarAssignment_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -41,6 +41,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInVarAssignment_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -50,9 +51,8 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInVarAssignment_main.js]
 "use strict";
+exports.__esModule = true;
 var i;
 var m = i;
-exports.__esModule = true;

tests/baselines/reference/aliasUsedAsNameValue.js

@@ -23,11 +23,12 @@ export var a = function () {
 exports.__esModule = true;
 //// [aliasUsedAsNameValue_1.js]
 "use strict";
+exports.__esModule = true;
 function b(a) { return null; }
 exports.b = b;
-exports.__esModule = true;
 //// [aliasUsedAsNameValue_2.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
 var mod = require("./aliasUsedAsNameValue_0");
@@ -36,4 +37,3 @@ exports.a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
 };
-exports.__esModule = true;

tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js

@@ -15,5 +15,5 @@ var d = b.q3;
 exports.__esModule = true;
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.js]
 "use strict";
-var d = b.q3;
 exports.__esModule = true;
+var d = b.q3;

tests/baselines/reference/allowSyntheticDefaultImports1.js

@@ -12,15 +12,15 @@ export class Foo {
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 exports.x = new b_1["default"].Foo();
-exports.__esModule = true;

tests/baselines/reference/allowSyntheticDefaultImports10.js

@@ -12,7 +12,7 @@ Foo.default.default.foo();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Foo = require("./b");
 Foo["default"].bar();
 Foo["default"]["default"].foo();
-exports.__esModule = true;

tests/baselines/reference/allowSyntheticDefaultImports4.js

@@ -13,6 +13,6 @@ export var x = new Foo();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 exports.x = new b_1["default"]();
-exports.__esModule = true;

tests/baselines/reference/allowSyntheticDefaultImports9.js

@@ -12,7 +12,7 @@ Foo.foo();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 b_1["default"].bar();
 b_1["default"].foo();
-exports.__esModule = true;

tests/baselines/reference/alwaysStrictModule4.js

@@ -5,6 +5,6 @@ export const a = 1
 
 //// [alwaysStrictModule4.js]
 "use strict";
+exports.__esModule = true;
 // Module commonjs
 exports.a = 1;
-exports.__esModule = true;

tests/baselines/reference/alwaysStrictModule6.js

@@ -5,6 +5,6 @@ export const a = 1;
 
 //// [alwaysStrictModule6.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // Targeting ES5
 exports.a = 1;
-Object.defineProperty(exports, "__esModule", { value: true });

tests/baselines/reference/ambientDeclarationsExternal.js

@@ -28,8 +28,8 @@ var n: number;
 // Ambient external import declaration referencing ambient external module using top level module name 
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 // Ambient external module members are always exported with or without export keyword when module lacks export assignment
 var imp3 = require("equ2");
 var n = imp3.x;
 var n;
-exports.__esModule = true;

tests/baselines/reference/ambientDeclarationsPatterns.js

@@ -34,6 +34,7 @@ foo(fileText);
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path="declarations.d.ts" />
 var foobarbaz_1 = require("foobarbaz");
 foobarbaz_1.foo(foobarbaz_1.baz);
@@ -42,4 +43,3 @@ foobarbaz_1.foo(foosball_1.foos);
 // Works with relative file name
 var file_text_1 = require("./file!text");
 foobarbaz_1.foo(file_text_1["default"]);
-exports.__esModule = true;

tests/baselines/reference/ambientExternalModuleMerging.js

@@ -19,9 +19,9 @@ declare module "M" {
 //// [ambientExternalModuleMerging_use.js]
 define(["require", "exports", "M"], function (require, exports, M) {
     "use strict";
+    exports.__esModule = true;
     // Should be strings
     var x = M.x;
     var y = M.y;
-    exports.__esModule = true;
 });
 //// [ambientExternalModuleMerging_declare.js]

tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js

@@ -22,6 +22,6 @@ var c = new A();
 //// [ambientExternalModuleWithInternalImportDeclaration_1.js]
 define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
-    var c = new A();
     exports.__esModule = true;
+    var c = new A();
 });

tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js

@@ -21,6 +21,6 @@ var c = new A();
 //// [ambientExternalModuleWithoutInternalImportDeclaration_1.js]
 define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
-    var c = new A();
     exports.__esModule = true;
+    var c = new A();
 });

tests/baselines/reference/ambientShorthand.js

@@ -15,9 +15,9 @@ foo(bar, baz, boom);
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path="declarations.d.ts"/>
 var jquery_1 = require("jquery");
 var baz = require("fs");
 var boom = require("jquery");
 jquery_1["default"](jquery_1.bar, baz, boom);
-exports.__esModule = true;

tests/baselines/reference/ambientShorthand_reExport.js

@@ -18,20 +18,20 @@ x($);
 
 //// [reExportX.js]
 "use strict";
+exports.__esModule = true;
 var jquery_1 = require("jquery");
 exports.x = jquery_1.x;
-exports.__esModule = true;
 //// [reExportAll.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("jquery"));
 exports.__esModule = true;
+__export(require("jquery"));
 //// [reExportUser.js]
 "use strict";
+exports.__esModule = true;
 var reExportX_1 = require("./reExportX");
 var $ = require("./reExportAll");
 // '$' is not callable, it is an object.
 reExportX_1.x($);
-exports.__esModule = true;

tests/baselines/reference/amdDependencyComment1.js

@@ -7,6 +7,6 @@ m1.f();
 //// [amdDependencyComment1.js]
 ///<amd-dependency path='bar'/>
 "use strict";
+exports.__esModule = true;
 var m1 = require("m2");
 m1.f();
-exports.__esModule = true;

tests/baselines/reference/amdDependencyComment2.js

@@ -8,6 +8,6 @@ m1.f();
 ///<amd-dependency path='bar'/>
 define(["require", "exports", "m2", "bar"], function (require, exports, m1) {
     "use strict";
-    m1.f();
     exports.__esModule = true;
+    m1.f();
 });

tests/baselines/reference/amdDependencyCommentName1.js

@@ -7,6 +7,6 @@ m1.f();
 //// [amdDependencyCommentName1.js]
 ///<amd-dependency path='bar' name='b'/>
 "use strict";
+exports.__esModule = true;
 var m1 = require("m2");
 m1.f();
-exports.__esModule = true;

tests/baselines/reference/amdDependencyCommentName2.js

@@ -8,6 +8,6 @@ m1.f();
 ///<amd-dependency path='bar' name='b'/>
 define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) {
     "use strict";
-    m1.f();
     exports.__esModule = true;
+    m1.f();
 });

tests/baselines/reference/amdDependencyCommentName3.js

@@ -12,6 +12,6 @@ m1.f();
 ///<amd-dependency path='goo' name='c'/>
 define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) {
     "use strict";
-    m1.f();
     exports.__esModule = true;
+    m1.f();
 });

tests/baselines/reference/amdDependencyCommentName4.js

@@ -27,9 +27,9 @@ import "unaliasedModule2";
 ///<amd-dependency path='unaliasedModule4'/>
 define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "unaliasedModule3", "unaliasedModule4", "unaliasedModule1", "unaliasedModule2"], function (require, exports, n1, n2, r1, aliasedModule2_1, aliasedModule3_1, ns) {
     "use strict";
+    exports.__esModule = true;
     r1;
     aliasedModule2_1.p1;
     aliasedModule3_1["default"];
     ns;
-    exports.__esModule = true;
 });

tests/baselines/reference/amdImportAsPrimaryExpression.js

@@ -15,18 +15,18 @@ if(foo.E1.A === 0){
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var E1;
     (function (E1) {
         E1[E1["A"] = 0] = "A";
         E1[E1["B"] = 1] = "B";
         E1[E1["C"] = 2] = "C";
     })(E1 = exports.E1 || (exports.E1 = {}));
-    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.E1.A === 0) {
     }
-    exports.__esModule = true;
 });

tests/baselines/reference/amdImportNotAsPrimaryExpression.js

@@ -34,6 +34,7 @@ var e: number = <foo.E1>0;
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
             this.m1 = 42;
@@ -48,15 +49,14 @@ define(["require", "exports"], function (require, exports) {
         E1[E1["B"] = 1] = "B";
         E1[E1["C"] = 2] = "C";
     })(E1 = exports.E1 || (exports.E1 = {}));
-    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var i;
     var x = {};
     var y = false;
     var z;
     var e = 0;
-    exports.__esModule = true;
 });

tests/baselines/reference/anonymousDefaultExportsAmd.js

@@ -9,15 +9,15 @@ export default function() {}
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class default_1 {
     }
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function default_1() { }
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });

tests/baselines/reference/anonymousDefaultExportsCommonjs.js

@@ -8,12 +8,12 @@ export default function() {}
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class default_1 {
 }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function default_1() { }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });

tests/baselines/reference/anonymousDefaultExportsUmd.js

@@ -17,10 +17,10 @@ export default function() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class default_1 {
     }
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 (function (factory) {
@@ -33,7 +33,7 @@ export default function() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function default_1() { }
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });

tests/baselines/reference/asOperator4.js

@@ -14,13 +14,13 @@ import { foo } from './foo';
 
 //// [foo.js]
 "use strict";
+exports.__esModule = true;
 function foo() { }
 exports.foo = foo;
-exports.__esModule = true;
 //// [bar.js]
 "use strict";
+exports.__esModule = true;
 var foo_1 = require("./foo");
 // These should emit identically
 foo_1.foo;
 foo_1.foo;
-exports.__esModule = true;

tests/baselines/reference/asyncAwaitIsolatedModules_es5.js

@@ -77,6 +77,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 var _this = this;
+Object.defineProperty(exports, "__esModule", { value: true });
 var missing_1 = require("missing");
 function f0() {
     return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -190,4 +191,3 @@ var M;
     }
     M.f1 = f1;
 })(M || (M = {}));
-Object.defineProperty(exports, "__esModule", { value: true });

tests/baselines/reference/asyncImportedPromise_es5.js

@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var Task = (function (_super) {
     __extends(Task, _super);
     function Task() {
@@ -29,7 +30,6 @@ var Task = (function (_super) {
     return Task;
 }(Promise));
 exports.Task = Task;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -67,6 +67,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var task_1 = require("./task");
 var Test = (function () {
     function Test() {
@@ -78,4 +79,3 @@ var Test = (function () {
     };
     return Test;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });

tests/baselines/reference/asyncImportedPromise_es6.js

@@ -11,10 +11,10 @@ class Test {
 
 //// [task.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class Task extends Promise {
 }
 exports.Task = Task;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -25,9 +25,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class Test {
     example() {
         return __awaiter(this, void 0, void 0, function* () { return; });
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });

tests/baselines/reference/augmentExportEquals1.js

@@ -33,6 +33,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
     exports.__esModule = true;
+    var a; // should not work
 });

tests/baselines/reference/augmentExportEquals1_1.js

@@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
     exports.__esModule = true;
+    var a; // should not work
 });

tests/baselines/reference/augmentExportEquals2.js

@@ -32,6 +32,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
     exports.__esModule = true;
+    var a; // should not work
 });

tests/baselines/reference/augmentExportEquals2_1.js

@@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
     exports.__esModule = true;
+    var a; // should not work
 });

tests/baselines/reference/augmentExportEquals3.js

@@ -36,13 +36,13 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
-    x.b = 1;
     exports.__esModule = true;
+    x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
-    exports.__esModule = true;
 });

tests/baselines/reference/augmentExportEquals3_1.js

@@ -30,13 +30,13 @@ let b = x.b;
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
-    x.b = 1;
     exports.__esModule = true;
+    x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
-    exports.__esModule = true;
 });

tests/baselines/reference/augmentExportEquals4.js

@@ -40,13 +40,13 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
-    x.b = 1;
     exports.__esModule = true;
+    x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
-    exports.__esModule = true;
 });

tests/baselines/reference/augmentExportEquals4_1.js

@@ -31,13 +31,13 @@ let b = x.b;
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
-    x.b = 1;
     exports.__esModule = true;
+    x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
-    exports.__esModule = true;
 });

tests/baselines/reference/augmentExportEquals5.js

@@ -90,7 +90,7 @@ define(["require", "exports"], function (require, exports) {
 //// [consumer.js]
 define(["require", "exports", "./augmentation"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     var y = x.id;
-    exports.__esModule = true;
 });

tests/baselines/reference/augmentExportEquals6.js

@@ -52,14 +52,14 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
-    x.B.b = 1;
     exports.__esModule = true;
+    x.B.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.a;
     var c = x.B.b;
-    exports.__esModule = true;
 });

tests/baselines/reference/augmentExportEquals6_1.js

@@ -34,7 +34,7 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.a;
-    exports.__esModule = true;
 });

tests/baselines/reference/augmentedTypesExternalModule1.js

@@ -6,6 +6,7 @@ module c5 { } // should be ok everywhere
 //// [augmentedTypesExternalModule1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 1;
     var c5 = (function () {
         function c5() {
@@ -13,5 +14,4 @@ define(["require", "exports"], function (require, exports) {
         c5.prototype.foo = function () { };
         return c5;
     }());
-    exports.__esModule = true;
 });

tests/baselines/reference/cacheResolutions.js

@@ -13,18 +13,18 @@ export let x = 1;
 //// [app.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [lib1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [lib2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });

tests/baselines/reference/chainedImportAlias.js

@@ -13,15 +13,15 @@ y.m.foo();
 
 //// [chainedImportAlias_file0.js]
 "use strict";
+exports.__esModule = true;
 var m;
 (function (m) {
     function foo() { }
     m.foo = foo;
 })(m = exports.m || (exports.m = {}));
-exports.__esModule = true;
 //// [chainedImportAlias_file1.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./chainedImportAlias_file0");
 var y = x;
 y.m.foo();
-exports.__esModule = true;

tests/baselines/reference/circularReference.js

@@ -35,6 +35,7 @@ export module M1 {
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 var foo2 = require("./foo2");
 var M1;
 (function (M1) {
@@ -48,9 +49,9 @@ var M1;
     }());
     M1.C1 = C1;
 })(M1 = exports.M1 || (exports.M1 = {}));
-exports.__esModule = true;
 //// [foo2.js]
 "use strict";
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var M1;
 (function (M1) {
@@ -67,4 +68,3 @@ var M1;
     }());
     M1.C1 = C1;
 })(M1 = exports.M1 || (exports.M1 = {}));
-exports.__esModule = true;

tests/baselines/reference/circularReferenceInImport.js

@@ -17,11 +17,11 @@ export function foo() {
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     return new Object();
 }
 exports.foo = foo;
-exports.__esModule = true;
 
 
 //// [app.d.ts]

tests/baselines/reference/classAbstractManyKeywords.js

@@ -6,6 +6,7 @@ import abstract class D {}
 
 //// [classAbstractManyKeywords.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = abstract;
 var A = (function () {
     function A() {
@@ -29,4 +30,3 @@ var D = (function () {
     }
     return D;
 }());
-exports.__esModule = true;

tests/baselines/reference/classExtendsAcrossFiles.js

@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 exports.b = {
     f: function () {
@@ -49,7 +50,6 @@ exports.b = {
         a_1.a.f();
     }
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [a.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -62,6 +62,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var b_1 = require("./b");
 exports.a = {
     f: function () {
@@ -80,4 +81,3 @@ exports.a = {
         b_1.b.f();
     }
 };
-Object.defineProperty(exports, "__esModule", { value: true });

tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js

@@ -21,6 +21,7 @@ export class Test1 {
 var field1;
 //// [classMemberInitializerWithLamdaScoping3_1.js]
 "use strict";
+exports.__esModule = true;
 var Test1 = (function () {
     function Test1(field1) {
         this.field1 = field1;
@@ -33,4 +34,3 @@ var Test1 = (function () {
     return Test1;
 }());
 exports.Test1 = Test1;
-exports.__esModule = true;

tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js

@@ -20,6 +20,7 @@ export class Test1 {
 exports.__esModule = true;
 //// [classMemberInitializerWithLamdaScoping3_1.js]
 "use strict";
+exports.__esModule = true;
 var Test1 = (function () {
     function Test1(field1) {
         this.field1 = field1;
@@ -30,4 +31,3 @@ var Test1 = (function () {
     return Test1;
 }());
 exports.Test1 = Test1;
-exports.__esModule = true;

tests/baselines/reference/collisionExportsRequireAndAlias.js

@@ -20,22 +20,23 @@ export function foo2() {
 //// [collisionExportsRequireAndAlias_file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function bar() {
     }
     exports.bar = bar;
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAlias_file3333.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function bar2() {
     }
     exports.bar2 = bar2;
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAlias_file2.js]
 define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
         require.bar();
     }
@@ -44,5 +45,4 @@ define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisio
         exports.bar2();
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });

tests/baselines/reference/collisionExportsRequireAndAmbientClass.js

@@ -40,10 +40,10 @@ module m4 {
 //// [collisionExportsRequireAndAmbientClass_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientClass_globalFile.js]
 var m4;

tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js

@@ -63,10 +63,10 @@ module m4 {
 //// [collisionExportsRequireAndAmbientEnum_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientEnum_globalFile.js]
 var m4;

tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js

@@ -16,9 +16,9 @@ module m2 {
 //// [collisionExportsRequireAndAmbientFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });

tests/baselines/reference/collisionExportsRequireAndAmbientModule.js

@@ -97,6 +97,7 @@ module m4 {
 //// [collisionExportsRequireAndAmbientModule_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
         return null;
     }
@@ -109,7 +110,6 @@ define(["require", "exports"], function (require, exports) {
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientModule_globalFile.js]
 var m4;

tests/baselines/reference/collisionExportsRequireAndAmbientVar.js

@@ -29,11 +29,11 @@ module m4 {
 //// [collisionExportsRequireAndAmbientVar_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientVar_globalFile.js]
 var m4;

tests/baselines/reference/collisionExportsRequireAndClass.js

@@ -39,6 +39,7 @@ module m4 {
 //// [collisionExportsRequireAndClass_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var require = (function () {
         function require() {
         }
@@ -79,7 +80,6 @@ define(["require", "exports"], function (require, exports) {
         }());
         m2.exports = exports;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndClass_globalFile.js]
 var require = (function () {

tests/baselines/reference/collisionExportsRequireAndEnum.js

@@ -63,6 +63,7 @@ module m4 {
 //// [collisionExportsRequireAndEnum_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var require;
     (function (require) {
         require[require["_thisVal1"] = 0] = "_thisVal1";
@@ -99,7 +100,6 @@ define(["require", "exports"], function (require, exports) {
             exports[exports["_thisVal2"] = 1] = "_thisVal2";
         })(exports = m2.exports || (m2.exports = {}));
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndEnum_globalFile.js]
 var require;

tests/baselines/reference/collisionExportsRequireAndFunction.js

@@ -25,6 +25,7 @@ module m2 {
 //// [collisionExportsRequireAndFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function exports() {
         return 1;
     }
@@ -53,5 +54,4 @@ define(["require", "exports"], function (require, exports) {
         }
         m2.require = require;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });

tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js

@@ -25,6 +25,7 @@ module m2 {
 //// [collisionExportsRequireAndInternalModuleAlias.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m;
     (function (m) {
         var c = (function () {
@@ -52,5 +53,4 @@ define(["require", "exports"], function (require, exports) {
         new m2.exports();
         new m2.require();
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });

tests/baselines/reference/collisionExportsRequireAndModule.js

@@ -94,6 +94,7 @@ module m4 {
 //// [collisionExportsRequireAndModule_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var require;
     (function (require) {
         var C = (function () {
@@ -162,7 +163,6 @@ define(["require", "exports"], function (require, exports) {
             exports.C = C;
         })(exports = m2.exports || (m2.exports = {}));
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndModule_globalFile.js]
 var require;

tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js

@@ -17,6 +17,7 @@ export function foo2(): exports.I {
 //// [collisionExportsRequireAndUninstantiatedModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
         return null;
     }
@@ -25,5 +26,4 @@ define(["require", "exports"], function (require, exports) {
         return null;
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });

tests/baselines/reference/collisionExportsRequireAndVar.js

@@ -29,6 +29,7 @@ module m4 {
 //// [collisionExportsRequireAndVar_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
     }
     exports.foo = foo;
@@ -44,7 +45,6 @@ define(["require", "exports"], function (require, exports) {
         m2.exports = 0;
         m2.require = "require";
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndVar_globalFile.js]
 var exports = 0;

tests/baselines/reference/commentOnExportEnumDeclaration.js

@@ -8,6 +8,7 @@ export enum Color {
 
 //// [commentOnExportEnumDeclaration.js]
 "use strict";
+exports.__esModule = true;
 /**
  * comment
  */
@@ -17,4 +18,3 @@ var Color;
     Color[Color["g"] = 1] = "g";
     Color[Color["b"] = 2] = "b";
 })(Color = exports.Color || (exports.Color = {}));
-exports.__esModule = true;

tests/baselines/reference/commentsDottedModuleName.js

@@ -10,6 +10,7 @@ export module outerModule.InnerModule {
 //// [commentsDottedModuleName.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** this is multi declare module*/
     var outerModule;
     (function (outerModule) {
@@ -24,7 +25,6 @@ define(["require", "exports"], function (require, exports) {
             InnerModule.b = b;
         })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {}));
     })(outerModule = exports.outerModule || (exports.outerModule = {}));
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 

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) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** Module comment*/
     var m1;
     (function (m1) {
@@ -124,16 +125,15 @@ define(["require", "exports"], function (require, exports) {
     })(m4 = exports.m4 || (exports.m4 = {}));
     m4.fooExport();
     var myvar2 = new m4.m2.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [commentsExternalModules_1.js]
 define(["require", "exports", "commentsExternalModules_0"], function (require, exports, extMod) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     extMod.m1.fooExport();
     var newVar = new extMod.m1.m2.c();
     extMod.m4.fooExport();
     var newVar2 = new extMod.m4.m2.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 

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) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** Module comment*/
     var m1;
     (function (m1) {
@@ -124,16 +125,15 @@ define(["require", "exports"], function (require, exports) {
     })(m4 = exports.m4 || (exports.m4 = {}));
     m4.fooExport();
     var myvar2 = new m4.m2.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [commentsExternalModules_1.js]
 define(["require", "exports", "commentsExternalModules2_0"], function (require, exports, extMod) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     extMod.m1.fooExport();
     exports.newVar = new extMod.m1.m2.c();
     extMod.m4.fooExport();
     exports.newVar2 = new extMod.m4.m2.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 

tests/baselines/reference/commentsExternalModules3.js

@@ -63,6 +63,7 @@ export var newVar2 = new extMod.m4.m2.c();
 
 //// [commentsExternalModules2_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** Module comment*/
 var m1;
 (function (m1) {
@@ -123,16 +124,15 @@ var m4;
 })(m4 = exports.m4 || (exports.m4 = {}));
 m4.fooExport();
 var myvar2 = new m4.m2.c();
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [commentsExternalModules_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**This is on import declaration*/
 var extMod = require("./commentsExternalModules2_0"); // trailing comment 1
 extMod.m1.fooExport();
 exports.newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
 exports.newVar2 = new extMod.m4.m2.c();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [commentsExternalModules2_0.d.ts]

tests/baselines/reference/commentsMultiModuleMultiFile.js

@@ -39,6 +39,7 @@ new multiM.d();
 //// [commentsMultiModuleMultiFile_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** this is multi declare module*/
     var multiM;
     (function (multiM) {
@@ -69,11 +70,11 @@ define(["require", "exports"], function (require, exports) {
     })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.b();
     new multiM.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [commentsMultiModuleMultiFile_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** this is multi module 3 comment*/
     var multiM;
     (function (multiM) {
@@ -93,7 +94,6 @@ define(["require", "exports"], function (require, exports) {
         multiM.f = f;
     })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.d();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 

tests/baselines/reference/commentsOnRequireStatement.js

@@ -19,14 +19,15 @@ export {subject1} from './1';
 
 //// [0.js]
 "use strict";
-exports.subject = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.subject = 10;
 //// [1.js]
 "use strict";
-exports.subject1 = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.subject1 = 10;
 //// [2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /* blah0 */
 // blah 
 // blah 
@@ -36,4 +37,3 @@ exports.subject = _0_1.subject;
 /* blah1 */
 var _1_1 = require("./1");
 exports.subject1 = _1_1.subject1;
-Object.defineProperty(exports, "__esModule", { value: true });

tests/baselines/reference/commonJSImportAsPrimaryExpression.js

@@ -15,6 +15,7 @@ if(foo.C1.s1){
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
         this.m1 = 42;
@@ -23,10 +24,9 @@ var C1 = (function () {
 }());
 C1.s1 = true;
 exports.C1 = C1;
-exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 if (foo.C1.s1) {
 }
-exports.__esModule = true;

tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js

@@ -33,6 +33,7 @@ var e: number = <foo.E1>0;
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
         this.m1 = 42;
@@ -47,12 +48,11 @@ var E1;
     E1[E1["B"] = 1] = "B";
     E1[E1["C"] = 2] = "C";
 })(E1 = exports.E1 || (exports.E1 = {}));
-exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var i;
 var x = {};
 var y = false;
 var z;
 var e = 0;
-exports.__esModule = true;

tests/baselines/reference/commonSourceDir5.js

@@ -19,18 +19,18 @@ export var y = x * i;
 //// [concat.js]
 define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require, exports, bar_1, foo_1) {
     "use strict";
+    exports.__esModule = true;
     exports.pi = Math.PI;
     exports.y = bar_1.x * foo_1.i;
-    exports.__esModule = true;
 });
 define("A:/foo", ["require", "exports", "B:/baz"], function (require, exports, baz_1) {
     "use strict";
+    exports.__esModule = true;
     exports.i = Math.sqrt(-1);
     exports.z = baz_1.pi * baz_1.pi;
-    exports.__esModule = true;
 });
 define("A:/bar", ["require", "exports", "A:/foo"], function (require, exports, foo_2) {
     "use strict";
-    exports.x = foo_2.z + foo_2.z;
     exports.__esModule = true;
+    exports.x = foo_2.z + foo_2.z;
 });

tests/baselines/reference/commonSourceDir6.js

@@ -18,18 +18,18 @@ export var y = x * i;
 //// [concat.js]
 define("baz", ["require", "exports", "a/bar", "a/foo"], function (require, exports, bar_1, foo_1) {
     "use strict";
+    exports.__esModule = true;
     exports.pi = Math.PI;
     exports.y = bar_1.x * foo_1.i;
-    exports.__esModule = true;
 });
 define("a/foo", ["require", "exports", "baz"], function (require, exports, baz_1) {
     "use strict";
+    exports.__esModule = true;
     exports.i = Math.sqrt(-1);
     exports.z = baz_1.pi * baz_1.pi;
-    exports.__esModule = true;
 });
 define("a/bar", ["require", "exports", "a/foo"], function (require, exports, foo_2) {
     "use strict";
-    exports.x = foo_2.z + foo_2.z;
     exports.__esModule = true;
+    exports.x = foo_2.z + foo_2.z;
 });

tests/baselines/reference/commonSourceDirectory.js

@@ -19,11 +19,11 @@ x + y;
 
 //// [/app/bin/index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="../types/bar.d.ts"/>
 var foo_1 = require("foo");
 var bar_1 = require("bar");
 foo_1.x + bar_1.y;
-exports.__esModule = true;
 //# sourceMappingURL=/app/myMapRoot/index.js.map
 
 //// [/app/bin/index.d.ts]

tests/baselines/reference/commonSourceDirectory.js.map

@@ -1,2 +1,2 @@
 //// [/app/bin/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"}

tests/baselines/reference/commonSourceDirectory.sourcemap.txt

@@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js
 sourceFile:index.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>exports.__esModule = true;
 >>>/// <reference path="../types/bar.d.ts"/>
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >/// <reference path="../types/bar.d.ts"/>
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 42) Source(1, 42) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 42) Source(1, 42) + SourceIndex(0)
 ---
 >>>var foo_1 = require("foo");
 1 >
@@ -24,8 +25,8 @@ sourceFile:index.ts
 1 >
   >
 2 >import { x } from "foo";
-1 >Emitted(3, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(3, 28) Source(2, 25) + SourceIndex(0)
+1 >Emitted(4, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(4, 28) Source(2, 25) + SourceIndex(0)
 ---
 >>>var bar_1 = require("bar");
 1->
@@ -33,8 +34,8 @@ sourceFile:index.ts
 1->
   >
 2 >import { y } from "bar";
-1->Emitted(4, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(4, 28) Source(3, 25) + SourceIndex(0)
+1->Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 28) Source(3, 25) + SourceIndex(0)
 ---
 >>>foo_1.x + bar_1.y;
 1 >
@@ -42,18 +43,17 @@ sourceFile:index.ts
 3 >       ^^^
 4 >          ^^^^^^^
 5 >                 ^
-6 >                  ^^^^^^^^^->
+6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >x
 3 >        + 
 4 >          y
 5 >                 ;
-1 >Emitted(5, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(5, 8) Source(4, 2) + SourceIndex(0)
-3 >Emitted(5, 11) Source(4, 5) + SourceIndex(0)
-4 >Emitted(5, 18) Source(4, 6) + SourceIndex(0)
-5 >Emitted(5, 19) Source(4, 7) + SourceIndex(0)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 8) Source(4, 2) + SourceIndex(0)
+3 >Emitted(6, 11) Source(4, 5) + SourceIndex(0)
+4 >Emitted(6, 18) Source(4, 6) + SourceIndex(0)
+5 >Emitted(6, 19) Source(4, 7) + SourceIndex(0)
 ---
->>>exports.__esModule = true;
 >>>//# sourceMappingURL=/app/myMapRoot/index.js.map

tests/baselines/reference/commonSourceDirectory_dts.js

@@ -12,9 +12,9 @@ export const x = y;
 
 //// [/app/bin/index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="../lib/bar.d.ts" />
 exports.x = y;
-exports.__esModule = true;
 //# sourceMappingURL=/app/myMapRoot/index.js.map
 
 //// [/app/bin/index.d.ts]

tests/baselines/reference/commonSourceDirectory_dts.js.map

@@ -1,2 +1,2 @@
 //// [/app/bin/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"}

tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt

@@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js
 sourceFile:index.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>exports.__esModule = true;
 >>>/// <reference path="../lib/bar.d.ts" />
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >/// <reference path="../lib/bar.d.ts" />
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 41) Source(1, 41) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 41) Source(1, 41) + SourceIndex(0)
 ---
 >>>exports.x = y;
 1 >
@@ -24,7 +25,7 @@ sourceFile:index.ts
 4 >         ^^^
 5 >            ^
 6 >             ^
-7 >              ^^^^^^^^^^^^^->
+7 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >export const 
 2 >
@@ -32,12 +33,11 @@ sourceFile:index.ts
 4 >          = 
 5 >            y
 6 >             ;
-1 >Emitted(3, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0)
-3 >Emitted(3, 10) Source(2, 15) + SourceIndex(0)
-4 >Emitted(3, 13) Source(2, 18) + SourceIndex(0)
-5 >Emitted(3, 14) Source(2, 19) + SourceIndex(0)
-6 >Emitted(3, 15) Source(2, 20) + SourceIndex(0)
+1 >Emitted(4, 1) Source(2, 14) + SourceIndex(0)
+2 >Emitted(4, 9) Source(2, 14) + SourceIndex(0)
+3 >Emitted(4, 10) Source(2, 15) + SourceIndex(0)
+4 >Emitted(4, 13) Source(2, 18) + SourceIndex(0)
+5 >Emitted(4, 14) Source(2, 19) + SourceIndex(0)
+6 >Emitted(4, 15) Source(2, 20) + SourceIndex(0)
 ---
->>>exports.__esModule = true;
 >>>//# sourceMappingURL=/app/myMapRoot/index.js.map

tests/baselines/reference/commonjsSafeImport.js

@@ -12,14 +12,14 @@ Foo();
 
 //// [10_lib.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Foo() { }
 exports.Foo = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var _10_lib_1 = require("./10_lib");
 _10_lib_1.Foo();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [10_lib.d.ts]

tests/baselines/reference/complexNarrowingWithAny.js

@@ -562,6 +562,7 @@ export function viewFactory_AppComponent0(viewUtils:any,parentInjector:any,decla
 //// [complexNarrowingWithAny.js]
 // Repro from #10869
 "use strict";
+exports.__esModule = true;
 /**
  * This file is generated by the Angular 2 template compiler.
  * Do not edit.
@@ -1025,4 +1026,3 @@ function viewFactory_AppComponent0(viewUtils, parentInjector, declarationEl) {
     return new _View_AppComponent0(viewUtils, parentInjector, declarationEl);
 }
 exports.viewFactory_AppComponent0 = viewFactory_AppComponent0;
-exports.__esModule = true;

tests/baselines/reference/constDeclarations-access5.js

@@ -51,12 +51,13 @@ m.x.toString();
 //// [constDeclarations_access_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 0;
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = 0;
 });
 //// [constDeclarations_access_2.js]
 define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     // Errors
     m.x = 1;
     m.x += 2;
@@ -87,5 +88,4 @@ define(["require", "exports", "constDeclarations_access_1"], function (require,
     -m.x;
     +m.x;
     m.x.toString();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });