From 39eb187e5c530ac1124bfeefd7c2c811493e55de Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Fri, 11 Nov 2016 01:22:06 -0800
Subject: [PATCH 001/127] Added diagnostic.

---
 src/compiler/diagnosticMessages.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 9a353e6fb36..1ae59b61acc 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3159,6 +3159,10 @@
         "category": "Message",
         "code": 90007
     },
+    "Add 'this.' to unresolved variable.": {
+        "category": "Message",
+        "code": 90008
+    },
     "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
         "category": "Error",
         "code": 90009

From da356b075a4829e616bebe26196c5944ac9393c9 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Fri, 11 Nov 2016 01:25:50 -0800
Subject: [PATCH 002/127] Added tests for missing 'this' property accesses.

---
 tests/cases/fourslash/codeFixAddForgottenThis01.ts | 10 ++++++++++
 tests/cases/fourslash/codeFixAddForgottenThis02.ts |  9 +++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 tests/cases/fourslash/codeFixAddForgottenThis01.ts
 create mode 100644 tests/cases/fourslash/codeFixAddForgottenThis02.ts

diff --git a/tests/cases/fourslash/codeFixAddForgottenThis01.ts b/tests/cases/fourslash/codeFixAddForgottenThis01.ts
new file mode 100644
index 00000000000..90d191b6ba5
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAddForgottenThis01.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+////class C {
+////    foo: number;
+////    constructor() {
+////        [|foo = 10|];
+////    }
+////}
+
+verify.rangeAfterCodeFix("this.foo = 10");
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixAddForgottenThis02.ts b/tests/cases/fourslash/codeFixAddForgottenThis02.ts
new file mode 100644
index 00000000000..b387f349073
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAddForgottenThis02.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+////class C {
+////    constructor(public foo) {
+////    }
+////    bar() { [|foo = 10|] };
+////}
+
+verify.rangeAfterCodeFix("this.foo = 10");
\ No newline at end of file

From f2c0aa4444db61ee3870c6d3dc7b8cb74cc44e05 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Fri, 11 Nov 2016 01:27:26 -0800
Subject: [PATCH 003/127] Added fix for missing 'this.' property accesses.

---
 .../codefixes/fixForgottenThisPropertyAccess.ts  | 16 ++++++++++++++++
 src/services/codefixes/fixes.ts                  |  3 ++-
 src/services/tsconfig.json                       |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/services/codefixes/fixForgottenThisPropertyAccess.ts

diff --git a/src/services/codefixes/fixForgottenThisPropertyAccess.ts b/src/services/codefixes/fixForgottenThisPropertyAccess.ts
new file mode 100644
index 00000000000..c9d59dd8337
--- /dev/null
+++ b/src/services/codefixes/fixForgottenThisPropertyAccess.ts
@@ -0,0 +1,16 @@
+/* @internal */
+namespace ts.codefix {
+    registerCodeFix({
+        errorCodes: [Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0.code],
+        getCodeActions: (context: CodeFixContext) => {
+            const sourceFile = context.sourceFile;
+            const token = getTokenAtPosition(sourceFile, context.span.start);
+            const start = token.getStart(sourceFile);
+
+            return [{
+                description: getLocaleSpecificMessage(Diagnostics.Add_this_to_unresolved_variable),
+                changes: [{ fileName: sourceFile.fileName, textChanges: [{ newText: "this.", span: { start, length: 0 } }] }]
+            }];
+        }
+    });
+}
\ No newline at end of file
diff --git a/src/services/codefixes/fixes.ts b/src/services/codefixes/fixes.ts
index 982b6abc84b..da51f04ff8c 100644
--- a/src/services/codefixes/fixes.ts
+++ b/src/services/codefixes/fixes.ts
@@ -3,4 +3,5 @@
 /// <reference path="fixClassSuperMustPrecedeThisAccess.ts" />
 /// <reference path="fixConstructorForDerivedNeedSuperCall.ts" />
 /// <reference path="fixExtendsInterfaceBecomesImplements.ts" />
-/// <reference path="fixRemoveAbstractModifierInNonAbstractClass.ts" />
\ No newline at end of file
+/// <reference path="fixRemoveAbstractModifierInNonAbstractClass.ts" />
+/// <reference path="fixForgottenThisPropertyAccess.ts" />
\ No newline at end of file
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 69efe29ba39..699ffcd7612 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -91,6 +91,7 @@
         "codeFixes/fixClassIncorrectlyImplementsInterface.ts",
         "codeFixes/fixClassDoesntImplementInheritedAbstractMember.ts",
         "codeFixes/fixClassSuperMustPrecedeThisAccess.ts",
-        "codeFixes/fixConstructorForDerivedNeedSuperCall.ts"
+        "codeFixes/fixConstructorForDerivedNeedSuperCall.ts",
+        "codefixes/fixForgottenThisPropertyAccess.ts"
     ]
 }

From b220831ab7a89fd7e03889911cea738e9daafd31 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Tue, 29 Nov 2016 07:01:31 -0800
Subject: [PATCH 004/127] Sort matched files by include order

---
 src/compiler/commandLineParser.ts             |   1 -
 src/compiler/core.ts                          | 123 +++++++++++-------
 src/harness/unittests/matchFiles.ts           |  52 ++++++--
 .../nodeModulesMaxDepthExceeded.errors.txt    |  20 +--
 .../amd/nodeModulesMaxDepthExceeded.json      |   4 +-
 .../nodeModulesMaxDepthExceeded.errors.txt    |  20 +--
 .../node/nodeModulesMaxDepthExceeded.json     |   4 +-
 7 files changed, 141 insertions(+), 83 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 3c6a86134ea..a81698469e7 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -1264,7 +1264,6 @@ namespace ts {
 
         const literalFiles = reduceProperties(literalFileMap, addFileToOutput, []);
         const wildcardFiles = reduceProperties(wildcardFileMap, addFileToOutput, []);
-        wildcardFiles.sort(host.useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
         return {
             fileNames: literalFiles.concat(wildcardFiles),
             wildcardDirectories
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 89057dd2939..8406404132d 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1668,7 +1668,19 @@ namespace ts {
     const singleAsteriskRegexFragmentFiles = "([^./]|(\\.(?!min\\.js$))?)*";
     const singleAsteriskRegexFragmentOther = "[^/]*";
 
-    export function getRegularExpressionForWildcard(specs: string[], basePath: string, usage: "files" | "directories" | "exclude") {
+    export function getRegularExpressionForWildcard(specs: string[], basePath: string, usage: "files" | "directories" | "exclude"): string | undefined {
+        const patterns = getRegularExpressionsForWildcards(specs, basePath, usage);
+        if (!patterns || !patterns.length) {
+            return undefined;
+        }
+
+        const pattern = patterns.map(pattern => `(${pattern})`).join("|");
+        // If excluding, match "foo/bar/baz...", but if including, only allow "foo".
+        const terminator = usage === "exclude" ? "($|/)" : "$";
+        return `^(${pattern})${terminator}`;
+    }
+
+    function getRegularExpressionsForWildcards(specs: string[], basePath: string, usage: "files" | "directories" | "exclude"): string[] | undefined {
         if (specs === undefined || specs.length === 0) {
             return undefined;
         }
@@ -1682,33 +1694,8 @@ namespace ts {
          */
         const doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?";
 
-        let pattern = "";
-        let hasWrittenSubpattern = false;
-        for (const spec of specs) {
-            if (!spec) {
-                continue;
-            }
-
-            const subPattern = getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter);
-            if (subPattern === undefined) {
-                continue;
-            }
-
-            if (hasWrittenSubpattern) {
-                pattern += "|";
-            }
-
-            pattern += "(" + subPattern + ")";
-            hasWrittenSubpattern = true;
-        }
-
-        if (!pattern) {
-            return undefined;
-        }
-
-        // If excluding, match "foo/bar/baz...", but if including, only allow "foo".
-        const terminator = usage === "exclude" ? "($|/)" : "$";
-        return `^(${pattern})${terminator}`;
+        return flatMap(specs, spec =>
+            spec && getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter));
     }
 
     /**
@@ -1803,6 +1790,9 @@ namespace ts {
     }
 
     export interface FileMatcherPatterns {
+        /** One pattern for each "include" spec. */
+        includeFilePatterns: string[];
+        /** One pattern matching one of any of the "include" specs. */
         includeFilePattern: string;
         includeDirectoryPattern: string;
         excludePattern: string;
@@ -1815,6 +1805,7 @@ namespace ts {
         const absolutePath = combinePaths(currentDirectory, path);
 
         return {
+            includeFilePatterns: map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), pattern => `^${pattern}$`),
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
@@ -1829,38 +1820,76 @@ namespace ts {
         const patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
 
         const regexFlag = useCaseSensitiveFileNames ? "" : "i";
-        const includeFileRegex = patterns.includeFilePattern && new RegExp(patterns.includeFilePattern, regexFlag);
+        const includeFileRegexes = patterns.includeFilePatterns && patterns.includeFilePatterns.map(pattern => new RegExp(pattern, regexFlag));
         const includeDirectoryRegex = patterns.includeDirectoryPattern && new RegExp(patterns.includeDirectoryPattern, regexFlag);
         const excludeRegex = patterns.excludePattern && new RegExp(patterns.excludePattern, regexFlag);
 
-        const result: string[] = [];
+        // Associate an array of results with each include regex. This keeps results in order of the "include" order.
+        // If there are no "includes", then just put everything in results[0].
+        const results: string[][] = includeFileRegexes ? includeFileRegexes.map(() => []) : [[]];
+
         for (const basePath of patterns.basePaths) {
-            visitDirectory(basePath, combinePaths(currentDirectory, basePath));
+            forEachFileInRecursiveDirectories(basePath, combinePaths(currentDirectory, basePath), { useCaseSensitiveFileNames, getFileSystemEntries, includeDirectory, visitFile });
         }
-        return result;
+
+        return flatten(results);
+
+        function includeDirectory(absoluteDirectoryName: string): boolean {
+            return (!includeDirectoryRegex || includeDirectoryRegex.test(absoluteDirectoryName)) &&
+                (!excludeRegex || !excludeRegex.test(absoluteDirectoryName));
+        }
+
+        function visitFile(fileName: string, absoluteFileName: string): void {
+            if (extensions && !fileExtensionIsAny(fileName, extensions) ||
+                excludeRegex && excludeRegex.test(absoluteFileName)) {
+                return;
+            }
+
+            if (!includeFileRegexes) {
+                results[0].push(fileName);
+            }
+            else {
+                for (let i = 0; i < includeFileRegexes.length; i++) {
+                    if (includeFileRegexes[i].test(absoluteFileName)) {
+                        results[i].push(fileName);
+                        // Only include a file once.
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    interface RecursiveDirectoryVisitor {
+        useCaseSensitiveFileNames: boolean;
+        getFileSystemEntries: (path: string) => FileSystemEntries;
+        includeDirectory: (absoluteDirectoryName: string) => boolean;
+        visitFile: (fileName: string, absoluteFileName: string) => void;
+    }
+
+    function forEachFileInRecursiveDirectories(start: string, absoluteStart: string, visitor: RecursiveDirectoryVisitor): void {
+        visitDirectory(start, absoluteStart);
 
         function visitDirectory(path: string, absolutePath: string) {
-            const { files, directories } = getFileSystemEntries(path);
+            let { files, directories } = visitor.getFileSystemEntries(path);
+            files = sorted(files);
+            directories = sorted(directories);
 
-            for (const current of files) {
-                const name = combinePaths(path, current);
-                const absoluteName = combinePaths(absolutePath, current);
-                if ((!extensions || fileExtensionIsAny(name, extensions)) &&
-                    (!includeFileRegex || includeFileRegex.test(absoluteName)) &&
-                    (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    result.push(name);
-                }
+            for (const file of files) {
+                visitor.visitFile(combinePaths(path, file), combinePaths(absolutePath, file));
             }
 
-            for (const current of directories) {
-                const name = combinePaths(path, current);
-                const absoluteName = combinePaths(absolutePath, current);
-                if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
-                    (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(name, absoluteName);
+            for (const dir of directories) {
+                const absoluteName = combinePaths(absolutePath, dir);
+                if (visitor.includeDirectory(absoluteName)) {
+                    visitDirectory(combinePaths(path, dir), absoluteName);
                 }
             }
         }
+
+        function sorted(names: string[]): string[] {
+            return names.slice().sort(visitor.useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
+        }
     }
 
     /**
diff --git a/src/harness/unittests/matchFiles.ts b/src/harness/unittests/matchFiles.ts
index c562fcefe91..00efe73c3e2 100644
--- a/src/harness/unittests/matchFiles.ts
+++ b/src/harness/unittests/matchFiles.ts
@@ -346,9 +346,9 @@ namespace ts {
                     fileNames: [
                         "c:/dev/a.ts",
                         "c:/dev/b.ts",
+                        "c:/dev/node_modules/a.ts",
                         "c:/dev/bower_components/a.ts",
-                        "c:/dev/jspm_packages/a.ts",
-                        "c:/dev/node_modules/a.ts"
+                        "c:/dev/jspm_packages/a.ts"
                     ],
                     wildcardDirectories: {},
                 };
@@ -373,9 +373,9 @@ namespace ts {
                     options: {},
                     errors: [],
                     fileNames: [
+                        "c:/dev/node_modules/a.ts",
                         "c:/dev/bower_components/a.ts",
-                        "c:/dev/jspm_packages/a.ts",
-                        "c:/dev/node_modules/a.ts"
+                        "c:/dev/jspm_packages/a.ts"
                     ],
                     wildcardDirectories: {},
                 };
@@ -398,9 +398,9 @@ namespace ts {
                     fileNames: [
                         "c:/dev/a.ts",
                         "c:/dev/b.ts",
+                        "c:/dev/node_modules/a.ts",
                         "c:/dev/bower_components/a.ts",
-                        "c:/dev/jspm_packages/a.ts",
-                        "c:/dev/node_modules/a.ts"
+                        "c:/dev/jspm_packages/a.ts"
                     ],
                     wildcardDirectories: {},
                 };
@@ -410,6 +410,36 @@ namespace ts {
         });
 
         describe("with wildcard include list", () => {
+            it("is sorted in include order, then in alphabetical order", () => {
+                const json = {
+                    include: [
+                        "z/*.ts",
+                        "x/*.ts"
+                    ]
+                };
+                const expected: ts.ParsedCommandLine = {
+                    options: {},
+                    errors: [],
+                    fileNames: [
+                        "c:/dev/z/a.ts",
+                        "c:/dev/z/aba.ts",
+                        "c:/dev/z/abz.ts",
+                        "c:/dev/z/b.ts",
+                        "c:/dev/z/bba.ts",
+                        "c:/dev/z/bbz.ts",
+                        "c:/dev/x/a.ts",
+                        "c:/dev/x/aa.ts",
+                        "c:/dev/x/b.ts"
+                    ],
+                    wildcardDirectories: {
+                        "c:/dev/z": ts.WatchDirectoryFlags.None,
+                        "c:/dev/x": ts.WatchDirectoryFlags.None
+                    },
+                };
+                const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveHost, caseInsensitiveBasePath);
+                assertParsed(actual, expected);
+            });
+
             it("same named declarations are excluded", () => {
                 const json = {
                     include: [
@@ -506,8 +536,8 @@ namespace ts {
                     options: {},
                     errors: [],
                     fileNames: [
-                        "c:/dev/x/a.ts",
                         "c:/dev/x/y/a.ts",
+                        "c:/dev/x/a.ts",
                         "c:/dev/z/a.ts"
                     ],
                     wildcardDirectories: {
@@ -1230,8 +1260,8 @@ namespace ts {
                         options: {},
                         errors: [],
                         fileNames: [
-                            "c:/dev/.z/.b.ts",
-                            "c:/dev/x/.y/a.ts"
+                            "c:/dev/x/.y/a.ts",
+                            "c:/dev/.z/.b.ts"
                         ],
                         wildcardDirectories: {}
                     };
@@ -1271,8 +1301,8 @@ namespace ts {
                         options: {},
                         errors: [],
                         fileNames: [
-                            "c:/dev/.z/.b.ts",
-                            "c:/dev/x/.y/a.ts"
+                            "c:/dev/x/.y/a.ts",
+                            "c:/dev/.z/.b.ts"
                         ],
                         wildcardDirectories: {
                             "c:/dev/.z": ts.WatchDirectoryFlags.Recursive,
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
index 99e7b193f0c..5b5199ad7ae 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
@@ -2,19 +2,10 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type '"10"' is not assignable to ty
 maxDepthExceeded/root.ts(4,4): error TS2540: Cannot assign to 'rel' because it is a constant or a read-only property.
 
 
-==== entry.js (0 errors) ====
-    var m3 = require("m3");
-    
-    module.exports = {
-    	"a": 42,
-    	"b": "hello, world",
-    	"person": m3.person
-    };
-    
 ==== relative.js (0 errors) ====
     exports.relativeProp = true;
     
-==== maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     var rel = require('./relative');
     
@@ -40,4 +31,13 @@ maxDepthExceeded/root.ts(4,4): error TS2540: Cannot assign to 'rel' because it i
 !!! error TS2540: Cannot assign to 'rel' because it is a constant or a read-only property.
     
     m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+    
+==== entry.js (0 errors) ====
+    var m3 = require("m3");
+    
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json
index 86e856dc7b8..9efa0e936ac 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json
@@ -7,10 +7,10 @@
     "project": "maxDepthExceeded",
     "resolvedInputFiles": [
         "lib.d.ts",
-        "maxDepthExceeded/node_modules/m2/entry.js",
         "maxDepthExceeded/node_modules/m1/relative.js",
         "maxDepthExceeded/node_modules/m1/index.js",
-        "maxDepthExceeded/root.ts"
+        "maxDepthExceeded/root.ts",
+        "maxDepthExceeded/node_modules/m2/entry.js"
     ],
     "emittedFiles": [
         "maxDepthExceeded/built/node_modules/m1/relative.js",
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
index 99e7b193f0c..5b5199ad7ae 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
@@ -2,19 +2,10 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type '"10"' is not assignable to ty
 maxDepthExceeded/root.ts(4,4): error TS2540: Cannot assign to 'rel' because it is a constant or a read-only property.
 
 
-==== entry.js (0 errors) ====
-    var m3 = require("m3");
-    
-    module.exports = {
-    	"a": 42,
-    	"b": "hello, world",
-    	"person": m3.person
-    };
-    
 ==== relative.js (0 errors) ====
     exports.relativeProp = true;
     
-==== maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     var rel = require('./relative');
     
@@ -40,4 +31,13 @@ maxDepthExceeded/root.ts(4,4): error TS2540: Cannot assign to 'rel' because it i
 !!! error TS2540: Cannot assign to 'rel' because it is a constant or a read-only property.
     
     m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+    
+==== entry.js (0 errors) ====
+    var m3 = require("m3");
+    
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json
index 86e856dc7b8..9efa0e936ac 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json
@@ -7,10 +7,10 @@
     "project": "maxDepthExceeded",
     "resolvedInputFiles": [
         "lib.d.ts",
-        "maxDepthExceeded/node_modules/m2/entry.js",
         "maxDepthExceeded/node_modules/m1/relative.js",
         "maxDepthExceeded/node_modules/m1/index.js",
-        "maxDepthExceeded/root.ts"
+        "maxDepthExceeded/root.ts",
+        "maxDepthExceeded/node_modules/m2/entry.js"
     ],
     "emittedFiles": [
         "maxDepthExceeded/built/node_modules/m1/relative.js",

From 157a9b02fc5e9aa825697bd7779145eded74cdf5 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 5 Dec 2016 08:43:16 -0800
Subject: [PATCH 005/127] Properly determine whether an augmentation is a
 ValueModule or NamespaceModule

---
 src/compiler/binder.ts                        | 19 ++++++++++------
 .../reference/augmentExportEquals7.errors.txt | 22 +++++++++++++++++++
 tests/cases/compiler/augmentExportEquals7.ts  | 10 +++++++++
 3 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 tests/baselines/reference/augmentExportEquals7.errors.txt
 create mode 100644 tests/cases/compiler/augmentExportEquals7.ts

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index a6f5993f6c8..e00e9294529 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1509,7 +1509,7 @@ namespace ts {
                     errorOnFirstToken(node, Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible);
                 }
                 if (isExternalModuleAugmentation(node)) {
-                    declareSymbolAndAddToSymbolTable(node, SymbolFlags.NamespaceModule, SymbolFlags.NamespaceModuleExcludes);
+                    declareModuleSymbol(node);
                 }
                 else {
                     let pattern: Pattern | undefined;
@@ -1531,12 +1531,8 @@ namespace ts {
                 }
             }
             else {
-                const state = getModuleInstanceState(node);
-                if (state === ModuleInstanceState.NonInstantiated) {
-                    declareSymbolAndAddToSymbolTable(node, SymbolFlags.NamespaceModule, SymbolFlags.NamespaceModuleExcludes);
-                }
-                else {
-                    declareSymbolAndAddToSymbolTable(node, SymbolFlags.ValueModule, SymbolFlags.ValueModuleExcludes);
+                const state = declareModuleSymbol(node);
+                if (state !== ModuleInstanceState.NonInstantiated) {
                     if (node.symbol.flags & (SymbolFlags.Function | SymbolFlags.Class | SymbolFlags.RegularEnum)) {
                         // if module was already merged with some function, class or non-const enum
                         // treat is a non-const-enum-only
@@ -1557,6 +1553,15 @@ namespace ts {
             }
         }
 
+        function declareModuleSymbol(node: ModuleDeclaration): ModuleInstanceState {
+            const state = getModuleInstanceState(node);
+            const instantiated = state !== ModuleInstanceState.NonInstantiated;
+            declareSymbolAndAddToSymbolTable(node,
+                instantiated ? SymbolFlags.ValueModule : SymbolFlags.NamespaceModule,
+                instantiated ? SymbolFlags.ValueModuleExcludes : SymbolFlags.NamespaceModuleExcludes);
+            return state;
+        }
+
         function bindFunctionOrConstructorType(node: SignatureDeclaration): void {
             // For a given function symbol "<...>(...) => T" we want to generate a symbol identical
             // to the one we would get for: { <...>(...): T }
diff --git a/tests/baselines/reference/augmentExportEquals7.errors.txt b/tests/baselines/reference/augmentExportEquals7.errors.txt
new file mode 100644
index 00000000000..1cb9ddc041c
--- /dev/null
+++ b/tests/baselines/reference/augmentExportEquals7.errors.txt
@@ -0,0 +1,22 @@
+/node_modules/@types/lib-extender/index.d.ts(2,16): error TS2300: Duplicate identifier '"lib"'.
+/node_modules/lib/index.d.ts(1,13): error TS2300: Duplicate identifier '"lib"'.
+/node_modules/lib/index.d.ts(2,19): error TS2300: Duplicate identifier '"lib"'.
+
+
+==== /node_modules/lib/index.d.ts (2 errors) ====
+    declare var lib: () => void;
+                ~~~
+!!! error TS2300: Duplicate identifier '"lib"'.
+    declare namespace lib {}
+                      ~~~
+!!! error TS2300: Duplicate identifier '"lib"'.
+    export = lib;
+    
+==== /node_modules/@types/lib-extender/index.d.ts (1 errors) ====
+    import * as lib from "lib";
+    declare module "lib" {
+                   ~~~~~
+!!! error TS2300: Duplicate identifier '"lib"'.
+        export function fn(): void;
+    }
+    
\ No newline at end of file
diff --git a/tests/cases/compiler/augmentExportEquals7.ts b/tests/cases/compiler/augmentExportEquals7.ts
new file mode 100644
index 00000000000..c287bcbe8c4
--- /dev/null
+++ b/tests/cases/compiler/augmentExportEquals7.ts
@@ -0,0 +1,10 @@
+// @Filename: /node_modules/lib/index.d.ts
+declare var lib: () => void;
+declare namespace lib {}
+export = lib;
+
+// @Filename: /node_modules/@types/lib-extender/index.d.ts
+import * as lib from "lib";
+declare module "lib" {
+    export function fn(): void;
+}

From 7beeb77201450aa8a95d494f3fde167c1fb9b550 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 5 Dec 2016 10:58:47 -0800
Subject: [PATCH 006/127] Update baseline

---
 .../reference/globalAugmentationModuleResolution.types          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.types b/tests/baselines/reference/globalAugmentationModuleResolution.types
index c057ea2943d..75f23b0cd6b 100644
--- a/tests/baselines/reference/globalAugmentationModuleResolution.types
+++ b/tests/baselines/reference/globalAugmentationModuleResolution.types
@@ -3,7 +3,7 @@
 export { };
 
 declare global {
->global : any
+>global : typeof global
 
   var x: number;
 >x : number

From 39040f61540c2a2ec3cb9a9cc5c2920a3a0188fe Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 7 Dec 2016 13:13:21 -0800
Subject: [PATCH 007/127] Provide better error message

---
 src/compiler/checker.ts                              |  3 +++
 src/compiler/diagnosticMessages.json                 |  4 ++++
 .../reference/augmentExportEquals7.errors.txt        | 12 +++---------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 903c8cfda1c..d2d4502c79d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -479,6 +479,9 @@ namespace ts {
                 }
                 recordMergedSymbol(target, source);
             }
+            else if (target.flags & SymbolFlags.NamespaceModule) {
+                error(source.valueDeclaration.name, Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+            }
             else {
                 const message = target.flags & SymbolFlags.BlockScopedVariable || source.flags & SymbolFlags.BlockScopedVariable
                     ? Diagnostics.Cannot_redeclare_block_scoped_variable_0 : Diagnostics.Duplicate_identifier_0;
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 4d42c77e566..19b297fd4a9 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1807,6 +1807,10 @@
         "category": "Error",
         "code": 2608
     },
+    "Cannot augment module '{0}' with value exports because it resolves to a non-module entity.": {
+        "category": "Error",
+        "code": 2649
+    },
     "Cannot emit namespaced JSX elements in React": {
         "category": "Error",
         "code": 2650
diff --git a/tests/baselines/reference/augmentExportEquals7.errors.txt b/tests/baselines/reference/augmentExportEquals7.errors.txt
index 1cb9ddc041c..e13cf037023 100644
--- a/tests/baselines/reference/augmentExportEquals7.errors.txt
+++ b/tests/baselines/reference/augmentExportEquals7.errors.txt
@@ -1,22 +1,16 @@
-/node_modules/@types/lib-extender/index.d.ts(2,16): error TS2300: Duplicate identifier '"lib"'.
-/node_modules/lib/index.d.ts(1,13): error TS2300: Duplicate identifier '"lib"'.
-/node_modules/lib/index.d.ts(2,19): error TS2300: Duplicate identifier '"lib"'.
+/node_modules/@types/lib-extender/index.d.ts(2,16): error TS2649: Cannot augment module 'lib' with value exports because it resolves to a non-module entity.
 
 
-==== /node_modules/lib/index.d.ts (2 errors) ====
+==== /node_modules/lib/index.d.ts (0 errors) ====
     declare var lib: () => void;
-                ~~~
-!!! error TS2300: Duplicate identifier '"lib"'.
     declare namespace lib {}
-                      ~~~
-!!! error TS2300: Duplicate identifier '"lib"'.
     export = lib;
     
 ==== /node_modules/@types/lib-extender/index.d.ts (1 errors) ====
     import * as lib from "lib";
     declare module "lib" {
                    ~~~~~
-!!! error TS2300: Duplicate identifier '"lib"'.
+!!! error TS2649: Cannot augment module 'lib' with value exports because it resolves to a non-module entity.
         export function fn(): void;
     }
     
\ No newline at end of file

From e8af1d285beb1f3517fd049fb6373958b1b15c4a Mon Sep 17 00:00:00 2001
From: Herrington Darkholme <nonamesheep1@gmail.com>
Date: Sun, 8 Jan 2017 18:31:56 +0800
Subject: [PATCH 008/127] update declaration file to use intrinsic object type

---
 src/lib/es2015.collection.d.ts       | 4 ++--
 src/lib/es2015.core.d.ts             | 2 +-
 src/lib/es2015.iterable.d.ts         | 6 +++---
 src/lib/es2015.proxy.d.ts            | 4 ++--
 src/lib/es2015.symbol.wellknown.d.ts | 4 ++--
 src/lib/es5.d.ts                     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/lib/es2015.collection.d.ts b/src/lib/es2015.collection.d.ts
index 6a2c43cd050..f93053e4288 100644
--- a/src/lib/es2015.collection.d.ts
+++ b/src/lib/es2015.collection.d.ts
@@ -22,7 +22,7 @@ interface ReadonlyMap<K, V> {
     readonly size: number;
 }
 
-interface WeakMap<K, V> {
+interface WeakMap<K extends object, V> {
     delete(key: K): boolean;
     get(key: K): V | undefined;
     has(key: K): boolean;
@@ -31,7 +31,7 @@ interface WeakMap<K, V> {
 
 interface WeakMapConstructor {
     new (): WeakMap<any, any>;
-    new <K, V>(entries?: [K, V][]): WeakMap<K, V>;
+    new <K extends object, V>(entries?: [K, V][]): WeakMap<K, V>;
     readonly prototype: WeakMap<any, any>;
 }
 declare var WeakMap: WeakMapConstructor;
diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts
index 356512ecf58..eb23ce7901f 100644
--- a/src/lib/es2015.core.d.ts
+++ b/src/lib/es2015.core.d.ts
@@ -325,7 +325,7 @@ interface ObjectConstructor {
       * @param o The object to change its prototype.
       * @param proto The value of the new prototype or null.
       */
-    setPrototypeOf(o: any, proto: any): any;
+    setPrototypeOf(o: any, proto: object | null): any;
 
     /**
       * Gets the own property descriptor of the specified object.
diff --git a/src/lib/es2015.iterable.d.ts b/src/lib/es2015.iterable.d.ts
index de339e2bf2c..c8b5158bcd6 100644
--- a/src/lib/es2015.iterable.d.ts
+++ b/src/lib/es2015.iterable.d.ts
@@ -99,10 +99,10 @@ interface MapConstructor {
     new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
 }
 
-interface WeakMap<K, V> { }
+interface WeakMap<K extends object, V> { }
 
 interface WeakMapConstructor {
-    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
+    new <K extends object, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
 }
 
 interface Set<T> {
@@ -442,4 +442,4 @@ interface Float64ArrayConstructor {
       * @param thisArg Value of 'this' used to invoke the mapfn.
       */
     from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
-}
\ No newline at end of file
+}
diff --git a/src/lib/es2015.proxy.d.ts b/src/lib/es2015.proxy.d.ts
index 34aedce0128..efccfd47cc5 100644
--- a/src/lib/es2015.proxy.d.ts
+++ b/src/lib/es2015.proxy.d.ts
@@ -1,5 +1,5 @@
 interface ProxyHandler<T> {
-    getPrototypeOf? (target: T): {} | null;
+    getPrototypeOf? (target: T): object | null;
     setPrototypeOf? (target: T, v: any): boolean;
     isExtensible? (target: T): boolean;
     preventExtensions? (target: T): boolean;
@@ -12,7 +12,7 @@ interface ProxyHandler<T> {
     enumerate? (target: T): PropertyKey[];
     ownKeys? (target: T): PropertyKey[];
     apply? (target: T, thisArg: any, argArray?: any): any;
-    construct? (target: T, argArray: any, newTarget?: any): {};
+    construct? (target: T, argArray: any, newTarget?: any): object
 }
 
 interface ProxyConstructor {
diff --git a/src/lib/es2015.symbol.wellknown.d.ts b/src/lib/es2015.symbol.wellknown.d.ts
index 145d8af6b10..7177b78e483 100644
--- a/src/lib/es2015.symbol.wellknown.d.ts
+++ b/src/lib/es2015.symbol.wellknown.d.ts
@@ -110,7 +110,7 @@ interface Map<K, V> {
     readonly [Symbol.toStringTag]: "Map";
 }
 
-interface WeakMap<K, V>{
+interface WeakMap<K extends object, V>{
     readonly [Symbol.toStringTag]: "WeakMap";
 }
 
@@ -324,4 +324,4 @@ interface Float32Array {
   */
 interface Float64Array {
     readonly [Symbol.toStringTag]: "Float64Array";
-}
\ No newline at end of file
+}
diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index e5eabe950a2..038d0344fda 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -146,14 +146,14 @@ interface ObjectConstructor {
       * Creates an object that has the specified prototype, and that optionally contains specified properties.
       * @param o Object to use as a prototype. May be null
       */
-    create<T>(o: T): T;
+    create<T extends object>(o: T): T;
 
     /**
       * Creates an object that has the specified prototype, and that optionally contains specified properties.
       * @param o Object to use as a prototype. May be null
       * @param properties JavaScript object that contains one or more property descriptors.
       */
-    create(o: any, properties: PropertyDescriptorMap): any;
+    create(o: object | null, properties: PropertyDescriptorMap): any;
 
     /**
       * Adds a property to an object, or modifies attributes of an existing property.

From 54d64ceb98425d13ae038e91e46849c5c93ab151 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 9 Jan 2017 06:55:42 -0800
Subject: [PATCH 009/127] Respond to PR comment

---
 src/compiler/core.ts | 83 ++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 49 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 3aab91f53ad..89131e16359 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -164,6 +164,16 @@ namespace ts {
         return undefined;
     }
 
+    /** Works like Array.prototype.findIndex, returning `-1` if no element satisfying the predicate is found. */
+    export function findIndex<T>(array: T[], predicate: (element: T, index: number) => boolean): number {
+        for (let i = 0; i < array.length; i++) {
+            if (predicate(array[i], i)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
     /**
      * Returns the first truthy result of `callback`, or else fails.
      * This is like `forEach`, but never returns undefined.
@@ -1810,68 +1820,43 @@ namespace ts {
         // If there are no "includes", then just put everything in results[0].
         const results: string[][] = includeFileRegexes ? includeFileRegexes.map(() => []) : [[]];
 
+        const comparer = useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive;
         for (const basePath of patterns.basePaths) {
-            forEachFileInRecursiveDirectories(basePath, combinePaths(currentDirectory, basePath), { useCaseSensitiveFileNames, getFileSystemEntries, includeDirectory, visitFile });
+            visitDirectory(basePath, combinePaths(currentDirectory, basePath));
         }
 
         return flatten(results);
 
-        function includeDirectory(absoluteDirectoryName: string): boolean {
-            return (!includeDirectoryRegex || includeDirectoryRegex.test(absoluteDirectoryName)) &&
-                (!excludeRegex || !excludeRegex.test(absoluteDirectoryName));
-        }
+        function visitDirectory(path: string, absolutePath: string) {
+            let { files, directories } = getFileSystemEntries(path);
+            files = files.slice().sort(comparer);
+            directories = directories.slice().sort(comparer);
 
-        function visitFile(fileName: string, absoluteFileName: string): void {
-            if (extensions && !fileExtensionIsAny(fileName, extensions) ||
-                excludeRegex && excludeRegex.test(absoluteFileName)) {
-                return;
-            }
-
-            if (!includeFileRegexes) {
-                results[0].push(fileName);
-            }
-            else {
-                for (let i = 0; i < includeFileRegexes.length; i++) {
-                    if (includeFileRegexes[i].test(absoluteFileName)) {
-                        results[i].push(fileName);
-                        // Only include a file once.
-                        break;
+            for (const current of files) {
+                const name = combinePaths(path, current);
+                const absoluteName = combinePaths(absolutePath, current);
+                if (extensions && !fileExtensionIsAny(name, extensions)) continue;
+                if (excludeRegex && excludeRegex.test(absoluteName)) continue;
+                if (!includeFileRegexes) {
+                    results[0].push(name);
+                }
+                else {
+                    const includeIndex = findIndex(includeFileRegexes, re => re.test(absoluteName));
+                    if (includeIndex !== -1) {
+                        results[includeIndex].push(name);
                     }
                 }
             }
-        }
-    }
 
-    interface RecursiveDirectoryVisitor {
-        useCaseSensitiveFileNames: boolean;
-        getFileSystemEntries: (path: string) => FileSystemEntries;
-        includeDirectory: (absoluteDirectoryName: string) => boolean;
-        visitFile: (fileName: string, absoluteFileName: string) => void;
-    }
-
-    function forEachFileInRecursiveDirectories(start: string, absoluteStart: string, visitor: RecursiveDirectoryVisitor): void {
-        visitDirectory(start, absoluteStart);
-
-        function visitDirectory(path: string, absolutePath: string) {
-            let { files, directories } = visitor.getFileSystemEntries(path);
-            files = sorted(files);
-            directories = sorted(directories);
-
-            for (const file of files) {
-                visitor.visitFile(combinePaths(path, file), combinePaths(absolutePath, file));
-            }
-
-            for (const dir of directories) {
-                const absoluteName = combinePaths(absolutePath, dir);
-                if (visitor.includeDirectory(absoluteName)) {
-                    visitDirectory(combinePaths(path, dir), absoluteName);
+            for (const current of directories) {
+                const name = combinePaths(path, current);
+                const absoluteName = combinePaths(absolutePath, current);
+                if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
+                    (!excludeRegex || !excludeRegex.test(absoluteName))) {
+                    visitDirectory(name, absoluteName);
                 }
             }
         }
-
-        function sorted(names: string[]): string[] {
-            return names.slice().sort(visitor.useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
-        }
     }
 
     /**

From aa706d785ba7a51f271ec7d4988d9c13ef1a4057 Mon Sep 17 00:00:00 2001
From: Zhengbo Li <zhengbli@microsoft.com>
Date: Tue, 10 Jan 2017 17:28:05 -0800
Subject: [PATCH 010/127] Support import fix for missing namespace as well

---
 src/services/codefixes/importFixes.ts             |  1 +
 .../fourslash/importNameCodeFixNewImportFile3.ts  | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportFile3.ts

diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index 3627d60492d..3aefcf994e9 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -114,6 +114,7 @@ namespace ts.codefix {
     registerCodeFix({
         errorCodes: [
             Diagnostics.Cannot_find_name_0.code,
+            Diagnostics.Cannot_find_namespace_0.code,
             Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code
         ],
         getCodeActions: (context: CodeFixContext) => {
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile3.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile3.ts
new file mode 100644
index 00000000000..af7901e03e6
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportFile3.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts" />
+
+//// [|let t: XXX/*0*/.I;|]
+
+// @Filename: ./module.ts
+//// export module XXX {
+////    export interface I {
+////    }
+//// }
+
+verify.importFixAtPosition([
+`import { XXX } from "./module";
+
+let t: XXX.I;`
+]);
\ No newline at end of file

From 77a504bb6495c277d5c8742426cf58162edbd06a Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 20 Jan 2017 14:58:07 -0800
Subject: [PATCH 011/127] Clean up code in findAllReferences

---
 src/services/findAllReferences.ts | 217 ++++++++++++++++--------------
 src/services/utilities.ts         |   2 +-
 2 files changed, 115 insertions(+), 104 deletions(-)

diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index 82a5da453b7..3c38c4e7536 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -7,30 +7,9 @@ namespace ts.FindAllReferences {
 
     export function getReferencedSymbolsForNode(typeChecker: TypeChecker, cancellationToken: CancellationToken, node: Node, sourceFiles: SourceFile[], findInStrings: boolean, findInComments: boolean, implementations: boolean): ReferencedSymbol[] | undefined {
         if (!implementations) {
-            if (isTypeKeyword(node.kind)) {
-                return getAllReferencesForKeyword(sourceFiles, node.kind, cancellationToken);
-            }
-
-            // Labels
-            if (isLabelName(node)) {
-                if (isJumpStatementTarget(node)) {
-                    const labelDefinition = getTargetLabel((<BreakOrContinueStatement>node.parent), (<Identifier>node).text);
-                    // if we have a label definition, look within its statement for references, if not, then
-                    // the label is undefined and we have no results..
-                    return labelDefinition && getLabelReferencesInNode(labelDefinition.parent, labelDefinition, cancellationToken);
-                }
-                else {
-                    // it is a label definition and not a target, search within the parent labeledStatement
-                    return getLabelReferencesInNode(node.parent, <Identifier>node, cancellationToken);
-                }
-            }
-
-            if (isThis(node)) {
-                return getReferencesForThisKeyword(node, sourceFiles, typeChecker, cancellationToken);
-            }
-
-            if (node.kind === SyntaxKind.SuperKeyword) {
-                return getReferencesForSuperKeyword(node, typeChecker, cancellationToken);
+            const special = getReferencedSymbolsSpecial(node, sourceFiles, typeChecker, cancellationToken);
+            if (special) {
+                return special;
             }
         }
 
@@ -69,9 +48,8 @@ namespace ts.FindAllReferences {
         // Maps from a symbol ID to the ReferencedSymbol entry in 'result'.
         const symbolToIndex: number[] = [];
 
-        let result: ReferencedSymbol[];
+        const result: ReferencedSymbol[] = [];
         if (scope) {
-            result = [];
             getReferencesInNode(scope, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex, implementations, typeChecker, cancellationToken);
         }
         else {
@@ -79,7 +57,6 @@ namespace ts.FindAllReferences {
             for (const sourceFile of sourceFiles) {
                 cancellationToken.throwIfCancellationRequested();
                 if (sourceFileHasName(sourceFile, internedName)) {
-                    result = result || [];
                     getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex, implementations, typeChecker, cancellationToken);
                 }
             }
@@ -88,6 +65,37 @@ namespace ts.FindAllReferences {
         return result;
     }
 
+    /** getReferencedSymbols for special node kinds. */
+    function getReferencedSymbolsSpecial(node: Node, sourceFiles: SourceFile[], typeChecker: TypeChecker, cancellationToken: CancellationToken): ReferencedSymbol[] | undefined {
+        if (isTypeKeyword(node.kind)) {
+            return getAllReferencesForKeyword(sourceFiles, node.kind, cancellationToken);
+        }
+
+        // Labels
+        if (isLabelName(node)) {
+            if (isJumpStatementTarget(node)) {
+                const labelDefinition = getTargetLabel((<BreakOrContinueStatement>node.parent), (<Identifier>node).text);
+                // if we have a label definition, look within its statement for references, if not, then
+                // the label is undefined and we have no results..
+                return labelDefinition && getLabelReferencesInNode(labelDefinition.parent, labelDefinition, cancellationToken);
+            }
+            else {
+                // it is a label definition and not a target, search within the parent labeledStatement
+                return getLabelReferencesInNode(node.parent, <Identifier>node, cancellationToken);
+            }
+        }
+
+        if (isThis(node)) {
+            return getReferencesForThisKeyword(node, sourceFiles, typeChecker, cancellationToken);
+        }
+
+        if (node.kind === SyntaxKind.SuperKeyword) {
+            return getReferencesForSuperKeyword(node, typeChecker, cancellationToken);
+        }
+
+        return undefined;
+    }
+
     function sourceFileHasName(sourceFile: SourceFile, name: string): boolean {
         return getNameTable(sourceFile).get(name) !== undefined;
     }
@@ -166,7 +174,7 @@ namespace ts.FindAllReferences {
         // If this is an export or import specifier it could have been renamed using the 'as' syntax.
         // If so we want to search for whatever under the cursor.
         if (isImportOrExportSpecifierName(location)) {
-            return location.getText();
+            return location.text;
         }
 
         // Try to get the local symbol if we're dealing with an 'export default'
@@ -401,6 +409,9 @@ namespace ts.FindAllReferences {
         const inheritsFromCache: Map<boolean> = createMap<boolean>();
         // Build the set of symbols to search for, initially it has only the current symbol
         const searchSymbols = populateSearchSymbolSet(searchSymbol, searchLocation, typeChecker, implementations);
+        function isSearchedFor(symbol: Symbol): boolean {
+            return contains(searchSymbols, symbol);
+        }
 
         for (const position of possiblePositions) {
             cancellationToken.throwIfCancellationRequested();
@@ -438,7 +449,7 @@ namespace ts.FindAllReferences {
             if (referenceSymbol) {
                 const referenceSymbolDeclaration = referenceSymbol.valueDeclaration;
                 const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration);
-                const relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation,
+                const relatedSymbol = getRelatedSymbol(isSearchedFor, referenceSymbol, referenceLocation,
                     /*searchLocationIsConstructor*/ searchLocation.kind === SyntaxKind.ConstructorKeyword, parents, inheritsFromCache, typeChecker);
 
                 if (relatedSymbol) {
@@ -450,7 +461,7 @@ namespace ts.FindAllReferences {
                     * the position in short-hand property assignment excluding property accessing. However, if we do findAllReference at the
                     * position of property accessing, the referenceEntry of such position will be handled in the first case.
                     */
-                else if (!(referenceSymbol.flags & SymbolFlags.Transient) && searchSymbols.indexOf(shorthandValueSymbol) >= 0) {
+                else if (!(referenceSymbol.flags & SymbolFlags.Transient) && isSearchedFor(shorthandValueSymbol)) {
                     addReferenceToRelatedSymbol(referenceSymbolDeclaration.name, shorthandValueSymbol);
                 }
                 else if (searchLocation.kind === SyntaxKind.ConstructorKeyword) {
@@ -482,10 +493,6 @@ namespace ts.FindAllReferences {
             }
         }
 
-        function getPropertyAccessExpressionFromRightHandSide(node: Node): PropertyAccessExpression {
-            return isRightSideOfPropertyAccess(node) && <PropertyAccessExpression>node.parent;
-        }
-
         /** Adds references when a constructor is used with `new this()` in its own class and `super()` calls in subclasses.  */
         function findAdditionalConstructorReferences(referenceSymbol: Symbol, referenceLocation: Node): void {
             Debug.assert(isClassLike(searchSymbol.valueDeclaration));
@@ -494,7 +501,7 @@ namespace ts.FindAllReferences {
             if (referenceSymbol === searchSymbol && isClassLike(referenceClass)) {
                 Debug.assert(referenceClass.name === referenceLocation);
                 // This is the class declaration containing the constructor.
-                addReferences(findOwnConstructorCalls(searchSymbol));
+                addReferences(findOwnConstructorCalls(searchSymbol, sourceFile));
             }
             else {
                 // If this class appears in `extends C`, then the extending class' "super" calls are references.
@@ -512,58 +519,6 @@ namespace ts.FindAllReferences {
             }
         }
 
-        /** `classSymbol` is the class where the constructor was defined.
-         * Reference the constructor and all calls to `new this()`.
-         */
-        function findOwnConstructorCalls(classSymbol: Symbol): Node[] {
-            const result: Node[] = [];
-
-            for (const decl of classSymbol.members.get("__constructor").declarations) {
-                const ctrKeyword = ts.findChildOfKind(decl, ts.SyntaxKind.ConstructorKeyword, sourceFile)!
-                Debug.assert(decl.kind === SyntaxKind.Constructor && !!ctrKeyword);
-                result.push(ctrKeyword);
-            }
-
-            classSymbol.exports.forEach(member => {
-                const decl = member.valueDeclaration;
-                if (decl && decl.kind === SyntaxKind.MethodDeclaration) {
-                    const body = (<MethodDeclaration>decl).body;
-                    if (body) {
-                        forEachDescendantOfKind(body, SyntaxKind.ThisKeyword, thisKeyword => {
-                            if (isNewExpressionTarget(thisKeyword)) {
-                                result.push(thisKeyword);
-                            }
-                        });
-                    }
-                }
-            });
-
-            return result;
-        }
-
-        /** Find references to `super` in the constructor of an extending class.  */
-        function superConstructorAccesses(cls: ClassLikeDeclaration): Node[] {
-            const symbol = cls.symbol;
-            const ctr = symbol.members.get("__constructor");
-            if (!ctr) {
-                return [];
-            }
-
-            const result: Node[] = [];
-            for (const decl of ctr.declarations) {
-                Debug.assert(decl.kind === SyntaxKind.Constructor);
-                const body = (<ConstructorDeclaration>decl).body;
-                if (body) {
-                    forEachDescendantOfKind(body, SyntaxKind.SuperKeyword, node => {
-                        if (isCallExpressionTarget(node)) {
-                            result.push(node);
-                        }
-                    });
-                }
-            };
-            return result;
-        }
-
         function getReferencedSymbol(symbol: Symbol): ReferencedSymbol {
             const symbolId = getSymbolId(symbol);
             let index = symbolToIndex[symbolId];
@@ -591,6 +546,62 @@ namespace ts.FindAllReferences {
         }
     }
 
+    function getPropertyAccessExpressionFromRightHandSide(node: Node): PropertyAccessExpression {
+        return isRightSideOfPropertyAccess(node) && <PropertyAccessExpression>node.parent;
+    }
+
+    /** `classSymbol` is the class where the constructor was defined.
+     * Reference the constructor and all calls to `new this()`.
+     */
+    function findOwnConstructorCalls(classSymbol: Symbol, sourceFile: SourceFile): Node[] {
+        const result: Node[] = [];
+
+        for (const decl of classSymbol.members.get("__constructor").declarations) {
+            const ctrKeyword = ts.findChildOfKind(decl, ts.SyntaxKind.ConstructorKeyword, sourceFile)!
+            Debug.assert(decl.kind === SyntaxKind.Constructor && !!ctrKeyword);
+            result.push(ctrKeyword);
+        }
+
+        classSymbol.exports.forEach(member => {
+            const decl = member.valueDeclaration;
+            if (decl && decl.kind === SyntaxKind.MethodDeclaration) {
+                const body = (<MethodDeclaration>decl).body;
+                if (body) {
+                    forEachDescendantOfKind(body, SyntaxKind.ThisKeyword, thisKeyword => {
+                        if (isNewExpressionTarget(thisKeyword)) {
+                            result.push(thisKeyword);
+                        }
+                    });
+                }
+            }
+        });
+
+        return result;
+    }
+
+    /** Find references to `super` in the constructor of an extending class.  */
+    function superConstructorAccesses(cls: ClassLikeDeclaration): Node[] {
+        const symbol = cls.symbol;
+        const ctr = symbol.members.get("__constructor");
+        if (!ctr) {
+            return [];
+        }
+
+        const result: Node[] = [];
+        for (const decl of ctr.declarations) {
+            Debug.assert(decl.kind === SyntaxKind.Constructor);
+            const body = (<ConstructorDeclaration>decl).body;
+            if (body) {
+                forEachDescendantOfKind(body, SyntaxKind.SuperKeyword, node => {
+                    if (isCallExpressionTarget(node)) {
+                        result.push(node);
+                    }
+                });
+            }
+        };
+        return result;
+    }
+
     function getImplementationReferenceEntryForNode(refNode: Node, result: ReferenceEntry[], typeChecker: TypeChecker): void {
         // Check if we found a function/propertyAssignment/method with an implementation or initializer
         if (isDeclarationName(refNode) && isImplementation(refNode.parent)) {
@@ -805,13 +816,13 @@ namespace ts.FindAllReferences {
 
         const sourceFile = searchSpaceNode.getSourceFile();
         const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd(), cancellationToken);
-        forEach(possiblePositions, position => {
+        for (const position of possiblePositions) {
             cancellationToken.throwIfCancellationRequested();
 
             const node = getTouchingWord(sourceFile, position);
 
             if (!node || node.kind !== SyntaxKind.SuperKeyword) {
-                return;
+                continue;
             }
 
             const container = getSuperContainer(node, /*stopOnFunctions*/ false);
@@ -822,7 +833,7 @@ namespace ts.FindAllReferences {
             if (container && (ModifierFlags.Static & getModifierFlags(container)) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
                 references.push(getReferenceEntryFromNode(node));
             }
-        });
+        }
 
         const definition = getDefinition(searchSpaceNode.symbol, superKeyword, typeChecker);
         return [{ definition, references }];
@@ -1057,7 +1068,7 @@ namespace ts.FindAllReferences {
 
         // If this is a union property, add all the symbols from all its source symbols in all unioned types.
         // If the symbol is an instantiation from a another symbol (e.g. widened symbol) , add the root the list
-        forEach(typeChecker.getRootSymbols(symbol), rootSymbol => {
+        for (const rootSymbol of typeChecker.getRootSymbols(symbol)) {
             if (rootSymbol !== symbol) {
                 result.push(rootSymbol);
             }
@@ -1066,7 +1077,7 @@ namespace ts.FindAllReferences {
             if (!implementations && rootSymbol.parent && rootSymbol.parent.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
                 getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result, /*previousIterationSymbolsCache*/ createMap<Symbol>(), typeChecker);
             }
-        });
+        }
 
         return result;
     }
@@ -1130,17 +1141,17 @@ namespace ts.FindAllReferences {
         }
     }
 
-    function getRelatedSymbol(searchSymbols: Symbol[], referenceSymbol: Symbol, referenceLocation: Node, searchLocationIsConstructor: boolean, parents: Symbol[] | undefined, cache: Map<boolean>, typeChecker: TypeChecker): Symbol {
-        if (contains(searchSymbols, referenceSymbol)) {
+    function getRelatedSymbol(isSearchedFor: (symbol: Symbol) => boolean, referenceSymbol: Symbol, referenceLocation: Node, searchLocationIsConstructor: boolean, parents: Symbol[] | undefined, cache: Map<boolean>, typeChecker: TypeChecker): Symbol | undefined {
+        if (isSearchedFor(referenceSymbol)) {
             // If we are searching for constructor uses, they must be 'new' expressions.
-            return (!searchLocationIsConstructor || isNewExpressionTarget(referenceLocation)) && referenceSymbol;
+            return (!searchLocationIsConstructor || isNewExpressionTarget(referenceLocation)) ? referenceSymbol : undefined;
         }
 
         // If the reference symbol is an alias, check if what it is aliasing is one of the search
         // symbols but by looking up for related symbol of this alias so it can handle multiple level of indirectness.
         const aliasSymbol = getAliasSymbolForPropertyNameSymbol(referenceSymbol, referenceLocation, typeChecker);
         if (aliasSymbol) {
-            return getRelatedSymbol(searchSymbols, aliasSymbol, referenceLocation, searchLocationIsConstructor, parents, cache, typeChecker);
+            return getRelatedSymbol(isSearchedFor, aliasSymbol, referenceLocation, searchLocationIsConstructor, parents, cache, typeChecker);
         }
 
         // If the reference location is in an object literal, try to get the contextual type for the
@@ -1148,9 +1159,8 @@ namespace ts.FindAllReferences {
         // compare to our searchSymbol
         const containingObjectLiteralElement = getContainingObjectLiteralElement(referenceLocation);
         if (containingObjectLiteralElement) {
-            const contextualSymbol = forEach(getPropertySymbolsFromContextualType(containingObjectLiteralElement, typeChecker), contextualSymbol => {
-                return forEach(typeChecker.getRootSymbols(contextualSymbol), s => searchSymbols.indexOf(s) >= 0 ? s : undefined);
-            });
+            const contextualSymbol = forEach(getPropertySymbolsFromContextualType(containingObjectLiteralElement, typeChecker), contextualSymbol =>
+                find(typeChecker.getRootSymbols(contextualSymbol), isSearchedFor));
 
             if (contextualSymbol) {
                 return contextualSymbol;
@@ -1161,7 +1171,7 @@ namespace ts.FindAllReferences {
             // In below eg. get 'property' from type of elems iterating type
             //      for ( { property: p2 } of elems) { }
             const propertySymbol = getPropertySymbolOfDestructuringAssignment(referenceLocation, typeChecker);
-            if (propertySymbol && searchSymbols.indexOf(propertySymbol) >= 0) {
+            if (propertySymbol && isSearchedFor(propertySymbol)) {
                 return propertySymbol;
             }
         }
@@ -1170,7 +1180,7 @@ namespace ts.FindAllReferences {
         // then include the binding element in the related symbols
         //      let { a } : { a };
         const bindingElementPropertySymbol = getPropertySymbolOfObjectBindingPatternWithoutPropertyName(referenceSymbol, typeChecker);
-        if (bindingElementPropertySymbol && searchSymbols.indexOf(bindingElementPropertySymbol) >= 0) {
+        if (bindingElementPropertySymbol && isSearchedFor(bindingElementPropertySymbol)) {
             return bindingElementPropertySymbol;
         }
 
@@ -1178,7 +1188,7 @@ namespace ts.FindAllReferences {
         // Or a union property, use its underlying unioned symbols
         return forEach(typeChecker.getRootSymbols(referenceSymbol), rootSymbol => {
             // if it is in the list, then we are done
-            if (searchSymbols.indexOf(rootSymbol) >= 0) {
+            if (isSearchedFor(rootSymbol)) {
                 return rootSymbol;
             }
 
@@ -1195,7 +1205,7 @@ namespace ts.FindAllReferences {
 
                 const result: Symbol[] = [];
                 getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result, /*previousIterationSymbolsCache*/ createMap<Symbol>(), typeChecker);
-                return forEach(result, s => searchSymbols.indexOf(s) >= 0 ? s : undefined);
+                return find(result, isSearchedFor);
             }
 
             return undefined;
@@ -1214,6 +1224,7 @@ namespace ts.FindAllReferences {
         return (<Identifier | LiteralExpression>node.name).text;
     }
 
+    /** Gets all symbols for one property. Does not get symbols for every property. */
     function getPropertySymbolsFromContextualType(node: ObjectLiteralElement, typeChecker: TypeChecker): Symbol[] {
         const objectLiteral = <ObjectLiteralExpression>node.parent;
         const contextualType = typeChecker.getContextualType(objectLiteral);
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index a1680da69c3..f83f9ef8231 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -1319,7 +1319,7 @@ namespace ts {
         return name;
     }
 
-    export function isImportOrExportSpecifierName(location: Node): boolean {
+    export function isImportOrExportSpecifierName(location: Node): location is Identifier {
         return location.parent &&
             (location.parent.kind === SyntaxKind.ImportSpecifier || location.parent.kind === SyntaxKind.ExportSpecifier) &&
             (<ImportOrExportSpecifier>location.parent).propertyName === location;

From 0ca4cb25d68f370ac6bc5013f71f43b96b6f1e7a Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 23 Jan 2017 13:23:26 -0800
Subject: [PATCH 012/127] Support find-all-references for default exports

---
 src/compiler/utilities.ts                     |   8 +-
 src/services/findAllReferences.ts             | 114 ++++++++++--------
 .../fourslash/findAllRefsForDefaultExport.ts  |  11 ++
 3 files changed, 82 insertions(+), 51 deletions(-)
 create mode 100644 tests/cases/fourslash/findAllRefsForDefaultExport.ts

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index b7cc0f0de6d..5c63d8bb60c 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -395,7 +395,7 @@ namespace ts {
 
     function isShorthandAmbientModule(node: Node): boolean {
         // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node.kind === SyntaxKind.ModuleDeclaration && (!(<ModuleDeclaration>node).body);
+        return node && node.kind === SyntaxKind.ModuleDeclaration && (!(<ModuleDeclaration>node).body);
     }
 
     export function isBlockScopedContainerTopLevel(node: Node): boolean {
@@ -3104,7 +3104,11 @@ namespace ts {
     }
 
     export function getLocalSymbolForExportDefault(symbol: Symbol) {
-        return symbol && symbol.valueDeclaration && hasModifier(symbol.valueDeclaration, ModifierFlags.Default) ? symbol.valueDeclaration.localSymbol : undefined;
+        return isExportDefaultSymbol(symbol) ? symbol.valueDeclaration.localSymbol : undefined;
+    }
+
+    export function isExportDefaultSymbol(symbol: Symbol): boolean {
+        return symbol && symbol.valueDeclaration && hasModifier(symbol.valueDeclaration, ModifierFlags.Default);
     }
 
     /** Return ".ts", ".d.ts", or ".tsx", if that is the extension. */
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index 3c38c4e7536..83006c66d77 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -15,14 +15,13 @@ namespace ts.FindAllReferences {
 
         // `getSymbolAtLocation` normally returns the symbol of the class when given the constructor keyword,
         // so we have to specify that we want the constructor symbol.
-        const symbol = typeChecker.getSymbolAtLocation(node);
-
-        if (!implementations && !symbol && node.kind === SyntaxKind.StringLiteral) {
-            return getReferencesForStringLiteral(<StringLiteral>node, sourceFiles, typeChecker, cancellationToken);
-        }
+        let symbol = typeChecker.getSymbolAtLocation(node);
 
         // Could not find a symbol e.g. unknown identifier
         if (!symbol) {
+            if (!implementations && node.kind === SyntaxKind.StringLiteral) {
+                return getReferencesForStringLiteral(<StringLiteral>node, sourceFiles, typeChecker, cancellationToken);
+            }
             // Can't have references to something that we have no symbol for.
             return undefined;
         }
@@ -34,9 +33,27 @@ namespace ts.FindAllReferences {
             return undefined;
         }
 
+        const aliasedSymbol = followAliasIfNecessary(symbol, node, typeChecker);
+        const isShorthandModule = ts.isShorthandAmbientModuleSymbol(aliasedSymbol);
+        // Don't follow alias for shorthand modules because we lose information that way.
+        if (!isShorthandModule) {
+            symbol = aliasedSymbol;
+        }
+
         // Compute the meaning from the location and the symbol it references
         const searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations);
 
+        const result: ReferencedSymbol[] = [];
+        // Maps from a symbol ID to the ReferencedSymbol entry in 'result'.
+        const symbolToIndex: number[] = [];
+        const inheritsFromCache: Map<boolean> = createMap<boolean>();
+
+        // Build the set of symbols to search for, initially it has only the current symbol
+        const searchSymbols = populateSearchSymbolSet(symbol, node, typeChecker, implementations, isShorthandModule ? aliasedSymbol : undefined);
+        function isSearchedFor(symbol: Symbol): boolean {
+            return contains(searchSymbols, symbol);
+        }
+
         // Get the text to search for.
         // Note: if this is an external module symbol, the name doesn't include quotes.
         const declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node));
@@ -44,25 +61,28 @@ namespace ts.FindAllReferences {
         // Try to get the smallest valid scope that we can limit our search to;
         // otherwise we'll need to search globally (i.e. include each file).
         const scope = getSymbolScope(symbol);
-
-        // Maps from a symbol ID to the ReferencedSymbol entry in 'result'.
-        const symbolToIndex: number[] = [];
-
-        const result: ReferencedSymbol[] = [];
         if (scope) {
-            getReferencesInNode(scope, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex, implementations, typeChecker, cancellationToken);
+            getRefs(scope, declaredName);
         }
         else {
-            const internedName = getInternedName(symbol, node);
+            const isDefault = isExportDefaultSymbol(symbol);
+            const internedName = isDefault ? symbol.valueDeclaration.localSymbol.name : getInternedName(symbol, node);
             for (const sourceFile of sourceFiles) {
                 cancellationToken.throwIfCancellationRequested();
-                if (sourceFileHasName(sourceFile, internedName)) {
-                    getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex, implementations, typeChecker, cancellationToken);
+                const searchName = (isDefault ? getDefaultImportName(symbol, sourceFile, typeChecker) : undefined) ||
+                    (sourceFileHasName(sourceFile, internedName) ? declaredName : undefined);
+                if (searchName !== undefined) {
+                    getRefs(sourceFile, searchName);
                 }
             }
         }
 
         return result;
+
+        function getRefs(scope: ts.Node, searchName: string): void {
+            getReferencesInNode(scope, symbol, searchName, node, searchMeaning, findInStrings, findInComments, result,
+                symbolToIndex, implementations, typeChecker, cancellationToken, isSearchedFor, inheritsFromCache);
+        }
     }
 
     /** getReferencedSymbols for special node kinds. */
@@ -100,6 +120,23 @@ namespace ts.FindAllReferences {
         return getNameTable(sourceFile).get(name) !== undefined;
     }
 
+    /**
+     * Given a symbol, see if any of the imports in a source file reference it.
+     * Only call this if `symbol` is a default export.
+     */
+    function getDefaultImportName(symbol: Symbol, sourceFile: SourceFile, checker: ts.TypeChecker): string | undefined {
+        for (const importSpecifier of sourceFile.imports) {
+            const importDecl = importSpecifier.parent as ts.ImportDeclaration;
+            Debug.assert(importDecl.moduleSpecifier === importSpecifier);
+            const defaultName = importDecl.importClause.name;
+            const defaultReferencedSymbol = checker.getAliasedSymbol(checker.getSymbolAtLocation(defaultName));
+            if (symbol === defaultReferencedSymbol) {
+                return defaultName.text;
+            }
+        }
+        return undefined;
+    }
+
     function getDefinition(symbol: Symbol, node: Node, typeChecker: TypeChecker): ReferencedSymbolDefinitionInfo {
         const { displayParts, symbolKind } = SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, node.getSourceFile(), getContainerNode(node), node);
         const name = displayParts.map(p => p.text).join("");
@@ -177,11 +214,6 @@ namespace ts.FindAllReferences {
             return location.text;
         }
 
-        // Try to get the local symbol if we're dealing with an 'export default'
-        // since that symbol has the "true" name.
-        const localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol);
-        symbol = localExportDefaultSymbol || symbol;
-
         return stripQuotes(symbol.name);
     }
 
@@ -398,7 +430,9 @@ namespace ts.FindAllReferences {
         symbolToIndex: number[],
         implementations: boolean,
         typeChecker: TypeChecker,
-        cancellationToken: CancellationToken): void {
+        cancellationToken: CancellationToken,
+        isSearchedFor: (symbol: Symbol) => boolean,
+        inheritsFromCache: Map<boolean>): void {
 
         const sourceFile = container.getSourceFile();
 
@@ -406,12 +440,6 @@ namespace ts.FindAllReferences {
         const possiblePositions = getPossibleSymbolReferencePositions(sourceFile, searchText, start, container.getEnd(), cancellationToken);
 
         const parents = getParentSymbolsOfPropertyAccess();
-        const inheritsFromCache: Map<boolean> = createMap<boolean>();
-        // Build the set of symbols to search for, initially it has only the current symbol
-        const searchSymbols = populateSearchSymbolSet(searchSymbol, searchLocation, typeChecker, implementations);
-        function isSearchedFor(symbol: Symbol): boolean {
-            return contains(searchSymbols, symbol);
-        }
 
         for (const position of possiblePositions) {
             cancellationToken.throwIfCancellationRequested();
@@ -456,11 +484,11 @@ namespace ts.FindAllReferences {
                     addReferenceToRelatedSymbol(referenceLocation, relatedSymbol);
                 }
                 /* Because in short-hand property assignment, an identifier which stored as name of the short-hand property assignment
-                    * has two meaning : property name and property value. Therefore when we do findAllReference at the position where
-                    * an identifier is declared, the language service should return the position of the variable declaration as well as
-                    * the position in short-hand property assignment excluding property accessing. However, if we do findAllReference at the
-                    * position of property accessing, the referenceEntry of such position will be handled in the first case.
-                    */
+                 * has two meanings: property name and property value. Therefore when we do findAllReference at the position where
+                 * an identifier is declared, the language service should return the position of the variable declaration as well as
+                 * the position in short-hand property assignment excluding property accessing. However, if we do findAllReference at the
+                 * position of property accessing, the referenceEntry of such position will be handled in the first case.
+                 */
                 else if (!(referenceSymbol.flags & SymbolFlags.Transient) && isSearchedFor(shorthandValueSymbol)) {
                     addReferenceToRelatedSymbol(referenceSymbolDeclaration.name, shorthandValueSymbol);
                 }
@@ -472,10 +500,10 @@ namespace ts.FindAllReferences {
         return;
 
         /* If we are just looking for implementations and this is a property access expression, we need to get the
-            * symbol of the local type of the symbol the property is being accessed on. This is because our search
-            * symbol may have a different parent symbol if the local type's symbol does not declare the property
-            * being accessed (i.e. it is declared in some parent class or interface)
-            */
+         * symbol of the local type of the symbol the property is being accessed on. This is because our search
+         * symbol may have a different parent symbol if the local type's symbol does not declare the property
+         * being accessed (i.e. it is declared in some parent class or interface)
+         */
         function getParentSymbolsOfPropertyAccess(): Symbol[] | undefined {
             if (implementations) {
                 const propertyAccessExpression = getPropertyAccessExpressionFromRightHandSide(searchLocation);
@@ -994,7 +1022,7 @@ namespace ts.FindAllReferences {
         }
     }
 
-    function populateSearchSymbolSet(symbol: Symbol, location: Node, typeChecker: TypeChecker, implementations: boolean): Symbol[] {
+    function populateSearchSymbolSet(symbol: Symbol, location: Node, typeChecker: TypeChecker, implementations: boolean, aliasSymbol?: Symbol): Symbol[] {
         // The search set contains at least the current symbol
         let result = [symbol];
 
@@ -1009,18 +1037,6 @@ namespace ts.FindAllReferences {
             }
         }
 
-        // If the symbol is an alias, add what it aliases to the list
-        //     import {a} from "mod";
-        //     export {a}
-        // If the symbol is an alias to default declaration, add what it aliases to the list
-        //     declare "mod" { export default class B { } }
-        //     import B from "mod";
-        //// For export specifiers, the exported name can be referring to a local symbol, e.g.:
-        ////     import {a} from "mod";
-        ////     export {a as somethingElse}
-        //// We want the *local* declaration of 'a' as declared in the import,
-        //// *not* as declared within "mod" (or farther)
-        const aliasSymbol = getAliasSymbolForPropertyNameSymbol(symbol, location, typeChecker);
         if (aliasSymbol) {
             result = result.concat(populateSearchSymbolSet(aliasSymbol, location, typeChecker, implementations));
         }
@@ -1225,7 +1241,7 @@ namespace ts.FindAllReferences {
     }
 
     /** Gets all symbols for one property. Does not get symbols for every property. */
-    function getPropertySymbolsFromContextualType(node: ObjectLiteralElement, typeChecker: TypeChecker): Symbol[] {
+    function getPropertySymbolsFromContextualType(node: ObjectLiteralElement, typeChecker: TypeChecker): Symbol[] | undefined {
         const objectLiteral = <ObjectLiteralExpression>node.parent;
         const contextualType = typeChecker.getContextualType(objectLiteral);
         const name = getNameFromObjectLiteralElement(node);
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport.ts b/tests/cases/fourslash/findAllRefsForDefaultExport.ts
new file mode 100644
index 00000000000..a27227b907a
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport.ts
@@ -0,0 +1,11 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: a.ts
+////export default function /*def*/[|f|]() {}
+
+// @Filename: b.ts
+////import [|g|] from "./a";
+/////*ref*/[|g|]();
+
+verify.rangesReferenceEachOther();
+verify.goToDefinition("ref", "def");

From e8c3d548eb66c020b02cfa135b492f9480ef639c Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Tue, 24 Jan 2017 12:56:21 -0800
Subject: [PATCH 013/127] Fix tests

---
 src/services/documentHighlights.ts            |   2 +-
 src/services/findAllReferences.ts             | 109 +++++++++++-------
 src/services/goToImplementation.ts            |   2 +-
 src/services/services.ts                      |  10 +-
 tests/cases/fourslash/renameDefaultImport.ts  |  17 ++-
 .../renameDefaultImportDifferentName.ts       |  14 ++-
 .../cases/fourslash/renameImportAndExport.ts  |   4 +-
 7 files changed, 104 insertions(+), 54 deletions(-)

diff --git a/src/services/documentHighlights.ts b/src/services/documentHighlights.ts
index 778a007ded5..ff2b819ec26 100644
--- a/src/services/documentHighlights.ts
+++ b/src/services/documentHighlights.ts
@@ -17,7 +17,7 @@ namespace ts.DocumentHighlights {
     }
 
     function getSemanticDocumentHighlights(node: Node, typeChecker: TypeChecker, cancellationToken: CancellationToken, sourceFilesToSearch: SourceFile[]): DocumentHighlights[] {
-        const referencedSymbols = FindAllReferences.getReferencedSymbolsForNode(typeChecker, cancellationToken, node, sourceFilesToSearch, /*findInStrings*/false, /*findInComments*/false, /*implementations*/false);
+        const referencedSymbols = FindAllReferences.getReferencedSymbolsForNode(typeChecker, cancellationToken, node, sourceFilesToSearch);
         return referencedSymbols && convertReferencedSymbols(referencedSymbols);
     }
 
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index 83006c66d77..df568f6df3e 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -1,11 +1,11 @@
 /* @internal */
 namespace ts.FindAllReferences {
-    export function findReferencedSymbols(typeChecker: TypeChecker, cancellationToken: CancellationToken, sourceFiles: SourceFile[], sourceFile: SourceFile, position: number, findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] | undefined {
+    export function findReferencedSymbols(typeChecker: TypeChecker, cancellationToken: CancellationToken, sourceFiles: SourceFile[], sourceFile: SourceFile, position: number, findInStrings: boolean, findInComments: boolean, isForRename: boolean): ReferencedSymbol[] | undefined {
         const node = getTouchingPropertyName(sourceFile, position, /*includeJsDocComment*/ true);
-        return getReferencedSymbolsForNode(typeChecker, cancellationToken, node, sourceFiles, findInStrings, findInComments, /*implementations*/false);
+        return getReferencedSymbolsForNode(typeChecker, cancellationToken, node, sourceFiles, findInStrings, findInComments, isForRename);
     }
 
-    export function getReferencedSymbolsForNode(typeChecker: TypeChecker, cancellationToken: CancellationToken, node: Node, sourceFiles: SourceFile[], findInStrings: boolean, findInComments: boolean, implementations: boolean): ReferencedSymbol[] | undefined {
+    export function getReferencedSymbolsForNode(typeChecker: TypeChecker, cancellationToken: CancellationToken, node: Node, sourceFiles: SourceFile[], findInStrings?: boolean, findInComments?: boolean, isForRename?: boolean, implementations?: boolean): ReferencedSymbol[] | undefined {
         if (!implementations) {
             const special = getReferencedSymbolsSpecial(node, sourceFiles, typeChecker, cancellationToken);
             if (special) {
@@ -33,11 +33,16 @@ namespace ts.FindAllReferences {
             return undefined;
         }
 
-        const aliasedSymbol = followAliasIfNecessary(symbol, node, typeChecker);
-        const isShorthandModule = ts.isShorthandAmbientModuleSymbol(aliasedSymbol);
-        // Don't follow alias for shorthand modules because we lose information that way.
-        if (!isShorthandModule) {
-            symbol = aliasedSymbol;
+        const { symbol: aliasedSymbol, shorthandModuleSymbol } = followAliases(symbol, node, typeChecker, isForRename);
+        symbol = aliasedSymbol;
+
+        // Build the set of symbols to search for, initially it has only the current symbol
+        const searchSymbols = populateSearchSymbolSet(symbol, node, typeChecker, implementations);
+        if (shorthandModuleSymbol) {
+            searchSymbols.push(shorthandModuleSymbol);
+        }
+        function isSearchedFor(symbol: Symbol): boolean {
+            return contains(searchSymbols, symbol);
         }
 
         // Compute the meaning from the location and the symbol it references
@@ -48,12 +53,6 @@ namespace ts.FindAllReferences {
         const symbolToIndex: number[] = [];
         const inheritsFromCache: Map<boolean> = createMap<boolean>();
 
-        // Build the set of symbols to search for, initially it has only the current symbol
-        const searchSymbols = populateSearchSymbolSet(symbol, node, typeChecker, implementations, isShorthandModule ? aliasedSymbol : undefined);
-        function isSearchedFor(symbol: Symbol): boolean {
-            return contains(searchSymbols, symbol);
-        }
-
         // Get the text to search for.
         // Note: if this is an external module symbol, the name doesn't include quotes.
         const declaredName = stripQuotes(getDeclaredName(typeChecker, symbol, node));
@@ -116,6 +115,31 @@ namespace ts.FindAllReferences {
         return undefined;
     }
 
+    /**
+     * Follows aliases to get to the original declaration of a symbol.
+     * For a shorthand ambient module, we don't follow the alias to it, but we will need to add it to the set of search symbols.
+     */
+    function followAliases(symbol: Symbol, node: Node, typeChecker: TypeChecker, isForRename: boolean): { symbol: Symbol, shorthandModuleSymbol?: Symbol } {
+        while (true) {
+            // When renaming a default import, only rename in the current file
+            if (isForRename && isImportDefaultSymbol(symbol)) {
+                return { symbol };
+            }
+
+            const aliasedSymbol = getAliasSymbolForPropertyNameSymbol(symbol, node, typeChecker);
+            // Don't follow alias if it goes to unknown symbol. This can happen if it points to an untyped module.
+            if (!aliasedSymbol || !aliasedSymbol.declarations) {
+                return { symbol };
+            }
+
+            if (ts.isShorthandAmbientModuleSymbol(aliasedSymbol)) {
+                return { symbol, shorthandModuleSymbol: aliasedSymbol };
+            }
+
+            symbol = aliasedSymbol;
+        }
+    }
+
     function sourceFileHasName(sourceFile: SourceFile, name: string): boolean {
         return getNameTable(sourceFile).get(name) !== undefined;
     }
@@ -157,29 +181,30 @@ namespace ts.FindAllReferences {
     }
 
     function getAliasSymbolForPropertyNameSymbol(symbol: Symbol, location: Node, typeChecker: TypeChecker): Symbol | undefined {
-        if (symbol.flags & SymbolFlags.Alias) {
-            // Default import get alias
-            const defaultImport = getDeclarationOfKind(symbol, SyntaxKind.ImportClause);
-            if (defaultImport) {
-                return typeChecker.getAliasedSymbol(symbol);
-            }
+        if (!(symbol.flags & SymbolFlags.Alias)) {
+            return undefined;
+        }
 
-            const importOrExportSpecifier = <ImportOrExportSpecifier>forEach(symbol.declarations,
-                declaration => (declaration.kind === SyntaxKind.ImportSpecifier ||
-                    declaration.kind === SyntaxKind.ExportSpecifier) ? declaration : undefined);
-            if (importOrExportSpecifier &&
-                // export { a }
-                (!importOrExportSpecifier.propertyName ||
-                    // export {a as class } where a is location
-                    importOrExportSpecifier.propertyName === location)) {
-                // If Import specifier -> get alias
-                // else Export specifier -> get local target
-                return importOrExportSpecifier.kind === SyntaxKind.ImportSpecifier ?
-                    typeChecker.getAliasedSymbol(symbol) :
-                    typeChecker.getExportSpecifierLocalTargetSymbol(importOrExportSpecifier);
-            }
+        // Default import get alias
+        const defaultImport = getDeclarationOfKind(symbol, SyntaxKind.ImportClause);
+        if (defaultImport) {
+            return typeChecker.getAliasedSymbol(symbol);
+        }
+
+        const importOrExportSpecifier = <ImportOrExportSpecifier>forEach(symbol.declarations,
+            declaration => (declaration.kind === SyntaxKind.ImportSpecifier ||
+                declaration.kind === SyntaxKind.ExportSpecifier) ? declaration : undefined);
+        if (importOrExportSpecifier &&
+            // export { a }
+            (!importOrExportSpecifier.propertyName ||
+                // export {a as class } where a is location
+                importOrExportSpecifier.propertyName === location)) {
+            // If Import specifier -> get alias
+            // else Export specifier -> get local target
+            return importOrExportSpecifier.kind === SyntaxKind.ImportSpecifier ?
+                typeChecker.getAliasedSymbol(symbol) :
+                typeChecker.getExportSpecifierLocalTargetSymbol(importOrExportSpecifier);
         }
-        return undefined;
     }
 
     function followAliasIfNecessary(symbol: Symbol, location: Node, typeChecker: TypeChecker): Symbol {
@@ -1022,9 +1047,9 @@ namespace ts.FindAllReferences {
         }
     }
 
-    function populateSearchSymbolSet(symbol: Symbol, location: Node, typeChecker: TypeChecker, implementations: boolean, aliasSymbol?: Symbol): Symbol[] {
+    function populateSearchSymbolSet(symbol: Symbol, location: Node, typeChecker: TypeChecker, implementations: boolean): Symbol[] {
         // The search set contains at least the current symbol
-        let result = [symbol];
+        const result = [symbol];
 
         // If the location is name of property symbol from object literal destructuring pattern
         // Search the property symbol
@@ -1037,10 +1062,6 @@ namespace ts.FindAllReferences {
             }
         }
 
-        if (aliasSymbol) {
-            result = result.concat(populateSearchSymbolSet(aliasSymbol, location, typeChecker, implementations));
-        }
-
         // If the location is in a context sensitive location (i.e. in an object literal) try
         // to get a contextual type for it, and add the property symbol from the contextual
         // type to the search set
@@ -1072,7 +1093,7 @@ namespace ts.FindAllReferences {
         // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members
         if (symbol.valueDeclaration && symbol.valueDeclaration.kind === SyntaxKind.Parameter &&
             isParameterPropertyDeclaration(<ParameterDeclaration>symbol.valueDeclaration)) {
-            result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(<ParameterDeclaration>symbol.valueDeclaration, symbol.name));
+            addRange(result, typeChecker.getSymbolsOfParameterPropertyDeclaration(<ParameterDeclaration>symbol.valueDeclaration, symbol.name));
         }
 
         // If this is symbol of binding element without propertyName declaration in Object binding pattern
@@ -1447,4 +1468,8 @@ namespace ts.FindAllReferences {
 
         return false;
     }
+
+    function isImportDefaultSymbol(symbol: Symbol): boolean {
+        return symbol.declarations[0].kind === SyntaxKind.ImportClause;
+    }
 }
diff --git a/src/services/goToImplementation.ts b/src/services/goToImplementation.ts
index 123d29630ad..9135e1fe0f0 100644
--- a/src/services/goToImplementation.ts
+++ b/src/services/goToImplementation.ts
@@ -17,7 +17,7 @@ namespace ts.GoToImplementation {
         else {
             // Perform "Find all References" and retrieve only those that are implementations
             const referencedSymbols = FindAllReferences.getReferencedSymbolsForNode(typeChecker, cancellationToken,
-                node, sourceFiles, /*findInStrings*/false, /*findInComments*/false, /*implementations*/true);
+                node, sourceFiles, /*findInStrings*/false, /*findInComments*/false, /*isForRename*/false, /*implementations*/true);
             const result = flatMap(referencedSymbols, symbol =>
                 map(symbol.references, ({ textSpan, fileName }) => ({ textSpan, fileName })));
 
diff --git a/src/services/services.ts b/src/services/services.ts
index cb38b1d500e..00a8c9a9f2e 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1406,25 +1406,25 @@ namespace ts {
         }
 
         function findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[] {
-            const referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments);
+            const referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments, /*isForRename*/true);
             return FindAllReferences.convertReferences(referencedSymbols);
         }
 
         function getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[] {
-            const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false);
+            const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false, /*isForRename*/false);
             return FindAllReferences.convertReferences(referencedSymbols);
         }
 
         function findReferences(fileName: string, position: number): ReferencedSymbol[] {
-            const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false);
+            const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false, /*isForRename*/false);
 
             // Only include referenced symbols that have a valid definition.
             return filter(referencedSymbols, rs => !!rs.definition);
         }
 
-        function findReferencedSymbols(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): ReferencedSymbol[] {
+        function findReferencedSymbols(fileName: string, position: number, findInStrings: boolean, findInComments: boolean, isForRename: boolean): ReferencedSymbol[] {
             synchronizeHostData();
-            return FindAllReferences.findReferencedSymbols(program.getTypeChecker(), cancellationToken, program.getSourceFiles(), getValidSourceFile(fileName), position, findInStrings, findInComments);
+            return FindAllReferences.findReferencedSymbols(program.getTypeChecker(), cancellationToken, program.getSourceFiles(), getValidSourceFile(fileName), position, findInStrings, findInComments, isForRename);
         }
 
         /// NavigateTo
diff --git a/tests/cases/fourslash/renameDefaultImport.ts b/tests/cases/fourslash/renameDefaultImport.ts
index 8d9b65d78d6..ff297ffa147 100644
--- a/tests/cases/fourslash/renameDefaultImport.ts
+++ b/tests/cases/fourslash/renameDefaultImport.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: B.ts
-////export default class [|B|] {
+////export default class /*1*/[|B|] {
 ////    test() {
 ////    }
 ////}
@@ -11,4 +11,17 @@
 ////let b = new [|B|]();
 ////b.test();
 
-verify.rangesAreRenameLocations();
+goTo.marker("1");
+verify.occurrencesAtPositionCount(1);
+
+const [C, B0, B1] = test.ranges();
+verify.rangesReferenceEachOther();
+
+goTo.rangeStart(C);
+verify.renameLocations(false, false, [C, B0, B1]);
+
+const rangesInB = [B0, B1];
+for (const r of rangesInB) {
+    goTo.rangeStart(r);
+    verify.renameLocations(false, false, rangesInB);
+}
diff --git a/tests/cases/fourslash/renameDefaultImportDifferentName.ts b/tests/cases/fourslash/renameDefaultImportDifferentName.ts
index aec699aadda..be968c9b883 100644
--- a/tests/cases/fourslash/renameDefaultImportDifferentName.ts
+++ b/tests/cases/fourslash/renameDefaultImportDifferentName.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: B.ts
-////export default class /*1*/C {
+////export default class /*1*/[|C|] {
 ////    test() {
 ////    }
 ////}
@@ -14,4 +14,14 @@
 goTo.marker("1");
 verify.occurrencesAtPositionCount(1);
 
-verify.rangesAreRenameLocations();
+const [C, B0, B1] = test.ranges();
+verify.rangesReferenceEachOther();
+
+goTo.rangeStart(C);
+verify.renameLocations(false, false, [C, B0, B1]);
+
+const rangesInB = [B0, B1];
+for (const r of rangesInB) {
+    goTo.rangeStart(r);
+    verify.renameLocations(false, false, rangesInB);
+}
diff --git a/tests/cases/fourslash/renameImportAndExport.ts b/tests/cases/fourslash/renameImportAndExport.ts
index fe8bce4b208..4545277c564 100644
--- a/tests/cases/fourslash/renameImportAndExport.ts
+++ b/tests/cases/fourslash/renameImportAndExport.ts
@@ -3,4 +3,6 @@
 ////import [|a|] from "module";
 ////export { [|a|] };
 
-verify.rangesAreRenameLocations();
+const [r0, r1] = test.ranges();
+verify.referencesOf(r1, [r0, r1]);
+//verify.rangesAreRenameLocations();

From 20249e5c4a66e5abef595c52e87be5b1eabff468 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 24 Jan 2017 13:42:05 -0800
Subject: [PATCH 014/127] More exhaustive needsDotDotForPropertyAccess

---
 src/compiler/emitter.ts                       |  6 ++-
 src/compiler/utilities.ts                     | 42 +++++++++++++++++--
 .../propertyAccessNumericLiterals.es6.js      | 14 +++++++
 .../propertyAccessNumericLiterals.es6.symbols | 21 ++++++++++
 .../propertyAccessNumericLiterals.es6.types   | 31 ++++++++++++++
 .../propertyAccessNumericLiterals.js          | 15 +++++++
 .../propertyAccessNumericLiterals.symbols     | 25 +++++++++++
 .../propertyAccessNumericLiterals.types       | 37 ++++++++++++++++
 .../propertyAccessNumericLiterals.es6.ts      |  6 +++
 .../propertyAccessNumericLiterals.ts          |  7 ++++
 10 files changed, 199 insertions(+), 5 deletions(-)
 create mode 100644 tests/baselines/reference/propertyAccessNumericLiterals.es6.js
 create mode 100644 tests/baselines/reference/propertyAccessNumericLiterals.es6.symbols
 create mode 100644 tests/baselines/reference/propertyAccessNumericLiterals.es6.types
 create mode 100644 tests/baselines/reference/propertyAccessNumericLiterals.js
 create mode 100644 tests/baselines/reference/propertyAccessNumericLiterals.symbols
 create mode 100644 tests/baselines/reference/propertyAccessNumericLiterals.types
 create mode 100644 tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts
 create mode 100644 tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index cc006a06637..27285a4c2dc 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1054,9 +1054,11 @@ namespace ts {
         // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
         function needsDotDotForPropertyAccess(expression: Expression) {
             if (expression.kind === SyntaxKind.NumericLiteral) {
-                // check if numeric literal was originally written with a dot
+                // check if numeric literal is a decimal literal that was originally written with a dot
                 const text = getLiteralTextOfNode(<LiteralExpression>expression);
-                return text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
+                return getNumericLiteralFlags(text, /*hint*/ NumericLiteralFlags.All) === NumericLiteralFlags.None
+                    && !(<LiteralExpression>expression).isOctalLiteral
+                    && text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
             }
             else if (isPropertyAccessExpression(expression) || isElementAccessExpression(expression)) {
                 // check if constant enum value is integer
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index b7cc0f0de6d..b1d2ba0854c 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -341,16 +341,52 @@ namespace ts {
     }
 
     export function isBinaryOrOctalIntegerLiteral(node: LiteralLikeNode, text: string) {
-        if (node.kind === SyntaxKind.NumericLiteral && text.length > 1) {
+        return node.kind === SyntaxKind.NumericLiteral
+            && (getNumericLiteralFlags(text, /*hint*/ NumericLiteralFlags.BinaryOrOctal) & NumericLiteralFlags.BinaryOrOctal) !== 0;
+    }
+
+    export const enum NumericLiteralFlags {
+        None = 0,
+        Hexadecimal = 1 << 0,
+        Binary = 1 << 1,
+        Octal = 1 << 2,
+        Scientific = 1 << 3,
+
+        BinaryOrOctal = Binary | Octal,
+        BinaryOrOctalOrHexadecimal = BinaryOrOctal | Hexadecimal,
+        All = Hexadecimal | Binary | Octal | Scientific,
+    }
+
+    /**
+     * Scans a numeric literal string to determine the form of the number.
+     * @param text Numeric literal text
+     * @param hint If `Scientific` or `All` is specified, performs a more expensive check to scan for scientific notation.
+     */
+    export function getNumericLiteralFlags(text: string, hint?: NumericLiteralFlags) {
+        if (text.length > 1) {
             switch (text.charCodeAt(1)) {
                 case CharacterCodes.b:
                 case CharacterCodes.B:
+                    return NumericLiteralFlags.Binary;
                 case CharacterCodes.o:
                 case CharacterCodes.O:
-                    return true;
+                    return NumericLiteralFlags.Octal;
+                case CharacterCodes.x:
+                case CharacterCodes.X:
+                    return NumericLiteralFlags.Hexadecimal;
+            }
+
+            if (hint & NumericLiteralFlags.Scientific) {
+                for (let i = text.length - 1; i >= 0; i--) {
+                    switch (text.charCodeAt(i)) {
+                        case CharacterCodes.e:
+                        case CharacterCodes.E:
+                            return NumericLiteralFlags.Scientific;
+                    }
+                }
             }
         }
-        return false;
+        return NumericLiteralFlags.None;
     }
 
     function getQuotedEscapedLiteralText(leftQuote: string, text: string, rightQuote: string) {
diff --git a/tests/baselines/reference/propertyAccessNumericLiterals.es6.js b/tests/baselines/reference/propertyAccessNumericLiterals.es6.js
new file mode 100644
index 00000000000..66ac4178155
--- /dev/null
+++ b/tests/baselines/reference/propertyAccessNumericLiterals.es6.js
@@ -0,0 +1,14 @@
+//// [propertyAccessNumericLiterals.es6.ts]
+0xffffffff.toString();
+0o01234.toString();
+0b01101101.toString();
+1234..toString();
+1e0.toString();
+
+
+//// [propertyAccessNumericLiterals.es6.js]
+0xffffffff.toString();
+0o01234.toString();
+0b01101101.toString();
+1234..toString();
+1e0.toString();
diff --git a/tests/baselines/reference/propertyAccessNumericLiterals.es6.symbols b/tests/baselines/reference/propertyAccessNumericLiterals.es6.symbols
new file mode 100644
index 00000000000..dc0be21d84f
--- /dev/null
+++ b/tests/baselines/reference/propertyAccessNumericLiterals.es6.symbols
@@ -0,0 +1,21 @@
+=== tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts ===
+0xffffffff.toString();
+>0xffffffff.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+
+0o01234.toString();
+>0o01234.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+
+0b01101101.toString();
+>0b01101101.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+
+1234..toString();
+>1234..toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+
+1e0.toString();
+>1e0.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
+
diff --git a/tests/baselines/reference/propertyAccessNumericLiterals.es6.types b/tests/baselines/reference/propertyAccessNumericLiterals.es6.types
new file mode 100644
index 00000000000..9d32cc5b6e8
--- /dev/null
+++ b/tests/baselines/reference/propertyAccessNumericLiterals.es6.types
@@ -0,0 +1,31 @@
+=== tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts ===
+0xffffffff.toString();
+>0xffffffff.toString() : string
+>0xffffffff.toString : (radix?: number) => string
+>0xffffffff : 4294967295
+>toString : (radix?: number) => string
+
+0o01234.toString();
+>0o01234.toString() : string
+>0o01234.toString : (radix?: number) => string
+>0o01234 : 668
+>toString : (radix?: number) => string
+
+0b01101101.toString();
+>0b01101101.toString() : string
+>0b01101101.toString : (radix?: number) => string
+>0b01101101 : 109
+>toString : (radix?: number) => string
+
+1234..toString();
+>1234..toString() : string
+>1234..toString : (radix?: number) => string
+>1234. : 1234
+>toString : (radix?: number) => string
+
+1e0.toString();
+>1e0.toString() : string
+>1e0.toString : (radix?: number) => string
+>1e0 : 1
+>toString : (radix?: number) => string
+
diff --git a/tests/baselines/reference/propertyAccessNumericLiterals.js b/tests/baselines/reference/propertyAccessNumericLiterals.js
new file mode 100644
index 00000000000..1a7eb6c0a21
--- /dev/null
+++ b/tests/baselines/reference/propertyAccessNumericLiterals.js
@@ -0,0 +1,15 @@
+//// [propertyAccessNumericLiterals.ts]
+0xffffffff.toString();
+0o01234.toString();
+0b01101101.toString();
+1234..toString();
+1e0.toString();
+000.toString();
+
+//// [propertyAccessNumericLiterals.js]
+0xffffffff.toString();
+668..toString();
+109..toString();
+1234..toString();
+1e0.toString();
+000.toString();
diff --git a/tests/baselines/reference/propertyAccessNumericLiterals.symbols b/tests/baselines/reference/propertyAccessNumericLiterals.symbols
new file mode 100644
index 00000000000..5be13615e90
--- /dev/null
+++ b/tests/baselines/reference/propertyAccessNumericLiterals.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts ===
+0xffffffff.toString();
+>0xffffffff.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+
+0o01234.toString();
+>0o01234.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+
+0b01101101.toString();
+>0b01101101.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+
+1234..toString();
+>1234..toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+
+1e0.toString();
+>1e0.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+
+000.toString();
+>000.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/propertyAccessNumericLiterals.types b/tests/baselines/reference/propertyAccessNumericLiterals.types
new file mode 100644
index 00000000000..a2567ff2537
--- /dev/null
+++ b/tests/baselines/reference/propertyAccessNumericLiterals.types
@@ -0,0 +1,37 @@
+=== tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts ===
+0xffffffff.toString();
+>0xffffffff.toString() : string
+>0xffffffff.toString : (radix?: number) => string
+>0xffffffff : 4294967295
+>toString : (radix?: number) => string
+
+0o01234.toString();
+>0o01234.toString() : string
+>0o01234.toString : (radix?: number) => string
+>0o01234 : 668
+>toString : (radix?: number) => string
+
+0b01101101.toString();
+>0b01101101.toString() : string
+>0b01101101.toString : (radix?: number) => string
+>0b01101101 : 109
+>toString : (radix?: number) => string
+
+1234..toString();
+>1234..toString() : string
+>1234..toString : (radix?: number) => string
+>1234. : 1234
+>toString : (radix?: number) => string
+
+1e0.toString();
+>1e0.toString() : string
+>1e0.toString : (radix?: number) => string
+>1e0 : 1
+>toString : (radix?: number) => string
+
+000.toString();
+>000.toString() : string
+>000.toString : (radix?: number) => string
+>000 : 0
+>toString : (radix?: number) => string
+
diff --git a/tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts b/tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts
new file mode 100644
index 00000000000..81e39965a6a
--- /dev/null
+++ b/tests/cases/conformance/es6/propertyAccess/propertyAccessNumericLiterals.es6.ts
@@ -0,0 +1,6 @@
+// @target: es6
+0xffffffff.toString();
+0o01234.toString();
+0b01101101.toString();
+1234..toString();
+1e0.toString();
diff --git a/tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts b/tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts
new file mode 100644
index 00000000000..318b05fc0b5
--- /dev/null
+++ b/tests/cases/conformance/expressions/propertyAccess/propertyAccessNumericLiterals.ts
@@ -0,0 +1,7 @@
+// @target: es3
+0xffffffff.toString();
+0o01234.toString();
+0b01101101.toString();
+1234..toString();
+1e0.toString();
+000.toString();
\ No newline at end of file

From 50442b5a23148a9dd818e716748b48be00776a8a Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Tue, 24 Jan 2017 13:57:42 -0800
Subject: [PATCH 015/127] Undo change to test

---
 tests/cases/fourslash/renameImportAndExport.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/cases/fourslash/renameImportAndExport.ts b/tests/cases/fourslash/renameImportAndExport.ts
index 4545277c564..fe8bce4b208 100644
--- a/tests/cases/fourslash/renameImportAndExport.ts
+++ b/tests/cases/fourslash/renameImportAndExport.ts
@@ -3,6 +3,4 @@
 ////import [|a|] from "module";
 ////export { [|a|] };
 
-const [r0, r1] = test.ranges();
-verify.referencesOf(r1, [r0, r1]);
-//verify.rangesAreRenameLocations();
+verify.rangesAreRenameLocations();

From 9be46006e60c6ce218086dec27534c8e17651816 Mon Sep 17 00:00:00 2001
From: Anatoly Ressin <artazor@gmail.com>
Date: Wed, 25 Jan 2017 15:41:46 +0200
Subject: [PATCH 016/127] fixes #13674

---
 tests/webTestServer.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/webTestServer.ts b/tests/webTestServer.ts
index 67bbce2a472..abfd71a8fff 100644
--- a/tests/webTestServer.ts
+++ b/tests/webTestServer.ts
@@ -315,7 +315,6 @@ if (browser === "chrome") {
     let defaultChromePath = "";
     switch (os.platform()) {
         case "win32":
-        case "win64":
             defaultChromePath = "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe";
             break;
         case "darwin":

From 432808d50b92ad5eeae067279b582ba9702746c0 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 25 Jan 2017 07:31:24 -0800
Subject: [PATCH 017/127] Allow package.json "main" to specify a directory

---
 src/compiler/diagnosticMessages.json          |   6 +-
 src/compiler/moduleNameResolver.ts            | 129 +++++++++---------
 ...lutionWithExtensions_unexpected.trace.json |  11 +-
 ...utionWithExtensions_unexpected2.trace.json |   8 +-
 tests/baselines/reference/packageJsonMain.js  |  34 +++++
 .../reference/packageJsonMain.symbols         |  15 ++
 .../reference/packageJsonMain.trace.json      |  68 +++++++++
 .../baselines/reference/packageJsonMain.types |  17 +++
 .../packageJsonMain_isNonRecursive.errors.txt |  18 +++
 .../packageJsonMain_isNonRecursive.js         |  18 +++
 .../packageJsonMain_isNonRecursive.trace.json |  28 ++++
 tests/baselines/reference/typingsLookup4.js   |  15 +-
 .../reference/typingsLookup4.symbols          |  10 +-
 .../reference/typingsLookup4.trace.json       |  37 ++++-
 .../baselines/reference/typingsLookup4.types  |  12 +-
 .../moduleResolution/packageJsonMain.ts       |  27 ++++
 .../packageJsonMain_isNonRecursive.ts         |  15 ++
 .../conformance/typings/typingsLookup4.ts     |  10 +-
 18 files changed, 396 insertions(+), 82 deletions(-)
 create mode 100644 tests/baselines/reference/packageJsonMain.js
 create mode 100644 tests/baselines/reference/packageJsonMain.symbols
 create mode 100644 tests/baselines/reference/packageJsonMain.trace.json
 create mode 100644 tests/baselines/reference/packageJsonMain.types
 create mode 100644 tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt
 create mode 100644 tests/baselines/reference/packageJsonMain_isNonRecursive.js
 create mode 100644 tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
 create mode 100644 tests/cases/conformance/moduleResolution/packageJsonMain.ts
 create mode 100644 tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 4278784e9ab..dd49db54a6f 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2793,7 +2793,7 @@
         "category": "Message",
         "code": 6099
     },
-    "'package.json' does not have a 'types' or 'main' field.": {
+    "'package.json' does not have a '{0}' field.": {
         "category": "Message",
         "code": 6100
     },
@@ -2941,10 +2941,6 @@
         "category": "Message",
         "code": 6136
     },
-    "No types specified in 'package.json', so returning 'main' value of '{0}'": {
-        "category": "Message",
-        "code": 6137
-    },
     "Property '{0}' is declared but never used.": {
         "category": "Error",
         "code": 6138
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 0300ff71ec5..519b1d5fad2 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -67,40 +67,32 @@ namespace ts {
     }
 
     /** Reads from "main" or "types"/"typings" depending on `extensions`. */
-    function tryReadPackageJsonMainOrTypes(extensions: Extensions, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string {
+    function tryReadPackageJsonFields(ts: boolean, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string | undefined {
         const jsonContent = readJson(packageJsonPath, state.host);
-
-        switch (extensions) {
-            case Extensions.DtsOnly:
-            case Extensions.TypeScript:
-                return tryReadFromField("typings") || tryReadFromField("types");
-
-            case Extensions.JavaScript:
-                if (typeof jsonContent.main === "string") {
-                    if (state.traceEnabled) {
-                        trace(state.host, Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
-                    }
-                    return normalizePath(combinePaths(baseDirectory, jsonContent.main));
-                }
-                return undefined;
+        const file = ts ? tryReadFromField("typings") || tryReadFromField("types") : tryReadFromField("main");
+        if (!file && state.traceEnabled) {
+            trace(state.host, Diagnostics.package_json_does_not_have_a_0_field, ts ? "types" : "main");
         }
+        return file;
 
-        function tryReadFromField(fieldName: string) {
-            if (hasProperty(jsonContent, fieldName)) {
-                const typesFile = (<any>jsonContent)[fieldName];
-                if (typeof typesFile === "string") {
-                    const typesFilePath = normalizePath(combinePaths(baseDirectory, typesFile));
-                    if (state.traceEnabled) {
-                        trace(state.host, Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
-                    }
-                    return typesFilePath;
-                }
-                else {
-                    if (state.traceEnabled) {
-                        trace(state.host, Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof typesFile);
-                    }
-                }
+        function tryReadFromField(fieldName: "typings" | "types" | "main"): string | undefined {
+            if (!hasProperty(jsonContent, fieldName)) {
+                return;
             }
+
+            const fileName = jsonContent[fieldName];
+            if (typeof fileName !== "string") {
+                if (state.traceEnabled) {
+                    trace(state.host, Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof fileName);
+                }
+                return;
+            }
+
+            const path = normalizePath(combinePaths(baseDirectory, fileName));
+            if (state.traceEnabled) {
+                trace(state.host, Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
+            }
+            return path;
         }
     }
 
@@ -731,7 +723,7 @@ namespace ts {
         return real;
     }
 
-    function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
+    function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson = true): Resolved | undefined {
         if (state.traceEnabled) {
             trace(state.host, Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0_target_file_type_1, candidate, Extensions[extensions]);
         }
@@ -759,7 +751,7 @@ namespace ts {
                 onlyRecordFailures = true;
             }
         }
-        return loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        return loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, considerPackageJson);
     }
 
     /* @internal */
@@ -835,50 +827,58 @@ namespace ts {
         return undefined;
     }
 
-    function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
-        const packageJsonPath = pathToPackageJson(candidate);
+    function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson = true): Resolved | undefined {
         const directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
 
-        if (directoryExists && state.host.fileExists(packageJsonPath)) {
-            if (state.traceEnabled) {
-                trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath);
-            }
-            const mainOrTypesFile = tryReadPackageJsonMainOrTypes(extensions, packageJsonPath, candidate, state);
-            if (mainOrTypesFile) {
-                const onlyRecordFailures = !directoryProbablyExists(getDirectoryPath(mainOrTypesFile), state.host);
-                // A package.json "typings" may specify an exact filename, or may choose to omit an extension.
-                const fromExactFile = tryFile(mainOrTypesFile, failedLookupLocations, onlyRecordFailures, state);
-                if (fromExactFile) {
-                    const resolved = fromExactFile && resolvedIfExtensionMatches(extensions, fromExactFile);
-                    if (resolved) {
-                        return resolved;
-                    }
-                    if (state.traceEnabled) {
-                        trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
-                    }
-                }
-                const resolved = tryAddingExtensions(mainOrTypesFile, Extensions.TypeScript, failedLookupLocations, onlyRecordFailures, state);
-                if (resolved) {
-                    return resolved;
+        if (considerPackageJson) {
+            const packageJsonPath = pathToPackageJson(candidate);
+            if (directoryExists && state.host.fileExists(packageJsonPath)) {
+                const fromPackageJson = loadModuleFromPackageJson(packageJsonPath, extensions, candidate, failedLookupLocations, state);
+                if (fromPackageJson) {
+                    return fromPackageJson;
                 }
             }
             else {
-                if (state.traceEnabled) {
-                    trace(state.host, Diagnostics.package_json_does_not_have_a_types_or_main_field);
+                if (directoryExists && state.traceEnabled) {
+                    trace(state.host, Diagnostics.File_0_does_not_exist, packageJsonPath);
                 }
+                // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
+                failedLookupLocations.push(packageJsonPath);
             }
         }
-        else {
-            if (directoryExists && state.traceEnabled) {
-                trace(state.host, Diagnostics.File_0_does_not_exist, packageJsonPath);
-            }
-            // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
-            failedLookupLocations.push(packageJsonPath);
-        }
 
         return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state);
     }
 
+    function loadModuleFromPackageJson(packageJsonPath: string, extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
+        if (state.traceEnabled) {
+            trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath);
+        }
+
+        const ts = extensions !== Extensions.JavaScript;
+        const file = tryReadPackageJsonFields(ts, packageJsonPath, candidate, state);
+        if (!file) {
+            return undefined;
+        }
+
+        const onlyRecordFailures = !directoryProbablyExists(getDirectoryPath(file), state.host);
+        const fromFile = tryFile(file, failedLookupLocations, onlyRecordFailures, state);
+        if (fromFile) {
+            const resolved = fromFile && resolvedIfExtensionMatches(extensions, fromFile);
+            if (resolved) {
+                return resolved;
+            }
+            if (state.traceEnabled) {
+                trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromFile);
+            }
+        }
+
+        // Even if extensions is DtsOnly, we can still look up a .ts file as a result of package.json "types"
+        const nextExtensions = extensions === Extensions.DtsOnly ? Extensions.TypeScript : extensions;
+        // Don't do package.json lookup recursively, because Node.js' package lookup doesn't.
+        return nodeLoadModuleByRelativeName(nextExtensions, file, failedLookupLocations, onlyRecordFailures, state, /*considerPackageJson*/ false);
+    }
+
     /** Resolve from an arbitrarily specified file. Return `undefined` if it has an unsupported extension. */
     function resolvedIfExtensionMatches(extensions: Extensions, path: string): Resolved | undefined {
         const extension = tryGetExtensionFromPath(path);
@@ -1040,7 +1040,6 @@ namespace ts {
         return value !== undefined ? { value } : undefined;
     }
 
-
     /** Calls `callback` on `directory` and every ancestor directory it has, returning the first defined result. */
     function forEachAncestorDirectory<T>(directory: string, callback: (directory: string) => SearchResult<T>): SearchResult<T> {
         while (true) {
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
index e1b1673b32a..c53a32ef97d 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
@@ -6,7 +6,7 @@
     "File '/node_modules/normalize.css.tsx' does not exist.",
     "File '/node_modules/normalize.css.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/normalize.css/package.json'.",
-    "'package.json' does not have a 'types' or 'main' field.",
+    "'package.json' does not have a 'types' field.",
     "File '/node_modules/normalize.css/index.ts' does not exist.",
     "File '/node_modules/normalize.css/index.tsx' does not exist.",
     "File '/node_modules/normalize.css/index.d.ts' does not exist.",
@@ -15,12 +15,13 @@
     "File '/node_modules/normalize.css.js' does not exist.",
     "File '/node_modules/normalize.css.jsx' does not exist.",
     "Found 'package.json' at '/node_modules/normalize.css/package.json'.",
-    "No types specified in 'package.json', so returning 'main' value of 'normalize.css'",
+    "'package.json' has 'main' field 'normalize.css' that references '/node_modules/normalize.css/normalize.css'.",
     "File '/node_modules/normalize.css/normalize.css' exist - use it as a name resolution result.",
     "File '/node_modules/normalize.css/normalize.css' has an unsupported extension, so skipping it.",
-    "File '/node_modules/normalize.css/normalize.css.ts' does not exist.",
-    "File '/node_modules/normalize.css/normalize.css.tsx' does not exist.",
-    "File '/node_modules/normalize.css/normalize.css.d.ts' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/normalize.css/normalize.css', target file type 'JavaScript'.",
+    "File '/node_modules/normalize.css/normalize.css.js' does not exist.",
+    "File '/node_modules/normalize.css/normalize.css.jsx' does not exist.",
+    "Directory '/node_modules/normalize.css/normalize.css' does not exist, skipping all lookups in it.",
     "File '/node_modules/normalize.css/index.js' does not exist.",
     "File '/node_modules/normalize.css/index.jsx' does not exist.",
     "======== Module name 'normalize.css' was not resolved. ========"
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
index 11dd95ebe45..f007bc77d75 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
@@ -9,9 +9,15 @@
     "'package.json' has 'types' field 'foo.js' that references '/node_modules/foo/foo.js'.",
     "File '/node_modules/foo/foo.js' exist - use it as a name resolution result.",
     "File '/node_modules/foo/foo.js' has an unsupported extension, so skipping it.",
+    "Loading module as file / folder, candidate module location '/node_modules/foo/foo.js', target file type 'TypeScript'.",
     "File '/node_modules/foo/foo.js.ts' does not exist.",
     "File '/node_modules/foo/foo.js.tsx' does not exist.",
     "File '/node_modules/foo/foo.js.d.ts' does not exist.",
+    "File name '/node_modules/foo/foo.js' has a '.js' extension - stripping it",
+    "File '/node_modules/foo/foo.ts' does not exist.",
+    "File '/node_modules/foo/foo.tsx' does not exist.",
+    "File '/node_modules/foo/foo.d.ts' does not exist.",
+    "Directory '/node_modules/foo/foo.js' does not exist, skipping all lookups in it.",
     "File '/node_modules/foo/index.ts' does not exist.",
     "File '/node_modules/foo/index.tsx' does not exist.",
     "File '/node_modules/foo/index.d.ts' does not exist.",
@@ -20,7 +26,7 @@
     "File '/node_modules/foo.js' does not exist.",
     "File '/node_modules/foo.jsx' does not exist.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
-    "'package.json' does not have a 'types' or 'main' field.",
+    "'package.json' does not have a 'main' field.",
     "File '/node_modules/foo/index.js' does not exist.",
     "File '/node_modules/foo/index.jsx' does not exist.",
     "======== Module name 'foo' was not resolved. ========"
diff --git a/tests/baselines/reference/packageJsonMain.js b/tests/baselines/reference/packageJsonMain.js
new file mode 100644
index 00000000000..c7f63af27f2
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain.js
@@ -0,0 +1,34 @@
+//// [tests/cases/conformance/moduleResolution/packageJsonMain.ts] ////
+
+//// [package.json]
+
+{ "main": "oof" }
+
+//// [oof.js]
+module.exports = 0;
+
+//// [package.json]
+{ "main": "rab.js" }
+
+//// [rab.js]
+module.exports = 0;
+
+//// [package.json]
+{ "main": "zab" }
+
+//// [index.js]
+module.exports = 0;
+
+//// [a.ts]
+import foo = require("foo");
+import bar = require("bar");
+import baz = require("baz");
+foo + bar + baz;
+
+
+//// [a.js]
+"use strict";
+var foo = require("foo");
+var bar = require("bar");
+var baz = require("baz");
+foo + bar + baz;
diff --git a/tests/baselines/reference/packageJsonMain.symbols b/tests/baselines/reference/packageJsonMain.symbols
new file mode 100644
index 00000000000..c34c36e8901
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain.symbols
@@ -0,0 +1,15 @@
+=== /a.ts ===
+import foo = require("foo");
+>foo : Symbol(foo, Decl(a.ts, 0, 0))
+
+import bar = require("bar");
+>bar : Symbol(bar, Decl(a.ts, 0, 28))
+
+import baz = require("baz");
+>baz : Symbol(baz, Decl(a.ts, 1, 28))
+
+foo + bar + baz;
+>foo : Symbol(foo, Decl(a.ts, 0, 0))
+>bar : Symbol(bar, Decl(a.ts, 0, 28))
+>baz : Symbol(baz, Decl(a.ts, 1, 28))
+
diff --git a/tests/baselines/reference/packageJsonMain.trace.json b/tests/baselines/reference/packageJsonMain.trace.json
new file mode 100644
index 00000000000..9b71c672337
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain.trace.json
@@ -0,0 +1,68 @@
+[
+    "======== Resolving module 'foo' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/foo.ts' does not exist.",
+    "File '/node_modules/foo.tsx' does not exist.",
+    "File '/node_modules/foo.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'types' field.",
+    "File '/node_modules/foo/index.ts' does not exist.",
+    "File '/node_modules/foo/index.tsx' does not exist.",
+    "File '/node_modules/foo/index.d.ts' does not exist.",
+    "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
+    "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.",
+    "File '/node_modules/foo.js' does not exist.",
+    "File '/node_modules/foo.jsx' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
+    "File '/node_modules/foo/oof' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/foo/oof', target file type 'JavaScript'.",
+    "File '/node_modules/foo/oof.js' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/foo/oof.js', result '/node_modules/foo/oof.js'",
+    "======== Module name 'foo' was successfully resolved to '/node_modules/foo/oof.js'. ========",
+    "======== Resolving module 'bar' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'bar' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/bar.ts' does not exist.",
+    "File '/node_modules/bar.tsx' does not exist.",
+    "File '/node_modules/bar.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/bar/package.json'.",
+    "'package.json' does not have a 'types' field.",
+    "File '/node_modules/bar/index.ts' does not exist.",
+    "File '/node_modules/bar/index.tsx' does not exist.",
+    "File '/node_modules/bar/index.d.ts' does not exist.",
+    "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
+    "Loading module 'bar' from 'node_modules' folder, target file type 'JavaScript'.",
+    "File '/node_modules/bar.js' does not exist.",
+    "File '/node_modules/bar.jsx' does not exist.",
+    "Found 'package.json' at '/node_modules/bar/package.json'.",
+    "'package.json' has 'main' field 'rab.js' that references '/node_modules/bar/rab.js'.",
+    "File '/node_modules/bar/rab.js' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/bar/rab.js', result '/node_modules/bar/rab.js'",
+    "======== Module name 'bar' was successfully resolved to '/node_modules/bar/rab.js'. ========",
+    "======== Resolving module 'baz' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'baz' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/baz.ts' does not exist.",
+    "File '/node_modules/baz.tsx' does not exist.",
+    "File '/node_modules/baz.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/baz/package.json'.",
+    "'package.json' does not have a 'types' field.",
+    "File '/node_modules/baz/index.ts' does not exist.",
+    "File '/node_modules/baz/index.tsx' does not exist.",
+    "File '/node_modules/baz/index.d.ts' does not exist.",
+    "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
+    "Loading module 'baz' from 'node_modules' folder, target file type 'JavaScript'.",
+    "File '/node_modules/baz.js' does not exist.",
+    "File '/node_modules/baz.jsx' does not exist.",
+    "Found 'package.json' at '/node_modules/baz/package.json'.",
+    "'package.json' has 'main' field 'zab' that references '/node_modules/baz/zab'.",
+    "File '/node_modules/baz/zab' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/baz/zab', target file type 'JavaScript'.",
+    "File '/node_modules/baz/zab.js' does not exist.",
+    "File '/node_modules/baz/zab.jsx' does not exist.",
+    "File '/node_modules/baz/zab/index.js' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/baz/zab/index.js', result '/node_modules/baz/zab/index.js'",
+    "======== Module name 'baz' was successfully resolved to '/node_modules/baz/zab/index.js'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/packageJsonMain.types b/tests/baselines/reference/packageJsonMain.types
new file mode 100644
index 00000000000..f30bd95f0e5
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain.types
@@ -0,0 +1,17 @@
+=== /a.ts ===
+import foo = require("foo");
+>foo : any
+
+import bar = require("bar");
+>bar : any
+
+import baz = require("baz");
+>baz : any
+
+foo + bar + baz;
+>foo + bar + baz : any
+>foo + bar : any
+>foo : any
+>bar : any
+>baz : any
+
diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt b/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt
new file mode 100644
index 00000000000..a886fe3dca5
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt
@@ -0,0 +1,18 @@
+/a.ts(1,22): error TS2307: Cannot find module 'foo'.
+
+
+==== /a.ts (1 errors) ====
+    import foo = require("foo");
+                         ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    
+==== /node_modules/foo/package.json (0 errors) ====
+    
+    { "main": "oof" }
+    
+==== /node_modules/foo/oof/package.json (0 errors) ====
+    { "main": "ofo" }
+    
+==== /node_modules/foo/oof/ofo.js (0 errors) ====
+    module.exports = 0;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.js b/tests/baselines/reference/packageJsonMain_isNonRecursive.js
new file mode 100644
index 00000000000..edd56b359ee
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.js
@@ -0,0 +1,18 @@
+//// [tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts] ////
+
+//// [package.json]
+
+{ "main": "oof" }
+
+//// [package.json]
+{ "main": "ofo" }
+
+//// [ofo.js]
+module.exports = 0;
+
+//// [a.ts]
+import foo = require("foo");
+
+
+//// [a.js]
+"use strict";
diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
new file mode 100644
index 00000000000..9d1f2f9bedf
--- /dev/null
+++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
@@ -0,0 +1,28 @@
+[
+    "======== Resolving module 'foo' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/foo.ts' does not exist.",
+    "File '/node_modules/foo.tsx' does not exist.",
+    "File '/node_modules/foo.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'types' field.",
+    "File '/node_modules/foo/index.ts' does not exist.",
+    "File '/node_modules/foo/index.tsx' does not exist.",
+    "File '/node_modules/foo/index.d.ts' does not exist.",
+    "Directory '/node_modules/@types' does not exist, skipping all lookups in it.",
+    "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.",
+    "File '/node_modules/foo.js' does not exist.",
+    "File '/node_modules/foo.jsx' does not exist.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.",
+    "File '/node_modules/foo/oof' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/foo/oof', target file type 'JavaScript'.",
+    "File '/node_modules/foo/oof.js' does not exist.",
+    "File '/node_modules/foo/oof.jsx' does not exist.",
+    "File '/node_modules/foo/oof/index.js' does not exist.",
+    "File '/node_modules/foo/oof/index.jsx' does not exist.",
+    "File '/node_modules/foo/index.js' does not exist.",
+    "File '/node_modules/foo/index.jsx' does not exist.",
+    "======== Module name 'foo' was not resolved. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js
index c11bc13c613..bc506a6036b 100644
--- a/tests/baselines/reference/typingsLookup4.js
+++ b/tests/baselines/reference/typingsLookup4.js
@@ -18,19 +18,30 @@ export const k: number;
 //// [lquery.ts]
 export const l = 2;
 
+//// [package.json]
+{ "typings": "mquery" }
+
+//// [index.tsx]
+export const m = 3;
+
 //// [a.ts]
 import { j } from "jquery";
 import { k } from "kquery";
 import { l } from "lquery";
-j + k + l;
+import { m } from "mquery";
+j + k + l + m;
 
 
 //// [lquery.js]
 "use strict";
 exports.l = 2;
+//// [index.js]
+"use strict";
+exports.m = 3;
 //// [a.js]
 "use strict";
 var jquery_1 = require("jquery");
 var kquery_1 = require("kquery");
 var lquery_1 = require("lquery");
-jquery_1.j + kquery_1.k + lquery_1.l;
+var mquery_1 = require("mquery");
+jquery_1.j + kquery_1.k + lquery_1.l + mquery_1.m;
diff --git a/tests/baselines/reference/typingsLookup4.symbols b/tests/baselines/reference/typingsLookup4.symbols
index 144548c6452..9269ee6617d 100644
--- a/tests/baselines/reference/typingsLookup4.symbols
+++ b/tests/baselines/reference/typingsLookup4.symbols
@@ -8,10 +8,14 @@ import { k } from "kquery";
 import { l } from "lquery";
 >l : Symbol(l, Decl(a.ts, 2, 8))
 
-j + k + l;
+import { m } from "mquery";
+>m : Symbol(m, Decl(a.ts, 3, 8))
+
+j + k + l + m;
 >j : Symbol(j, Decl(a.ts, 0, 8))
 >k : Symbol(k, Decl(a.ts, 1, 8))
 >l : Symbol(l, Decl(a.ts, 2, 8))
+>m : Symbol(m, Decl(a.ts, 3, 8))
 
 === /node_modules/@types/jquery/jquery.d.ts ===
 export const j: number;
@@ -25,3 +29,7 @@ export const k: number;
 export const l = 2;
 >l : Symbol(l, Decl(lquery.ts, 0, 12))
 
+=== /node_modules/@types/mquery/mquery/index.tsx ===
+export const m = 3;
+>m : Symbol(m, Decl(index.tsx, 0, 12))
+
diff --git a/tests/baselines/reference/typingsLookup4.trace.json b/tests/baselines/reference/typingsLookup4.trace.json
index 451d68edf28..332d9ffa416 100644
--- a/tests/baselines/reference/typingsLookup4.trace.json
+++ b/tests/baselines/reference/typingsLookup4.trace.json
@@ -21,6 +21,7 @@
     "Found 'package.json' at '/node_modules/@types/kquery/package.json'.",
     "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.",
     "File '/node_modules/@types/kquery/kquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/kquery/kquery', target file type 'TypeScript'.",
     "File '/node_modules/@types/kquery/kquery.ts' does not exist.",
     "File '/node_modules/@types/kquery/kquery.tsx' does not exist.",
     "File '/node_modules/@types/kquery/kquery.d.ts' exist - use it as a name resolution result.",
@@ -36,9 +37,28 @@
     "Found 'package.json' at '/node_modules/@types/lquery/package.json'.",
     "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
     "File '/node_modules/@types/lquery/lquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/lquery/lquery', target file type 'TypeScript'.",
     "File '/node_modules/@types/lquery/lquery.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/@types/lquery/lquery.ts', result '/node_modules/@types/lquery/lquery.ts'",
     "======== Module name 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts'. ========",
+    "======== Resolving module 'mquery' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'mquery' from 'node_modules' folder, target file type 'TypeScript'.",
+    "File '/node_modules/mquery.ts' does not exist.",
+    "File '/node_modules/mquery.tsx' does not exist.",
+    "File '/node_modules/mquery.d.ts' does not exist.",
+    "File '/node_modules/@types/mquery.d.ts' does not exist.",
+    "Found 'package.json' at '/node_modules/@types/mquery/package.json'.",
+    "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.",
+    "File '/node_modules/@types/mquery/mquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/mquery/mquery', target file type 'TypeScript'.",
+    "File '/node_modules/@types/mquery/mquery.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery.tsx' does not exist.",
+    "File '/node_modules/@types/mquery/mquery.d.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery/index.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery/index.tsx' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/mquery/mquery/index.tsx', result '/node_modules/@types/mquery/mquery/index.tsx'",
+    "======== Module name 'mquery' was successfully resolved to '/node_modules/@types/mquery/mquery/index.tsx'. ========",
     "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
     "Found 'package.json' at '/node_modules/@types/jquery/package.json'.",
@@ -51,6 +71,7 @@
     "Found 'package.json' at '/node_modules/@types/kquery/package.json'.",
     "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.",
     "File '/node_modules/@types/kquery/kquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/kquery/kquery', target file type 'TypeScript'.",
     "File '/node_modules/@types/kquery/kquery.ts' does not exist.",
     "File '/node_modules/@types/kquery/kquery.tsx' does not exist.",
     "File '/node_modules/@types/kquery/kquery.d.ts' exist - use it as a name resolution result.",
@@ -61,7 +82,21 @@
     "Found 'package.json' at '/node_modules/@types/lquery/package.json'.",
     "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
     "File '/node_modules/@types/lquery/lquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/lquery/lquery', target file type 'TypeScript'.",
     "File '/node_modules/@types/lquery/lquery.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/@types/lquery/lquery.ts', result '/node_modules/@types/lquery/lquery.ts'",
-    "======== Type reference directive 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts', primary: true. ========"
+    "======== Type reference directive 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts', primary: true. ========",
+    "======== Resolving type reference directive 'mquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
+    "Resolving with primary search path '/node_modules/@types'",
+    "Found 'package.json' at '/node_modules/@types/mquery/package.json'.",
+    "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.",
+    "File '/node_modules/@types/mquery/mquery' does not exist.",
+    "Loading module as file / folder, candidate module location '/node_modules/@types/mquery/mquery', target file type 'TypeScript'.",
+    "File '/node_modules/@types/mquery/mquery.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery.tsx' does not exist.",
+    "File '/node_modules/@types/mquery/mquery.d.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery/index.ts' does not exist.",
+    "File '/node_modules/@types/mquery/mquery/index.tsx' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/mquery/mquery/index.tsx', result '/node_modules/@types/mquery/mquery/index.tsx'",
+    "======== Type reference directive 'mquery' was successfully resolved to '/node_modules/@types/mquery/mquery/index.tsx', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typingsLookup4.types b/tests/baselines/reference/typingsLookup4.types
index e3f747ac55d..afa2483a862 100644
--- a/tests/baselines/reference/typingsLookup4.types
+++ b/tests/baselines/reference/typingsLookup4.types
@@ -8,12 +8,17 @@ import { k } from "kquery";
 import { l } from "lquery";
 >l : 2
 
-j + k + l;
+import { m } from "mquery";
+>m : 3
+
+j + k + l + m;
+>j + k + l + m : number
 >j + k + l : number
 >j + k : number
 >j : number
 >k : number
 >l : 2
+>m : 3
 
 === /node_modules/@types/jquery/jquery.d.ts ===
 export const j: number;
@@ -28,3 +33,8 @@ export const l = 2;
 >l : 2
 >2 : 2
 
+=== /node_modules/@types/mquery/mquery/index.tsx ===
+export const m = 3;
+>m : 3
+>3 : 3
+
diff --git a/tests/cases/conformance/moduleResolution/packageJsonMain.ts b/tests/cases/conformance/moduleResolution/packageJsonMain.ts
new file mode 100644
index 00000000000..6bf21cfaa3a
--- /dev/null
+++ b/tests/cases/conformance/moduleResolution/packageJsonMain.ts
@@ -0,0 +1,27 @@
+// @noImplicitReferences: true
+// @currentDirectory: /
+// @traceResolution: true
+
+// @filename: /node_modules/foo/package.json
+{ "main": "oof" }
+
+// @filename: /node_modules/foo/oof.js
+module.exports = 0;
+
+// @filename: /node_modules/bar/package.json
+{ "main": "rab.js" }
+
+// @filename: /node_modules/bar/rab.js
+module.exports = 0;
+
+// @filename: /node_modules/baz/package.json
+{ "main": "zab" }
+
+// @filename: /node_modules/baz/zab/index.js
+module.exports = 0;
+
+// @filename: /a.ts
+import foo = require("foo");
+import bar = require("bar");
+import baz = require("baz");
+foo + bar + baz;
diff --git a/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts
new file mode 100644
index 00000000000..c6e684b3fe1
--- /dev/null
+++ b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts
@@ -0,0 +1,15 @@
+// @noImplicitReferences: true
+// @currentDirectory: /
+// @traceResolution: true
+
+// @filename: /node_modules/foo/package.json
+{ "main": "oof" }
+
+// @filename: /node_modules/foo/oof/package.json
+{ "main": "ofo" }
+
+// @filename: /node_modules/foo/oof/ofo.js
+module.exports = 0;
+
+// @filename: /a.ts
+import foo = require("foo");
diff --git a/tests/cases/conformance/typings/typingsLookup4.ts b/tests/cases/conformance/typings/typingsLookup4.ts
index 234090aebad..10317b6084b 100644
--- a/tests/cases/conformance/typings/typingsLookup4.ts
+++ b/tests/cases/conformance/typings/typingsLookup4.ts
@@ -1,6 +1,7 @@
 // @traceResolution: true
 // @noImplicitReferences: true
 // @currentDirectory: /
+// @jsx: react
 // A file extension is optional in typings entries.
 
 // @filename: /tsconfig.json
@@ -24,8 +25,15 @@ export const k: number;
 // @filename: /node_modules/@types/lquery/lquery.ts
 export const l = 2;
 
+// @filename: /node_modules/@types/mquery/package.json
+{ "typings": "mquery" }
+
+// @filename: /node_modules/@types/mquery/mquery/index.tsx
+export const m = 3;
+
 // @filename: /a.ts
 import { j } from "jquery";
 import { k } from "kquery";
 import { l } from "lquery";
-j + k + l;
+import { m } from "mquery";
+j + k + l + m;

From 128b84d1db7359119fa211c3a222d43f5fb99a8b Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 25 Jan 2017 09:13:00 -0800
Subject: [PATCH 018/127] Add "workers" option in gulpfile.

This allows e.g. `gulp runtests-parallel --w 3`.
---
 Gulpfile.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gulpfile.ts b/Gulpfile.ts
index bf5a074ef06..4f205bfb0ff 100644
--- a/Gulpfile.ts
+++ b/Gulpfile.ts
@@ -50,7 +50,8 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
         r: "reporter",
         color: "colors",
         f: "files",
-        file: "files"
+        file: "files",
+        w: "workers",
     },
     default: {
         soft: false,
@@ -63,6 +64,7 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
         reporter: process.env.reporter || process.env.r,
         lint: process.env.lint || true,
         files: process.env.f || process.env.file || process.env.files || "",
+        workers: process.env.workerCount || os.cpus().length,
     }
 });
 
@@ -604,7 +606,7 @@ function runConsoleTests(defaultReporter: string, runInParallel: boolean, done:
             } while (fs.existsSync(taskConfigsFolder));
             fs.mkdirSync(taskConfigsFolder);
 
-            workerCount = process.env.workerCount || os.cpus().length;
+            workerCount = cmdLineOptions["workers"];
         }
 
         if (tests || light || taskConfigsFolder) {
@@ -1017,7 +1019,7 @@ gulp.task("lint", "Runs tslint on the compiler sources. Optional arguments are:
             cb();
         }, (cb) => {
             files = files.filter(file =>  fileMatcher.test(file.path)).sort((filea, fileb) => filea.stat.size - fileb.stat.size);
-            const workerCount = (process.env.workerCount && +process.env.workerCount) || os.cpus().length;
+            const workerCount = cmdLineOptions["workers"];
             for (let i = 0; i < workerCount; i++) {
                 spawnLintWorker(files, finished);
             }

From abc30b26c75247d839d2a2ecf5ee2b80ff5864ac Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Wed, 25 Jan 2017 09:53:34 -0800
Subject: [PATCH 019/127] handle cases when body of for-of statement is
 expanded after loop conversion (#13677)

---
 src/compiler/transformers/es2015.ts           |  2 +-
 .../nestedLoopWithOnlyInnerLetCaptured.js     | 18 +++++++++++++++++
 ...nestedLoopWithOnlyInnerLetCaptured.symbols | 15 ++++++++++++++
 .../nestedLoopWithOnlyInnerLetCaptured.types  | 20 +++++++++++++++++++
 .../nestedLoopWithOnlyInnerLetCaptured.ts     |  6 ++++++
 5 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.js
 create mode 100644 tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.symbols
 create mode 100644 tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.types
 create mode 100644 tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts

diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index d1dab8eeb7a..3b8b4524aab 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -2316,7 +2316,7 @@ namespace ts {
                 addRange(statements, convertedLoopBodyStatements);
             }
             else {
-                const statement = visitNode(node.statement, visitor, isStatement);
+                const statement = visitNode(node.statement, visitor, isStatement, /*optional*/ false, liftToBlock);
                 if (isBlock(statement)) {
                     addRange(statements, statement.statements);
                     bodyLocation = statement;
diff --git a/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.js b/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.js
new file mode 100644
index 00000000000..ee17bb53eec
--- /dev/null
+++ b/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.js
@@ -0,0 +1,18 @@
+//// [nestedLoopWithOnlyInnerLetCaptured.ts]
+declare let doSomething;
+
+for (let a1 of [])
+    for (let a2 of a1.someArray)
+        doSomething(() => a2);
+
+//// [nestedLoopWithOnlyInnerLetCaptured.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var a1 = _a[_i];
+    var _loop_1 = function (a2) {
+        doSomething(function () { return a2; });
+    };
+    for (var _b = 0, _c = a1.someArray; _b < _c.length; _b++) {
+        var a2 = _c[_b];
+        _loop_1(a2);
+    }
+}
diff --git a/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.symbols b/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.symbols
new file mode 100644
index 00000000000..f134dcbffa9
--- /dev/null
+++ b/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.symbols
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts ===
+declare let doSomething;
+>doSomething : Symbol(doSomething, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 0, 11))
+
+for (let a1 of [])
+>a1 : Symbol(a1, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 2, 8))
+
+    for (let a2 of a1.someArray)
+>a2 : Symbol(a2, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 3, 12))
+>a1 : Symbol(a1, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 2, 8))
+
+        doSomething(() => a2);
+>doSomething : Symbol(doSomething, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 0, 11))
+>a2 : Symbol(a2, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 3, 12))
+
diff --git a/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.types b/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.types
new file mode 100644
index 00000000000..6be9dbf6abf
--- /dev/null
+++ b/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.types
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts ===
+declare let doSomething;
+>doSomething : any
+
+for (let a1 of [])
+>a1 : any
+>[] : undefined[]
+
+    for (let a2 of a1.someArray)
+>a2 : any
+>a1.someArray : any
+>a1 : any
+>someArray : any
+
+        doSomething(() => a2);
+>doSomething(() => a2) : any
+>doSomething : any
+>() => a2 : () => any
+>a2 : any
+
diff --git a/tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts b/tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts
new file mode 100644
index 00000000000..210465b13da
--- /dev/null
+++ b/tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts
@@ -0,0 +1,6 @@
+// @target: es5
+declare let doSomething;
+
+for (let a1 of [])
+    for (let a2 of a1.someArray)
+        doSomething(() => a2);
\ No newline at end of file

From 76b1e95c3d89fa2ca762eda75c9bd182612ee85a Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Wed, 25 Jan 2017 10:40:59 -0800
Subject: [PATCH 020/127] Always call `checkExpression` on JSX attribute values

Fixes #13676
---
 src/compiler/checker.ts                       | 19 ++---
 .../baselines/reference/reactImportDropped.js | 48 ++++++++++++
 .../reference/reactImportDropped.symbols      | 65 ++++++++++++++++
 .../reference/reactImportDropped.types        | 74 +++++++++++++++++++
 tests/cases/compiler/reactImportDropped.ts    | 42 +++++++++++
 5 files changed, 239 insertions(+), 9 deletions(-)
 create mode 100644 tests/baselines/reference/reactImportDropped.js
 create mode 100644 tests/baselines/reference/reactImportDropped.symbols
 create mode 100644 tests/baselines/reference/reactImportDropped.types
 create mode 100644 tests/cases/compiler/reactImportDropped.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index a09b63d46fd..7c8a0b7337f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11879,6 +11879,16 @@ namespace ts {
         function checkJsxAttribute(node: JsxAttribute, elementAttributesType: Type, nameTable: Map<boolean>) {
             let correspondingPropType: Type = undefined;
 
+            // We need to unconditionally get the expression type
+            let exprType: Type;
+            if (node.initializer) {
+                exprType = checkExpression(node.initializer);
+            }
+            else {
+                // <Elem attr /> is sugar for <Elem attr={true} />
+                exprType = booleanType;
+            }
+
             // Look up the corresponding property for this attribute
             if (elementAttributesType === emptyObjectType && isUnhyphenatedJsxName(node.name.text)) {
                 // If there is no 'props' property, you may not have non-"data-" attributes
@@ -11902,15 +11912,6 @@ namespace ts {
                 }
             }
 
-            let exprType: Type;
-            if (node.initializer) {
-                exprType = checkExpression(node.initializer);
-            }
-            else {
-                // <Elem attr /> is sugar for <Elem attr={true} />
-                exprType = booleanType;
-            }
-
             if (correspondingPropType) {
                 checkTypeAssignableTo(exprType, correspondingPropType, node);
             }
diff --git a/tests/baselines/reference/reactImportDropped.js b/tests/baselines/reference/reactImportDropped.js
new file mode 100644
index 00000000000..7ada76b42f4
--- /dev/null
+++ b/tests/baselines/reference/reactImportDropped.js
@@ -0,0 +1,48 @@
+//// [tests/cases/compiler/reactImportDropped.ts] ////
+
+//// [react.d.ts]
+
+export = React;
+export as namespace React;
+
+declare namespace React {
+
+    function createClass(spec: any): ClassicComponentClass;
+
+    interface ClassicComponentClass {
+        new (props?: any): ClassicComponentClass;
+    }
+}
+
+declare global {
+    namespace JSX {
+        interface ElementAttributesProperty { }
+    }
+}
+
+
+//// [TabBar.js]
+export default React.createClass({
+  render() {
+    return (
+      null
+    );
+  }
+});
+
+//// [NavigationView.js]
+import TabBar from '../../components/TabBar';
+import {layout} from '../../utils/theme'; // <- DO NOT DROP this import
+const x = <TabBar height={layout.footerHeight} />;
+
+
+//// [TabBar.js]
+export default React.createClass({
+    render() {
+        return (null);
+    }
+});
+//// [NavigationView.js]
+import TabBar from '../../components/TabBar';
+import { layout } from '../../utils/theme'; // <- DO NOT DROP this import
+const x = React.createElement(TabBar, { height: layout.footerHeight });
diff --git a/tests/baselines/reference/reactImportDropped.symbols b/tests/baselines/reference/reactImportDropped.symbols
new file mode 100644
index 00000000000..d7374df044e
--- /dev/null
+++ b/tests/baselines/reference/reactImportDropped.symbols
@@ -0,0 +1,65 @@
+=== tests/cases/compiler/react.d.ts ===
+
+export = React;
+>React : Symbol(React, Decl(react.d.ts, 2, 26))
+
+export as namespace React;
+>React : Symbol(React, Decl(react.d.ts, 1, 15))
+
+declare namespace React {
+>React : Symbol(React, Decl(react.d.ts, 2, 26))
+
+    function createClass(spec: any): ClassicComponentClass;
+>createClass : Symbol(createClass, Decl(react.d.ts, 4, 25))
+>spec : Symbol(spec, Decl(react.d.ts, 6, 25))
+>ClassicComponentClass : Symbol(ClassicComponentClass, Decl(react.d.ts, 6, 59))
+
+    interface ClassicComponentClass {
+>ClassicComponentClass : Symbol(ClassicComponentClass, Decl(react.d.ts, 6, 59))
+
+        new (props?: any): ClassicComponentClass;
+>props : Symbol(props, Decl(react.d.ts, 9, 13))
+>ClassicComponentClass : Symbol(ClassicComponentClass, Decl(react.d.ts, 6, 59))
+    }
+}
+
+declare global {
+>global : Symbol(global, Decl(react.d.ts, 11, 1))
+
+    namespace JSX {
+>JSX : Symbol(JSX, Decl(react.d.ts, 13, 16))
+
+        interface ElementAttributesProperty { }
+>ElementAttributesProperty : Symbol(ElementAttributesProperty, Decl(react.d.ts, 14, 19))
+    }
+}
+
+
+=== tests/cases/compiler/src/components/TabBar.js ===
+export default React.createClass({
+>React.createClass : Symbol(React.createClass, Decl(react.d.ts, 4, 25))
+>React : Symbol(React, Decl(react.d.ts, 1, 15))
+>createClass : Symbol(React.createClass, Decl(react.d.ts, 4, 25))
+
+  render() {
+>render : Symbol(render, Decl(TabBar.js, 0, 34))
+
+    return (
+      null
+    );
+  }
+});
+
+=== tests/cases/compiler/src/modules/navigation/NavigationView.js ===
+import TabBar from '../../components/TabBar';
+>TabBar : Symbol(TabBar, Decl(NavigationView.js, 0, 6))
+
+import {layout} from '../../utils/theme'; // <- DO NOT DROP this import
+>layout : Symbol(layout, Decl(NavigationView.js, 1, 8))
+
+const x = <TabBar height={layout.footerHeight} />;
+>x : Symbol(x, Decl(NavigationView.js, 2, 5))
+>TabBar : Symbol(TabBar, Decl(NavigationView.js, 0, 6))
+>height : Symbol(layout)
+>layout : Symbol(layout, Decl(NavigationView.js, 1, 8))
+
diff --git a/tests/baselines/reference/reactImportDropped.types b/tests/baselines/reference/reactImportDropped.types
new file mode 100644
index 00000000000..36f1a6a4779
--- /dev/null
+++ b/tests/baselines/reference/reactImportDropped.types
@@ -0,0 +1,74 @@
+=== tests/cases/compiler/react.d.ts ===
+
+export = React;
+>React : typeof React
+
+export as namespace React;
+>React : typeof React
+
+declare namespace React {
+>React : typeof React
+
+    function createClass(spec: any): ClassicComponentClass;
+>createClass : (spec: any) => ClassicComponentClass
+>spec : any
+>ClassicComponentClass : ClassicComponentClass
+
+    interface ClassicComponentClass {
+>ClassicComponentClass : ClassicComponentClass
+
+        new (props?: any): ClassicComponentClass;
+>props : any
+>ClassicComponentClass : ClassicComponentClass
+    }
+}
+
+declare global {
+>global : any
+
+    namespace JSX {
+>JSX : any
+
+        interface ElementAttributesProperty { }
+>ElementAttributesProperty : ElementAttributesProperty
+    }
+}
+
+
+=== tests/cases/compiler/src/components/TabBar.js ===
+export default React.createClass({
+>React.createClass({  render() {    return (      null    );  }}) : React.ClassicComponentClass
+>React.createClass : (spec: any) => React.ClassicComponentClass
+>React : typeof React
+>createClass : (spec: any) => React.ClassicComponentClass
+>{  render() {    return (      null    );  }} : { render(): any; }
+
+  render() {
+>render : () => any
+
+    return (
+>(      null    ) : null
+
+      null
+>null : null
+
+    );
+  }
+});
+
+=== tests/cases/compiler/src/modules/navigation/NavigationView.js ===
+import TabBar from '../../components/TabBar';
+>TabBar : React.ClassicComponentClass
+
+import {layout} from '../../utils/theme'; // <- DO NOT DROP this import
+>layout : any
+
+const x = <TabBar height={layout.footerHeight} />;
+>x : any
+><TabBar height={layout.footerHeight} /> : any
+>TabBar : React.ClassicComponentClass
+>height : any
+>layout.footerHeight : any
+>layout : any
+>footerHeight : any
+
diff --git a/tests/cases/compiler/reactImportDropped.ts b/tests/cases/compiler/reactImportDropped.ts
new file mode 100644
index 00000000000..a345e7c74fd
--- /dev/null
+++ b/tests/cases/compiler/reactImportDropped.ts
@@ -0,0 +1,42 @@
+//@module: es6
+//@moduleResolution: node
+//@target: es6
+//@noImplicitAny: false
+//@allowSyntheticDefaultImports: true
+//@allowJs: true
+//@jsx: react
+//@outDir: "build"
+
+//@filename: react.d.ts
+export = React;
+export as namespace React;
+
+declare namespace React {
+
+    function createClass(spec: any): ClassicComponentClass;
+
+    interface ClassicComponentClass {
+        new (props?: any): ClassicComponentClass;
+    }
+}
+
+declare global {
+    namespace JSX {
+        interface ElementAttributesProperty { }
+    }
+}
+
+
+//@filename: src/components/TabBar.js
+export default React.createClass({
+  render() {
+    return (
+      null
+    );
+  }
+});
+
+//@filename: src/modules/navigation/NavigationView.js
+import TabBar from '../../components/TabBar';
+import {layout} from '../../utils/theme'; // <- DO NOT DROP this import
+const x = <TabBar height={layout.footerHeight} />;

From 16bdaaa0a6db70a3594d3e847545e6ce370ce620 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 25 Jan 2017 11:04:23 -0800
Subject: [PATCH 021/127] Fix positionToLineOffset conversion for
 getImplementation

---
 src/server/session.ts                         | 16 +++++++++-------
 .../goToImplementation_inDifferentFiles.ts    | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts

diff --git a/src/server/session.ts b/src/server/session.ts
index 1fa3986f66f..825ad8506d7 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -484,18 +484,20 @@ namespace ts.server {
 
         private getImplementation(args: protocol.FileLocationRequestArgs, simplifiedResult: boolean): protocol.FileSpan[] | ImplementationLocation[] {
             const { file, project } = this.getFileAndProject(args);
-            const scriptInfo = project.getScriptInfoForNormalizedPath(file);
-            const position = this.getPosition(args, scriptInfo);
+            const position = this.getPosition(args, project.getScriptInfoForNormalizedPath(file));
             const implementations = project.getLanguageService().getImplementationAtPosition(file, position);
             if (!implementations) {
                 return [];
             }
             if (simplifiedResult) {
-                return implementations.map(impl => ({
-                    file: impl.fileName,
-                    start: scriptInfo.positionToLineOffset(impl.textSpan.start),
-                    end: scriptInfo.positionToLineOffset(ts.textSpanEnd(impl.textSpan))
-                }));
+                return implementations.map(({ fileName, textSpan }) => {
+                    const scriptInfo = project.getScriptInfo(fileName);
+                    return {
+                        file: fileName,
+                        start: scriptInfo.positionToLineOffset(textSpan.start),
+                        end: scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan))
+                    };
+                });
             }
             else {
                 return implementations;
diff --git a/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts b/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts
new file mode 100644
index 00000000000..e4289b83102
--- /dev/null
+++ b/tests/cases/fourslash/server/goToImplementation_inDifferentFiles.ts
@@ -0,0 +1,19 @@
+/// <reference path='../fourslash.ts'/>
+
+// @Filename: /bar.ts
+////import {Foo} from './foo'
+////
+////[|class A implements Foo {
+////    func() {}
+////}|]
+////
+////[|class B implements Foo {
+////    func() {}
+////}|]
+
+// @Filename: /foo.ts
+////export interface /**/Foo {
+////    func();
+////}
+
+verify.allRangesAppearInImplementationList("");

From 916e67a92c0c9d348ac74f8f3e78374d55964d78 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 25 Jan 2017 08:32:08 -0800
Subject: [PATCH 022/127] For goToDefinition, verify that
 tryGetSignatureDeclaration returns a signature declaration and not a
 FunctionType.

---
 src/services/goToDefinition.ts                  | 17 +++++++++++++++--
 .../fourslash/goToDefinitionFunctionType.ts     | 17 +++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/fourslash/goToDefinitionFunctionType.ts

diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts
index ab35a17fcef..73cf06d31ef 100644
--- a/src/services/goToDefinition.ts
+++ b/src/services/goToDefinition.ts
@@ -187,7 +187,15 @@ namespace ts.GoToDefinition {
     }
 
     function isSignatureDeclaration(node: Node): boolean {
-        return node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature
+        switch (node.kind) {
+            case ts.SyntaxKind.Constructor:
+            case ts.SyntaxKind.FunctionDeclaration:
+            case ts.SyntaxKind.MethodDeclaration:
+            case ts.SyntaxKind.MethodSignature:
+                return true;
+            default:
+                return false;
+        }
     }
 
     /** Creates a DefinitionInfo from a Declaration, using the declaration's name if possible. */
@@ -254,6 +262,11 @@ namespace ts.GoToDefinition {
 
     function tryGetSignatureDeclaration(typeChecker: TypeChecker, node: Node): SignatureDeclaration | undefined {
         const callLike = getAncestorCallLikeExpression(node);
-        return callLike && typeChecker.getResolvedSignature(callLike).declaration;
+        const decl = callLike && typeChecker.getResolvedSignature(callLike).declaration;
+        if (decl && isSignatureDeclaration(decl)) {
+            return decl;
+        }
+        // Don't go to a function type, go to the value having that type.
+        return undefined;
     }
 }
diff --git a/tests/cases/fourslash/goToDefinitionFunctionType.ts b/tests/cases/fourslash/goToDefinitionFunctionType.ts
new file mode 100644
index 00000000000..1b50de3af6d
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionFunctionType.ts
@@ -0,0 +1,17 @@
+/// <reference path='fourslash.ts'/>
+
+// Tests that goToDefinition does not go to a function type; it goes to the value.
+
+////const /*constDefinition*/c: () => void;
+/////*constReference*/c();
+////function test(/*cbDefinition*/cb: () => void) {
+////    /*cbReference*/cb();
+////}
+////class C {
+////    /*propDefinition*/prop: () => void;
+////    m() {
+////        this./*propReference*/prop();
+////    }
+////}
+
+verify.goToDefinitionForMarkers("const", "cb", "prop");

From 97e964a08f242eb806962d9d53e1d92f7d764fc8 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 25 Jan 2017 14:15:06 -0800
Subject: [PATCH 023/127] Fix typo

---
 tests/cases/fourslash/findAllRefsForMappedType.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cases/fourslash/findAllRefsForMappedType.ts b/tests/cases/fourslash/findAllRefsForMappedType.ts
index 620eae0815c..38fb3a226c6 100644
--- a/tests/cases/fourslash/findAllRefsForMappedType.ts
+++ b/tests/cases/fourslash/findAllRefsForMappedType.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface T { [|a|]: number };
-////type U { [K in keyof T]: string };
+////type U = { [K in keyof T]: string };
 ////type V = { [K in keyof U]: boolean };
 ////const u: U = { [|a|]: "" }
 ////const v: V = { [|a|]: true }

From 5bf9b30c5d596037a10bdf78213b711fac20efbf Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 26 Jan 2017 09:50:38 -0800
Subject: [PATCH 024/127] Replace `isSearchedFor` with directly passing
 `searchSymbols`

---
 src/services/findAllReferences.ts | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index df568f6df3e..28474839cf3 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -41,9 +41,6 @@ namespace ts.FindAllReferences {
         if (shorthandModuleSymbol) {
             searchSymbols.push(shorthandModuleSymbol);
         }
-        function isSearchedFor(symbol: Symbol): boolean {
-            return contains(searchSymbols, symbol);
-        }
 
         // Compute the meaning from the location and the symbol it references
         const searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations);
@@ -80,7 +77,7 @@ namespace ts.FindAllReferences {
 
         function getRefs(scope: ts.Node, searchName: string): void {
             getReferencesInNode(scope, symbol, searchName, node, searchMeaning, findInStrings, findInComments, result,
-                symbolToIndex, implementations, typeChecker, cancellationToken, isSearchedFor, inheritsFromCache);
+                symbolToIndex, implementations, typeChecker, cancellationToken, searchSymbols, inheritsFromCache);
         }
     }
 
@@ -456,7 +453,7 @@ namespace ts.FindAllReferences {
         implementations: boolean,
         typeChecker: TypeChecker,
         cancellationToken: CancellationToken,
-        isSearchedFor: (symbol: Symbol) => boolean,
+        searchSymbols: Symbol[],
         inheritsFromCache: Map<boolean>): void {
 
         const sourceFile = container.getSourceFile();
@@ -502,7 +499,7 @@ namespace ts.FindAllReferences {
             if (referenceSymbol) {
                 const referenceSymbolDeclaration = referenceSymbol.valueDeclaration;
                 const shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration);
-                const relatedSymbol = getRelatedSymbol(isSearchedFor, referenceSymbol, referenceLocation,
+                const relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation,
                     /*searchLocationIsConstructor*/ searchLocation.kind === SyntaxKind.ConstructorKeyword, parents, inheritsFromCache, typeChecker);
 
                 if (relatedSymbol) {
@@ -514,7 +511,7 @@ namespace ts.FindAllReferences {
                  * the position in short-hand property assignment excluding property accessing. However, if we do findAllReference at the
                  * position of property accessing, the referenceEntry of such position will be handled in the first case.
                  */
-                else if (!(referenceSymbol.flags & SymbolFlags.Transient) && isSearchedFor(shorthandValueSymbol)) {
+                else if (!(referenceSymbol.flags & SymbolFlags.Transient) && contains(searchSymbols, shorthandValueSymbol)) {
                     addReferenceToRelatedSymbol(referenceSymbolDeclaration.name, shorthandValueSymbol);
                 }
                 else if (searchLocation.kind === SyntaxKind.ConstructorKeyword) {
@@ -1178,8 +1175,8 @@ namespace ts.FindAllReferences {
         }
     }
 
-    function getRelatedSymbol(isSearchedFor: (symbol: Symbol) => boolean, referenceSymbol: Symbol, referenceLocation: Node, searchLocationIsConstructor: boolean, parents: Symbol[] | undefined, cache: Map<boolean>, typeChecker: TypeChecker): Symbol | undefined {
-        if (isSearchedFor(referenceSymbol)) {
+    function getRelatedSymbol(searchSymbols: Symbol[], referenceSymbol: Symbol, referenceLocation: Node, searchLocationIsConstructor: boolean, parents: Symbol[] | undefined, cache: Map<boolean>, typeChecker: TypeChecker): Symbol | undefined {
+        if (contains(searchSymbols, referenceSymbol)) {
             // If we are searching for constructor uses, they must be 'new' expressions.
             return (!searchLocationIsConstructor || isNewExpressionTarget(referenceLocation)) ? referenceSymbol : undefined;
         }
@@ -1188,7 +1185,7 @@ namespace ts.FindAllReferences {
         // symbols but by looking up for related symbol of this alias so it can handle multiple level of indirectness.
         const aliasSymbol = getAliasSymbolForPropertyNameSymbol(referenceSymbol, referenceLocation, typeChecker);
         if (aliasSymbol) {
-            return getRelatedSymbol(isSearchedFor, aliasSymbol, referenceLocation, searchLocationIsConstructor, parents, cache, typeChecker);
+            return getRelatedSymbol(searchSymbols, aliasSymbol, referenceLocation, searchLocationIsConstructor, parents, cache, typeChecker);
         }
 
         // If the reference location is in an object literal, try to get the contextual type for the
@@ -1197,7 +1194,7 @@ namespace ts.FindAllReferences {
         const containingObjectLiteralElement = getContainingObjectLiteralElement(referenceLocation);
         if (containingObjectLiteralElement) {
             const contextualSymbol = forEach(getPropertySymbolsFromContextualType(containingObjectLiteralElement, typeChecker), contextualSymbol =>
-                find(typeChecker.getRootSymbols(contextualSymbol), isSearchedFor));
+                find(typeChecker.getRootSymbols(contextualSymbol), symbol => contains(searchSymbols, symbol)));
 
             if (contextualSymbol) {
                 return contextualSymbol;
@@ -1208,7 +1205,7 @@ namespace ts.FindAllReferences {
             // In below eg. get 'property' from type of elems iterating type
             //      for ( { property: p2 } of elems) { }
             const propertySymbol = getPropertySymbolOfDestructuringAssignment(referenceLocation, typeChecker);
-            if (propertySymbol && isSearchedFor(propertySymbol)) {
+            if (propertySymbol && contains(searchSymbols, propertySymbol)) {
                 return propertySymbol;
             }
         }
@@ -1217,7 +1214,7 @@ namespace ts.FindAllReferences {
         // then include the binding element in the related symbols
         //      let { a } : { a };
         const bindingElementPropertySymbol = getPropertySymbolOfObjectBindingPatternWithoutPropertyName(referenceSymbol, typeChecker);
-        if (bindingElementPropertySymbol && isSearchedFor(bindingElementPropertySymbol)) {
+        if (bindingElementPropertySymbol && contains(searchSymbols, bindingElementPropertySymbol)) {
             return bindingElementPropertySymbol;
         }
 
@@ -1225,7 +1222,7 @@ namespace ts.FindAllReferences {
         // Or a union property, use its underlying unioned symbols
         return forEach(typeChecker.getRootSymbols(referenceSymbol), rootSymbol => {
             // if it is in the list, then we are done
-            if (isSearchedFor(rootSymbol)) {
+            if (contains(searchSymbols, rootSymbol)) {
                 return rootSymbol;
             }
 
@@ -1242,7 +1239,7 @@ namespace ts.FindAllReferences {
 
                 const result: Symbol[] = [];
                 getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result, /*previousIterationSymbolsCache*/ createMap<Symbol>(), typeChecker);
-                return find(result, isSearchedFor);
+                return find(result, symbol => contains(searchSymbols, symbol));
             }
 
             return undefined;

From 71d1a3f051c0990c07a510dc811dfc4be4b3b6d7 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Thu, 26 Jan 2017 11:38:50 -0800
Subject: [PATCH 025/127] property handle misspelled namepath in @typedef tag
 (#13702)

---
 src/compiler/parser.ts                        |  9 ++++++--
 .../misspelledJsDocTypedefTags.symbols        |  8 +++++++
 .../misspelledJsDocTypedefTags.types          | 22 +++++++++++++++++++
 .../compiler/misspelledJsDocTypedefTags.ts    |  9 ++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/misspelledJsDocTypedefTags.symbols
 create mode 100644 tests/baselines/reference/misspelledJsDocTypedefTags.types
 create mode 100644 tests/cases/compiler/misspelledJsDocTypedefTags.ts

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index c795cab14a3..c5439aa051b 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -6693,10 +6693,15 @@ namespace ts {
                     typedefTag.fullName = parseJSDocTypeNameWithNamespace(/*flags*/ 0);
                     if (typedefTag.fullName) {
                         let rightNode = typedefTag.fullName;
-                        while (rightNode.kind !== SyntaxKind.Identifier) {
+                        while (true) {
+                            if (rightNode.kind === SyntaxKind.Identifier || !rightNode.body) {
+                                // if node is identifier - use it as name
+                                // otherwise use name of the rightmost part that we were able to parse
+                                typedefTag.name = rightNode.kind === SyntaxKind.Identifier ? rightNode : rightNode.name;
+                                break;
+                            }
                             rightNode = rightNode.body;
                         }
-                        typedefTag.name = rightNode;
                     }
                     typedefTag.typeExpression = typeExpression;
                     skipWhitespace();
diff --git a/tests/baselines/reference/misspelledJsDocTypedefTags.symbols b/tests/baselines/reference/misspelledJsDocTypedefTags.symbols
new file mode 100644
index 00000000000..bf3f6e7fab0
--- /dev/null
+++ b/tests/baselines/reference/misspelledJsDocTypedefTags.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/a.js ===
+
+No type information for this code./** @typedef {{ endTime: number, screenshots: number}} A.<b>*/
+No type information for this code.Animation.AnimationModel.ScreenshotCapture.Request;
+No type information for this code.
+No type information for this code./** @typedef {{ endTime: number, screenshots: !B.<string>}} */
+No type information for this code.Animation.AnimationModel.ScreenshotCapture.Request;
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/misspelledJsDocTypedefTags.types b/tests/baselines/reference/misspelledJsDocTypedefTags.types
new file mode 100644
index 00000000000..70cc011ea69
--- /dev/null
+++ b/tests/baselines/reference/misspelledJsDocTypedefTags.types
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/a.js ===
+
+/** @typedef {{ endTime: number, screenshots: number}} A.<b>*/
+Animation.AnimationModel.ScreenshotCapture.Request;
+>Animation.AnimationModel.ScreenshotCapture.Request : any
+>Animation.AnimationModel.ScreenshotCapture : any
+>Animation.AnimationModel : any
+>Animation : any
+>AnimationModel : any
+>ScreenshotCapture : any
+>Request : any
+
+/** @typedef {{ endTime: number, screenshots: !B.<string>}} */
+Animation.AnimationModel.ScreenshotCapture.Request;
+>Animation.AnimationModel.ScreenshotCapture.Request : any
+>Animation.AnimationModel.ScreenshotCapture : any
+>Animation.AnimationModel : any
+>Animation : any
+>AnimationModel : any
+>ScreenshotCapture : any
+>Request : any
+
diff --git a/tests/cases/compiler/misspelledJsDocTypedefTags.ts b/tests/cases/compiler/misspelledJsDocTypedefTags.ts
new file mode 100644
index 00000000000..3f3221020bd
--- /dev/null
+++ b/tests/cases/compiler/misspelledJsDocTypedefTags.ts
@@ -0,0 +1,9 @@
+// @allowJs: true
+// @noEmit: true
+
+// @filename: a.js
+/** @typedef {{ endTime: number, screenshots: number}} A.<b>*/
+Animation.AnimationModel.ScreenshotCapture.Request;
+
+/** @typedef {{ endTime: number, screenshots: !B.<string>}} */
+Animation.AnimationModel.ScreenshotCapture.Request;
\ No newline at end of file

From 132fa7093ed64bc0e78a9a3bb4ca7a7325e540be Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 26 Jan 2017 14:26:49 -0800
Subject: [PATCH 026/127] Respond to comments

---
 src/compiler/moduleNameResolver.ts            | 21 +++++++++----------
 .../reference/library-reference-12.trace.json |  1 +
 .../reference/library-reference-2.trace.json  |  2 ++
 ...lutionWithExtensions_unexpected.trace.json |  1 +
 ...utionWithExtensions_unexpected2.trace.json |  1 +
 .../reference/packageJsonMain.trace.json      |  3 +++
 .../packageJsonMain_isNonRecursive.trace.json |  1 +
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 519b1d5fad2..68b043f1439 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -67,16 +67,15 @@ namespace ts {
     }
 
     /** Reads from "main" or "types"/"typings" depending on `extensions`. */
-    function tryReadPackageJsonFields(ts: boolean, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string | undefined {
+    function tryReadPackageJsonFields(readTypes: boolean, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string | undefined {
         const jsonContent = readJson(packageJsonPath, state.host);
-        const file = ts ? tryReadFromField("typings") || tryReadFromField("types") : tryReadFromField("main");
-        if (!file && state.traceEnabled) {
-            trace(state.host, Diagnostics.package_json_does_not_have_a_0_field, ts ? "types" : "main");
-        }
-        return file;
+        return readTypes ? tryReadFromField("typings") || tryReadFromField("types") : tryReadFromField("main");
 
         function tryReadFromField(fieldName: "typings" | "types" | "main"): string | undefined {
             if (!hasProperty(jsonContent, fieldName)) {
+                if (state.traceEnabled) {
+                    trace(state.host, Diagnostics.package_json_does_not_have_a_0_field, fieldName);
+                }
                 return;
             }
 
@@ -690,7 +689,8 @@ namespace ts {
         return { resolvedModule: undefined, failedLookupLocations };
 
         function tryResolve(extensions: Extensions): SearchResult<{ resolved: Resolved, isExternalLibraryImport: boolean }> {
-            const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state);
+            const loader: ResolutionKindSpecificLoader = (extensions, candidate, failedLookupLocations, onlyRecordFailures, state) => nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, /*considerPackageJson*/true);
+            const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
             if (resolved) {
                 return toSearchResult({ resolved, isExternalLibraryImport: false });
             }
@@ -705,7 +705,7 @@ namespace ts {
             }
             else {
                 const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
-                const resolved = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                const resolved = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state, /*considerPackageJson*/true);
                 return resolved && toSearchResult({ resolved, isExternalLibraryImport: false });
             }
         }
@@ -723,7 +723,7 @@ namespace ts {
         return real;
     }
 
-    function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson = true): Resolved | undefined {
+    function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson: boolean): Resolved | undefined {
         if (state.traceEnabled) {
             trace(state.host, Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0_target_file_type_1, candidate, Extensions[extensions]);
         }
@@ -855,8 +855,7 @@ namespace ts {
             trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath);
         }
 
-        const ts = extensions !== Extensions.JavaScript;
-        const file = tryReadPackageJsonFields(ts, packageJsonPath, candidate, state);
+        const file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript, packageJsonPath, candidate, state);
         if (!file) {
             return undefined;
         }
diff --git a/tests/baselines/reference/library-reference-12.trace.json b/tests/baselines/reference/library-reference-12.trace.json
index 14e46647d6d..75b53d589ee 100644
--- a/tests/baselines/reference/library-reference-12.trace.json
+++ b/tests/baselines/reference/library-reference-12.trace.json
@@ -5,6 +5,7 @@
     "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.",
     "File '/a/node_modules/jquery.d.ts' does not exist.",
     "Found 'package.json' at '/a/node_modules/jquery/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'dist/jquery.d.ts' that references '/a/node_modules/jquery/dist/jquery.d.ts'.",
     "File '/a/node_modules/jquery/dist/jquery.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/a/node_modules/jquery/dist/jquery.d.ts', result '/a/node_modules/jquery/dist/jquery.d.ts'",
diff --git a/tests/baselines/reference/library-reference-2.trace.json b/tests/baselines/reference/library-reference-2.trace.json
index 8837f2c9cb1..ef0936a35a2 100644
--- a/tests/baselines/reference/library-reference-2.trace.json
+++ b/tests/baselines/reference/library-reference-2.trace.json
@@ -2,6 +2,7 @@
     "======== Resolving type reference directive 'jquery', containing file '/consumer.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "Found 'package.json' at '/types/jquery/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/types/jquery/jquery.d.ts', result '/types/jquery/jquery.d.ts'",
@@ -9,6 +10,7 @@
     "======== Resolving type reference directive 'jquery', containing file 'test/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "Found 'package.json' at '/types/jquery/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/types/jquery/jquery.d.ts', result '/types/jquery/jquery.d.ts'",
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
index c53a32ef97d..8c820e07e48 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json
@@ -6,6 +6,7 @@
     "File '/node_modules/normalize.css.tsx' does not exist.",
     "File '/node_modules/normalize.css.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/normalize.css/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "File '/node_modules/normalize.css/index.ts' does not exist.",
     "File '/node_modules/normalize.css/index.tsx' does not exist.",
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
index f007bc77d75..e550bb41eab 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json
@@ -6,6 +6,7 @@
     "File '/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/foo.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' has 'types' field 'foo.js' that references '/node_modules/foo/foo.js'.",
     "File '/node_modules/foo/foo.js' exist - use it as a name resolution result.",
     "File '/node_modules/foo/foo.js' has an unsupported extension, so skipping it.",
diff --git a/tests/baselines/reference/packageJsonMain.trace.json b/tests/baselines/reference/packageJsonMain.trace.json
index 9b71c672337..a167e8dfec6 100644
--- a/tests/baselines/reference/packageJsonMain.trace.json
+++ b/tests/baselines/reference/packageJsonMain.trace.json
@@ -6,6 +6,7 @@
     "File '/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/foo.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "File '/node_modules/foo/index.ts' does not exist.",
     "File '/node_modules/foo/index.tsx' does not exist.",
@@ -28,6 +29,7 @@
     "File '/node_modules/bar.tsx' does not exist.",
     "File '/node_modules/bar.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/bar/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "File '/node_modules/bar/index.ts' does not exist.",
     "File '/node_modules/bar/index.tsx' does not exist.",
@@ -48,6 +50,7 @@
     "File '/node_modules/baz.tsx' does not exist.",
     "File '/node_modules/baz.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/baz/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "File '/node_modules/baz/index.ts' does not exist.",
     "File '/node_modules/baz/index.tsx' does not exist.",
diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
index 9d1f2f9bedf..53e1ad25605 100644
--- a/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
+++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json
@@ -6,6 +6,7 @@
     "File '/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/foo.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "File '/node_modules/foo/index.ts' does not exist.",
     "File '/node_modules/foo/index.tsx' does not exist.",

From cabcaaadcbd505f264dc396aad97cee427459171 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 26 Jan 2017 16:04:58 -0800
Subject: [PATCH 027/127] Property assignment is not an assignment target

In a destructuring assignment, a property assignment is not an
assignment target. Its initialiser is. For example:

```ts
({ source: target} = o);
```

Here, `target` is the assignment target. `source` is not. Previously,
both were assignment targets.
---
 src/compiler/utilities.ts                     | 11 +++++---
 ...ertyAssignmentNameIsNotAssignmentTarget.js | 17 +++++++++++++
 ...ssignmentNameIsNotAssignmentTarget.symbols | 21 ++++++++++++++++
 ...yAssignmentNameIsNotAssignmentTarget.types | 25 +++++++++++++++++++
 ...ertyAssignmentNameIsNotAssignmentTarget.ts |  7 ++++++
 5 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.js
 create mode 100644 tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.symbols
 create mode 100644 tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.types
 create mode 100644 tests/cases/compiler/destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 5c63d8bb60c..17e9fe8e1d7 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1662,11 +1662,15 @@ namespace ts {
                     node = parent;
                     break;
                 case SyntaxKind.ShorthandPropertyAssignment:
-                    if ((<ShorthandPropertyAssignment>parent).name !== node) {
+                    if ((parent as ShorthandPropertyAssignment).name !== node) {
                         return AssignmentKind.None;
                     }
-                // Fall through
+                    node = parent.parent;
+                    break;
                 case SyntaxKind.PropertyAssignment:
+                    if ((parent as ShorthandPropertyAssignment).name === node) {
+                        return AssignmentKind.None;
+                    }
                     node = parent.parent;
                     break;
                 default:
@@ -1678,7 +1682,8 @@ namespace ts {
 
     // A node is an assignment target if it is on the left hand side of an '=' token, if it is parented by a property
     // assignment in an object literal that is an assignment target, or if it is parented by an array literal that is
-    // an assignment target. Examples include 'a = xxx', '{ p: a } = xxx', '[{ p: a}] = xxx'.
+    // an assignment target. Examples include 'a = xxx', '{ p: a } = xxx', '[{ a }] = xxx'.
+    // (Note that `p` is not a target in the above examples, only `a`.)
     export function isAssignmentTarget(node: Node): boolean {
         return getAssignmentTargetKind(node) !== AssignmentKind.None;
     }
diff --git a/tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.js b/tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.js
new file mode 100644
index 00000000000..b2ba970ef51
--- /dev/null
+++ b/tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.js
@@ -0,0 +1,17 @@
+//// [destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts]
+// test for #10668
+function qux(bar: { value: number }) {
+    let foo: number;
+    ({ value: foo } = bar);
+    let x = () => bar;
+}
+
+
+
+//// [destructuringPropertyAssignmentNameIsNotAssignmentTarget.js]
+// test for #10668
+function qux(bar) {
+    var foo;
+    (foo = bar.value);
+    var x = function () { return bar; };
+}
diff --git a/tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.symbols b/tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.symbols
new file mode 100644
index 00000000000..b9ebe219f65
--- /dev/null
+++ b/tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.symbols
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts ===
+// test for #10668
+function qux(bar: { value: number }) {
+>qux : Symbol(qux, Decl(destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts, 0, 0))
+>bar : Symbol(bar, Decl(destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts, 1, 13))
+>value : Symbol(value, Decl(destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts, 1, 19))
+
+    let foo: number;
+>foo : Symbol(foo, Decl(destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts, 2, 7))
+
+    ({ value: foo } = bar);
+>value : Symbol(value, Decl(destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts, 3, 6))
+>foo : Symbol(foo, Decl(destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts, 2, 7))
+>bar : Symbol(bar, Decl(destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts, 1, 13))
+
+    let x = () => bar;
+>x : Symbol(x, Decl(destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts, 4, 7))
+>bar : Symbol(bar, Decl(destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts, 1, 13))
+}
+
+
diff --git a/tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.types b/tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.types
new file mode 100644
index 00000000000..e0428fc959f
--- /dev/null
+++ b/tests/baselines/reference/destructuringPropertyAssignmentNameIsNotAssignmentTarget.types
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts ===
+// test for #10668
+function qux(bar: { value: number }) {
+>qux : (bar: { value: number; }) => void
+>bar : { value: number; }
+>value : number
+
+    let foo: number;
+>foo : number
+
+    ({ value: foo } = bar);
+>({ value: foo } = bar) : { value: number; }
+>{ value: foo } = bar : { value: number; }
+>{ value: foo } : { value: number; }
+>value : number
+>foo : number
+>bar : { value: number; }
+
+    let x = () => bar;
+>x : () => { value: number; }
+>() => bar : () => { value: number; }
+>bar : { value: number; }
+}
+
+
diff --git a/tests/cases/compiler/destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts b/tests/cases/compiler/destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts
new file mode 100644
index 00000000000..c0002f3e80a
--- /dev/null
+++ b/tests/cases/compiler/destructuringPropertyAssignmentNameIsNotAssignmentTarget.ts
@@ -0,0 +1,7 @@
+// test for #10668
+function qux(bar: { value: number }) {
+    let foo: number;
+    ({ value: foo } = bar);
+    let x = () => bar;
+}
+

From 4d67b0c2b6f4cb99b74db702eda6eb62c1cda7f4 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 27 Jan 2017 09:53:57 -0800
Subject: [PATCH 028/127] Allow super to access method signatures

Previously, super was only allowed to access method *declarations*. But
method signatures can come from interfaces that merge with classes, and
should also be accessible as methods on super.
---
 src/compiler/checker.ts                       | 13 ++++---
 .../superHasMethodsFromMergedInterface.js     | 37 +++++++++++++++++++
 ...superHasMethodsFromMergedInterface.symbols | 23 ++++++++++++
 .../superHasMethodsFromMergedInterface.types  | 24 ++++++++++++
 .../superHasMethodsFromMergedInterface.ts     |  7 ++++
 5 files changed, 99 insertions(+), 5 deletions(-)
 create mode 100644 tests/baselines/reference/superHasMethodsFromMergedInterface.js
 create mode 100644 tests/baselines/reference/superHasMethodsFromMergedInterface.symbols
 create mode 100644 tests/baselines/reference/superHasMethodsFromMergedInterface.types
 create mode 100644 tests/cases/compiler/superHasMethodsFromMergedInterface.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7c8a0b7337f..7d0f2cb0bbb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -12337,12 +12337,15 @@ namespace ts {
                 // - In a static member function or static member accessor
                 //   where this references the constructor function object of a derived class,
                 //   a super property access is permitted and must specify a public static member function of the base class.
-                if (languageVersion < ScriptTarget.ES2015 && getDeclarationKindFromSymbol(prop) !== SyntaxKind.MethodDeclaration) {
-                    // `prop` refers to a *property* declared in the super class
-                    // rather than a *method*, so it does not satisfy the above criteria.
+                if (languageVersion < ScriptTarget.ES2015) {
+                    const propKind = getDeclarationKindFromSymbol(prop);
+                    if (propKind !== SyntaxKind.MethodDeclaration && propKind !== SyntaxKind.MethodSignature) {
+                        // `prop` refers to a *property* declared in the super class
+                        // rather than a *method*, so it does not satisfy the above criteria.
 
-                    error(errorNode, Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
-                    return false;
+                        error(errorNode, Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
+                        return false;
+                    }
                 }
 
                 if (flags & ModifierFlags.Abstract) {
diff --git a/tests/baselines/reference/superHasMethodsFromMergedInterface.js b/tests/baselines/reference/superHasMethodsFromMergedInterface.js
new file mode 100644
index 00000000000..e7086106210
--- /dev/null
+++ b/tests/baselines/reference/superHasMethodsFromMergedInterface.js
@@ -0,0 +1,37 @@
+//// [superHasMethodsFromMergedInterface.ts]
+class C { m1() { } }
+interface C { m2(): void }
+class Sub extends C {
+    m3() {
+        super.m2();
+    }
+}
+
+
+//// [superHasMethodsFromMergedInterface.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var C = (function () {
+    function C() {
+    }
+    C.prototype.m1 = function () { };
+    return C;
+}());
+var Sub = (function (_super) {
+    __extends(Sub, _super);
+    function Sub() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Sub.prototype.m3 = function () {
+        _super.prototype.m2.call(this);
+    };
+    return Sub;
+}(C));
diff --git a/tests/baselines/reference/superHasMethodsFromMergedInterface.symbols b/tests/baselines/reference/superHasMethodsFromMergedInterface.symbols
new file mode 100644
index 00000000000..ec0af8064ed
--- /dev/null
+++ b/tests/baselines/reference/superHasMethodsFromMergedInterface.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/superHasMethodsFromMergedInterface.ts ===
+class C { m1() { } }
+>C : Symbol(C, Decl(superHasMethodsFromMergedInterface.ts, 0, 0), Decl(superHasMethodsFromMergedInterface.ts, 0, 20))
+>m1 : Symbol(C.m1, Decl(superHasMethodsFromMergedInterface.ts, 0, 9))
+
+interface C { m2(): void }
+>C : Symbol(C, Decl(superHasMethodsFromMergedInterface.ts, 0, 0), Decl(superHasMethodsFromMergedInterface.ts, 0, 20))
+>m2 : Symbol(C.m2, Decl(superHasMethodsFromMergedInterface.ts, 1, 13))
+
+class Sub extends C {
+>Sub : Symbol(Sub, Decl(superHasMethodsFromMergedInterface.ts, 1, 26))
+>C : Symbol(C, Decl(superHasMethodsFromMergedInterface.ts, 0, 0), Decl(superHasMethodsFromMergedInterface.ts, 0, 20))
+
+    m3() {
+>m3 : Symbol(Sub.m3, Decl(superHasMethodsFromMergedInterface.ts, 2, 21))
+
+        super.m2();
+>super.m2 : Symbol(C.m2, Decl(superHasMethodsFromMergedInterface.ts, 1, 13))
+>super : Symbol(C, Decl(superHasMethodsFromMergedInterface.ts, 0, 0), Decl(superHasMethodsFromMergedInterface.ts, 0, 20))
+>m2 : Symbol(C.m2, Decl(superHasMethodsFromMergedInterface.ts, 1, 13))
+    }
+}
+
diff --git a/tests/baselines/reference/superHasMethodsFromMergedInterface.types b/tests/baselines/reference/superHasMethodsFromMergedInterface.types
new file mode 100644
index 00000000000..7f314d90bed
--- /dev/null
+++ b/tests/baselines/reference/superHasMethodsFromMergedInterface.types
@@ -0,0 +1,24 @@
+=== tests/cases/compiler/superHasMethodsFromMergedInterface.ts ===
+class C { m1() { } }
+>C : C
+>m1 : () => void
+
+interface C { m2(): void }
+>C : C
+>m2 : () => void
+
+class Sub extends C {
+>Sub : Sub
+>C : C
+
+    m3() {
+>m3 : () => void
+
+        super.m2();
+>super.m2() : void
+>super.m2 : () => void
+>super : C
+>m2 : () => void
+    }
+}
+
diff --git a/tests/cases/compiler/superHasMethodsFromMergedInterface.ts b/tests/cases/compiler/superHasMethodsFromMergedInterface.ts
new file mode 100644
index 00000000000..cdca6ae65bf
--- /dev/null
+++ b/tests/cases/compiler/superHasMethodsFromMergedInterface.ts
@@ -0,0 +1,7 @@
+class C { m1() { } }
+interface C { m2(): void }
+class Sub extends C {
+    m3() {
+        super.m2();
+    }
+}

From 89b72ac9cec52d3a663f17daaabebc219c207644 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 28 Jan 2017 14:46:29 -0800
Subject: [PATCH 029/127] Support mixin classes

---
 src/compiler/checker.ts              | 86 +++++++++++++++++++++++-----
 src/compiler/diagnosticMessages.json |  4 ++
 2 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7c8a0b7337f..6e0f0d6509a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2465,7 +2465,8 @@ namespace ts {
                     const symbol = type.symbol;
                     if (symbol) {
                         // Always use 'typeof T' for type of class, enum, and module objects
-                        if (symbol.flags & (SymbolFlags.Class | SymbolFlags.Enum | SymbolFlags.ValueModule)) {
+                        if (symbol.flags & SymbolFlags.Class && !getBaseTypeVariableOfClass(symbol) ||
+                            symbol.flags & (SymbolFlags.Enum | SymbolFlags.ValueModule)) {
                             writeTypeOfSymbol(type, flags);
                         }
                         else if (shouldWriteTypeOfFunctionSymbol()) {
@@ -3639,6 +3640,11 @@ namespace ts {
             return links.type;
         }
 
+        function getBaseTypeVariableOfClass(symbol: Symbol) {
+            const baseConstructorType = getBaseConstructorTypeOfClass(getDeclaredTypeOfClassOrInterface(symbol));
+            return baseConstructorType.flags & TypeFlags.TypeVariable ? baseConstructorType : undefined;
+        }
+
         function getTypeOfFuncClassEnumModule(symbol: Symbol): Type {
             const links = getSymbolLinks(symbol);
             if (!links.type) {
@@ -3647,8 +3653,13 @@ namespace ts {
                 }
                 else {
                     const type = createObjectType(ObjectFlags.Anonymous, symbol);
-                    links.type = strictNullChecks && symbol.flags & SymbolFlags.Optional ?
-                        includeFalsyTypes(type, TypeFlags.Undefined) : type;
+                    if (symbol.flags & SymbolFlags.Class) {
+                        const baseTypeVariable = getBaseTypeVariableOfClass(symbol);
+                        links.type = baseTypeVariable ? getIntersectionType([type, baseTypeVariable]) : type;
+                    }
+                    else {
+                        links.type = strictNullChecks && symbol.flags & SymbolFlags.Optional ? includeFalsyTypes(type, TypeFlags.Undefined) : type;
+                    }
                 }
             }
             return links.type;
@@ -3812,8 +3823,26 @@ namespace ts {
             return concatenate(getOuterTypeParametersOfClassOrInterface(symbol), getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol));
         }
 
+        // A type is a mixin constructor if it has a single construct signature taking no type parameters and a single
+        // rest parameter of type any[].
+        function isMixinConstructorType(type: Type) {
+            const signatures = getSignaturesOfType(type, SignatureKind.Construct);
+            if (signatures.length === 1) {
+                const s = signatures[0];
+                return !s.typeParameters && s.parameters.length === 1 && s.hasRestParameter && getTypeOfParameter(s.parameters[0]) === anyArrayType;
+            }
+            return false;
+        }
+
         function isConstructorType(type: Type): boolean {
-            return isValidBaseType(type) && getSignaturesOfType(type, SignatureKind.Construct).length > 0;
+            if (isValidBaseType(type) && getSignaturesOfType(type, SignatureKind.Construct).length > 0) {
+                return true;
+            }
+            if (type.flags & TypeFlags.TypeVariable) {
+                const constraint = getBaseConstraintOfType(<TypeVariable>type);
+                return isValidBaseType(constraint) && isMixinConstructorType(constraint);
+            }
+            return false;
         }
 
         function getBaseTypeNodeOfClass(type: InterfaceType): ExpressionWithTypeArguments {
@@ -3892,7 +3921,7 @@ namespace ts {
 
         function resolveBaseTypesOfClass(type: InterfaceType): void {
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
-            const baseConstructorType = <ObjectType>getBaseConstructorTypeOfClass(type);
+            const baseConstructorType = getApparentType(getBaseConstructorTypeOfClass(type));
             if (!(baseConstructorType.flags & (TypeFlags.Object | TypeFlags.Intersection))) {
                 return;
             }
@@ -4547,11 +4576,32 @@ namespace ts {
             // intersection type use getPropertiesOfType (only the language service uses this).
             let callSignatures: Signature[] = emptyArray;
             let constructSignatures: Signature[] = emptyArray;
-            let stringIndexInfo: IndexInfo = undefined;
-            let numberIndexInfo: IndexInfo = undefined;
-            for (const t of type.types) {
+            let stringIndexInfo: IndexInfo;
+            let numberIndexInfo: IndexInfo;
+            let mixinTypes: Type[];
+            const count = type.types.length;
+            for (let i = 0; i < count; i++) {
+                const t = type.types[i];
+                // When a type T is preceded by a mixin constructor type, the return type of each construct signature
+                // in T is intersected with the return type of the mixin constructor, and the mixin construct signature
+                // is removed. For example, the intersection '{ new(...args: any[]) => A } & { new(s: string) => B }'
+                // has a single construct signature 'new(s: string) => A & B'.
+                let signatures = getSignaturesOfType(t, SignatureKind.Construct);
+                if (i < count - 1 && isMixinConstructorType(t)) {
+                    (mixinTypes || (mixinTypes = [])).push(getReturnTypeOfSignature(signatures[0]));
+                }
+                else {
+                    if (mixinTypes) {
+                        signatures = map(signatures, s => {
+                            const clone = cloneSignature(s);
+                            clone.resolvedReturnType = getIntersectionType([...mixinTypes, getReturnTypeOfSignature(s)]);
+                            return clone;
+                        });
+                        mixinTypes = undefined;
+                    }
+                    constructSignatures = concatenate(constructSignatures, signatures);
+                }
                 callSignatures = concatenate(callSignatures, getSignaturesOfType(t, SignatureKind.Call));
-                constructSignatures = concatenate(constructSignatures, getSignaturesOfType(t, SignatureKind.Construct));
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number));
             }
@@ -4593,7 +4643,7 @@ namespace ts {
                         constructSignatures = getDefaultConstructSignatures(classType);
                     }
                     const baseConstructorType = getBaseConstructorTypeOfClass(classType);
-                    if (baseConstructorType.flags & (TypeFlags.Object | TypeFlags.Intersection)) {
+                    if (baseConstructorType.flags & (TypeFlags.Object | TypeFlags.Intersection | TypeFlags.TypeVariable)) {
                         members = createSymbolTable(getNamedMembers(members));
                         addInheritedMembers(members, getPropertiesOfType(baseConstructorType));
                     }
@@ -4890,6 +4940,7 @@ namespace ts {
 
         function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol {
             const types = containingType.types;
+            const excludeModifiers = containingType.flags & TypeFlags.Union ? ModifierFlags.Private | ModifierFlags.Protected : 0;
             let props: Symbol[];
             // Flags we want to propagate to the result if they exist in all source symbols
             let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None;
@@ -4899,7 +4950,7 @@ namespace ts {
                 const type = getApparentType(current);
                 if (type !== unknownType) {
                     const prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected))) {
+                    if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & excludeModifiers)) {
                         commonFlags &= prop.flags;
                         if (!props) {
                             props = [prop];
@@ -6965,9 +7016,12 @@ namespace ts {
                     result.properties = resolved.properties;
                     result.callSignatures = emptyArray;
                     result.constructSignatures = emptyArray;
-                    type = result;
+                    return result;
                 }
             }
+            else if (type.flags & TypeFlags.Intersection) {
+                return getIntersectionType(map((<IntersectionType>type).types, getTypeWithoutSignatures));
+            }
             return type;
         }
 
@@ -18387,7 +18441,8 @@ namespace ts {
                 const baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
                     const baseType = baseTypes[0];
-                    const staticBaseType = getBaseConstructorTypeOfClass(type);
+                    const baseConstructorType = getBaseConstructorTypeOfClass(type);
+                    const staticBaseType = getApparentType(baseConstructorType);
                     checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
                     if (baseTypeNode.typeArguments) {
@@ -18401,6 +18456,9 @@ namespace ts {
                     checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType, type.thisType), node.name || node, Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node,
                         Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
+                    if (baseConstructorType.flags & TypeFlags.TypeVariable && !isMixinConstructorType(staticType)) {
+                        error(node.name || node, Diagnostics.A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any);
+                    }
 
                     if (baseType.symbol && baseType.symbol.valueDeclaration &&
                         !isInAmbientContext(baseType.symbol.valueDeclaration) &&
@@ -18410,7 +18468,7 @@ namespace ts {
                         }
                     }
 
-                    if (!(staticBaseType.symbol && staticBaseType.symbol.flags & SymbolFlags.Class)) {
+                    if (!(staticBaseType.symbol && staticBaseType.symbol.flags & SymbolFlags.Class) && !(baseConstructorType.flags & TypeFlags.TypeVariable)) {
                         // When the static base type is a "class-like" constructor function (but not actually a class), we verify
                         // that all instantiated base constructor signatures return the same type. We can simply compare the type
                         // references (as opposed to checking the structure of the types) because elsewhere we have already checked
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 43a9cce4de6..3fa399d3d38 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1783,6 +1783,10 @@
         "category": "Error",
         "code": 2544
     },
+    "A mixin class must have a constructor with a single rest parameter of type 'any[]'.": {
+        "category": "Error",
+        "code": 2545
+    },
     "JSX element attributes type '{0}' may not be a union type.": {
         "category": "Error",
         "code": 2600

From 763df852c610d9bc1e098fb7529474e7a7e52f92 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 29 Jan 2017 08:14:28 -0800
Subject: [PATCH 030/127] Revise intersection construct signature mixin
 algorithm

---
 src/compiler/checker.ts | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 6e0f0d6509a..dff8953e913 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4571,6 +4571,19 @@ namespace ts {
                 getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
         }
 
+        function includeMixinType(type: Type, types: Type[], index: number): Type {
+            const mixedTypes: Type[] = [];
+            for (let i = 0; i < types.length; i++) {
+                if (i === index) {
+                    mixedTypes.push(type);
+                }
+                else if (isMixinConstructorType(types[i])) {
+                    mixedTypes.push(getReturnTypeOfSignature(getSignaturesOfType(types[i], SignatureKind.Construct)[0]));
+                }
+            }
+            return getIntersectionType(mixedTypes);
+        }
+
         function resolveIntersectionTypeMembers(type: IntersectionType) {
             // The members and properties collections are empty for intersection types. To get all properties of an
             // intersection type use getPropertiesOfType (only the language service uses this).
@@ -4578,26 +4591,23 @@ namespace ts {
             let constructSignatures: Signature[] = emptyArray;
             let stringIndexInfo: IndexInfo;
             let numberIndexInfo: IndexInfo;
-            let mixinTypes: Type[];
-            const count = type.types.length;
-            for (let i = 0; i < count; i++) {
+            const types = type.types;
+            const mixinCount = countWhere(types, isMixinConstructorType);
+            for (let i = 0; i < types.length; i++) {
                 const t = type.types[i];
-                // When a type T is preceded by a mixin constructor type, the return type of each construct signature
-                // in T is intersected with the return type of the mixin constructor, and the mixin construct signature
-                // is removed. For example, the intersection '{ new(...args: any[]) => A } & { new(s: string) => B }'
-                // has a single construct signature 'new(s: string) => A & B'.
-                let signatures = getSignaturesOfType(t, SignatureKind.Construct);
-                if (i < count - 1 && isMixinConstructorType(t)) {
-                    (mixinTypes || (mixinTypes = [])).push(getReturnTypeOfSignature(signatures[0]));
-                }
-                else {
-                    if (mixinTypes) {
+                // When an intersection type contains mixin constructor types, the construct signatures from
+                // those types are discarded and their return types are mixed into the return types of all
+                // other construct signatures in the intersection type. For example, the intersection type
+                // '{ new(...args: any[]) => A } & { new(s: string) => B }' has a single construct signature
+                // 'new(s: string) => A & B'.
+                if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(t)) {
+                    let signatures = getSignaturesOfType(t, SignatureKind.Construct);
+                    if (signatures.length && mixinCount > 0) {
                         signatures = map(signatures, s => {
                             const clone = cloneSignature(s);
-                            clone.resolvedReturnType = getIntersectionType([...mixinTypes, getReturnTypeOfSignature(s)]);
+                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, i);
                             return clone;
                         });
-                        mixinTypes = undefined;
                     }
                     constructSignatures = concatenate(constructSignatures, signatures);
                 }

From 028e4e2b13b4a65d5418865cc22d3b37c935c955 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Thu, 26 Jan 2017 15:46:26 -0800
Subject: [PATCH 031/127] Extract printer from emitter for reusability.

---
 Jakefile.js                                |    2 +
 src/compiler/comments.ts                   |   20 +-
 src/compiler/declarationEmitter.ts         |   16 +-
 src/compiler/emitter.ts                    | 2781 +-------------------
 src/compiler/factory.ts                    |   13 +
 src/compiler/printer.ts                    | 2659 +++++++++++++++++++
 src/compiler/sourcemap.ts                  |   28 +-
 src/compiler/transformer.ts                |   30 +-
 src/compiler/transformers/es2015.ts        |   16 +-
 src/compiler/transformers/es2017.ts        |   16 +-
 src/compiler/transformers/es5.ts           |   18 +-
 src/compiler/transformers/generators.ts    |    6 +-
 src/compiler/transformers/module/es2015.ts |   16 +-
 src/compiler/transformers/module/module.ts |   16 +-
 src/compiler/transformers/module/system.ts |   18 +-
 src/compiler/transformers/ts.ts            |   14 +-
 src/compiler/tsconfig.json                 |    1 +
 src/compiler/types.ts                      |   75 +-
 src/compiler/utilities.ts                  |   42 +-
 src/harness/tsconfig.json                  |    1 +
 src/services/tsconfig.json                 |    1 +
 21 files changed, 2939 insertions(+), 2850 deletions(-)
 create mode 100644 src/compiler/printer.ts

diff --git a/Jakefile.js b/Jakefile.js
index 3ee8476c842..a23b9cbe03c 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -84,6 +84,7 @@ var compilerSources = [
     "sourcemap.ts",
     "comments.ts",
     "declarationEmitter.ts",
+    "printer.ts",
     "emitter.ts",
     "program.ts",
     "commandLineParser.ts",
@@ -121,6 +122,7 @@ var servicesSources = [
     "sourcemap.ts",
     "comments.ts",
     "declarationEmitter.ts",
+    "printer.ts",
     "emitter.ts",
     "program.ts",
     "commandLineParser.ts",
diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
index bd9190dbec7..3106d3ccfec 100644
--- a/src/compiler/comments.ts
+++ b/src/compiler/comments.ts
@@ -5,17 +5,13 @@ namespace ts {
     export interface CommentWriter {
         reset(): void;
         setSourceFile(sourceFile: SourceFile): void;
-        emitNodeWithComments(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+        emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
         emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void): void;
         emitTrailingCommentsOfPosition(pos: number): void;
     }
 
-    export function createCommentWriter(host: EmitHost, writer: EmitTextWriter, sourceMap: SourceMapWriter): CommentWriter {
-        const compilerOptions = host.getCompilerOptions();
+    export function createCommentWriter(writer: EmitTextWriter, compilerOptions: CompilerOptions, newLine: string, emitPos: (pos: number) => void): CommentWriter {
         const extendedDiagnostics = compilerOptions.extendedDiagnostics;
-        const newLine = host.getNewLine();
-        const { emitPos } = sourceMap;
-
         let containerPos = -1;
         let containerEnd = -1;
         let declarationListContainerEnd = -1;
@@ -34,9 +30,9 @@ namespace ts {
             emitTrailingCommentsOfPosition,
         };
 
-        function emitNodeWithComments(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) {
+        function emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) {
             if (disabled) {
-                emitCallback(emitContext, node);
+                emitCallback(hint, node);
                 return;
             }
 
@@ -47,11 +43,11 @@ namespace ts {
                     // Both pos and end are synthesized, so just emit the node without comments.
                     if (emitFlags & EmitFlags.NoNestedComments) {
                         disabled = true;
-                        emitCallback(emitContext, node);
+                        emitCallback(hint, node);
                         disabled = false;
                     }
                     else {
-                        emitCallback(emitContext, node);
+                        emitCallback(hint, node);
                     }
                 }
                 else {
@@ -94,11 +90,11 @@ namespace ts {
 
                     if (emitFlags & EmitFlags.NoNestedComments) {
                         disabled = true;
-                        emitCallback(emitContext, node);
+                        emitCallback(hint, node);
                         disabled = false;
                     }
                     else {
-                        emitCallback(emitContext, node);
+                        emitCallback(hint, node);
                     }
 
                     if (extendedDiagnostics) {
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 46df4fed689..4b878adaff5 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -35,13 +35,15 @@ namespace ts {
         forEachEmittedFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);
         return declarationDiagnostics.getDiagnostics(targetSourceFile ? targetSourceFile.fileName : undefined);
 
-        function getDeclarationDiagnosticsFromFile({ declarationFilePath }: EmitFileNames, sources: SourceFile[], isBundledEmit: boolean) {
-            emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, sources, isBundledEmit, /*emitOnlyDtsFiles*/ false);
+        function getDeclarationDiagnosticsFromFile({ declarationFilePath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle) {
+            emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, sourceFileOrBundle, /*emitOnlyDtsFiles*/ false);
         }
     }
 
     function emitDeclarations(host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection, declarationFilePath: string,
-        sourceFiles: SourceFile[], isBundledEmit: boolean, emitOnlyDtsFiles: boolean): DeclarationEmit {
+        sourceFileOrBundle: SourceFile | Bundle, emitOnlyDtsFiles: boolean): DeclarationEmit {
+        const sourceFiles = sourceFileOrBundle.kind === SyntaxKind.Bundle ? sourceFileOrBundle.sourceFiles : [sourceFileOrBundle];
+        const isBundledEmit = sourceFileOrBundle.kind === SyntaxKind.Bundle;
         const newLine = host.getNewLine();
         const compilerOptions = host.getCompilerOptions();
 
@@ -1803,8 +1805,9 @@ namespace ts {
             }
             return addedBundledEmitReference;
 
-            function getDeclFileName(emitFileNames: EmitFileNames, _sourceFiles: SourceFile[], isBundledEmit: boolean) {
+            function getDeclFileName(emitFileNames: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle) {
                 // Dont add reference path to this file if it is a bundled emit and caller asked not emit bundled file path
+                const isBundledEmit = sourceFileOrBundle.kind === SyntaxKind.Bundle;
                 if (isBundledEmit && !addBundledFileReference) {
                     return;
                 }
@@ -1817,10 +1820,11 @@ namespace ts {
     }
 
     /* @internal */
-    export function writeDeclarationFile(declarationFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean, host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection, emitOnlyDtsFiles: boolean) {
-        const emitDeclarationResult = emitDeclarations(host, resolver, emitterDiagnostics, declarationFilePath, sourceFiles, isBundledEmit, emitOnlyDtsFiles);
+    export function writeDeclarationFile(declarationFilePath: string, sourceFileOrBundle: SourceFile | Bundle, host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection, emitOnlyDtsFiles: boolean) {
+        const emitDeclarationResult = emitDeclarations(host, resolver, emitterDiagnostics, declarationFilePath, sourceFileOrBundle, emitOnlyDtsFiles);
         const emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isEmitBlocked(declarationFilePath) || host.getCompilerOptions().noEmit;
         if (!emitSkipped) {
+            const sourceFiles = sourceFileOrBundle.kind === SyntaxKind.Bundle ? sourceFileOrBundle.sourceFiles : [sourceFileOrBundle];
             const declarationOutput = emitDeclarationResult.referencesOutput
                 + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo);
             writeFile(host, emitterDiagnostics, declarationFilePath, declarationOutput, host.getCompilerOptions().emitBOM, sourceFiles);
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 27285a4c2dc..dd823cf7994 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1,61 +1,28 @@
-/// <reference path="checker.ts"/>
+/// <reference path="checker.ts" />
 /// <reference path="transformer.ts" />
-/// <reference path="declarationEmitter.ts"/>
-/// <reference path="sourcemap.ts"/>
+/// <reference path="declarationEmitter.ts" />
+/// <reference path="sourcemap.ts" />
 /// <reference path="comments.ts" />
+/// <reference path="printer.ts" />
 
 /* @internal */
 namespace ts {
-    // Flags enum to track count of temp variables and a few dedicated names
-    const enum TempFlags {
-        Auto      = 0x00000000,  // No preferred name
-        CountMask = 0x0FFFFFFF,  // Temp variable counter
-        _i        = 0x10000000,  // Use/preference flag for '_i'
-    }
-
     const id = (s: SourceFile) => s;
     const nullTransformers: Transformer[] = [_ => id];
 
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
     export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile, emitOnlyDtsFiles?: boolean): EmitResult {
-        const delimiters = createDelimiterMap();
-        const brackets = createBracketsMap();
         const compilerOptions = host.getCompilerOptions();
-        const languageVersion = getEmitScriptTarget(compilerOptions);
-        const moduleKind = getEmitModuleKind(compilerOptions);
         const sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
         const emittedFilesList: string[] = compilerOptions.listEmittedFiles ? [] : undefined;
         const emitterDiagnostics = createDiagnosticCollection();
         const newLine = host.getNewLine();
         const transformers: Transformer[] = emitOnlyDtsFiles ? nullTransformers : getTransformers(compilerOptions);
         const writer = createTextWriter(newLine);
-        const {
-            write,
-            writeLine,
-            increaseIndent,
-            decreaseIndent
-        } = writer;
-
         const sourceMap = createSourceMapWriter(host, writer);
-        const {
-            emitNodeWithSourceMap,
-            emitTokenWithSourceMap
-        } = sourceMap;
+        const comments = createCommentWriter(writer, compilerOptions, newLine, sourceMap.emitPos);
 
-        const comments = createCommentWriter(host, writer, sourceMap);
-        const {
-            emitNodeWithComments,
-            emitBodyWithDetachedComments,
-            emitTrailingCommentsOfPosition
-        } = comments;
-
-        let nodeIdToGeneratedName: string[];
-        let autoGeneratedIdToGeneratedName: string[];
-        let generatedNameSet: Map<string>;
-        let tempFlags: TempFlags;
         let currentSourceFile: SourceFile;
-        let currentText: string;
-        let currentFileIdentifiers: Map<string>;
         let bundledHelpers: Map<boolean>;
         let isOwnFileEmit: boolean;
         let emitSkipped = false;
@@ -63,17 +30,34 @@ namespace ts {
         const sourceFiles = getSourceFilesToEmit(host, targetSourceFile);
 
         // Transform the source files
-        performance.mark("beforeTransform");
-        const {
-            transformed,
-            emitNodeWithSubstitution,
-            emitNodeWithNotification
-        } = transformFiles(resolver, host, sourceFiles, transformers);
-        performance.measure("transformTime", "beforeTransform");
+        const transform = transformFiles(resolver, host, sourceFiles, transformers);
+
+        // Create a printer to print the nodes
+        const printer = createPrinter(writer, compilerOptions, {
+            // resolver hooks
+            hasGlobalName: resolver.hasGlobalName,
+
+            // transform hooks
+            onEmitNode: transform.emitNodeWithNotification,
+            onSubstituteNode: transform.emitNodeWithSubstitution,
+
+            // sourcemap hooks
+            onEmitSourceMapOfNode: sourceMap.emitNodeWithSourceMap,
+            onEmitSourceMapOfToken: sourceMap.emitTokenWithSourceMap,
+
+            // comment hooks
+            onEmitCommentsOfNode: comments.emitNodeWithComments,
+            onEmitDetachedCommentsOfNode: comments.emitBodyWithDetachedComments,
+            onEmitTrailingCommentsOfPosition: comments.emitTrailingCommentsOfPosition,
+
+            // emitter hooks
+            onEmitHelpers: emitHelpers,
+            onSetSourceFile: setSourceFile,
+        });
 
         // Emit each output file
         performance.mark("beforePrint");
-        forEachEmittedFile(host, emitFile, transformed, emitOnlyDtsFiles);
+        forEachEmittedFile(host, emitSourceFileOrBundle, transform.transformed, emitOnlyDtsFiles);
         performance.measure("printTime", "beforePrint");
 
         // Clean up emit nodes on parse tree
@@ -88,11 +72,11 @@ namespace ts {
             sourceMaps: sourceMapDataList
         };
 
-        function emitFile({ jsFilePath, sourceMapFilePath, declarationFilePath }: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean) {
+        function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle) {
             // Make sure not to write js file and source map file if any of them cannot be written
             if (!host.isEmitBlocked(jsFilePath) && !compilerOptions.noEmit) {
                 if (!emitOnlyDtsFiles) {
-                    printFile(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
+                    printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle);
                 }
             }
             else {
@@ -100,7 +84,7 @@ namespace ts {
             }
 
             if (declarationFilePath) {
-                emitSkipped = writeDeclarationFile(declarationFilePath, getOriginalSourceFiles(sourceFiles), isBundledEmit, host, resolver, emitterDiagnostics, emitOnlyDtsFiles) || emitSkipped;
+                emitSkipped = writeDeclarationFile(declarationFilePath, getOriginalSourceFileOrBundle(sourceFileOrBundle), host, resolver, emitterDiagnostics, emitOnlyDtsFiles) || emitSkipped;
             }
 
             if (!emitSkipped && emittedFilesList) {
@@ -116,34 +100,32 @@ namespace ts {
             }
         }
 
-        function printFile(jsFilePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) {
-            sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
-            nodeIdToGeneratedName = [];
-            autoGeneratedIdToGeneratedName = [];
-            generatedNameSet = createMap<string>();
-            bundledHelpers = isBundledEmit ? createMap<boolean>() : undefined;
-            isOwnFileEmit = !isBundledEmit;
+        function printSourceFileOrBundle(jsFilePath: string, sourceMapFilePath: string, sourceFileOrBundle: SourceFile | Bundle) {
+            const bundle = sourceFileOrBundle.kind === SyntaxKind.Bundle ? sourceFileOrBundle : undefined;
+            const sourceFile = sourceFileOrBundle.kind === SyntaxKind.SourceFile ? sourceFileOrBundle : undefined;
+            const sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
+            sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFileOrBundle);
 
-            // Emit helpers from all the files
-            if (isBundledEmit && moduleKind) {
-                for (const sourceFile of sourceFiles) {
-                    emitHelpers(sourceFile, /*isBundle*/ true);
-                }
+            if (bundle) {
+                bundledHelpers = createMap<boolean>();
+                isOwnFileEmit = false;
+                printer.printBundle(bundle);
+            }
+            else {
+                isOwnFileEmit = true;
+                printer.printFile(sourceFile);
             }
 
-            // Print each transformed source file.
-            forEach(sourceFiles, printSourceFile);
-
-            writeLine();
+            writer.writeLine();
 
             const sourceMappingURL = sourceMap.getSourceMappingURL();
             if (sourceMappingURL) {
-                write(`//# ${"sourceMappingURL"}=${sourceMappingURL}`); // Sometimes tools can sometimes see this line as a source mapping url comment
+                writer.write(`//# ${"sourceMappingURL"}=${sourceMappingURL}`); // Sometimes tools can sometimes see this line as a source mapping url comment
             }
 
             // Write the source map
             if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(),  /*writeByteOrderMark*/ false, sourceFiles);
+                writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false, sourceFiles);
             }
 
             // Record source map data for the test harness.
@@ -159,2654 +141,57 @@ namespace ts {
             comments.reset();
             writer.reset();
 
-            tempFlags = TempFlags.Auto;
             currentSourceFile = undefined;
-            currentText = undefined;
+            bundledHelpers = undefined;
             isOwnFileEmit = false;
         }
 
-        function printSourceFile(node: SourceFile) {
+        function setSourceFile(node: SourceFile) {
             currentSourceFile = node;
-            currentText = node.text;
-            currentFileIdentifiers = node.identifiers;
             sourceMap.setSourceFile(node);
             comments.setSourceFile(node);
-            pipelineEmitWithNotification(EmitContext.SourceFile, node);
         }
 
-        /**
-         * Emits a node.
-         */
-        function emit(node: Node) {
-            pipelineEmitWithNotification(EmitContext.Unspecified, node);
-        }
-
-        /**
-         * Emits an IdentifierName.
-         */
-        function emitIdentifierName(node: Identifier) {
-            pipelineEmitWithNotification(EmitContext.IdentifierName, node);
-        }
-
-        /**
-         * Emits an expression node.
-         */
-        function emitExpression(node: Expression) {
-            pipelineEmitWithNotification(EmitContext.Expression, node);
-        }
-
-        /**
-         * Emits a node with possible notification.
-         *
-         * NOTE: Do not call this method directly. It is part of the emit pipeline
-         * and should only be called from printSourceFile, emit, emitExpression, or
-         * emitIdentifierName.
-         */
-        function pipelineEmitWithNotification(emitContext: EmitContext, node: Node) {
-            emitNodeWithNotification(emitContext, node, pipelineEmitWithComments);
-        }
-
-        /**
-         * Emits a node with comments.
-         *
-         * NOTE: Do not call this method directly. It is part of the emit pipeline
-         * and should only be called indirectly from pipelineEmitWithNotification.
-         */
-        function pipelineEmitWithComments(emitContext: EmitContext, node: Node) {
-            // Do not emit comments for SourceFile
-            if (emitContext === EmitContext.SourceFile) {
-                pipelineEmitWithSourceMap(emitContext, node);
-                return;
-            }
-
-            emitNodeWithComments(emitContext, node, pipelineEmitWithSourceMap);
-        }
-
-        /**
-         * Emits a node with source maps.
-         *
-         * NOTE: Do not call this method directly. It is part of the emit pipeline
-         * and should only be called indirectly from pipelineEmitWithComments.
-         */
-        function pipelineEmitWithSourceMap(emitContext: EmitContext, node: Node) {
-            // Do not emit source mappings for SourceFile or IdentifierName
-            if (emitContext === EmitContext.SourceFile
-                || emitContext === EmitContext.IdentifierName) {
-                pipelineEmitWithSubstitution(emitContext, node);
-                return;
-            }
-
-            emitNodeWithSourceMap(emitContext, node, pipelineEmitWithSubstitution);
-        }
-
-        /**
-         * Emits a node with possible substitution.
-         *
-         * NOTE: Do not call this method directly. It is part of the emit pipeline
-         * and should only be called indirectly from pipelineEmitWithSourceMap or
-         * pipelineEmitInUnspecifiedContext (when picking a more specific context).
-         */
-        function pipelineEmitWithSubstitution(emitContext: EmitContext, node: Node) {
-            emitNodeWithSubstitution(emitContext, node, pipelineEmitForContext);
-        }
-
-        /**
-         * Emits a node.
-         *
-         * NOTE: Do not call this method directly. It is part of the emit pipeline
-         * and should only be called indirectly from pipelineEmitWithSubstitution.
-         */
-        function pipelineEmitForContext(emitContext: EmitContext, node: Node): void {
-            switch (emitContext) {
-                case EmitContext.SourceFile: return pipelineEmitInSourceFileContext(node);
-                case EmitContext.IdentifierName: return pipelineEmitInIdentifierNameContext(node);
-                case EmitContext.Unspecified: return pipelineEmitInUnspecifiedContext(node);
-                case EmitContext.Expression: return pipelineEmitInExpressionContext(node);
-            }
-        }
-
-        /**
-         * Emits a node in the SourceFile EmitContext.
-         *
-         * NOTE: Do not call this method directly. It is part of the emit pipeline
-         * and should only be called indirectly from pipelineEmitForContext.
-         */
-        function pipelineEmitInSourceFileContext(node: Node): void {
-            const kind = node.kind;
-            switch (kind) {
-                // Top-level nodes
-                case SyntaxKind.SourceFile:
-                    return emitSourceFile(<SourceFile>node);
-            }
-        }
-
-        /**
-         * Emits a node in the IdentifierName EmitContext.
-         *
-         * NOTE: Do not call this method directly. It is part of the emit pipeline
-         * and should only be called indirectly from pipelineEmitForContext.
-         */
-        function pipelineEmitInIdentifierNameContext(node: Node): void {
-            const kind = node.kind;
-            switch (kind) {
-                // Identifiers
-                case SyntaxKind.Identifier:
-                    return emitIdentifier(<Identifier>node);
-            }
-        }
-
-        /**
-         * Emits a node in the Unspecified EmitContext.
-         *
-         * NOTE: Do not call this method directly. It is part of the emit pipeline
-         * and should only be called indirectly from pipelineEmitForContext.
-         */
-        function pipelineEmitInUnspecifiedContext(node: Node): void {
-            const kind = node.kind;
-            switch (kind) {
-                // Pseudo-literals
-                case SyntaxKind.TemplateHead:
-                case SyntaxKind.TemplateMiddle:
-                case SyntaxKind.TemplateTail:
-                    return emitLiteral(<LiteralExpression>node);
-
-                // Identifiers
-                case SyntaxKind.Identifier:
-                    return emitIdentifier(<Identifier>node);
-
-                // Reserved words
-                case SyntaxKind.ConstKeyword:
-                case SyntaxKind.DefaultKeyword:
-                case SyntaxKind.ExportKeyword:
-                case SyntaxKind.VoidKeyword:
-
-                // Strict mode reserved words
-                case SyntaxKind.PrivateKeyword:
-                case SyntaxKind.ProtectedKeyword:
-                case SyntaxKind.PublicKeyword:
-                case SyntaxKind.StaticKeyword:
-
-                // Contextual keywords
-                case SyntaxKind.AbstractKeyword:
-                case SyntaxKind.AsKeyword:
-                case SyntaxKind.AnyKeyword:
-                case SyntaxKind.AsyncKeyword:
-                case SyntaxKind.AwaitKeyword:
-                case SyntaxKind.BooleanKeyword:
-                case SyntaxKind.ConstructorKeyword:
-                case SyntaxKind.DeclareKeyword:
-                case SyntaxKind.GetKeyword:
-                case SyntaxKind.IsKeyword:
-                case SyntaxKind.ModuleKeyword:
-                case SyntaxKind.NamespaceKeyword:
-                case SyntaxKind.NeverKeyword:
-                case SyntaxKind.ReadonlyKeyword:
-                case SyntaxKind.RequireKeyword:
-                case SyntaxKind.NumberKeyword:
-                case SyntaxKind.SetKeyword:
-                case SyntaxKind.StringKeyword:
-                case SyntaxKind.SymbolKeyword:
-                case SyntaxKind.TypeKeyword:
-                case SyntaxKind.UndefinedKeyword:
-                case SyntaxKind.FromKeyword:
-                case SyntaxKind.GlobalKeyword:
-                case SyntaxKind.OfKeyword:
-                    writeTokenText(kind);
-                    return;
-
-                // Parse tree nodes
-
-                // Names
-                case SyntaxKind.QualifiedName:
-                    return emitQualifiedName(<QualifiedName>node);
-                case SyntaxKind.ComputedPropertyName:
-                    return emitComputedPropertyName(<ComputedPropertyName>node);
-
-                // Signature elements
-                case SyntaxKind.TypeParameter:
-                    return emitTypeParameter(<TypeParameterDeclaration>node);
-                case SyntaxKind.Parameter:
-                    return emitParameter(<ParameterDeclaration>node);
-                case SyntaxKind.Decorator:
-                    return emitDecorator(<Decorator>node);
-
-                // Type members
-                case SyntaxKind.PropertySignature:
-                    return emitPropertySignature(<PropertySignature>node);
-                case SyntaxKind.PropertyDeclaration:
-                    return emitPropertyDeclaration(<PropertyDeclaration>node);
-                case SyntaxKind.MethodSignature:
-                    return emitMethodSignature(<MethodSignature>node);
-                case SyntaxKind.MethodDeclaration:
-                    return emitMethodDeclaration(<MethodDeclaration>node);
-                case SyntaxKind.Constructor:
-                    return emitConstructor(<ConstructorDeclaration>node);
-                case SyntaxKind.GetAccessor:
-                case SyntaxKind.SetAccessor:
-                    return emitAccessorDeclaration(<AccessorDeclaration>node);
-                case SyntaxKind.CallSignature:
-                    return emitCallSignature(<CallSignatureDeclaration>node);
-                case SyntaxKind.ConstructSignature:
-                    return emitConstructSignature(<ConstructSignatureDeclaration>node);
-                case SyntaxKind.IndexSignature:
-                    return emitIndexSignature(<IndexSignatureDeclaration>node);
-
-                // Types
-                case SyntaxKind.TypePredicate:
-                    return emitTypePredicate(<TypePredicateNode>node);
-                case SyntaxKind.TypeReference:
-                    return emitTypeReference(<TypeReferenceNode>node);
-                case SyntaxKind.FunctionType:
-                    return emitFunctionType(<FunctionTypeNode>node);
-                case SyntaxKind.ConstructorType:
-                    return emitConstructorType(<ConstructorTypeNode>node);
-                case SyntaxKind.TypeQuery:
-                    return emitTypeQuery(<TypeQueryNode>node);
-                case SyntaxKind.TypeLiteral:
-                    return emitTypeLiteral(<TypeLiteralNode>node);
-                case SyntaxKind.ArrayType:
-                    return emitArrayType(<ArrayTypeNode>node);
-                case SyntaxKind.TupleType:
-                    return emitTupleType(<TupleTypeNode>node);
-                case SyntaxKind.UnionType:
-                    return emitUnionType(<UnionTypeNode>node);
-                case SyntaxKind.IntersectionType:
-                    return emitIntersectionType(<IntersectionTypeNode>node);
-                case SyntaxKind.ParenthesizedType:
-                    return emitParenthesizedType(<ParenthesizedTypeNode>node);
-                case SyntaxKind.ExpressionWithTypeArguments:
-                    return emitExpressionWithTypeArguments(<ExpressionWithTypeArguments>node);
-                case SyntaxKind.ThisType:
-                    return emitThisType();
-                case SyntaxKind.TypeOperator:
-                    return emitTypeOperator(<TypeOperatorNode>node);
-                case SyntaxKind.IndexedAccessType:
-                    return emitIndexedAccessType(<IndexedAccessTypeNode>node);
-                case SyntaxKind.MappedType:
-                    return emitMappedType(<MappedTypeNode>node);
-                case SyntaxKind.LiteralType:
-                    return emitLiteralType(<LiteralTypeNode>node);
-
-                // Binding patterns
-                case SyntaxKind.ObjectBindingPattern:
-                    return emitObjectBindingPattern(<ObjectBindingPattern>node);
-                case SyntaxKind.ArrayBindingPattern:
-                    return emitArrayBindingPattern(<ArrayBindingPattern>node);
-                case SyntaxKind.BindingElement:
-                    return emitBindingElement(<BindingElement>node);
-
-                // Misc
-                case SyntaxKind.TemplateSpan:
-                    return emitTemplateSpan(<TemplateSpan>node);
-                case SyntaxKind.SemicolonClassElement:
-                    return emitSemicolonClassElement();
-
-                // Statements
-                case SyntaxKind.Block:
-                    return emitBlock(<Block>node);
-                case SyntaxKind.VariableStatement:
-                    return emitVariableStatement(<VariableStatement>node);
-                case SyntaxKind.EmptyStatement:
-                    return emitEmptyStatement();
-                case SyntaxKind.ExpressionStatement:
-                    return emitExpressionStatement(<ExpressionStatement>node);
-                case SyntaxKind.IfStatement:
-                    return emitIfStatement(<IfStatement>node);
-                case SyntaxKind.DoStatement:
-                    return emitDoStatement(<DoStatement>node);
-                case SyntaxKind.WhileStatement:
-                    return emitWhileStatement(<WhileStatement>node);
-                case SyntaxKind.ForStatement:
-                    return emitForStatement(<ForStatement>node);
-                case SyntaxKind.ForInStatement:
-                    return emitForInStatement(<ForInStatement>node);
-                case SyntaxKind.ForOfStatement:
-                    return emitForOfStatement(<ForOfStatement>node);
-                case SyntaxKind.ContinueStatement:
-                    return emitContinueStatement(<ContinueStatement>node);
-                case SyntaxKind.BreakStatement:
-                    return emitBreakStatement(<BreakStatement>node);
-                case SyntaxKind.ReturnStatement:
-                    return emitReturnStatement(<ReturnStatement>node);
-                case SyntaxKind.WithStatement:
-                    return emitWithStatement(<WithStatement>node);
-                case SyntaxKind.SwitchStatement:
-                    return emitSwitchStatement(<SwitchStatement>node);
-                case SyntaxKind.LabeledStatement:
-                    return emitLabeledStatement(<LabeledStatement>node);
-                case SyntaxKind.ThrowStatement:
-                    return emitThrowStatement(<ThrowStatement>node);
-                case SyntaxKind.TryStatement:
-                    return emitTryStatement(<TryStatement>node);
-                case SyntaxKind.DebuggerStatement:
-                    return emitDebuggerStatement(<DebuggerStatement>node);
-
-                // Declarations
-                case SyntaxKind.VariableDeclaration:
-                    return emitVariableDeclaration(<VariableDeclaration>node);
-                case SyntaxKind.VariableDeclarationList:
-                    return emitVariableDeclarationList(<VariableDeclarationList>node);
-                case SyntaxKind.FunctionDeclaration:
-                    return emitFunctionDeclaration(<FunctionDeclaration>node);
-                case SyntaxKind.ClassDeclaration:
-                    return emitClassDeclaration(<ClassDeclaration>node);
-                case SyntaxKind.InterfaceDeclaration:
-                    return emitInterfaceDeclaration(<InterfaceDeclaration>node);
-                case SyntaxKind.TypeAliasDeclaration:
-                    return emitTypeAliasDeclaration(<TypeAliasDeclaration>node);
-                case SyntaxKind.EnumDeclaration:
-                    return emitEnumDeclaration(<EnumDeclaration>node);
-                case SyntaxKind.ModuleDeclaration:
-                    return emitModuleDeclaration(<ModuleDeclaration>node);
-                case SyntaxKind.ModuleBlock:
-                    return emitModuleBlock(<ModuleBlock>node);
-                case SyntaxKind.CaseBlock:
-                    return emitCaseBlock(<CaseBlock>node);
-                case SyntaxKind.ImportEqualsDeclaration:
-                    return emitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
-                case SyntaxKind.ImportDeclaration:
-                    return emitImportDeclaration(<ImportDeclaration>node);
-                case SyntaxKind.ImportClause:
-                    return emitImportClause(<ImportClause>node);
-                case SyntaxKind.NamespaceImport:
-                    return emitNamespaceImport(<NamespaceImport>node);
-                case SyntaxKind.NamedImports:
-                    return emitNamedImports(<NamedImports>node);
-                case SyntaxKind.ImportSpecifier:
-                    return emitImportSpecifier(<ImportSpecifier>node);
-                case SyntaxKind.ExportAssignment:
-                    return emitExportAssignment(<ExportAssignment>node);
-                case SyntaxKind.ExportDeclaration:
-                    return emitExportDeclaration(<ExportDeclaration>node);
-                case SyntaxKind.NamedExports:
-                    return emitNamedExports(<NamedExports>node);
-                case SyntaxKind.ExportSpecifier:
-                    return emitExportSpecifier(<ExportSpecifier>node);
-                case SyntaxKind.MissingDeclaration:
-                    return;
-
-                // Module references
-                case SyntaxKind.ExternalModuleReference:
-                    return emitExternalModuleReference(<ExternalModuleReference>node);
-
-                // JSX (non-expression)
-                case SyntaxKind.JsxText:
-                    return emitJsxText(<JsxText>node);
-                case SyntaxKind.JsxOpeningElement:
-                    return emitJsxOpeningElement(<JsxOpeningElement>node);
-                case SyntaxKind.JsxClosingElement:
-                    return emitJsxClosingElement(<JsxClosingElement>node);
-                case SyntaxKind.JsxAttribute:
-                    return emitJsxAttribute(<JsxAttribute>node);
-                case SyntaxKind.JsxSpreadAttribute:
-                    return emitJsxSpreadAttribute(<JsxSpreadAttribute>node);
-                case SyntaxKind.JsxExpression:
-                    return emitJsxExpression(<JsxExpression>node);
-
-                // Clauses
-                case SyntaxKind.CaseClause:
-                    return emitCaseClause(<CaseClause>node);
-                case SyntaxKind.DefaultClause:
-                    return emitDefaultClause(<DefaultClause>node);
-                case SyntaxKind.HeritageClause:
-                    return emitHeritageClause(<HeritageClause>node);
-                case SyntaxKind.CatchClause:
-                    return emitCatchClause(<CatchClause>node);
-
-                // Property assignments
-                case SyntaxKind.PropertyAssignment:
-                    return emitPropertyAssignment(<PropertyAssignment>node);
-                case SyntaxKind.ShorthandPropertyAssignment:
-                    return emitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
-                case SyntaxKind.SpreadAssignment:
-                    return emitSpreadAssignment(node as SpreadAssignment);
-
-                // Enum
-                case SyntaxKind.EnumMember:
-                    return emitEnumMember(<EnumMember>node);
-
-                // JSDoc nodes (ignored)
-                // Transformation nodes (ignored)
-            }
-
-            // If the node is an expression, try to emit it as an expression with
-            // substitution.
-            if (isExpression(node)) {
-                return pipelineEmitWithSubstitution(EmitContext.Expression, node);
-            }
-        }
-
-        /**
-         * Emits a node in the Expression EmitContext.
-         *
-         * NOTE: Do not call this method directly. It is part of the emit pipeline
-         * and should only be called indirectly from pipelineEmitForContext.
-         */
-        function pipelineEmitInExpressionContext(node: Node): void {
-            const kind = node.kind;
-            switch (kind) {
-                // Literals
-                case SyntaxKind.NumericLiteral:
-                    return emitNumericLiteral(<NumericLiteral>node);
-
-                case SyntaxKind.StringLiteral:
-                case SyntaxKind.RegularExpressionLiteral:
-                case SyntaxKind.NoSubstitutionTemplateLiteral:
-                    return emitLiteral(<LiteralExpression>node);
-
-                // Identifiers
-                case SyntaxKind.Identifier:
-                    return emitIdentifier(<Identifier>node);
-
-                // Reserved words
-                case SyntaxKind.FalseKeyword:
-                case SyntaxKind.NullKeyword:
-                case SyntaxKind.SuperKeyword:
-                case SyntaxKind.TrueKeyword:
-                case SyntaxKind.ThisKeyword:
-                    writeTokenText(kind);
-                    return;
-
-                // Expressions
-                case SyntaxKind.ArrayLiteralExpression:
-                    return emitArrayLiteralExpression(<ArrayLiteralExpression>node);
-                case SyntaxKind.ObjectLiteralExpression:
-                    return emitObjectLiteralExpression(<ObjectLiteralExpression>node);
-                case SyntaxKind.PropertyAccessExpression:
-                    return emitPropertyAccessExpression(<PropertyAccessExpression>node);
-                case SyntaxKind.ElementAccessExpression:
-                    return emitElementAccessExpression(<ElementAccessExpression>node);
-                case SyntaxKind.CallExpression:
-                    return emitCallExpression(<CallExpression>node);
-                case SyntaxKind.NewExpression:
-                    return emitNewExpression(<NewExpression>node);
-                case SyntaxKind.TaggedTemplateExpression:
-                    return emitTaggedTemplateExpression(<TaggedTemplateExpression>node);
-                case SyntaxKind.TypeAssertionExpression:
-                    return emitTypeAssertionExpression(<TypeAssertion>node);
-                case SyntaxKind.ParenthesizedExpression:
-                    return emitParenthesizedExpression(<ParenthesizedExpression>node);
-                case SyntaxKind.FunctionExpression:
-                    return emitFunctionExpression(<FunctionExpression>node);
-                case SyntaxKind.ArrowFunction:
-                    return emitArrowFunction(<ArrowFunction>node);
-                case SyntaxKind.DeleteExpression:
-                    return emitDeleteExpression(<DeleteExpression>node);
-                case SyntaxKind.TypeOfExpression:
-                    return emitTypeOfExpression(<TypeOfExpression>node);
-                case SyntaxKind.VoidExpression:
-                    return emitVoidExpression(<VoidExpression>node);
-                case SyntaxKind.AwaitExpression:
-                    return emitAwaitExpression(<AwaitExpression>node);
-                case SyntaxKind.PrefixUnaryExpression:
-                    return emitPrefixUnaryExpression(<PrefixUnaryExpression>node);
-                case SyntaxKind.PostfixUnaryExpression:
-                    return emitPostfixUnaryExpression(<PostfixUnaryExpression>node);
-                case SyntaxKind.BinaryExpression:
-                    return emitBinaryExpression(<BinaryExpression>node);
-                case SyntaxKind.ConditionalExpression:
-                    return emitConditionalExpression(<ConditionalExpression>node);
-                case SyntaxKind.TemplateExpression:
-                    return emitTemplateExpression(<TemplateExpression>node);
-                case SyntaxKind.YieldExpression:
-                    return emitYieldExpression(<YieldExpression>node);
-                case SyntaxKind.SpreadElement:
-                    return emitSpreadExpression(<SpreadElement>node);
-                case SyntaxKind.ClassExpression:
-                    return emitClassExpression(<ClassExpression>node);
-                case SyntaxKind.OmittedExpression:
-                    return;
-                case SyntaxKind.AsExpression:
-                    return emitAsExpression(<AsExpression>node);
-                case SyntaxKind.NonNullExpression:
-                    return emitNonNullExpression(<NonNullExpression>node);
-                case SyntaxKind.MetaProperty:
-                    return emitMetaProperty(<MetaProperty>node);
-
-                // JSX
-                case SyntaxKind.JsxElement:
-                    return emitJsxElement(<JsxElement>node);
-                case SyntaxKind.JsxSelfClosingElement:
-                    return emitJsxSelfClosingElement(<JsxSelfClosingElement>node);
-
-                // Transformation nodes
-                case SyntaxKind.PartiallyEmittedExpression:
-                    return emitPartiallyEmittedExpression(<PartiallyEmittedExpression>node);
-            }
-        }
-
-        //
-        // Literals/Pseudo-literals
-        //
-
-        // SyntaxKind.NumericLiteral
-        function emitNumericLiteral(node: NumericLiteral) {
-            emitLiteral(node);
-            if (node.trailingComment) {
-                write(` /*${node.trailingComment}*/`);
-            }
-        }
-
-        // SyntaxKind.StringLiteral
-        // SyntaxKind.RegularExpressionLiteral
-        // SyntaxKind.NoSubstitutionTemplateLiteral
-        // SyntaxKind.TemplateHead
-        // SyntaxKind.TemplateMiddle
-        // SyntaxKind.TemplateTail
-        function emitLiteral(node: LiteralLikeNode) {
-            const text = getLiteralTextOfNode(node);
-            if ((compilerOptions.sourceMap || compilerOptions.inlineSourceMap)
-                && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
-                writer.writeLiteral(text);
-            }
-            else {
-                write(text);
-            }
-        }
-
-        //
-        // Identifiers
-        //
-
-        function emitIdentifier(node: Identifier) {
-            write(getTextOfNode(node, /*includeTrivia*/ false));
-        }
-
-        //
-        // Names
-        //
-
-        function emitQualifiedName(node: QualifiedName) {
-            emitEntityName(node.left);
-            write(".");
-            emit(node.right);
-        }
-
-        function emitEntityName(node: EntityName) {
-            if (node.kind === SyntaxKind.Identifier) {
-                emitExpression(<Identifier>node);
-            }
-            else {
-                emit(node);
-            }
-        }
-
-        function emitComputedPropertyName(node: ComputedPropertyName) {
-            write("[");
-            emitExpression(node.expression);
-            write("]");
-        }
-
-        //
-        // Signature elements
-        //
-
-        function emitTypeParameter(node: TypeParameterDeclaration) {
-            emit(node.name);
-            emitWithPrefix(" extends ", node.constraint);
-        }
-
-        function emitParameter(node: ParameterDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            writeIfPresent(node.dotDotDotToken, "...");
-            emit(node.name);
-            writeIfPresent(node.questionToken, "?");
-            emitExpressionWithPrefix(" = ", node.initializer);
-            emitWithPrefix(": ", node.type);
-        }
-
-        function emitDecorator(decorator: Decorator) {
-            write("@");
-            emitExpression(decorator.expression);
-        }
-
-        //
-        // Type members
-        //
-
-        function emitPropertySignature(node: PropertySignature) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emit(node.name);
-            writeIfPresent(node.questionToken, "?");
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitPropertyDeclaration(node: PropertyDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emit(node.name);
-            emitWithPrefix(": ", node.type);
-            emitExpressionWithPrefix(" = ", node.initializer);
-            write(";");
-        }
-
-        function emitMethodSignature(node: MethodSignature) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emit(node.name);
-            writeIfPresent(node.questionToken, "?");
-            emitTypeParameters(node, node.typeParameters);
-            emitParameters(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitMethodDeclaration(node: MethodDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            writeIfPresent(node.asteriskToken, "*");
-            emit(node.name);
-            emitSignatureAndBody(node, emitSignatureHead);
-        }
-
-        function emitConstructor(node: ConstructorDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write("constructor");
-            emitSignatureAndBody(node, emitSignatureHead);
-        }
-
-        function emitAccessorDeclaration(node: AccessorDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write(node.kind === SyntaxKind.GetAccessor ? "get " : "set ");
-            emit(node.name);
-            emitSignatureAndBody(node, emitSignatureHead);
-        }
-
-        function emitCallSignature(node: CallSignatureDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emitTypeParameters(node, node.typeParameters);
-            emitParameters(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitConstructSignature(node: ConstructSignatureDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write("new ");
-            emitTypeParameters(node, node.typeParameters);
-            emitParameters(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitIndexSignature(node: IndexSignatureDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emitParametersForIndexSignature(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitSemicolonClassElement() {
-            write(";");
-        }
-
-        //
-        // Types
-        //
-
-        function emitTypePredicate(node: TypePredicateNode) {
-            emit(node.parameterName);
-            write(" is ");
-            emit(node.type);
-        }
-
-        function emitTypeReference(node: TypeReferenceNode) {
-            emit(node.typeName);
-            emitTypeArguments(node, node.typeArguments);
-        }
-
-        function emitFunctionType(node: FunctionTypeNode) {
-            emitTypeParameters(node, node.typeParameters);
-            emitParametersForArrow(node, node.parameters);
-            write(" => ");
-            emit(node.type);
-        }
-
-        function emitConstructorType(node: ConstructorTypeNode) {
-            write("new ");
-            emitTypeParameters(node, node.typeParameters);
-            emitParametersForArrow(node, node.parameters);
-            write(" => ");
-            emit(node.type);
-        }
-
-        function emitTypeQuery(node: TypeQueryNode) {
-            write("typeof ");
-            emit(node.exprName);
-        }
-
-        function emitTypeLiteral(node: TypeLiteralNode) {
-            write("{");
-            emitList(node, node.members, ListFormat.TypeLiteralMembers);
-            write("}");
-        }
-
-        function emitArrayType(node: ArrayTypeNode) {
-            emit(node.elementType);
-            write("[]");
-        }
-
-        function emitTupleType(node: TupleTypeNode) {
-            write("[");
-            emitList(node, node.elementTypes, ListFormat.TupleTypeElements);
-            write("]");
-        }
-
-        function emitUnionType(node: UnionTypeNode) {
-            emitList(node, node.types, ListFormat.UnionTypeConstituents);
-        }
-
-        function emitIntersectionType(node: IntersectionTypeNode) {
-            emitList(node, node.types, ListFormat.IntersectionTypeConstituents);
-        }
-
-        function emitParenthesizedType(node: ParenthesizedTypeNode) {
-            write("(");
-            emit(node.type);
-            write(")");
-        }
-
-        function emitThisType() {
-            write("this");
-        }
-
-        function emitTypeOperator(node: TypeOperatorNode) {
-            writeTokenText(node.operator);
-            write(" ");
-            emit(node.type);
-        }
-
-        function emitIndexedAccessType(node: IndexedAccessTypeNode) {
-            emit(node.objectType);
-            write("[");
-            emit(node.indexType);
-            write("]");
-        }
-
-        function emitMappedType(node: MappedTypeNode) {
-            write("{");
-            writeLine();
-            increaseIndent();
-            if (node.readonlyToken) {
-                write("readonly ");
-            }
-            write("[");
-            emit(node.typeParameter.name);
-            write(" in ");
-            emit(node.typeParameter.constraint);
-            write("]");
-            if (node.questionToken) {
-                write("?");
-            }
-            write(": ");
-            emit(node.type);
-            write(";");
-            writeLine();
-            decreaseIndent();
-            write("}");
-        }
-
-        function emitLiteralType(node: LiteralTypeNode) {
-            emitExpression(node.literal);
-        }
-
-        //
-        // Binding patterns
-        //
-
-        function emitObjectBindingPattern(node: ObjectBindingPattern) {
-            const elements = node.elements;
-            if (elements.length === 0) {
-                write("{}");
-            }
-            else {
-                write("{");
-                emitList(node, elements, ListFormat.ObjectBindingPatternElements);
-                write("}");
-            }
-        }
-
-        function emitArrayBindingPattern(node: ArrayBindingPattern) {
-            const elements = node.elements;
-            if (elements.length === 0) {
-                write("[]");
-            }
-            else {
-                write("[");
-                emitList(node, node.elements, ListFormat.ArrayBindingPatternElements);
-                write("]");
-            }
-        }
-
-        function emitBindingElement(node: BindingElement) {
-            emitWithSuffix(node.propertyName, ": ");
-            writeIfPresent(node.dotDotDotToken, "...");
-            emit(node.name);
-            emitExpressionWithPrefix(" = ", node.initializer);
-        }
-
-        //
-        // Expressions
-        //
-
-        function emitArrayLiteralExpression(node: ArrayLiteralExpression) {
-            const elements = node.elements;
-            if (elements.length === 0) {
-                write("[]");
-            }
-            else {
-                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
-                emitExpressionList(node, elements, ListFormat.ArrayLiteralExpressionElements | preferNewLine);
-            }
-        }
-
-        function emitObjectLiteralExpression(node: ObjectLiteralExpression) {
-            const properties = node.properties;
-            if (properties.length === 0) {
-                write("{}");
-            }
-            else {
-                const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
-                if (indentedFlag) {
-                    increaseIndent();
-                }
-
-                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
-                const allowTrailingComma = languageVersion >= ScriptTarget.ES5 ? ListFormat.AllowTrailingComma : ListFormat.None;
-                emitList(node, properties, ListFormat.ObjectLiteralExpressionProperties | allowTrailingComma | preferNewLine);
-
-                if (indentedFlag) {
-                    decreaseIndent();
-                }
-            }
-        }
-
-        function emitPropertyAccessExpression(node: PropertyAccessExpression) {
-            let indentBeforeDot = false;
-            let indentAfterDot = false;
-            if (!(getEmitFlags(node) & EmitFlags.NoIndentation)) {
-                const dotRangeStart = node.expression.end;
-                const dotRangeEnd = skipTrivia(currentText, node.expression.end) + 1;
-                const dotToken = <Node>{ kind: SyntaxKind.DotToken, pos: dotRangeStart, end: dotRangeEnd };
-                indentBeforeDot = needsIndentation(node, node.expression, dotToken);
-                indentAfterDot = needsIndentation(node, dotToken, node.name);
-            }
-
-            emitExpression(node.expression);
-            increaseIndentIf(indentBeforeDot);
-
-            const shouldEmitDotDot = !indentBeforeDot && needsDotDotForPropertyAccess(node.expression);
-            write(shouldEmitDotDot ? ".." : ".");
-
-            increaseIndentIf(indentAfterDot);
-            emit(node.name);
-            decreaseIndentIf(indentBeforeDot, indentAfterDot);
-        }
-
-        // 1..toString is a valid property access, emit a dot after the literal
-        // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
-        function needsDotDotForPropertyAccess(expression: Expression) {
-            if (expression.kind === SyntaxKind.NumericLiteral) {
-                // check if numeric literal is a decimal literal that was originally written with a dot
-                const text = getLiteralTextOfNode(<LiteralExpression>expression);
-                return getNumericLiteralFlags(text, /*hint*/ NumericLiteralFlags.All) === NumericLiteralFlags.None
-                    && !(<LiteralExpression>expression).isOctalLiteral
-                    && text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
-            }
-            else if (isPropertyAccessExpression(expression) || isElementAccessExpression(expression)) {
-                // check if constant enum value is integer
-                const constantValue = getConstantValue(expression);
-                // isFinite handles cases when constantValue is undefined
-                return isFinite(constantValue)
-                    && Math.floor(constantValue) === constantValue
-                    && compilerOptions.removeComments;
-            }
-        }
-
-        function emitElementAccessExpression(node: ElementAccessExpression) {
-            emitExpression(node.expression);
-            write("[");
-            emitExpression(node.argumentExpression);
-            write("]");
-        }
-
-        function emitCallExpression(node: CallExpression) {
-            emitExpression(node.expression);
-            emitTypeArguments(node, node.typeArguments);
-            emitExpressionList(node, node.arguments, ListFormat.CallExpressionArguments);
-        }
-
-        function emitNewExpression(node: NewExpression) {
-            write("new ");
-            emitExpression(node.expression);
-            emitTypeArguments(node, node.typeArguments);
-            emitExpressionList(node, node.arguments, ListFormat.NewExpressionArguments);
-        }
-
-        function emitTaggedTemplateExpression(node: TaggedTemplateExpression) {
-            emitExpression(node.tag);
-            write(" ");
-            emitExpression(node.template);
-        }
-
-        function emitTypeAssertionExpression(node: TypeAssertion) {
-            if (node.type) {
-                write("<");
-                emit(node.type);
-                write(">");
-            }
-
-            emitExpression(node.expression);
-        }
-
-        function emitParenthesizedExpression(node: ParenthesizedExpression) {
-            write("(");
-            emitExpression(node.expression);
-            write(")");
-        }
-
-        function emitFunctionExpression(node: FunctionExpression) {
-            emitFunctionDeclarationOrExpression(node);
-        }
-
-        function emitArrowFunction(node: ArrowFunction) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emitSignatureAndBody(node, emitArrowFunctionHead);
-        }
-
-        function emitArrowFunctionHead(node: ArrowFunction) {
-            emitTypeParameters(node, node.typeParameters);
-            emitParametersForArrow(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(" =>");
-        }
-
-        function emitDeleteExpression(node: DeleteExpression) {
-            write("delete ");
-            emitExpression(node.expression);
-        }
-
-        function emitTypeOfExpression(node: TypeOfExpression) {
-            write("typeof ");
-            emitExpression(node.expression);
-        }
-
-        function emitVoidExpression(node: VoidExpression) {
-            write("void ");
-            emitExpression(node.expression);
-        }
-
-        function emitAwaitExpression(node: AwaitExpression) {
-            write("await ");
-            emitExpression(node.expression);
-        }
-
-        function emitPrefixUnaryExpression(node: PrefixUnaryExpression) {
-            writeTokenText(node.operator);
-            if (shouldEmitWhitespaceBeforeOperand(node)) {
-                write(" ");
-            }
-            emitExpression(node.operand);
-        }
-
-        function shouldEmitWhitespaceBeforeOperand(node: PrefixUnaryExpression) {
-            // In some cases, we need to emit a space between the operator and the operand. One obvious case
-            // is when the operator is an identifier, like delete or typeof. We also need to do this for plus
-            // and minus expressions in certain cases. Specifically, consider the following two cases (parens
-            // are just for clarity of exposition, and not part of the source code):
-            //
-            //  (+(+1))
-            //  (+(++1))
-            //
-            // We need to emit a space in both cases. In the first case, the absence of a space will make
-            // the resulting expression a prefix increment operation. And in the second, it will make the resulting
-            // expression a prefix increment whose operand is a plus expression - (++(+x))
-            // The same is true of minus of course.
-            const operand = node.operand;
-            return operand.kind === SyntaxKind.PrefixUnaryExpression
-                && ((node.operator === SyntaxKind.PlusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusPlusToken))
-                || (node.operator === SyntaxKind.MinusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusMinusToken)));
-        }
-
-        function emitPostfixUnaryExpression(node: PostfixUnaryExpression) {
-            emitExpression(node.operand);
-            writeTokenText(node.operator);
-        }
-
-        function emitBinaryExpression(node: BinaryExpression) {
-            const isCommaOperator = node.operatorToken.kind !== SyntaxKind.CommaToken;
-            const indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-            const indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-
-            emitExpression(node.left);
-            increaseIndentIf(indentBeforeOperator, isCommaOperator ? " " : undefined);
-            writeTokenText(node.operatorToken.kind);
-            increaseIndentIf(indentAfterOperator, " ");
-            emitExpression(node.right);
-            decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
-        }
-
-        function emitConditionalExpression(node: ConditionalExpression) {
-            const indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
-            const indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
-            const indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
-            const indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
-
-            emitExpression(node.condition);
-            increaseIndentIf(indentBeforeQuestion, " ");
-            write("?");
-            increaseIndentIf(indentAfterQuestion, " ");
-            emitExpression(node.whenTrue);
-            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
-
-            increaseIndentIf(indentBeforeColon, " ");
-            write(":");
-            increaseIndentIf(indentAfterColon, " ");
-            emitExpression(node.whenFalse);
-            decreaseIndentIf(indentBeforeColon, indentAfterColon);
-        }
-
-        function emitTemplateExpression(node: TemplateExpression) {
-            emit(node.head);
-            emitList(node, node.templateSpans, ListFormat.TemplateExpressionSpans);
-        }
-
-        function emitYieldExpression(node: YieldExpression) {
-            write(node.asteriskToken ? "yield*" : "yield");
-            emitExpressionWithPrefix(" ", node.expression);
-        }
-
-        function emitSpreadExpression(node: SpreadElement) {
-            write("...");
-            emitExpression(node.expression);
-        }
-
-        function emitClassExpression(node: ClassExpression) {
-            emitClassDeclarationOrExpression(node);
-        }
-
-        function emitExpressionWithTypeArguments(node: ExpressionWithTypeArguments) {
-            emitExpression(node.expression);
-            emitTypeArguments(node, node.typeArguments);
-        }
-
-        function emitAsExpression(node: AsExpression) {
-            emitExpression(node.expression);
-            if (node.type) {
-                write(" as ");
-                emit(node.type);
-            }
-        }
-
-        function emitNonNullExpression(node: NonNullExpression) {
-            emitExpression(node.expression);
-            write("!");
-        }
-
-        function emitMetaProperty(node: MetaProperty) {
-            writeToken(node.keywordToken, node.pos);
-            write(".");
-            emit(node.name);
-        }
-
-        //
-        // Misc
-        //
-
-        function emitTemplateSpan(node: TemplateSpan) {
-            emitExpression(node.expression);
-            emit(node.literal);
-        }
-
-        //
-        // Statements
-        //
-
-        function emitBlock(node: Block) {
-            if (isSingleLineEmptyBlock(node)) {
-                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
-                write(" ");
-                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
-            }
-            else {
-                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
-                emitBlockStatements(node);
-                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
-            }
-        }
-
-        function emitBlockStatements(node: BlockLike) {
-            if (getEmitFlags(node) & EmitFlags.SingleLine) {
-                emitList(node, node.statements, ListFormat.SingleLineBlockStatements);
-            }
-            else {
-                emitList(node, node.statements, ListFormat.MultiLineBlockStatements);
-            }
-        }
-
-        function emitVariableStatement(node: VariableStatement) {
-            emitModifiers(node, node.modifiers);
-            emit(node.declarationList);
-            write(";");
-        }
-
-        function emitEmptyStatement() {
-            write(";");
-        }
-
-        function emitExpressionStatement(node: ExpressionStatement) {
-            emitExpression(node.expression);
-            write(";");
-        }
-
-        function emitIfStatement(node: IfStatement) {
-            const openParenPos = writeToken(SyntaxKind.IfKeyword, node.pos, node);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos, node);
-            emitExpression(node.expression);
-            writeToken(SyntaxKind.CloseParenToken, node.expression.end, node);
-            emitEmbeddedStatement(node, node.thenStatement);
-            if (node.elseStatement) {
-                writeLineOrSpace(node);
-                writeToken(SyntaxKind.ElseKeyword, node.thenStatement.end, node);
-                if (node.elseStatement.kind === SyntaxKind.IfStatement) {
-                    write(" ");
-                    emit(node.elseStatement);
-                }
-                else {
-                    emitEmbeddedStatement(node, node.elseStatement);
-                }
-            }
-        }
-
-        function emitDoStatement(node: DoStatement) {
-            write("do");
-            emitEmbeddedStatement(node, node.statement);
-            if (isBlock(node.statement)) {
-                write(" ");
-            }
-            else {
-                writeLineOrSpace(node);
-            }
-
-            write("while (");
-            emitExpression(node.expression);
-            write(");");
-        }
-
-        function emitWhileStatement(node: WhileStatement) {
-            write("while (");
-            emitExpression(node.expression);
-            write(")");
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitForStatement(node: ForStatement) {
-            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos, /*contextNode*/ node);
-            emitForBinding(node.initializer);
-            write(";");
-            emitExpressionWithPrefix(" ", node.condition);
-            write(";");
-            emitExpressionWithPrefix(" ", node.incrementor);
-            write(")");
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitForInStatement(node: ForInStatement) {
-            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos);
-            emitForBinding(node.initializer);
-            write(" in ");
-            emitExpression(node.expression);
-            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitForOfStatement(node: ForOfStatement) {
-            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos);
-            emitForBinding(node.initializer);
-            write(" of ");
-            emitExpression(node.expression);
-            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitForBinding(node: VariableDeclarationList | Expression) {
-            if (node !== undefined) {
-                if (node.kind === SyntaxKind.VariableDeclarationList) {
-                    emit(node);
-                }
-                else {
-                    emitExpression(<Expression>node);
-                }
-            }
-        }
-
-        function emitContinueStatement(node: ContinueStatement) {
-            writeToken(SyntaxKind.ContinueKeyword, node.pos);
-            emitWithPrefix(" ", node.label);
-            write(";");
-        }
-
-        function emitBreakStatement(node: BreakStatement) {
-            writeToken(SyntaxKind.BreakKeyword, node.pos);
-            emitWithPrefix(" ", node.label);
-            write(";");
-        }
-
-        function emitReturnStatement(node: ReturnStatement) {
-            writeToken(SyntaxKind.ReturnKeyword, node.pos, /*contextNode*/ node);
-            emitExpressionWithPrefix(" ", node.expression);
-            write(";");
-        }
-
-        function emitWithStatement(node: WithStatement) {
-            write("with (");
-            emitExpression(node.expression);
-            write(")");
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitSwitchStatement(node: SwitchStatement) {
-            const openParenPos = writeToken(SyntaxKind.SwitchKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos);
-            emitExpression(node.expression);
-            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
-            write(" ");
-            emit(node.caseBlock);
-        }
-
-        function emitLabeledStatement(node: LabeledStatement) {
-            emit(node.label);
-            write(": ");
-            emit(node.statement);
-        }
-
-        function emitThrowStatement(node: ThrowStatement) {
-            write("throw");
-            emitExpressionWithPrefix(" ", node.expression);
-            write(";");
-        }
-
-        function emitTryStatement(node: TryStatement) {
-            write("try ");
-            emit(node.tryBlock);
-            if (node.catchClause) {
-                writeLineOrSpace(node);
-                emit(node.catchClause);
-            }
-            if (node.finallyBlock) {
-                writeLineOrSpace(node);
-                write("finally ");
-                emit(node.finallyBlock);
-            }
-        }
-
-        function emitDebuggerStatement(node: DebuggerStatement) {
-            writeToken(SyntaxKind.DebuggerKeyword, node.pos);
-            write(";");
-        }
-
-        //
-        // Declarations
-        //
-
-        function emitVariableDeclaration(node: VariableDeclaration) {
-            emit(node.name);
-            emitWithPrefix(": ", node.type);
-            emitExpressionWithPrefix(" = ", node.initializer);
-        }
-
-        function emitVariableDeclarationList(node: VariableDeclarationList) {
-            write(isLet(node) ? "let " : isConst(node) ? "const " : "var ");
-            emitList(node, node.declarations, ListFormat.VariableDeclarationList);
-        }
-
-        function emitFunctionDeclaration(node: FunctionDeclaration) {
-            emitFunctionDeclarationOrExpression(node);
-        }
-
-        function emitFunctionDeclarationOrExpression(node: FunctionDeclaration | FunctionExpression) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write(node.asteriskToken ? "function* " : "function ");
-            emitIdentifierName(node.name);
-            emitSignatureAndBody(node, emitSignatureHead);
-        }
-
-        function emitSignatureAndBody(node: FunctionLikeDeclaration, emitSignatureHead: (node: SignatureDeclaration) => void) {
-            const body = node.body;
-            if (body) {
-                if (isBlock(body)) {
-                    const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
-                    if (indentedFlag) {
-                        increaseIndent();
-                    }
-
-                    if (getEmitFlags(node) & EmitFlags.ReuseTempVariableScope) {
-                        emitSignatureHead(node);
-                        emitBlockFunctionBody(body);
-                    }
-                    else {
-                        const savedTempFlags = tempFlags;
-                        tempFlags = 0;
-                        emitSignatureHead(node);
-                        emitBlockFunctionBody(body);
-                        tempFlags = savedTempFlags;
-                    }
-
-                    if (indentedFlag) {
-                        decreaseIndent();
-                    }
-                }
-                else {
-                    emitSignatureHead(node);
-                    write(" ");
-                    emitExpression(body);
-                }
-            }
-            else {
-                emitSignatureHead(node);
-                write(";");
-            }
-
-        }
-
-        function emitSignatureHead(node: FunctionDeclaration | FunctionExpression | MethodDeclaration | AccessorDeclaration | ConstructorDeclaration) {
-            emitTypeParameters(node, node.typeParameters);
-            emitParameters(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-        }
-
-        function shouldEmitBlockFunctionBodyOnSingleLine(body: Block) {
-            // We must emit a function body as a single-line body in the following case:
-            // * The body has NodeEmitFlags.SingleLine specified.
-
-            // We must emit a function body as a multi-line body in the following cases:
-            // * The body is explicitly marked as multi-line.
-            // * A non-synthesized body's start and end position are on different lines.
-            // * Any statement in the body starts on a new line.
-
-            if (getEmitFlags(body) & EmitFlags.SingleLine) {
-                return true;
-            }
-
-            if (body.multiLine) {
-                return false;
-            }
-
-            if (!nodeIsSynthesized(body) && !rangeIsOnSingleLine(body, currentSourceFile)) {
-                return false;
-            }
-
-            if (shouldWriteLeadingLineTerminator(body, body.statements, ListFormat.PreserveLines)
-                || shouldWriteClosingLineTerminator(body, body.statements, ListFormat.PreserveLines)) {
-                return false;
-            }
-
-            let previousStatement: Statement;
-            for (const statement of body.statements) {
-                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, ListFormat.PreserveLines)) {
-                    return false;
-                }
-
-                previousStatement = statement;
-            }
-
-            return true;
-        }
-
-        function emitBlockFunctionBody(body: Block) {
-            write(" {");
-            increaseIndent();
-
-            emitBodyWithDetachedComments(body, body.statements,
-                shouldEmitBlockFunctionBodyOnSingleLine(body)
-                    ? emitBlockFunctionBodyOnSingleLine
-                    : emitBlockFunctionBodyWorker);
-
-            decreaseIndent();
-            writeToken(SyntaxKind.CloseBraceToken, body.statements.end, body);
-        }
-
-        function emitBlockFunctionBodyOnSingleLine(body: Block) {
-            emitBlockFunctionBodyWorker(body, /*emitBlockFunctionBodyOnSingleLine*/ true);
-        }
-
-        function emitBlockFunctionBodyWorker(body: Block, emitBlockFunctionBodyOnSingleLine?: boolean) {
-            // Emit all the prologue directives (like "use strict").
-            const statementOffset = emitPrologueDirectives(body.statements, /*startWithNewLine*/ true);
-            const helpersEmitted = emitHelpers(body);
-
-            if (statementOffset === 0 && !helpersEmitted && emitBlockFunctionBodyOnSingleLine) {
-                decreaseIndent();
-                emitList(body, body.statements, ListFormat.SingleLineFunctionBodyStatements);
-                increaseIndent();
-            }
-            else {
-                emitList(body, body.statements, ListFormat.MultiLineFunctionBodyStatements, statementOffset);
-            }
-        }
-
-        function emitClassDeclaration(node: ClassDeclaration) {
-            emitClassDeclarationOrExpression(node);
-        }
-
-        function emitClassDeclarationOrExpression(node: ClassDeclaration | ClassExpression) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write("class");
-            emitNodeWithPrefix(" ", node.name, emitIdentifierName);
-
-            const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
-            if (indentedFlag) {
-                increaseIndent();
-            }
-
-            emitTypeParameters(node, node.typeParameters);
-            emitList(node, node.heritageClauses, ListFormat.ClassHeritageClauses);
-
-            const savedTempFlags = tempFlags;
-            tempFlags = 0;
-
-            write(" {");
-            emitList(node, node.members, ListFormat.ClassMembers);
-            write("}");
-
-            if (indentedFlag) {
-                decreaseIndent();
-            }
-
-            tempFlags = savedTempFlags;
-        }
-
-        function emitInterfaceDeclaration(node: InterfaceDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write("interface ");
-            emit(node.name);
-            emitTypeParameters(node, node.typeParameters);
-            emitList(node, node.heritageClauses, ListFormat.HeritageClauses);
-            write(" {");
-            emitList(node, node.members, ListFormat.InterfaceMembers);
-            write("}");
-        }
-
-        function emitTypeAliasDeclaration(node: TypeAliasDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write("type ");
-            emit(node.name);
-            emitTypeParameters(node, node.typeParameters);
-            write(" = ");
-            emit(node.type);
-            write(";");
-        }
-
-        function emitEnumDeclaration(node: EnumDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write("enum ");
-            emit(node.name);
-
-            const savedTempFlags = tempFlags;
-            tempFlags = 0;
-
-            write(" {");
-            emitList(node, node.members, ListFormat.EnumMembers);
-            write("}");
-            tempFlags = savedTempFlags;
-        }
-
-        function emitModuleDeclaration(node: ModuleDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write(node.flags & NodeFlags.Namespace ? "namespace " : "module ");
-            emit(node.name);
-
-            let body = node.body;
-            while (body.kind === SyntaxKind.ModuleDeclaration) {
-                write(".");
-                emit((<ModuleDeclaration>body).name);
-                body = (<ModuleDeclaration>body).body;
-            }
-
-            write(" ");
-            emit(body);
-        }
-
-        function emitModuleBlock(node: ModuleBlock) {
-            if (isEmptyBlock(node)) {
-                write("{ }");
-            }
-            else {
-                const savedTempFlags = tempFlags;
-                tempFlags = 0;
-                write("{");
-                increaseIndent();
-                emitBlockStatements(node);
-                write("}");
-                tempFlags = savedTempFlags;
-            }
-        }
-
-        function emitCaseBlock(node: CaseBlock) {
-            writeToken(SyntaxKind.OpenBraceToken, node.pos);
-            emitList(node, node.clauses, ListFormat.CaseBlockClauses);
-            writeToken(SyntaxKind.CloseBraceToken, node.clauses.end);
-        }
-
-        function emitImportEqualsDeclaration(node: ImportEqualsDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write("import ");
-            emit(node.name);
-            write(" = ");
-            emitModuleReference(node.moduleReference);
-            write(";");
-        }
-
-        function emitModuleReference(node: ModuleReference) {
-            if (node.kind === SyntaxKind.Identifier) {
-                emitExpression(<Identifier>node);
-            }
-            else {
-                emit(node);
-            }
-        }
-
-        function emitImportDeclaration(node: ImportDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write("import ");
-            if (node.importClause) {
-                emit(node.importClause);
-                write(" from ");
-            }
-            emitExpression(node.moduleSpecifier);
-            write(";");
-        }
-
-        function emitImportClause(node: ImportClause) {
-            emit(node.name);
-            if (node.name && node.namedBindings) {
-                write(", ");
-            }
-            emit(node.namedBindings);
-        }
-
-        function emitNamespaceImport(node: NamespaceImport) {
-            write("* as ");
-            emit(node.name);
-        }
-
-        function emitNamedImports(node: NamedImports) {
-            emitNamedImportsOrExports(node);
-        }
-
-        function emitImportSpecifier(node: ImportSpecifier) {
-            emitImportOrExportSpecifier(node);
-        }
-
-        function emitExportAssignment(node: ExportAssignment) {
-            write(node.isExportEquals ? "export = " : "export default ");
-            emitExpression(node.expression);
-            write(";");
-        }
-
-        function emitExportDeclaration(node: ExportDeclaration) {
-            write("export ");
-            if (node.exportClause) {
-                emit(node.exportClause);
-            }
-            else {
-                write("*");
-            }
-            if (node.moduleSpecifier) {
-                write(" from ");
-                emitExpression(node.moduleSpecifier);
-            }
-            write(";");
-        }
-
-        function emitNamedExports(node: NamedExports) {
-            emitNamedImportsOrExports(node);
-        }
-
-        function emitExportSpecifier(node: ExportSpecifier) {
-            emitImportOrExportSpecifier(node);
-        }
-
-        function emitNamedImportsOrExports(node: NamedImportsOrExports) {
-            write("{");
-            emitList(node, node.elements, ListFormat.NamedImportsOrExportsElements);
-            write("}");
-        }
-
-        function emitImportOrExportSpecifier(node: ImportOrExportSpecifier) {
-            if (node.propertyName) {
-                emit(node.propertyName);
-                write(" as ");
-            }
-
-            emit(node.name);
-        }
-
-        //
-        // Module references
-        //
-
-        function emitExternalModuleReference(node: ExternalModuleReference) {
-            write("require(");
-            emitExpression(node.expression);
-            write(")");
-        }
-
-        //
-        // JSX
-        //
-
-        function emitJsxElement(node: JsxElement) {
-            emit(node.openingElement);
-            emitList(node, node.children, ListFormat.JsxElementChildren);
-            emit(node.closingElement);
-        }
-
-        function emitJsxSelfClosingElement(node: JsxSelfClosingElement) {
-            write("<");
-            emitJsxTagName(node.tagName);
-            write(" ");
-            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
-            write("/>");
-        }
-
-        function emitJsxOpeningElement(node: JsxOpeningElement) {
-            write("<");
-            emitJsxTagName(node.tagName);
-            writeIfAny(node.attributes, " ");
-            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
-            write(">");
-        }
-
-        function emitJsxText(node: JsxText) {
-            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
-        }
-
-        function emitJsxClosingElement(node: JsxClosingElement) {
-            write("</");
-            emitJsxTagName(node.tagName);
-            write(">");
-        }
-
-        function emitJsxAttribute(node: JsxAttribute) {
-            emit(node.name);
-            emitWithPrefix("=", node.initializer);
-        }
-
-        function emitJsxSpreadAttribute(node: JsxSpreadAttribute) {
-            write("{...");
-            emitExpression(node.expression);
-            write("}");
-        }
-
-        function emitJsxExpression(node: JsxExpression) {
-            if (node.expression) {
-                write("{");
-                if (node.dotDotDotToken) {
-                    write("...");
-                }
-                emitExpression(node.expression);
-                write("}");
-            }
-        }
-
-        function emitJsxTagName(node: JsxTagNameExpression) {
-            if (node.kind === SyntaxKind.Identifier) {
-                emitExpression(<Identifier>node);
-            }
-            else {
-                emit(node);
-            }
-        }
-
-        //
-        // Clauses
-        //
-
-        function emitCaseClause(node: CaseClause) {
-            write("case ");
-            emitExpression(node.expression);
-            write(":");
-
-            emitCaseOrDefaultClauseStatements(node, node.statements);
-        }
-
-        function emitDefaultClause(node: DefaultClause) {
-            write("default:");
-            emitCaseOrDefaultClauseStatements(node, node.statements);
-        }
-
-        function emitCaseOrDefaultClauseStatements(parentNode: Node, statements: NodeArray<Statement>) {
-            const emitAsSingleStatement =
-                statements.length === 1 &&
-                (
-                    // treat synthesized nodes as located on the same line for emit purposes
-                    nodeIsSynthesized(parentNode) ||
-                    nodeIsSynthesized(statements[0]) ||
-                    rangeStartPositionsAreOnSameLine(parentNode, statements[0], currentSourceFile)
-                );
-
-            if (emitAsSingleStatement) {
-                write(" ");
-                emit(statements[0]);
-            }
-            else {
-                emitList(parentNode, statements, ListFormat.CaseOrDefaultClauseStatements);
-            }
-        }
-
-        function emitHeritageClause(node: HeritageClause) {
-            write(" ");
-            writeTokenText(node.token);
-            write(" ");
-            emitList(node, node.types, ListFormat.HeritageClauseTypes);
-        }
-
-        function emitCatchClause(node: CatchClause) {
-            writeLine();
-            const openParenPos = writeToken(SyntaxKind.CatchKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos);
-            emit(node.variableDeclaration);
-            writeToken(SyntaxKind.CloseParenToken, node.variableDeclaration ? node.variableDeclaration.end : openParenPos);
-            write(" ");
-            emit(node.block);
-        }
-
-        //
-        // Property assignments
-        //
-
-        function emitPropertyAssignment(node: PropertyAssignment) {
-            emit(node.name);
-            write(": ");
-            // This is to ensure that we emit comment in the following case:
-            //      For example:
-            //          obj = {
-            //              id: /*comment1*/ ()=>void
-            //          }
-            // "comment1" is not considered to be leading comment for node.initializer
-            // but rather a trailing comment on the previous node.
-            const initializer = node.initializer;
-            if ((getEmitFlags(initializer) & EmitFlags.NoLeadingComments) === 0) {
-                const commentRange = getCommentRange(initializer);
-                emitTrailingCommentsOfPosition(commentRange.pos);
-            }
-
-            emitExpression(initializer);
-        }
-
-        function emitShorthandPropertyAssignment(node: ShorthandPropertyAssignment) {
-            emit(node.name);
-            if (node.objectAssignmentInitializer) {
-                write(" = ");
-                emitExpression(node.objectAssignmentInitializer);
-            }
-        }
-
-        function emitSpreadAssignment(node: SpreadAssignment) {
-            if (node.expression) {
-                write("...");
-                emitExpression(node.expression);
-            }
-        }
-
-        //
-        // Enum
-        //
-
-        function emitEnumMember(node: EnumMember) {
-            emit(node.name);
-            emitExpressionWithPrefix(" = ", node.initializer);
-        }
-
-        //
-        // Top-level nodes
-        //
-
-        function emitSourceFile(node: SourceFile) {
-            writeLine();
-            emitShebang();
-            emitBodyWithDetachedComments(node, node.statements, emitSourceFileWorker);
-        }
-
-        function emitSourceFileWorker(node: SourceFile) {
-            const statements = node.statements;
-            const statementOffset = emitPrologueDirectives(statements);
-            const savedTempFlags = tempFlags;
-            tempFlags = 0;
-            emitHelpers(node);
-            emitList(node, statements, ListFormat.MultiLine, statementOffset);
-            tempFlags = savedTempFlags;
-        }
-
-        // Transformation nodes
-
-        function emitPartiallyEmittedExpression(node: PartiallyEmittedExpression) {
-            emitExpression(node.expression);
-        }
-
-        /**
-         * Emits any prologue directives at the start of a Statement list, returning the
-         * number of prologue directives written to the output.
-         */
-        function emitPrologueDirectives(statements: Node[], startWithNewLine?: boolean): number {
-            for (let i = 0; i < statements.length; i++) {
-                if (isPrologueDirective(statements[i])) {
-                    if (startWithNewLine || i > 0) {
-                        writeLine();
-                    }
-                    emit(statements[i]);
-                }
-                else {
-                    // return index of the first non prologue directive
-                    return i;
-                }
-            }
-
-            return statements.length;
-        }
-
-        function emitHelpers(node: Node, isBundle?: boolean) {
-            const sourceFile = isSourceFile(node) ? node : currentSourceFile;
-            const shouldSkip = compilerOptions.noEmitHelpers || (sourceFile && getExternalHelpersModuleName(sourceFile) !== undefined);
-            const shouldBundle = isSourceFile(node) && !isOwnFileEmit;
-
+        function emitHelpers(node: Node, writeLines: (text: string) => void) {
             let helpersEmitted = false;
-            const helpers = getEmitHelpers(node);
-            if (helpers) {
-                for (const helper of stableSort(helpers, compareEmitHelpers)) {
-                    if (!helper.scoped) {
-                        // Skip the helper if it can be skipped and the noEmitHelpers compiler
-                        // option is set, or if it can be imported and the importHelpers compiler
-                        // option is set.
-                        if (shouldSkip) continue;
+            const bundle = node.kind === SyntaxKind.Bundle ? <Bundle>node : undefined;
+            const numNodes = bundle ? bundle.sourceFiles.length : 1;
+            for (let i = 0; i < numNodes; i++) {
+                const currentNode = bundle ? bundle.sourceFiles[i] : node;
+                const sourceFile = isSourceFile(currentNode) ? currentNode : currentSourceFile;
+                const shouldSkip = compilerOptions.noEmitHelpers || (sourceFile && getExternalHelpersModuleName(sourceFile) !== undefined);
+                const shouldBundle = isSourceFile(currentNode) && !isOwnFileEmit;
+                const helpers = getEmitHelpers(currentNode);
+                if (helpers) {
+                    for (const helper of stableSort(helpers, compareEmitHelpers)) {
+                        if (!helper.scoped) {
+                            // Skip the helper if it can be skipped and the noEmitHelpers compiler
+                            // option is set, or if it can be imported and the importHelpers compiler
+                            // option is set.
+                            if (shouldSkip) continue;
 
-                        // Skip the helper if it can be bundled but hasn't already been emitted and we
-                        // are emitting a bundled module.
-                        if (shouldBundle) {
-                            if (bundledHelpers.get(helper.name)) {
-                                continue;
+                            // Skip the helper if it can be bundled but hasn't already been emitted and we
+                            // are emitting a bundled module.
+                            if (shouldBundle) {
+                                if (bundledHelpers.get(helper.name)) {
+                                    continue;
+                                }
+
+                                bundledHelpers.set(helper.name, true);
                             }
-
-                            bundledHelpers.set(helper.name, true);
                         }
-                    }
-                    else if (isBundle) {
-                        // Skip the helper if it is scoped and we are emitting bundled helpers
-                        continue;
-                    }
+                        else if (bundle) {
+                            // Skip the helper if it is scoped and we are emitting bundled helpers
+                            continue;
+                        }
 
-                    writeLines(helper.text);
-                    helpersEmitted = true;
+                        writeLines(helper.text);
+                        helpersEmitted = true;
+                    }
                 }
             }
 
-            if (helpersEmitted) {
-                writeLine();
-            }
-
             return helpersEmitted;
         }
-
-        function writeLines(text: string): void {
-            const lines = text.split(/\r\n?|\n/g);
-            const indentation = guessIndentation(lines);
-            for (let i = 0; i < lines.length; i++) {
-                const line = indentation ? lines[i].slice(indentation) : lines[i];
-                if (line.length) {
-                    if (i > 0) {
-                        writeLine();
-                    }
-                    write(line);
-                }
-            }
-        }
-
-        function guessIndentation(lines: string[]) {
-            let indentation: number;
-            for (const line of lines) {
-                for (let i = 0; i < line.length && (indentation === undefined || i < indentation); i++) {
-                    if (!isWhiteSpace(line.charCodeAt(i))) {
-                        if (indentation === undefined || i < indentation) {
-                            indentation = i;
-                            break;
-                        }
-                    }
-                }
-            }
-            return indentation;
-        }
-
-        //
-        // Helpers
-        //
-
-        function emitShebang() {
-            const shebang = getShebang(currentText);
-            if (shebang) {
-                write(shebang);
-                writeLine();
-            }
-        }
-
-        function emitModifiers(node: Node, modifiers: NodeArray<Modifier>) {
-            if (modifiers && modifiers.length) {
-                emitList(node, modifiers, ListFormat.Modifiers);
-                write(" ");
-            }
-        }
-
-        function emitWithPrefix(prefix: string, node: Node) {
-            emitNodeWithPrefix(prefix, node, emit);
-        }
-
-        function emitExpressionWithPrefix(prefix: string, node: Node) {
-            emitNodeWithPrefix(prefix, node, emitExpression);
-        }
-
-        function emitNodeWithPrefix(prefix: string, node: Node, emit: (node: Node) => void) {
-            if (node) {
-                write(prefix);
-                emit(node);
-            }
-        }
-
-        function emitWithSuffix(node: Node, suffix: string) {
-            if (node) {
-                emit(node);
-                write(suffix);
-            }
-        }
-
-        function emitEmbeddedStatement(parent: Node, node: Statement) {
-            if (isBlock(node) || getEmitFlags(parent) & EmitFlags.SingleLine) {
-                write(" ");
-                emit(node);
-            }
-            else {
-                writeLine();
-                increaseIndent();
-                emit(node);
-                decreaseIndent();
-            }
-        }
-
-        function emitDecorators(parentNode: Node, decorators: NodeArray<Decorator>) {
-            emitList(parentNode, decorators, ListFormat.Decorators);
-        }
-
-        function emitTypeArguments(parentNode: Node, typeArguments: NodeArray<TypeNode>) {
-            emitList(parentNode, typeArguments, ListFormat.TypeArguments);
-        }
-
-        function emitTypeParameters(parentNode: Node, typeParameters: NodeArray<TypeParameterDeclaration>) {
-            emitList(parentNode, typeParameters, ListFormat.TypeParameters);
-        }
-
-        function emitParameters(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
-            emitList(parentNode, parameters, ListFormat.Parameters);
-        }
-
-        function emitParametersForArrow(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
-            if (parameters &&
-                parameters.length === 1 &&
-                parameters[0].type === undefined &&
-                parameters[0].pos === parentNode.pos) {
-                emit(parameters[0]);
-            }
-            else {
-                emitParameters(parentNode, parameters);
-            }
-        }
-
-        function emitParametersForIndexSignature(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
-            emitList(parentNode, parameters, ListFormat.IndexSignatureParameters);
-        }
-
-        function emitList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
-            emitNodeList(emit, parentNode, children, format, start, count);
-        }
-
-        function emitExpressionList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
-            emitNodeList(emitExpression, parentNode, children, format, start, count);
-        }
-
-        function emitNodeList(emit: (node: Node) => void, parentNode: Node, children: NodeArray<Node>, format: ListFormat, start = 0, count = children ? children.length - start : 0) {
-            const isUndefined = children === undefined;
-            if (isUndefined && format & ListFormat.OptionalIfUndefined) {
-                return;
-            }
-
-            const isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0;
-            if (isEmpty && format & ListFormat.OptionalIfEmpty) {
-                return;
-            }
-
-            if (format & ListFormat.BracketsMask) {
-                write(getOpeningBracket(format));
-            }
-
-            if (isEmpty) {
-                // Write a line terminator if the parent node was multi-line
-                if (format & ListFormat.MultiLine) {
-                    writeLine();
-                }
-                else if (format & ListFormat.SpaceBetweenBraces) {
-                    write(" ");
-                }
-            }
-            else {
-                // Write the opening line terminator or leading whitespace.
-                const mayEmitInterveningComments = (format & ListFormat.NoInterveningComments) === 0;
-                let shouldEmitInterveningComments = mayEmitInterveningComments;
-                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) {
-                    writeLine();
-                    shouldEmitInterveningComments = false;
-                }
-                else if (format & ListFormat.SpaceBetweenBraces) {
-                    write(" ");
-                }
-
-                // Increase the indent, if requested.
-                if (format & ListFormat.Indented) {
-                    increaseIndent();
-                }
-
-                // Emit each child.
-                let previousSibling: Node;
-                let shouldDecreaseIndentAfterEmit: boolean;
-                const delimiter = getDelimiter(format);
-                for (let i = 0; i < count; i++) {
-                    const child = children[start + i];
-
-                    // Write the delimiter if this is not the first node.
-                    if (previousSibling) {
-                        write(delimiter);
-
-                        // Write either a line terminator or whitespace to separate the elements.
-                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
-                            // If a synthesized node in a single-line list starts on a new
-                            // line, we should increase the indent.
-                            if ((format & (ListFormat.LinesMask | ListFormat.Indented)) === ListFormat.SingleLine) {
-                                increaseIndent();
-                                shouldDecreaseIndentAfterEmit = true;
-                            }
-
-                            writeLine();
-                            shouldEmitInterveningComments = false;
-                        }
-                        else if (previousSibling && format & ListFormat.SpaceBetweenSiblings) {
-                            write(" ");
-                        }
-                    }
-
-                    if (shouldEmitInterveningComments) {
-                        const commentRange = getCommentRange(child);
-                        emitTrailingCommentsOfPosition(commentRange.pos);
-                    }
-                    else {
-                        shouldEmitInterveningComments = mayEmitInterveningComments;
-                    }
-
-                    // Emit this child.
-                    emit(child);
-
-                    if (shouldDecreaseIndentAfterEmit) {
-                        decreaseIndent();
-                        shouldDecreaseIndentAfterEmit = false;
-                    }
-
-                    previousSibling = child;
-                }
-
-                // Write a trailing comma, if requested.
-                const hasTrailingComma = (format & ListFormat.AllowTrailingComma) && children.hasTrailingComma;
-                if (format & ListFormat.CommaDelimited && hasTrailingComma) {
-                    write(",");
-                }
-
-                // Decrease the indent, if requested.
-                if (format & ListFormat.Indented) {
-                    decreaseIndent();
-                }
-
-                // Write the closing line terminator or closing whitespace.
-                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
-                    writeLine();
-                }
-                else if (format & ListFormat.SpaceBetweenBraces) {
-                    write(" ");
-                }
-            }
-
-            if (format & ListFormat.BracketsMask) {
-                write(getClosingBracket(format));
-            }
-        }
-
-        function writeLineOrSpace(node: Node) {
-            if (getEmitFlags(node) & EmitFlags.SingleLine) {
-                write(" ");
-            }
-            else {
-                writeLine();
-            }
-        }
-
-        function writeIfAny(nodes: NodeArray<Node>, text: string) {
-            if (nodes && nodes.length > 0) {
-                write(text);
-            }
-        }
-
-        function writeIfPresent(node: Node, text: string) {
-            if (node !== undefined) {
-                write(text);
-            }
-        }
-
-        function writeToken(token: SyntaxKind, pos: number, contextNode?: Node) {
-            return emitTokenWithSourceMap(contextNode, token, pos, writeTokenText);
-        }
-
-        function writeTokenText(token: SyntaxKind, pos?: number) {
-            const tokenString = tokenToString(token);
-            write(tokenString);
-            return pos < 0 ? pos : pos + tokenString.length;
-        }
-
-        function increaseIndentIf(value: boolean, valueToWriteWhenNotIndenting?: string) {
-            if (value) {
-                increaseIndent();
-                writeLine();
-            }
-            else if (valueToWriteWhenNotIndenting) {
-                write(valueToWriteWhenNotIndenting);
-            }
-        }
-
-        // Helper function to decrease the indent if we previously indented.  Allows multiple
-        // previous indent values to be considered at a time.  This also allows caller to just
-        // call this once, passing in all their appropriate indent values, instead of needing
-        // to call this helper function multiple times.
-        function decreaseIndentIf(value1: boolean, value2?: boolean) {
-            if (value1) {
-                decreaseIndent();
-            }
-            if (value2) {
-                decreaseIndent();
-            }
-        }
-
-        function shouldWriteLeadingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
-            if (format & ListFormat.MultiLine) {
-                return true;
-            }
-
-            if (format & ListFormat.PreserveLines) {
-                if (format & ListFormat.PreferNewLine) {
-                    return true;
-                }
-
-                const firstChild = children[0];
-                if (firstChild === undefined) {
-                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
-                }
-                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(firstChild)) {
-                    return synthesizedNodeStartsOnNewLine(firstChild, format);
-                }
-                else {
-                    return !rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
-                }
-            }
-            else {
-                return false;
-            }
-        }
-
-        function shouldWriteSeparatingLineTerminator(previousNode: Node, nextNode: Node, format: ListFormat) {
-            if (format & ListFormat.MultiLine) {
-                return true;
-            }
-            else if (format & ListFormat.PreserveLines) {
-                if (previousNode === undefined || nextNode === undefined) {
-                    return false;
-                }
-                else if (nodeIsSynthesized(previousNode) || nodeIsSynthesized(nextNode)) {
-                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
-                }
-                else {
-                    return !rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
-                }
-            }
-            else {
-                return nextNode.startsOnNewLine;
-            }
-        }
-
-        function shouldWriteClosingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
-            if (format & ListFormat.MultiLine) {
-                return (format & ListFormat.NoTrailingNewLine) === 0;
-            }
-            else if (format & ListFormat.PreserveLines) {
-                if (format & ListFormat.PreferNewLine) {
-                    return true;
-                }
-
-                const lastChild = lastOrUndefined(children);
-                if (lastChild === undefined) {
-                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
-                }
-                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(lastChild)) {
-                    return synthesizedNodeStartsOnNewLine(lastChild, format);
-                }
-                else {
-                    return !rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
-                }
-            }
-            else {
-                return false;
-            }
-        }
-
-        function synthesizedNodeStartsOnNewLine(node: Node, format?: ListFormat) {
-            if (nodeIsSynthesized(node)) {
-                const startsOnNewLine = node.startsOnNewLine;
-                if (startsOnNewLine === undefined) {
-                    return (format & ListFormat.PreferNewLine) !== 0;
-                }
-
-                return startsOnNewLine;
-            }
-
-            return (format & ListFormat.PreferNewLine) !== 0;
-        }
-
-        function needsIndentation(parent: Node, node1: Node, node2: Node): boolean {
-            parent = skipSynthesizedParentheses(parent);
-            node1 = skipSynthesizedParentheses(node1);
-            node2 = skipSynthesizedParentheses(node2);
-
-            // Always use a newline for synthesized code if the synthesizer desires it.
-            if (node2.startsOnNewLine) {
-                return true;
-            }
-
-            return !nodeIsSynthesized(parent)
-                && !nodeIsSynthesized(node1)
-                && !nodeIsSynthesized(node2)
-                && !rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
-        }
-
-        function skipSynthesizedParentheses(node: Node) {
-            while (node.kind === SyntaxKind.ParenthesizedExpression && nodeIsSynthesized(node)) {
-                node = (<ParenthesizedExpression>node).expression;
-            }
-
-            return node;
-        }
-
-        function getTextOfNode(node: Node, includeTrivia?: boolean): string {
-            if (isGeneratedIdentifier(node)) {
-                return getGeneratedIdentifier(<Identifier>node);
-            }
-            else if (isIdentifier(node) && (nodeIsSynthesized(node) || !node.parent)) {
-                return unescapeIdentifier(node.text);
-            }
-            else if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
-                return getTextOfNode((<StringLiteral>node).textSourceNode, includeTrivia);
-            }
-            else if (isLiteralExpression(node) && (nodeIsSynthesized(node) || !node.parent)) {
-                return node.text;
-            }
-
-            return getSourceTextOfNodeFromSourceFile(currentSourceFile, node, includeTrivia);
-        }
-
-        function getLiteralTextOfNode(node: LiteralLikeNode): string {
-            if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
-                const textSourceNode = (<StringLiteral>node).textSourceNode;
-                if (isIdentifier(textSourceNode)) {
-                    return "\"" + escapeNonAsciiCharacters(escapeString(getTextOfNode(textSourceNode))) + "\"";
-                }
-                else {
-                    return getLiteralTextOfNode(textSourceNode);
-                }
-            }
-
-            return getLiteralText(node, currentSourceFile, languageVersion);
-        }
-
-        function isSingleLineEmptyBlock(block: Block) {
-            return !block.multiLine
-                && isEmptyBlock(block);
-        }
-
-        function isEmptyBlock(block: BlockLike) {
-            return block.statements.length === 0
-                && rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
-        }
-
-        function isUniqueName(name: string): boolean {
-            return !resolver.hasGlobalName(name) &&
-                !currentFileIdentifiers.has(name) &&
-                !generatedNameSet.has(name);
-        }
-
-        function isUniqueLocalName(name: string, container: Node): boolean {
-            for (let node = container; isNodeDescendantOf(node, container); node = node.nextContainer) {
-                if (node.locals) {
-                    const local = node.locals.get(name);
-                    // We conservatively include alias symbols to cover cases where they're emitted as locals
-                    if (local && local.flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        /**
-        * Return the next available name in the pattern _a ... _z, _0, _1, ...
-        * TempFlags._i or TempFlags._n may be used to express a preference for that dedicated name.
-        * Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
-        */
-        function makeTempVariableName(flags: TempFlags): string {
-            if (flags && !(tempFlags & flags)) {
-                const name = flags === TempFlags._i ? "_i" : "_n";
-                if (isUniqueName(name)) {
-                    tempFlags |= flags;
-                    return name;
-                }
-            }
-            while (true) {
-                const count = tempFlags & TempFlags.CountMask;
-                tempFlags++;
-                // Skip over 'i' and 'n'
-                if (count !== 8 && count !== 13) {
-                    const name = count < 26
-                        ? "_" + String.fromCharCode(CharacterCodes.a + count)
-                        : "_" + (count - 26);
-                    if (isUniqueName(name)) {
-                        return name;
-                    }
-                }
-            }
-        }
-
-        // Generate a name that is unique within the current file and doesn't conflict with any names
-        // in global scope. The name is formed by adding an '_n' suffix to the specified base name,
-        // where n is a positive integer. Note that names generated by makeTempVariableName and
-        // makeUniqueName are guaranteed to never conflict.
-        function makeUniqueName(baseName: string): string {
-            // Find the first unique 'name_n', where n is a positive number
-            if (baseName.charCodeAt(baseName.length - 1) !== CharacterCodes._) {
-                baseName += "_";
-            }
-            let i = 1;
-            while (true) {
-                const generatedName = baseName + i;
-                if (isUniqueName(generatedName)) {
-                    generatedNameSet.set(generatedName, generatedName);
-                    return generatedName;
-                }
-                i++;
-            }
-        }
-
-        function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
-            const name = getTextOfNode(node.name);
-            // Use module/enum name itself if it is unique, otherwise make a unique variation
-            return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
-        }
-
-        function generateNameForImportOrExportDeclaration(node: ImportDeclaration | ExportDeclaration) {
-            const expr = getExternalModuleName(node);
-            const baseName = expr.kind === SyntaxKind.StringLiteral ?
-                escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
-            return makeUniqueName(baseName);
-        }
-
-        function generateNameForExportDefault() {
-            return makeUniqueName("default");
-        }
-
-        function generateNameForClassExpression() {
-            return makeUniqueName("class");
-        }
-
-        function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration) {
-            if (isIdentifier(node.name)) {
-                return generateNameForNodeCached(node.name);
-            }
-            return makeTempVariableName(TempFlags.Auto);
-        }
-
-        /**
-         * Generates a unique name from a node.
-         *
-         * @param node A node.
-         */
-        function generateNameForNode(node: Node): string {
-            switch (node.kind) {
-                case SyntaxKind.Identifier:
-                    return makeUniqueName(getTextOfNode(node));
-                case SyntaxKind.ModuleDeclaration:
-                case SyntaxKind.EnumDeclaration:
-                    return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node);
-                case SyntaxKind.ImportDeclaration:
-                case SyntaxKind.ExportDeclaration:
-                    return generateNameForImportOrExportDeclaration(<ImportDeclaration | ExportDeclaration>node);
-                case SyntaxKind.FunctionDeclaration:
-                case SyntaxKind.ClassDeclaration:
-                case SyntaxKind.ExportAssignment:
-                    return generateNameForExportDefault();
-                case SyntaxKind.ClassExpression:
-                    return generateNameForClassExpression();
-                case SyntaxKind.MethodDeclaration:
-                case SyntaxKind.GetAccessor:
-                case SyntaxKind.SetAccessor:
-                    return generateNameForMethodOrAccessor(<MethodDeclaration | AccessorDeclaration>node);
-                default:
-                    return makeTempVariableName(TempFlags.Auto);
-            }
-        }
-
-        /**
-         * Generates a unique identifier for a node.
-         *
-         * @param name A generated name.
-         */
-        function generateName(name: Identifier) {
-            switch (name.autoGenerateKind) {
-                case GeneratedIdentifierKind.Auto:
-                    return makeTempVariableName(TempFlags.Auto);
-                case GeneratedIdentifierKind.Loop:
-                    return makeTempVariableName(TempFlags._i);
-                case GeneratedIdentifierKind.Unique:
-                    return makeUniqueName(name.text);
-            }
-
-            Debug.fail("Unsupported GeneratedIdentifierKind.");
-        }
-
-        /**
-         * Gets the node from which a name should be generated.
-         *
-         * @param name A generated name wrapper.
-         */
-        function getNodeForGeneratedName(name: Identifier) {
-            const autoGenerateId = name.autoGenerateId;
-            let node = name as Node;
-            let original = node.original;
-            while (original) {
-                node = original;
-
-                // if "node" is a different generated name (having a different
-                // "autoGenerateId"), use it and stop traversing.
-                if (isIdentifier(node)
-                    && node.autoGenerateKind === GeneratedIdentifierKind.Node
-                    && node.autoGenerateId !== autoGenerateId) {
-                    break;
-                }
-
-                original = node.original;
-            }
-
-            // otherwise, return the original node for the source;
-            return node;
-        }
-
-        function generateNameForNodeCached(node: Node) {
-            const nodeId = getNodeId(node);
-            return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node)));
-        }
-
-        /**
-         * Gets the generated identifier text from a generated identifier.
-         *
-         * @param name The generated identifier.
-         */
-        function getGeneratedIdentifier(name: Identifier) {
-            if (name.autoGenerateKind === GeneratedIdentifierKind.Node) {
-                // Generated names generate unique names based on their original node
-                // and are cached based on that node's id
-                const node = getNodeForGeneratedName(name);
-                return generateNameForNodeCached(node);
-            }
-            else {
-                // Auto, Loop, and Unique names are cached based on their unique
-                // autoGenerateId.
-                const autoGenerateId = name.autoGenerateId;
-                return autoGeneratedIdToGeneratedName[autoGenerateId] || (autoGeneratedIdToGeneratedName[autoGenerateId] = unescapeIdentifier(generateName(name)));
-            }
-        }
-
-        function createDelimiterMap() {
-            const delimiters: string[] = [];
-            delimiters[ListFormat.None] = "";
-            delimiters[ListFormat.CommaDelimited] = ",";
-            delimiters[ListFormat.BarDelimited] = " |";
-            delimiters[ListFormat.AmpersandDelimited] = " &";
-            return delimiters;
-        }
-
-        function getDelimiter(format: ListFormat) {
-            return delimiters[format & ListFormat.DelimitersMask];
-        }
-
-        function createBracketsMap() {
-            const brackets: string[][] = [];
-            brackets[ListFormat.Braces] = ["{", "}"];
-            brackets[ListFormat.Parenthesis] = ["(", ")"];
-            brackets[ListFormat.AngleBrackets] = ["<", ">"];
-            brackets[ListFormat.SquareBrackets] = ["[", "]"];
-            return brackets;
-        }
-
-        function getOpeningBracket(format: ListFormat) {
-            return brackets[format & ListFormat.BracketsMask][0];
-        }
-
-        function getClosingBracket(format: ListFormat) {
-            return brackets[format & ListFormat.BracketsMask][1];
-        }
     }
-
-    const enum ListFormat {
-        None = 0,
-
-        // Line separators
-        SingleLine = 0,                 // Prints the list on a single line (default).
-        MultiLine = 1 << 0,             // Prints the list on multiple lines.
-        PreserveLines = 1 << 1,         // Prints the list using line preservation if possible.
-        LinesMask = SingleLine | MultiLine | PreserveLines,
-
-        // Delimiters
-        NotDelimited = 0,               // There is no delimiter between list items (default).
-        BarDelimited = 1 << 2,          // Each list item is space-and-bar (" |") delimited.
-        AmpersandDelimited = 1 << 3,    // Each list item is space-and-ampersand (" &") delimited.
-        CommaDelimited = 1 << 4,        // Each list item is comma (",") delimited.
-        DelimitersMask = BarDelimited | AmpersandDelimited | CommaDelimited,
-
-        AllowTrailingComma = 1 << 5,    // Write a trailing comma (",") if present.
-
-        // Whitespace
-        Indented = 1 << 6,              // The list should be indented.
-        SpaceBetweenBraces = 1 << 7,    // Inserts a space after the opening brace and before the closing brace.
-        SpaceBetweenSiblings = 1 << 8,  // Inserts a space between each sibling node.
-
-        // Brackets/Braces
-        Braces = 1 << 9,                 // The list is surrounded by "{" and "}".
-        Parenthesis = 1 << 10,          // The list is surrounded by "(" and ")".
-        AngleBrackets = 1 << 11,        // The list is surrounded by "<" and ">".
-        SquareBrackets = 1 << 12,       // The list is surrounded by "[" and "]".
-        BracketsMask = Braces | Parenthesis | AngleBrackets | SquareBrackets,
-
-        OptionalIfUndefined = 1 << 13,  // Do not emit brackets if the list is undefined.
-        OptionalIfEmpty = 1 << 14,      // Do not emit brackets if the list is empty.
-        Optional = OptionalIfUndefined | OptionalIfEmpty,
-
-        // Other
-        PreferNewLine = 1 << 15,        // Prefer adding a LineTerminator between synthesized nodes.
-        NoTrailingNewLine = 1 << 16,    // Do not emit a trailing NewLine for a MultiLine list.
-        NoInterveningComments = 1 << 17, // Do not emit comments between each node
-
-        // Precomputed Formats
-        Modifiers = SingleLine | SpaceBetweenSiblings,
-        HeritageClauses = SingleLine | SpaceBetweenSiblings,
-        TypeLiteralMembers = MultiLine | Indented,
-        TupleTypeElements = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented,
-        UnionTypeConstituents = BarDelimited | SpaceBetweenSiblings | SingleLine,
-        IntersectionTypeConstituents = AmpersandDelimited | SpaceBetweenSiblings | SingleLine,
-        ObjectBindingPatternElements = SingleLine | AllowTrailingComma | SpaceBetweenBraces | CommaDelimited | SpaceBetweenSiblings,
-        ArrayBindingPatternElements = SingleLine | AllowTrailingComma | CommaDelimited | SpaceBetweenSiblings,
-        ObjectLiteralExpressionProperties = PreserveLines | CommaDelimited | SpaceBetweenSiblings | SpaceBetweenBraces | Indented | Braces,
-        ArrayLiteralExpressionElements = PreserveLines | CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | Indented | SquareBrackets,
-        CallExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis,
-        NewExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis | OptionalIfUndefined,
-        TemplateExpressionSpans = SingleLine | NoInterveningComments,
-        SingleLineBlockStatements = SpaceBetweenBraces | SpaceBetweenSiblings | SingleLine,
-        MultiLineBlockStatements = Indented | MultiLine,
-        VariableDeclarationList = CommaDelimited | SpaceBetweenSiblings | SingleLine,
-        SingleLineFunctionBodyStatements = SingleLine | SpaceBetweenSiblings | SpaceBetweenBraces,
-        MultiLineFunctionBodyStatements = MultiLine,
-        ClassHeritageClauses = SingleLine | SpaceBetweenSiblings,
-        ClassMembers = Indented | MultiLine,
-        InterfaceMembers = Indented | MultiLine,
-        EnumMembers = CommaDelimited | Indented | MultiLine,
-        CaseBlockClauses = Indented | MultiLine,
-        NamedImportsOrExportsElements = CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | SingleLine | SpaceBetweenBraces,
-        JsxElementChildren = SingleLine | NoInterveningComments,
-        JsxElementAttributes = SingleLine | SpaceBetweenSiblings | NoInterveningComments,
-        CaseOrDefaultClauseStatements = Indented | MultiLine | NoTrailingNewLine | OptionalIfEmpty,
-        HeritageClauseTypes = CommaDelimited | SpaceBetweenSiblings | SingleLine,
-        SourceFileStatements = MultiLine | NoTrailingNewLine,
-        Decorators = MultiLine | Optional,
-        TypeArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
-        TypeParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
-        Parameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | Parenthesis,
-        IndexSignatureParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | SquareBrackets,
-    }
-}
+}
\ No newline at end of file
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index f63094ae16d..f2a8de3a93b 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1530,6 +1530,19 @@ namespace ts {
         return node;
     }
 
+    export function createBundle(sourceFiles: SourceFile[]) {
+        const node = <Bundle>createNode(SyntaxKind.Bundle);
+        node.sourceFiles = sourceFiles;
+        return node;
+    }
+
+    export function updateBundle(node: Bundle, sourceFiles: SourceFile[]) {
+        if (node.sourceFiles !== sourceFiles) {
+            return createBundle(sourceFiles);
+        }
+        return node;
+    }
+
     // Compound nodes
 
     export function createComma(left: Expression, right: Expression) {
diff --git a/src/compiler/printer.ts b/src/compiler/printer.ts
new file mode 100644
index 00000000000..9ae824dac67
--- /dev/null
+++ b/src/compiler/printer.ts
@@ -0,0 +1,2659 @@
+/// <reference path="checker.ts"/>
+
+namespace ts {
+    // Flags enum to track count of temp variables and a few dedicated names
+    const enum TempFlags {
+        Auto      = 0x00000000,  // No preferred name
+        CountMask = 0x0FFFFFFF,  // Temp variable counter
+        _i        = 0x10000000,  // Use/preference flag for '_i'
+    }
+
+    const delimiters = createDelimiterMap();
+    const brackets = createBracketsMap();
+
+    export function createPrinter(writer: EmitTextWriter, compilerOptions: CompilerOptions, printerOptions: PrinterOptions = {}): Printer {
+        const languageVersion = getEmitScriptTarget(compilerOptions);
+        const moduleKind = getEmitModuleKind(compilerOptions);
+        const {
+            hasGlobalName,
+            onEmitSourceMapOfNode,
+            onEmitSourceMapOfToken,
+            onEmitCommentsOfNode,
+            onEmitDetachedCommentsOfNode,
+            onEmitTrailingCommentsOfPosition,
+            onEmitNode,
+            onEmitHelpers,
+            onSetSourceFile,
+            onSubstituteNode,
+        } = printerOptions;
+        const {
+            write,
+            writeLine,
+            increaseIndent,
+            decreaseIndent
+        } = writer;
+
+        let currentSourceFile: SourceFile;
+        let nodeIdToGeneratedName: string[]; // Map of generated names for specific nodes.
+        let autoGeneratedIdToGeneratedName: string[]; // Map of generated names for temp and loop variables.
+        let generatedNames: Map<string>; // Set of names generated by the NameGenerator.
+        let tempFlagsStack: TempFlags[]; // Stack of enclosing name generation scopes.
+        let tempFlags: TempFlags; // TempFlags for the current name generation scope.
+
+        return {
+            printNode,
+            printFile,
+            printBundle
+        };
+
+        function printNode(hint: EmitHint, node: Node, sourceFile: SourceFile) {
+            print(hint, node, sourceFile);
+            resetGeneratedNames();
+        }
+
+        function printBundle(bundle: Bundle) {
+            if (moduleKind) {
+                emitHelpersIndirect(bundle);
+            }
+            for (const sourceFile of bundle.sourceFiles) {
+                print(EmitHint.SourceFile, sourceFile, sourceFile);
+            }
+            resetGeneratedNames();
+        }
+
+        function printFile(sourceFile: SourceFile) {
+            print(EmitHint.SourceFile, sourceFile, sourceFile);
+            resetGeneratedNames();
+        }
+
+        function print(hint: EmitHint, node: Node, sourceFile: SourceFile) {
+            setSourceFile(sourceFile);
+            pipelineEmitWithNotification(hint, node);
+        }
+
+        function setSourceFile(sourceFile: SourceFile) {
+            currentSourceFile = sourceFile;
+
+            if (onSetSourceFile) {
+                onSetSourceFile(sourceFile);
+            }
+        }
+
+        function emit(node: Node, hint = EmitHint.Unspecified) {
+            pipelineEmitWithNotification(hint, node);
+        }
+
+        function emitIdentifierName(node: Identifier) {
+            pipelineEmitWithNotification(EmitHint.IdentifierName, node);
+        }
+
+        function emitExpression(node: Expression) {
+            pipelineEmitWithNotification(EmitHint.Expression, node);
+        }
+
+        function pipelineEmitWithNotification(hint: EmitHint, node: Node) {
+            if (onEmitNode) {
+                onEmitNode(hint, node, pipelineEmitWithComments);
+            }
+            else {
+                pipelineEmitWithComments(hint, node);
+            }
+        }
+
+        function pipelineEmitWithComments(hint: EmitHint, node: Node) {
+            if (onEmitCommentsOfNode && hint !== EmitHint.SourceFile) {
+                onEmitCommentsOfNode(hint, node, pipelineEmitWithSourceMap);
+            }
+            else {
+                pipelineEmitWithSourceMap(hint, node);
+            }
+        }
+
+        function pipelineEmitWithSourceMap(hint: EmitHint, node: Node) {
+            if (onEmitSourceMapOfNode && hint !== EmitHint.SourceFile && hint !== EmitHint.IdentifierName) {
+                onEmitSourceMapOfNode(hint, node, pipelineEmitWithSubstitution);
+            }
+            else {
+                pipelineEmitWithSubstitution(hint, node);
+            }
+        }
+
+        function pipelineEmitWithSubstitution(hint: EmitHint, node: Node) {
+            if (onSubstituteNode) {
+                onSubstituteNode(hint, node, pipelineEmitWithHint);
+            }
+            else {
+                pipelineEmitWithHint(hint, node);
+            }
+        }
+
+        function pipelineEmitWithHint(hint: EmitHint, node: Node): void {
+            switch (hint) {
+                case EmitHint.SourceFile: return pipelineEmitSourceFile(node);
+                case EmitHint.IdentifierName: return pipelineEmitIdentifierName(node);
+                case EmitHint.Expression: return pipelineEmitExpression(node);
+                case EmitHint.Unspecified: return pipelineEmitUnspecified(node);
+            }
+        }
+
+        function pipelineEmitSourceFile(node: Node): void {
+            Debug.assertNode(node, isSourceFile);
+            emitSourceFile(<SourceFile>node);
+        }
+
+        function pipelineEmitIdentifierName(node: Node): void {
+            Debug.assertNode(node, isIdentifier);
+            emitIdentifier(<Identifier>node);
+        }
+
+        function pipelineEmitUnspecified(node: Node): void {
+            const kind = node.kind;
+            switch (kind) {
+                // Pseudo-literals
+                case SyntaxKind.TemplateHead:
+                case SyntaxKind.TemplateMiddle:
+                case SyntaxKind.TemplateTail:
+                    return emitLiteral(<LiteralExpression>node);
+
+                // Identifiers
+                case SyntaxKind.Identifier:
+                    return emitIdentifier(<Identifier>node);
+
+                // Reserved words
+                case SyntaxKind.ConstKeyword:
+                case SyntaxKind.DefaultKeyword:
+                case SyntaxKind.ExportKeyword:
+                case SyntaxKind.VoidKeyword:
+
+                // Strict mode reserved words
+                case SyntaxKind.PrivateKeyword:
+                case SyntaxKind.ProtectedKeyword:
+                case SyntaxKind.PublicKeyword:
+                case SyntaxKind.StaticKeyword:
+
+                // Contextual keywords
+                case SyntaxKind.AbstractKeyword:
+                case SyntaxKind.AsKeyword:
+                case SyntaxKind.AnyKeyword:
+                case SyntaxKind.AsyncKeyword:
+                case SyntaxKind.AwaitKeyword:
+                case SyntaxKind.BooleanKeyword:
+                case SyntaxKind.ConstructorKeyword:
+                case SyntaxKind.DeclareKeyword:
+                case SyntaxKind.GetKeyword:
+                case SyntaxKind.IsKeyword:
+                case SyntaxKind.ModuleKeyword:
+                case SyntaxKind.NamespaceKeyword:
+                case SyntaxKind.NeverKeyword:
+                case SyntaxKind.ReadonlyKeyword:
+                case SyntaxKind.RequireKeyword:
+                case SyntaxKind.NumberKeyword:
+                case SyntaxKind.SetKeyword:
+                case SyntaxKind.StringKeyword:
+                case SyntaxKind.SymbolKeyword:
+                case SyntaxKind.TypeKeyword:
+                case SyntaxKind.UndefinedKeyword:
+                case SyntaxKind.FromKeyword:
+                case SyntaxKind.GlobalKeyword:
+                case SyntaxKind.OfKeyword:
+                    writeTokenText(kind);
+                    return;
+
+                // Parse tree nodes
+
+                // Names
+                case SyntaxKind.QualifiedName:
+                    return emitQualifiedName(<QualifiedName>node);
+                case SyntaxKind.ComputedPropertyName:
+                    return emitComputedPropertyName(<ComputedPropertyName>node);
+
+                // Signature elements
+                case SyntaxKind.TypeParameter:
+                    return emitTypeParameter(<TypeParameterDeclaration>node);
+                case SyntaxKind.Parameter:
+                    return emitParameter(<ParameterDeclaration>node);
+                case SyntaxKind.Decorator:
+                    return emitDecorator(<Decorator>node);
+
+                // Type members
+                case SyntaxKind.PropertySignature:
+                    return emitPropertySignature(<PropertySignature>node);
+                case SyntaxKind.PropertyDeclaration:
+                    return emitPropertyDeclaration(<PropertyDeclaration>node);
+                case SyntaxKind.MethodSignature:
+                    return emitMethodSignature(<MethodSignature>node);
+                case SyntaxKind.MethodDeclaration:
+                    return emitMethodDeclaration(<MethodDeclaration>node);
+                case SyntaxKind.Constructor:
+                    return emitConstructor(<ConstructorDeclaration>node);
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    return emitAccessorDeclaration(<AccessorDeclaration>node);
+                case SyntaxKind.CallSignature:
+                    return emitCallSignature(<CallSignatureDeclaration>node);
+                case SyntaxKind.ConstructSignature:
+                    return emitConstructSignature(<ConstructSignatureDeclaration>node);
+                case SyntaxKind.IndexSignature:
+                    return emitIndexSignature(<IndexSignatureDeclaration>node);
+
+                // Types
+                case SyntaxKind.TypePredicate:
+                    return emitTypePredicate(<TypePredicateNode>node);
+                case SyntaxKind.TypeReference:
+                    return emitTypeReference(<TypeReferenceNode>node);
+                case SyntaxKind.FunctionType:
+                    return emitFunctionType(<FunctionTypeNode>node);
+                case SyntaxKind.ConstructorType:
+                    return emitConstructorType(<ConstructorTypeNode>node);
+                case SyntaxKind.TypeQuery:
+                    return emitTypeQuery(<TypeQueryNode>node);
+                case SyntaxKind.TypeLiteral:
+                    return emitTypeLiteral(<TypeLiteralNode>node);
+                case SyntaxKind.ArrayType:
+                    return emitArrayType(<ArrayTypeNode>node);
+                case SyntaxKind.TupleType:
+                    return emitTupleType(<TupleTypeNode>node);
+                case SyntaxKind.UnionType:
+                    return emitUnionType(<UnionTypeNode>node);
+                case SyntaxKind.IntersectionType:
+                    return emitIntersectionType(<IntersectionTypeNode>node);
+                case SyntaxKind.ParenthesizedType:
+                    return emitParenthesizedType(<ParenthesizedTypeNode>node);
+                case SyntaxKind.ExpressionWithTypeArguments:
+                    return emitExpressionWithTypeArguments(<ExpressionWithTypeArguments>node);
+                case SyntaxKind.ThisType:
+                    return emitThisType();
+                case SyntaxKind.TypeOperator:
+                    return emitTypeOperator(<TypeOperatorNode>node);
+                case SyntaxKind.IndexedAccessType:
+                    return emitIndexedAccessType(<IndexedAccessTypeNode>node);
+                case SyntaxKind.MappedType:
+                    return emitMappedType(<MappedTypeNode>node);
+                case SyntaxKind.LiteralType:
+                    return emitLiteralType(<LiteralTypeNode>node);
+
+                // Binding patterns
+                case SyntaxKind.ObjectBindingPattern:
+                    return emitObjectBindingPattern(<ObjectBindingPattern>node);
+                case SyntaxKind.ArrayBindingPattern:
+                    return emitArrayBindingPattern(<ArrayBindingPattern>node);
+                case SyntaxKind.BindingElement:
+                    return emitBindingElement(<BindingElement>node);
+
+                // Misc
+                case SyntaxKind.TemplateSpan:
+                    return emitTemplateSpan(<TemplateSpan>node);
+                case SyntaxKind.SemicolonClassElement:
+                    return emitSemicolonClassElement();
+
+                // Statements
+                case SyntaxKind.Block:
+                    return emitBlock(<Block>node);
+                case SyntaxKind.VariableStatement:
+                    return emitVariableStatement(<VariableStatement>node);
+                case SyntaxKind.EmptyStatement:
+                    return emitEmptyStatement();
+                case SyntaxKind.ExpressionStatement:
+                    return emitExpressionStatement(<ExpressionStatement>node);
+                case SyntaxKind.IfStatement:
+                    return emitIfStatement(<IfStatement>node);
+                case SyntaxKind.DoStatement:
+                    return emitDoStatement(<DoStatement>node);
+                case SyntaxKind.WhileStatement:
+                    return emitWhileStatement(<WhileStatement>node);
+                case SyntaxKind.ForStatement:
+                    return emitForStatement(<ForStatement>node);
+                case SyntaxKind.ForInStatement:
+                    return emitForInStatement(<ForInStatement>node);
+                case SyntaxKind.ForOfStatement:
+                    return emitForOfStatement(<ForOfStatement>node);
+                case SyntaxKind.ContinueStatement:
+                    return emitContinueStatement(<ContinueStatement>node);
+                case SyntaxKind.BreakStatement:
+                    return emitBreakStatement(<BreakStatement>node);
+                case SyntaxKind.ReturnStatement:
+                    return emitReturnStatement(<ReturnStatement>node);
+                case SyntaxKind.WithStatement:
+                    return emitWithStatement(<WithStatement>node);
+                case SyntaxKind.SwitchStatement:
+                    return emitSwitchStatement(<SwitchStatement>node);
+                case SyntaxKind.LabeledStatement:
+                    return emitLabeledStatement(<LabeledStatement>node);
+                case SyntaxKind.ThrowStatement:
+                    return emitThrowStatement(<ThrowStatement>node);
+                case SyntaxKind.TryStatement:
+                    return emitTryStatement(<TryStatement>node);
+                case SyntaxKind.DebuggerStatement:
+                    return emitDebuggerStatement(<DebuggerStatement>node);
+
+                // Declarations
+                case SyntaxKind.VariableDeclaration:
+                    return emitVariableDeclaration(<VariableDeclaration>node);
+                case SyntaxKind.VariableDeclarationList:
+                    return emitVariableDeclarationList(<VariableDeclarationList>node);
+                case SyntaxKind.FunctionDeclaration:
+                    return emitFunctionDeclaration(<FunctionDeclaration>node);
+                case SyntaxKind.ClassDeclaration:
+                    return emitClassDeclaration(<ClassDeclaration>node);
+                case SyntaxKind.InterfaceDeclaration:
+                    return emitInterfaceDeclaration(<InterfaceDeclaration>node);
+                case SyntaxKind.TypeAliasDeclaration:
+                    return emitTypeAliasDeclaration(<TypeAliasDeclaration>node);
+                case SyntaxKind.EnumDeclaration:
+                    return emitEnumDeclaration(<EnumDeclaration>node);
+                case SyntaxKind.ModuleDeclaration:
+                    return emitModuleDeclaration(<ModuleDeclaration>node);
+                case SyntaxKind.ModuleBlock:
+                    return emitModuleBlock(<ModuleBlock>node);
+                case SyntaxKind.CaseBlock:
+                    return emitCaseBlock(<CaseBlock>node);
+                case SyntaxKind.ImportEqualsDeclaration:
+                    return emitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
+                case SyntaxKind.ImportDeclaration:
+                    return emitImportDeclaration(<ImportDeclaration>node);
+                case SyntaxKind.ImportClause:
+                    return emitImportClause(<ImportClause>node);
+                case SyntaxKind.NamespaceImport:
+                    return emitNamespaceImport(<NamespaceImport>node);
+                case SyntaxKind.NamedImports:
+                    return emitNamedImports(<NamedImports>node);
+                case SyntaxKind.ImportSpecifier:
+                    return emitImportSpecifier(<ImportSpecifier>node);
+                case SyntaxKind.ExportAssignment:
+                    return emitExportAssignment(<ExportAssignment>node);
+                case SyntaxKind.ExportDeclaration:
+                    return emitExportDeclaration(<ExportDeclaration>node);
+                case SyntaxKind.NamedExports:
+                    return emitNamedExports(<NamedExports>node);
+                case SyntaxKind.ExportSpecifier:
+                    return emitExportSpecifier(<ExportSpecifier>node);
+                case SyntaxKind.MissingDeclaration:
+                    return;
+
+                // Module references
+                case SyntaxKind.ExternalModuleReference:
+                    return emitExternalModuleReference(<ExternalModuleReference>node);
+
+                // JSX (non-expression)
+                case SyntaxKind.JsxText:
+                    return emitJsxText(<JsxText>node);
+                case SyntaxKind.JsxOpeningElement:
+                    return emitJsxOpeningElement(<JsxOpeningElement>node);
+                case SyntaxKind.JsxClosingElement:
+                    return emitJsxClosingElement(<JsxClosingElement>node);
+                case SyntaxKind.JsxAttribute:
+                    return emitJsxAttribute(<JsxAttribute>node);
+                case SyntaxKind.JsxSpreadAttribute:
+                    return emitJsxSpreadAttribute(<JsxSpreadAttribute>node);
+                case SyntaxKind.JsxExpression:
+                    return emitJsxExpression(<JsxExpression>node);
+
+                // Clauses
+                case SyntaxKind.CaseClause:
+                    return emitCaseClause(<CaseClause>node);
+                case SyntaxKind.DefaultClause:
+                    return emitDefaultClause(<DefaultClause>node);
+                case SyntaxKind.HeritageClause:
+                    return emitHeritageClause(<HeritageClause>node);
+                case SyntaxKind.CatchClause:
+                    return emitCatchClause(<CatchClause>node);
+
+                // Property assignments
+                case SyntaxKind.PropertyAssignment:
+                    return emitPropertyAssignment(<PropertyAssignment>node);
+                case SyntaxKind.ShorthandPropertyAssignment:
+                    return emitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
+                case SyntaxKind.SpreadAssignment:
+                    return emitSpreadAssignment(node as SpreadAssignment);
+
+                // Enum
+                case SyntaxKind.EnumMember:
+                    return emitEnumMember(<EnumMember>node);
+
+                // JSDoc nodes (ignored)
+                // Transformation nodes (ignored)
+            }
+
+            // If the node is an expression, try to emit it as an expression with
+            // substitution.
+            if (isExpression(node)) {
+                return pipelineEmitWithSubstitution(EmitHint.Expression, node);
+            }
+        }
+
+        function pipelineEmitExpression(node: Node): void {
+            const kind = node.kind;
+            switch (kind) {
+                // Literals
+                case SyntaxKind.NumericLiteral:
+                    return emitNumericLiteral(<NumericLiteral>node);
+
+                case SyntaxKind.StringLiteral:
+                case SyntaxKind.RegularExpressionLiteral:
+                case SyntaxKind.NoSubstitutionTemplateLiteral:
+                    return emitLiteral(<LiteralExpression>node);
+
+                // Identifiers
+                case SyntaxKind.Identifier:
+                    return emitIdentifier(<Identifier>node);
+
+                // Reserved words
+                case SyntaxKind.FalseKeyword:
+                case SyntaxKind.NullKeyword:
+                case SyntaxKind.SuperKeyword:
+                case SyntaxKind.TrueKeyword:
+                case SyntaxKind.ThisKeyword:
+                    writeTokenText(kind);
+                    return;
+
+                // Expressions
+                case SyntaxKind.ArrayLiteralExpression:
+                    return emitArrayLiteralExpression(<ArrayLiteralExpression>node);
+                case SyntaxKind.ObjectLiteralExpression:
+                    return emitObjectLiteralExpression(<ObjectLiteralExpression>node);
+                case SyntaxKind.PropertyAccessExpression:
+                    return emitPropertyAccessExpression(<PropertyAccessExpression>node);
+                case SyntaxKind.ElementAccessExpression:
+                    return emitElementAccessExpression(<ElementAccessExpression>node);
+                case SyntaxKind.CallExpression:
+                    return emitCallExpression(<CallExpression>node);
+                case SyntaxKind.NewExpression:
+                    return emitNewExpression(<NewExpression>node);
+                case SyntaxKind.TaggedTemplateExpression:
+                    return emitTaggedTemplateExpression(<TaggedTemplateExpression>node);
+                case SyntaxKind.TypeAssertionExpression:
+                    return emitTypeAssertionExpression(<TypeAssertion>node);
+                case SyntaxKind.ParenthesizedExpression:
+                    return emitParenthesizedExpression(<ParenthesizedExpression>node);
+                case SyntaxKind.FunctionExpression:
+                    return emitFunctionExpression(<FunctionExpression>node);
+                case SyntaxKind.ArrowFunction:
+                    return emitArrowFunction(<ArrowFunction>node);
+                case SyntaxKind.DeleteExpression:
+                    return emitDeleteExpression(<DeleteExpression>node);
+                case SyntaxKind.TypeOfExpression:
+                    return emitTypeOfExpression(<TypeOfExpression>node);
+                case SyntaxKind.VoidExpression:
+                    return emitVoidExpression(<VoidExpression>node);
+                case SyntaxKind.AwaitExpression:
+                    return emitAwaitExpression(<AwaitExpression>node);
+                case SyntaxKind.PrefixUnaryExpression:
+                    return emitPrefixUnaryExpression(<PrefixUnaryExpression>node);
+                case SyntaxKind.PostfixUnaryExpression:
+                    return emitPostfixUnaryExpression(<PostfixUnaryExpression>node);
+                case SyntaxKind.BinaryExpression:
+                    return emitBinaryExpression(<BinaryExpression>node);
+                case SyntaxKind.ConditionalExpression:
+                    return emitConditionalExpression(<ConditionalExpression>node);
+                case SyntaxKind.TemplateExpression:
+                    return emitTemplateExpression(<TemplateExpression>node);
+                case SyntaxKind.YieldExpression:
+                    return emitYieldExpression(<YieldExpression>node);
+                case SyntaxKind.SpreadElement:
+                    return emitSpreadExpression(<SpreadElement>node);
+                case SyntaxKind.ClassExpression:
+                    return emitClassExpression(<ClassExpression>node);
+                case SyntaxKind.OmittedExpression:
+                    return;
+                case SyntaxKind.AsExpression:
+                    return emitAsExpression(<AsExpression>node);
+                case SyntaxKind.NonNullExpression:
+                    return emitNonNullExpression(<NonNullExpression>node);
+                case SyntaxKind.MetaProperty:
+                    return emitMetaProperty(<MetaProperty>node);
+
+                // JSX
+                case SyntaxKind.JsxElement:
+                    return emitJsxElement(<JsxElement>node);
+                case SyntaxKind.JsxSelfClosingElement:
+                    return emitJsxSelfClosingElement(<JsxSelfClosingElement>node);
+
+                // Transformation nodes
+                case SyntaxKind.PartiallyEmittedExpression:
+                    return emitPartiallyEmittedExpression(<PartiallyEmittedExpression>node);
+            }
+        }
+
+        function emitBodyIndirect(node: Node, elements: NodeArray<Node>, emitCallback: (node: Node) => void): void {
+            if (onEmitDetachedCommentsOfNode) {
+                onEmitDetachedCommentsOfNode(node, elements, emitCallback);
+            }
+            else {
+                emitCallback(node);
+            }
+        }
+
+        function emitHelpersIndirect(node: Node) {
+            if (onEmitHelpers) {
+                onEmitHelpers(node, writeLines);
+            }
+        }
+
+        //
+        // Literals/Pseudo-literals
+        //
+
+        // SyntaxKind.NumericLiteral
+        function emitNumericLiteral(node: NumericLiteral) {
+            emitLiteral(node);
+            if (node.trailingComment) {
+                write(` /*${node.trailingComment}*/`);
+            }
+        }
+
+        // SyntaxKind.StringLiteral
+        // SyntaxKind.RegularExpressionLiteral
+        // SyntaxKind.NoSubstitutionTemplateLiteral
+        // SyntaxKind.TemplateHead
+        // SyntaxKind.TemplateMiddle
+        // SyntaxKind.TemplateTail
+        function emitLiteral(node: LiteralLikeNode) {
+            const text = getLiteralTextOfNode(node);
+            if ((compilerOptions.sourceMap || compilerOptions.inlineSourceMap)
+                && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
+                writer.writeLiteral(text);
+            }
+            else {
+                write(text);
+            }
+        }
+
+        //
+        // Identifiers
+        //
+
+        function emitIdentifier(node: Identifier) {
+            write(getTextOfNode(node, /*includeTrivia*/ false));
+        }
+
+        //
+        // Names
+        //
+
+        function emitQualifiedName(node: QualifiedName) {
+            emitEntityName(node.left);
+            write(".");
+            emit(node.right);
+        }
+
+        function emitEntityName(node: EntityName) {
+            if (node.kind === SyntaxKind.Identifier) {
+                emitExpression(<Identifier>node);
+            }
+            else {
+                emit(node);
+            }
+        }
+
+        function emitComputedPropertyName(node: ComputedPropertyName) {
+            write("[");
+            emitExpression(node.expression);
+            write("]");
+        }
+
+        //
+        // Signature elements
+        //
+
+        function emitTypeParameter(node: TypeParameterDeclaration) {
+            emit(node.name);
+            emitWithPrefix(" extends ", node.constraint);
+        }
+
+        function emitParameter(node: ParameterDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeIfPresent(node.dotDotDotToken, "...");
+            emit(node.name);
+            writeIfPresent(node.questionToken, "?");
+            emitExpressionWithPrefix(" = ", node.initializer);
+            emitWithPrefix(": ", node.type);
+        }
+
+        function emitDecorator(decorator: Decorator) {
+            write("@");
+            emitExpression(decorator.expression);
+        }
+
+        //
+        // Type members
+        //
+
+        function emitPropertySignature(node: PropertySignature) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            writeIfPresent(node.questionToken, "?");
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitPropertyDeclaration(node: PropertyDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            emitWithPrefix(": ", node.type);
+            emitExpressionWithPrefix(" = ", node.initializer);
+            write(";");
+        }
+
+        function emitMethodSignature(node: MethodSignature) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            writeIfPresent(node.questionToken, "?");
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitMethodDeclaration(node: MethodDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeIfPresent(node.asteriskToken, "*");
+            emit(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitConstructor(node: ConstructorDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("constructor");
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitAccessorDeclaration(node: AccessorDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write(node.kind === SyntaxKind.GetAccessor ? "get " : "set ");
+            emit(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitCallSignature(node: CallSignatureDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitConstructSignature(node: ConstructSignatureDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("new ");
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitIndexSignature(node: IndexSignatureDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitParametersForIndexSignature(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitSemicolonClassElement() {
+            write(";");
+        }
+
+        //
+        // Types
+        //
+
+        function emitTypePredicate(node: TypePredicateNode) {
+            emit(node.parameterName);
+            write(" is ");
+            emit(node.type);
+        }
+
+        function emitTypeReference(node: TypeReferenceNode) {
+            emit(node.typeName);
+            emitTypeArguments(node, node.typeArguments);
+        }
+
+        function emitFunctionType(node: FunctionTypeNode) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            write(" => ");
+            emit(node.type);
+        }
+
+        function emitConstructorType(node: ConstructorTypeNode) {
+            write("new ");
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            write(" => ");
+            emit(node.type);
+        }
+
+        function emitTypeQuery(node: TypeQueryNode) {
+            write("typeof ");
+            emit(node.exprName);
+        }
+
+        function emitTypeLiteral(node: TypeLiteralNode) {
+            write("{");
+            emitList(node, node.members, ListFormat.TypeLiteralMembers);
+            write("}");
+        }
+
+        function emitArrayType(node: ArrayTypeNode) {
+            emit(node.elementType);
+            write("[]");
+        }
+
+        function emitTupleType(node: TupleTypeNode) {
+            write("[");
+            emitList(node, node.elementTypes, ListFormat.TupleTypeElements);
+            write("]");
+        }
+
+        function emitUnionType(node: UnionTypeNode) {
+            emitList(node, node.types, ListFormat.UnionTypeConstituents);
+        }
+
+        function emitIntersectionType(node: IntersectionTypeNode) {
+            emitList(node, node.types, ListFormat.IntersectionTypeConstituents);
+        }
+
+        function emitParenthesizedType(node: ParenthesizedTypeNode) {
+            write("(");
+            emit(node.type);
+            write(")");
+        }
+
+        function emitThisType() {
+            write("this");
+        }
+
+        function emitTypeOperator(node: TypeOperatorNode) {
+            writeTokenText(node.operator);
+            write(" ");
+            emit(node.type);
+        }
+
+        function emitIndexedAccessType(node: IndexedAccessTypeNode) {
+            emit(node.objectType);
+            write("[");
+            emit(node.indexType);
+            write("]");
+        }
+
+        function emitMappedType(node: MappedTypeNode) {
+            write("{");
+            writeLine();
+            increaseIndent();
+            writeIfPresent(node.readonlyToken, "readonly ");
+            write("[");
+            emit(node.typeParameter.name);
+            write(" in ");
+            emit(node.typeParameter.constraint);
+            write("]");
+            writeIfPresent(node.questionToken, "?");
+            write(": ");
+            emit(node.type);
+            write(";");
+            writeLine();
+            decreaseIndent();
+            write("}");
+        }
+
+        function emitLiteralType(node: LiteralTypeNode) {
+            emitExpression(node.literal);
+        }
+
+        //
+        // Binding patterns
+        //
+
+        function emitObjectBindingPattern(node: ObjectBindingPattern) {
+            const elements = node.elements;
+            if (elements.length === 0) {
+                write("{}");
+            }
+            else {
+                write("{");
+                emitList(node, elements, ListFormat.ObjectBindingPatternElements);
+                write("}");
+            }
+        }
+
+        function emitArrayBindingPattern(node: ArrayBindingPattern) {
+            const elements = node.elements;
+            if (elements.length === 0) {
+                write("[]");
+            }
+            else {
+                write("[");
+                emitList(node, node.elements, ListFormat.ArrayBindingPatternElements);
+                write("]");
+            }
+        }
+
+        function emitBindingElement(node: BindingElement) {
+            emitWithSuffix(node.propertyName, ": ");
+            writeIfPresent(node.dotDotDotToken, "...");
+            emit(node.name);
+            emitExpressionWithPrefix(" = ", node.initializer);
+        }
+
+        //
+        // Expressions
+        //
+
+        function emitArrayLiteralExpression(node: ArrayLiteralExpression) {
+            const elements = node.elements;
+            if (elements.length === 0) {
+                write("[]");
+            }
+            else {
+                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
+                emitExpressionList(node, elements, ListFormat.ArrayLiteralExpressionElements | preferNewLine);
+            }
+        }
+
+        function emitObjectLiteralExpression(node: ObjectLiteralExpression) {
+            const properties = node.properties;
+            if (properties.length === 0) {
+                write("{}");
+            }
+            else {
+                const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
+                if (indentedFlag) {
+                    increaseIndent();
+                }
+
+                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
+                const allowTrailingComma = languageVersion >= ScriptTarget.ES5 ? ListFormat.AllowTrailingComma : ListFormat.None;
+                emitList(node, properties, ListFormat.ObjectLiteralExpressionProperties | allowTrailingComma | preferNewLine);
+
+                if (indentedFlag) {
+                    decreaseIndent();
+                }
+            }
+        }
+
+        function emitPropertyAccessExpression(node: PropertyAccessExpression) {
+            let indentBeforeDot = false;
+            let indentAfterDot = false;
+            if (!(getEmitFlags(node) & EmitFlags.NoIndentation)) {
+                const dotRangeStart = node.expression.end;
+                const dotRangeEnd = skipTrivia(currentSourceFile.text, node.expression.end) + 1;
+                const dotToken = <Node>{ kind: SyntaxKind.DotToken, pos: dotRangeStart, end: dotRangeEnd };
+                indentBeforeDot = needsIndentation(node, node.expression, dotToken);
+                indentAfterDot = needsIndentation(node, dotToken, node.name);
+            }
+
+            emitExpression(node.expression);
+            increaseIndentIf(indentBeforeDot);
+
+            const shouldEmitDotDot = !indentBeforeDot && needsDotDotForPropertyAccess(node.expression);
+            write(shouldEmitDotDot ? ".." : ".");
+
+            increaseIndentIf(indentAfterDot);
+            emit(node.name);
+            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+        }
+
+        // 1..toString is a valid property access, emit a dot after the literal
+        // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
+        function needsDotDotForPropertyAccess(expression: Expression) {
+            if (expression.kind === SyntaxKind.NumericLiteral) {
+                // check if numeric literal is a decimal literal that was originally written with a dot
+                const text = getLiteralTextOfNode(<LiteralExpression>expression);
+                return getNumericLiteralFlags(text, /*hint*/ NumericLiteralFlags.All) === NumericLiteralFlags.None
+                    && !(<LiteralExpression>expression).isOctalLiteral
+                    && text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
+            }
+            else if (isPropertyAccessExpression(expression) || isElementAccessExpression(expression)) {
+                // check if constant enum value is integer
+                const constantValue = getConstantValue(expression);
+                // isFinite handles cases when constantValue is undefined
+                return isFinite(constantValue)
+                    && Math.floor(constantValue) === constantValue
+                    && compilerOptions.removeComments;
+            }
+        }
+
+        function emitElementAccessExpression(node: ElementAccessExpression) {
+            emitExpression(node.expression);
+            write("[");
+            emitExpression(node.argumentExpression);
+            write("]");
+        }
+
+        function emitCallExpression(node: CallExpression) {
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+            emitExpressionList(node, node.arguments, ListFormat.CallExpressionArguments);
+        }
+
+        function emitNewExpression(node: NewExpression) {
+            write("new ");
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+            emitExpressionList(node, node.arguments, ListFormat.NewExpressionArguments);
+        }
+
+        function emitTaggedTemplateExpression(node: TaggedTemplateExpression) {
+            emitExpression(node.tag);
+            write(" ");
+            emitExpression(node.template);
+        }
+
+        function emitTypeAssertionExpression(node: TypeAssertion) {
+            write("<");
+            emit(node.type);
+            write(">");
+            emitExpression(node.expression);
+        }
+
+        function emitParenthesizedExpression(node: ParenthesizedExpression) {
+            write("(");
+            emitExpression(node.expression);
+            write(")");
+        }
+
+        function emitFunctionExpression(node: FunctionExpression) {
+            emitFunctionDeclarationOrExpression(node);
+        }
+
+        function emitArrowFunction(node: ArrowFunction) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitSignatureAndBody(node, emitArrowFunctionHead);
+        }
+
+        function emitArrowFunctionHead(node: ArrowFunction) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(" =>");
+        }
+
+        function emitDeleteExpression(node: DeleteExpression) {
+            write("delete ");
+            emitExpression(node.expression);
+        }
+
+        function emitTypeOfExpression(node: TypeOfExpression) {
+            write("typeof ");
+            emitExpression(node.expression);
+        }
+
+        function emitVoidExpression(node: VoidExpression) {
+            write("void ");
+            emitExpression(node.expression);
+        }
+
+        function emitAwaitExpression(node: AwaitExpression) {
+            write("await ");
+            emitExpression(node.expression);
+        }
+
+        function emitPrefixUnaryExpression(node: PrefixUnaryExpression) {
+            writeTokenText(node.operator);
+            if (shouldEmitWhitespaceBeforeOperand(node)) {
+                write(" ");
+            }
+            emitExpression(node.operand);
+        }
+
+        function shouldEmitWhitespaceBeforeOperand(node: PrefixUnaryExpression) {
+            // In some cases, we need to emit a space between the operator and the operand. One obvious case
+            // is when the operator is an identifier, like delete or typeof. We also need to do this for plus
+            // and minus expressions in certain cases. Specifically, consider the following two cases (parens
+            // are just for clarity of exposition, and not part of the source code):
+            //
+            //  (+(+1))
+            //  (+(++1))
+            //
+            // We need to emit a space in both cases. In the first case, the absence of a space will make
+            // the resulting expression a prefix increment operation. And in the second, it will make the resulting
+            // expression a prefix increment whose operand is a plus expression - (++(+x))
+            // The same is true of minus of course.
+            const operand = node.operand;
+            return operand.kind === SyntaxKind.PrefixUnaryExpression
+                && ((node.operator === SyntaxKind.PlusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusPlusToken))
+                || (node.operator === SyntaxKind.MinusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusMinusToken)));
+        }
+
+        function emitPostfixUnaryExpression(node: PostfixUnaryExpression) {
+            emitExpression(node.operand);
+            writeTokenText(node.operator);
+        }
+
+        function emitBinaryExpression(node: BinaryExpression) {
+            const isCommaOperator = node.operatorToken.kind !== SyntaxKind.CommaToken;
+            const indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
+            const indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
+
+            emitExpression(node.left);
+            increaseIndentIf(indentBeforeOperator, isCommaOperator ? " " : undefined);
+            writeTokenText(node.operatorToken.kind);
+            increaseIndentIf(indentAfterOperator, " ");
+            emitExpression(node.right);
+            decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+        }
+
+        function emitConditionalExpression(node: ConditionalExpression) {
+            const indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
+            const indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
+            const indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
+            const indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+
+            emitExpression(node.condition);
+            increaseIndentIf(indentBeforeQuestion, " ");
+            write("?");
+            increaseIndentIf(indentAfterQuestion, " ");
+            emitExpression(node.whenTrue);
+            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
+
+            increaseIndentIf(indentBeforeColon, " ");
+            write(":");
+            increaseIndentIf(indentAfterColon, " ");
+            emitExpression(node.whenFalse);
+            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+        }
+
+        function emitTemplateExpression(node: TemplateExpression) {
+            emit(node.head);
+            emitList(node, node.templateSpans, ListFormat.TemplateExpressionSpans);
+        }
+
+        function emitYieldExpression(node: YieldExpression) {
+            write(node.asteriskToken ? "yield*" : "yield");
+            emitExpressionWithPrefix(" ", node.expression);
+        }
+
+        function emitSpreadExpression(node: SpreadElement) {
+            write("...");
+            emitExpression(node.expression);
+        }
+
+        function emitClassExpression(node: ClassExpression) {
+            emitClassDeclarationOrExpression(node);
+        }
+
+        function emitExpressionWithTypeArguments(node: ExpressionWithTypeArguments) {
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+        }
+
+        function emitAsExpression(node: AsExpression) {
+            emitExpression(node.expression);
+            if (node.type) {
+                write(" as ");
+                emit(node.type);
+            }
+        }
+
+        function emitNonNullExpression(node: NonNullExpression) {
+            emitExpression(node.expression);
+            write("!");
+        }
+
+        function emitMetaProperty(node: MetaProperty) {
+            writeToken(node.keywordToken, node.pos);
+            write(".");
+            emit(node.name);
+        }
+
+        //
+        // Misc
+        //
+
+        function emitTemplateSpan(node: TemplateSpan) {
+            emitExpression(node.expression);
+            emit(node.literal);
+        }
+
+        //
+        // Statements
+        //
+
+        function emitBlock(node: Block) {
+            if (isSingleLineEmptyBlock(node)) {
+                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
+                write(" ");
+                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
+            }
+            else {
+                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
+                emitBlockStatements(node);
+                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
+            }
+        }
+
+        function emitBlockStatements(node: BlockLike) {
+            if (getEmitFlags(node) & EmitFlags.SingleLine) {
+                emitList(node, node.statements, ListFormat.SingleLineBlockStatements);
+            }
+            else {
+                emitList(node, node.statements, ListFormat.MultiLineBlockStatements);
+            }
+        }
+
+        function emitVariableStatement(node: VariableStatement) {
+            emitModifiers(node, node.modifiers);
+            emit(node.declarationList);
+            write(";");
+        }
+
+        function emitEmptyStatement() {
+            write(";");
+        }
+
+        function emitExpressionStatement(node: ExpressionStatement) {
+            emitExpression(node.expression);
+            write(";");
+        }
+
+        function emitIfStatement(node: IfStatement) {
+            const openParenPos = writeToken(SyntaxKind.IfKeyword, node.pos, node);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos, node);
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end, node);
+            emitEmbeddedStatement(node, node.thenStatement);
+            if (node.elseStatement) {
+                writeLineOrSpace(node);
+                writeToken(SyntaxKind.ElseKeyword, node.thenStatement.end, node);
+                if (node.elseStatement.kind === SyntaxKind.IfStatement) {
+                    write(" ");
+                    emit(node.elseStatement);
+                }
+                else {
+                    emitEmbeddedStatement(node, node.elseStatement);
+                }
+            }
+        }
+
+        function emitDoStatement(node: DoStatement) {
+            write("do");
+            emitEmbeddedStatement(node, node.statement);
+            if (isBlock(node.statement)) {
+                write(" ");
+            }
+            else {
+                writeLineOrSpace(node);
+            }
+
+            write("while (");
+            emitExpression(node.expression);
+            write(");");
+        }
+
+        function emitWhileStatement(node: WhileStatement) {
+            write("while (");
+            emitExpression(node.expression);
+            write(")");
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitForStatement(node: ForStatement) {
+            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos, /*contextNode*/ node);
+            emitForBinding(node.initializer);
+            write(";");
+            emitExpressionWithPrefix(" ", node.condition);
+            write(";");
+            emitExpressionWithPrefix(" ", node.incrementor);
+            write(")");
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitForInStatement(node: ForInStatement) {
+            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emitForBinding(node.initializer);
+            write(" in ");
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitForOfStatement(node: ForOfStatement) {
+            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emitForBinding(node.initializer);
+            write(" of ");
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitForBinding(node: VariableDeclarationList | Expression) {
+            if (node !== undefined) {
+                if (node.kind === SyntaxKind.VariableDeclarationList) {
+                    emit(node);
+                }
+                else {
+                    emitExpression(<Expression>node);
+                }
+            }
+        }
+
+        function emitContinueStatement(node: ContinueStatement) {
+            writeToken(SyntaxKind.ContinueKeyword, node.pos);
+            emitWithPrefix(" ", node.label);
+            write(";");
+        }
+
+        function emitBreakStatement(node: BreakStatement) {
+            writeToken(SyntaxKind.BreakKeyword, node.pos);
+            emitWithPrefix(" ", node.label);
+            write(";");
+        }
+
+        function emitReturnStatement(node: ReturnStatement) {
+            writeToken(SyntaxKind.ReturnKeyword, node.pos, /*contextNode*/ node);
+            emitExpressionWithPrefix(" ", node.expression);
+            write(";");
+        }
+
+        function emitWithStatement(node: WithStatement) {
+            write("with (");
+            emitExpression(node.expression);
+            write(")");
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitSwitchStatement(node: SwitchStatement) {
+            const openParenPos = writeToken(SyntaxKind.SwitchKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+            write(" ");
+            emit(node.caseBlock);
+        }
+
+        function emitLabeledStatement(node: LabeledStatement) {
+            emit(node.label);
+            write(": ");
+            emit(node.statement);
+        }
+
+        function emitThrowStatement(node: ThrowStatement) {
+            write("throw");
+            emitExpressionWithPrefix(" ", node.expression);
+            write(";");
+        }
+
+        function emitTryStatement(node: TryStatement) {
+            write("try ");
+            emit(node.tryBlock);
+            if (node.catchClause) {
+                writeLineOrSpace(node);
+                emit(node.catchClause);
+            }
+            if (node.finallyBlock) {
+                writeLineOrSpace(node);
+                write("finally ");
+                emit(node.finallyBlock);
+            }
+        }
+
+        function emitDebuggerStatement(node: DebuggerStatement) {
+            writeToken(SyntaxKind.DebuggerKeyword, node.pos);
+            write(";");
+        }
+
+        //
+        // Declarations
+        //
+
+        function emitVariableDeclaration(node: VariableDeclaration) {
+            emit(node.name);
+            emitWithPrefix(": ", node.type);
+            emitExpressionWithPrefix(" = ", node.initializer);
+        }
+
+        function emitVariableDeclarationList(node: VariableDeclarationList) {
+            write(isLet(node) ? "let " : isConst(node) ? "const " : "var ");
+            emitList(node, node.declarations, ListFormat.VariableDeclarationList);
+        }
+
+        function emitFunctionDeclaration(node: FunctionDeclaration) {
+            emitFunctionDeclarationOrExpression(node);
+        }
+
+        function emitFunctionDeclarationOrExpression(node: FunctionDeclaration | FunctionExpression) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write(node.asteriskToken ? "function* " : "function ");
+            emitIdentifierName(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitSignatureAndBody(node: FunctionLikeDeclaration, emitSignatureHead: (node: SignatureDeclaration) => void) {
+            const body = node.body;
+            if (body) {
+                if (isBlock(body)) {
+                    const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
+                    if (indentedFlag) {
+                        increaseIndent();
+                    }
+
+                    if (getEmitFlags(node) & EmitFlags.ReuseTempVariableScope) {
+                        emitSignatureHead(node);
+                        emitBlockFunctionBody(body);
+                    }
+                    else {
+                        pushNameGenerationScope();
+                        emitSignatureHead(node);
+                        emitBlockFunctionBody(body);
+                        popNameGenerationScope();
+                    }
+
+                    if (indentedFlag) {
+                        decreaseIndent();
+                    }
+                }
+                else {
+                    emitSignatureHead(node);
+                    write(" ");
+                    emitExpression(body);
+                }
+            }
+            else {
+                emitSignatureHead(node);
+                write(";");
+            }
+
+        }
+
+        function emitSignatureHead(node: FunctionDeclaration | FunctionExpression | MethodDeclaration | AccessorDeclaration | ConstructorDeclaration) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+        }
+
+        function shouldEmitBlockFunctionBodyOnSingleLine(body: Block) {
+            // We must emit a function body as a single-line body in the following case:
+            // * The body has NodeEmitFlags.SingleLine specified.
+
+            // We must emit a function body as a multi-line body in the following cases:
+            // * The body is explicitly marked as multi-line.
+            // * A non-synthesized body's start and end position are on different lines.
+            // * Any statement in the body starts on a new line.
+
+            if (getEmitFlags(body) & EmitFlags.SingleLine) {
+                return true;
+            }
+
+            if (body.multiLine) {
+                return false;
+            }
+
+            if (!nodeIsSynthesized(body) && !rangeIsOnSingleLine(body, currentSourceFile)) {
+                return false;
+            }
+
+            if (shouldWriteLeadingLineTerminator(body, body.statements, ListFormat.PreserveLines)
+                || shouldWriteClosingLineTerminator(body, body.statements, ListFormat.PreserveLines)) {
+                return false;
+            }
+
+            let previousStatement: Statement;
+            for (const statement of body.statements) {
+                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, ListFormat.PreserveLines)) {
+                    return false;
+                }
+
+                previousStatement = statement;
+            }
+
+            return true;
+        }
+
+        function emitBlockFunctionBody(body: Block) {
+            write(" {");
+            increaseIndent();
+
+            const emitBlockFunctionBody = shouldEmitBlockFunctionBodyOnSingleLine(body)
+                ? emitBlockFunctionBodyOnSingleLine
+                : emitBlockFunctionBodyWorker;
+
+            emitBodyIndirect(body, body.statements, emitBlockFunctionBody);
+
+            decreaseIndent();
+            writeToken(SyntaxKind.CloseBraceToken, body.statements.end, body);
+        }
+
+        function emitBlockFunctionBodyOnSingleLine(body: Block) {
+            emitBlockFunctionBodyWorker(body, /*emitBlockFunctionBodyOnSingleLine*/ true);
+        }
+
+        function emitBlockFunctionBodyWorker(body: Block, emitBlockFunctionBodyOnSingleLine?: boolean) {
+            // Emit all the prologue directives (like "use strict").
+            const statementOffset = emitPrologueDirectives(body.statements, /*startWithNewLine*/ true);
+            const pos = writer.getTextPos();
+            emitHelpersIndirect(body);
+            if (statementOffset === 0 && pos === writer.getTextPos() && emitBlockFunctionBodyOnSingleLine) {
+                decreaseIndent();
+                emitList(body, body.statements, ListFormat.SingleLineFunctionBodyStatements);
+                increaseIndent();
+            }
+            else {
+                emitList(body, body.statements, ListFormat.MultiLineFunctionBodyStatements, statementOffset);
+            }
+        }
+
+        function emitClassDeclaration(node: ClassDeclaration) {
+            emitClassDeclarationOrExpression(node);
+        }
+
+        function emitClassDeclarationOrExpression(node: ClassDeclaration | ClassExpression) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("class");
+            emitNodeWithPrefix(" ", node.name, emitIdentifierName);
+
+            const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
+            if (indentedFlag) {
+                increaseIndent();
+            }
+
+            emitTypeParameters(node, node.typeParameters);
+            emitList(node, node.heritageClauses, ListFormat.ClassHeritageClauses);
+
+            pushNameGenerationScope();
+            write(" {");
+            emitList(node, node.members, ListFormat.ClassMembers);
+            write("}");
+            popNameGenerationScope();
+
+            if (indentedFlag) {
+                decreaseIndent();
+            }
+        }
+
+        function emitInterfaceDeclaration(node: InterfaceDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("interface ");
+            emit(node.name);
+            emitTypeParameters(node, node.typeParameters);
+            emitList(node, node.heritageClauses, ListFormat.HeritageClauses);
+            write(" {");
+            emitList(node, node.members, ListFormat.InterfaceMembers);
+            write("}");
+        }
+
+        function emitTypeAliasDeclaration(node: TypeAliasDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("type ");
+            emit(node.name);
+            emitTypeParameters(node, node.typeParameters);
+            write(" = ");
+            emit(node.type);
+            write(";");
+        }
+
+        function emitEnumDeclaration(node: EnumDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("enum ");
+            emit(node.name);
+            pushNameGenerationScope();
+            write(" {");
+            emitList(node, node.members, ListFormat.EnumMembers);
+            write("}");
+            popNameGenerationScope();
+        }
+
+        function emitModuleDeclaration(node: ModuleDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write(node.flags & NodeFlags.Namespace ? "namespace " : "module ");
+            emit(node.name);
+
+            let body = node.body;
+            while (body.kind === SyntaxKind.ModuleDeclaration) {
+                write(".");
+                emit((<ModuleDeclaration>body).name);
+                body = (<ModuleDeclaration>body).body;
+            }
+
+            write(" ");
+            emit(body);
+        }
+
+        function emitModuleBlock(node: ModuleBlock) {
+            if (isEmptyBlock(node)) {
+                write("{ }");
+            }
+            else {
+                pushNameGenerationScope();
+                write("{");
+                increaseIndent();
+                emitBlockStatements(node);
+                write("}");
+                popNameGenerationScope();
+            }
+        }
+
+        function emitCaseBlock(node: CaseBlock) {
+            writeToken(SyntaxKind.OpenBraceToken, node.pos);
+            emitList(node, node.clauses, ListFormat.CaseBlockClauses);
+            writeToken(SyntaxKind.CloseBraceToken, node.clauses.end);
+        }
+
+        function emitImportEqualsDeclaration(node: ImportEqualsDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("import ");
+            emit(node.name);
+            write(" = ");
+            emitModuleReference(node.moduleReference);
+            write(";");
+        }
+
+        function emitModuleReference(node: ModuleReference) {
+            if (node.kind === SyntaxKind.Identifier) {
+                emitExpression(<Identifier>node);
+            }
+            else {
+                emit(node);
+            }
+        }
+
+        function emitImportDeclaration(node: ImportDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("import ");
+            if (node.importClause) {
+                emit(node.importClause);
+                write(" from ");
+            }
+            emitExpression(node.moduleSpecifier);
+            write(";");
+        }
+
+        function emitImportClause(node: ImportClause) {
+            emit(node.name);
+            if (node.name && node.namedBindings) {
+                write(", ");
+            }
+            emit(node.namedBindings);
+        }
+
+        function emitNamespaceImport(node: NamespaceImport) {
+            write("* as ");
+            emit(node.name);
+        }
+
+        function emitNamedImports(node: NamedImports) {
+            emitNamedImportsOrExports(node);
+        }
+
+        function emitImportSpecifier(node: ImportSpecifier) {
+            emitImportOrExportSpecifier(node);
+        }
+
+        function emitExportAssignment(node: ExportAssignment) {
+            write(node.isExportEquals ? "export = " : "export default ");
+            emitExpression(node.expression);
+            write(";");
+        }
+
+        function emitExportDeclaration(node: ExportDeclaration) {
+            write("export ");
+            if (node.exportClause) {
+                emit(node.exportClause);
+            }
+            else {
+                write("*");
+            }
+            if (node.moduleSpecifier) {
+                write(" from ");
+                emitExpression(node.moduleSpecifier);
+            }
+            write(";");
+        }
+
+        function emitNamedExports(node: NamedExports) {
+            emitNamedImportsOrExports(node);
+        }
+
+        function emitExportSpecifier(node: ExportSpecifier) {
+            emitImportOrExportSpecifier(node);
+        }
+
+        function emitNamedImportsOrExports(node: NamedImportsOrExports) {
+            write("{");
+            emitList(node, node.elements, ListFormat.NamedImportsOrExportsElements);
+            write("}");
+        }
+
+        function emitImportOrExportSpecifier(node: ImportOrExportSpecifier) {
+            if (node.propertyName) {
+                emit(node.propertyName);
+                write(" as ");
+            }
+
+            emit(node.name);
+        }
+
+        //
+        // Module references
+        //
+
+        function emitExternalModuleReference(node: ExternalModuleReference) {
+            write("require(");
+            emitExpression(node.expression);
+            write(")");
+        }
+
+        //
+        // JSX
+        //
+
+        function emitJsxElement(node: JsxElement) {
+            emit(node.openingElement);
+            emitList(node, node.children, ListFormat.JsxElementChildren);
+            emit(node.closingElement);
+        }
+
+        function emitJsxSelfClosingElement(node: JsxSelfClosingElement) {
+            write("<");
+            emitJsxTagName(node.tagName);
+            write(" ");
+            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
+            write("/>");
+        }
+
+        function emitJsxOpeningElement(node: JsxOpeningElement) {
+            write("<");
+            emitJsxTagName(node.tagName);
+            writeIfAny(node.attributes, " ");
+            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
+            write(">");
+        }
+
+        function emitJsxText(node: JsxText) {
+            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+        }
+
+        function emitJsxClosingElement(node: JsxClosingElement) {
+            write("</");
+            emitJsxTagName(node.tagName);
+            write(">");
+        }
+
+        function emitJsxAttribute(node: JsxAttribute) {
+            emit(node.name);
+            emitWithPrefix("=", node.initializer);
+        }
+
+        function emitJsxSpreadAttribute(node: JsxSpreadAttribute) {
+            write("{...");
+            emitExpression(node.expression);
+            write("}");
+        }
+
+        function emitJsxExpression(node: JsxExpression) {
+            if (node.expression) {
+                write("{");
+                if (node.dotDotDotToken) {
+                    write("...");
+                }
+                emitExpression(node.expression);
+                write("}");
+            }
+        }
+
+        function emitJsxTagName(node: JsxTagNameExpression) {
+            if (node.kind === SyntaxKind.Identifier) {
+                emitExpression(<Identifier>node);
+            }
+            else {
+                emit(node);
+            }
+        }
+
+        //
+        // Clauses
+        //
+
+        function emitCaseClause(node: CaseClause) {
+            write("case ");
+            emitExpression(node.expression);
+            write(":");
+
+            emitCaseOrDefaultClauseStatements(node, node.statements);
+        }
+
+        function emitDefaultClause(node: DefaultClause) {
+            write("default:");
+            emitCaseOrDefaultClauseStatements(node, node.statements);
+        }
+
+        function emitCaseOrDefaultClauseStatements(parentNode: Node, statements: NodeArray<Statement>) {
+            const emitAsSingleStatement =
+                statements.length === 1 &&
+                (
+                    // treat synthesized nodes as located on the same line for emit purposes
+                    nodeIsSynthesized(parentNode) ||
+                    nodeIsSynthesized(statements[0]) ||
+                    rangeStartPositionsAreOnSameLine(parentNode, statements[0], currentSourceFile)
+                );
+
+            if (emitAsSingleStatement) {
+                write(" ");
+                emit(statements[0]);
+            }
+            else {
+                emitList(parentNode, statements, ListFormat.CaseOrDefaultClauseStatements);
+            }
+        }
+
+        function emitHeritageClause(node: HeritageClause) {
+            write(" ");
+            writeTokenText(node.token);
+            write(" ");
+            emitList(node, node.types, ListFormat.HeritageClauseTypes);
+        }
+
+        function emitCatchClause(node: CatchClause) {
+            writeLine();
+            const openParenPos = writeToken(SyntaxKind.CatchKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emit(node.variableDeclaration);
+            writeToken(SyntaxKind.CloseParenToken, node.variableDeclaration ? node.variableDeclaration.end : openParenPos);
+            write(" ");
+            emit(node.block);
+        }
+
+        //
+        // Property assignments
+        //
+
+        function emitPropertyAssignment(node: PropertyAssignment) {
+            emit(node.name);
+            write(": ");
+            // This is to ensure that we emit comment in the following case:
+            //      For example:
+            //          obj = {
+            //              id: /*comment1*/ ()=>void
+            //          }
+            // "comment1" is not considered to be leading comment for node.initializer
+            // but rather a trailing comment on the previous node.
+            const initializer = node.initializer;
+            if (onEmitTrailingCommentsOfPosition && (getEmitFlags(initializer) & EmitFlags.NoLeadingComments) === 0) {
+                const commentRange = getCommentRange(initializer);
+                onEmitTrailingCommentsOfPosition(commentRange.pos);
+            }
+            emitExpression(initializer);
+        }
+
+        function emitShorthandPropertyAssignment(node: ShorthandPropertyAssignment) {
+            emit(node.name);
+            if (node.objectAssignmentInitializer) {
+                write(" = ");
+                emitExpression(node.objectAssignmentInitializer);
+            }
+        }
+
+        function emitSpreadAssignment(node: SpreadAssignment) {
+            if (node.expression) {
+                write("...");
+                emitExpression(node.expression);
+            }
+        }
+
+        //
+        // Enum
+        //
+
+        function emitEnumMember(node: EnumMember) {
+            emit(node.name);
+            emitExpressionWithPrefix(" = ", node.initializer);
+        }
+
+        //
+        // Top-level nodes
+        //
+
+        function emitSourceFile(node: SourceFile) {
+            writeLine();
+            emitShebang();
+            emitBodyIndirect(node, node.statements, emitSourceFileWorker);
+        }
+
+        function emitSourceFileWorker(node: SourceFile) {
+            const statements = node.statements;
+            const statementOffset = emitPrologueDirectives(statements);
+            pushNameGenerationScope();
+            emitHelpersIndirect(node);
+            emitList(node, statements, ListFormat.MultiLine, statementOffset);
+            popNameGenerationScope();
+        }
+
+        // Transformation nodes
+
+        function emitPartiallyEmittedExpression(node: PartiallyEmittedExpression) {
+            emitExpression(node.expression);
+        }
+
+        /**
+         * Emits any prologue directives at the start of a Statement list, returning the
+         * number of prologue directives written to the output.
+         */
+        function emitPrologueDirectives(statements: Node[], startWithNewLine?: boolean): number {
+            for (let i = 0; i < statements.length; i++) {
+                if (isPrologueDirective(statements[i])) {
+                    if (startWithNewLine || i > 0) {
+                        writeLine();
+                    }
+                    emit(statements[i]);
+                }
+                else {
+                    // return index of the first non prologue directive
+                    return i;
+                }
+            }
+
+            return statements.length;
+        }
+
+        //
+        // Helpers
+        //
+
+        function emitShebang() {
+            const shebang = getShebang(currentSourceFile.text);
+            if (shebang) {
+                write(shebang);
+                writeLine();
+            }
+        }
+
+        function emitModifiers(node: Node, modifiers: NodeArray<Modifier>) {
+            if (modifiers && modifiers.length) {
+                emitList(node, modifiers, ListFormat.Modifiers);
+                write(" ");
+            }
+        }
+
+        function emitWithPrefix(prefix: string, node: Node) {
+            emitNodeWithPrefix(prefix, node, emit);
+        }
+
+        function emitExpressionWithPrefix(prefix: string, node: Node) {
+            emitNodeWithPrefix(prefix, node, emitExpression);
+        }
+
+        function emitNodeWithPrefix(prefix: string, node: Node, emit: (node: Node) => void) {
+            if (node) {
+                write(prefix);
+                emit(node);
+            }
+        }
+
+        function emitWithSuffix(node: Node, suffix: string) {
+            if (node) {
+                emit(node);
+                write(suffix);
+            }
+        }
+
+        function emitEmbeddedStatement(parent: Node, node: Statement) {
+            if (isBlock(node) || getEmitFlags(parent) & EmitFlags.SingleLine) {
+                write(" ");
+                emit(node);
+            }
+            else {
+                writeLine();
+                increaseIndent();
+                emit(node);
+                decreaseIndent();
+            }
+        }
+
+        function emitDecorators(parentNode: Node, decorators: NodeArray<Decorator>) {
+            emitList(parentNode, decorators, ListFormat.Decorators);
+        }
+
+        function emitTypeArguments(parentNode: Node, typeArguments: NodeArray<TypeNode>) {
+            emitList(parentNode, typeArguments, ListFormat.TypeArguments);
+        }
+
+        function emitTypeParameters(parentNode: Node, typeParameters: NodeArray<TypeParameterDeclaration>) {
+            emitList(parentNode, typeParameters, ListFormat.TypeParameters);
+        }
+
+        function emitParameters(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
+            emitList(parentNode, parameters, ListFormat.Parameters);
+        }
+
+        function emitParametersForArrow(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
+            if (parameters &&
+                parameters.length === 1 &&
+                parameters[0].type === undefined &&
+                parameters[0].pos === parentNode.pos) {
+                emit(parameters[0]);
+            }
+            else {
+                emitParameters(parentNode, parameters);
+            }
+        }
+
+        function emitParametersForIndexSignature(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
+            emitList(parentNode, parameters, ListFormat.IndexSignatureParameters);
+        }
+
+        function emitList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
+            emitNodeList(emit, parentNode, children, format, start, count);
+        }
+
+        function emitExpressionList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
+            emitNodeList(emitExpression, parentNode, children, format, start, count);
+        }
+
+        function emitNodeList(emit: (node: Node) => void, parentNode: Node, children: NodeArray<Node>, format: ListFormat, start = 0, count = children ? children.length - start : 0) {
+            const isUndefined = children === undefined;
+            if (isUndefined && format & ListFormat.OptionalIfUndefined) {
+                return;
+            }
+
+            const isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0;
+            if (isEmpty && format & ListFormat.OptionalIfEmpty) {
+                return;
+            }
+
+            if (format & ListFormat.BracketsMask) {
+                write(getOpeningBracket(format));
+            }
+
+            if (isEmpty) {
+                // Write a line terminator if the parent node was multi-line
+                if (format & ListFormat.MultiLine) {
+                    writeLine();
+                }
+                else if (format & ListFormat.SpaceBetweenBraces) {
+                    write(" ");
+                }
+            }
+            else {
+                // Write the opening line terminator or leading whitespace.
+                const mayEmitInterveningComments = (format & ListFormat.NoInterveningComments) === 0;
+                let shouldEmitInterveningComments = mayEmitInterveningComments;
+                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) {
+                    writeLine();
+                    shouldEmitInterveningComments = false;
+                }
+                else if (format & ListFormat.SpaceBetweenBraces) {
+                    write(" ");
+                }
+
+                // Increase the indent, if requested.
+                if (format & ListFormat.Indented) {
+                    increaseIndent();
+                }
+
+                // Emit each child.
+                let previousSibling: Node;
+                let shouldDecreaseIndentAfterEmit: boolean;
+                const delimiter = getDelimiter(format);
+                for (let i = 0; i < count; i++) {
+                    const child = children[start + i];
+
+                    // Write the delimiter if this is not the first node.
+                    if (previousSibling) {
+                        write(delimiter);
+
+                        // Write either a line terminator or whitespace to separate the elements.
+                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                            // If a synthesized node in a single-line list starts on a new
+                            // line, we should increase the indent.
+                            if ((format & (ListFormat.LinesMask | ListFormat.Indented)) === ListFormat.SingleLine) {
+                                increaseIndent();
+                                shouldDecreaseIndentAfterEmit = true;
+                            }
+
+                            writeLine();
+                            shouldEmitInterveningComments = false;
+                        }
+                        else if (previousSibling && format & ListFormat.SpaceBetweenSiblings) {
+                            write(" ");
+                        }
+                    }
+
+                    // Emit this child.
+                    if (shouldEmitInterveningComments) {
+                        if (onEmitTrailingCommentsOfPosition) {
+                            const commentRange = getCommentRange(child);
+                            onEmitTrailingCommentsOfPosition(commentRange.pos);
+                        }
+                    }
+                    else {
+                        shouldEmitInterveningComments = mayEmitInterveningComments;
+                    }
+
+                    emit(child);
+
+                    if (shouldDecreaseIndentAfterEmit) {
+                        decreaseIndent();
+                        shouldDecreaseIndentAfterEmit = false;
+                    }
+
+                    previousSibling = child;
+                }
+
+                // Write a trailing comma, if requested.
+                const hasTrailingComma = (format & ListFormat.AllowTrailingComma) && children.hasTrailingComma;
+                if (format & ListFormat.CommaDelimited && hasTrailingComma) {
+                    write(",");
+                }
+
+                // Decrease the indent, if requested.
+                if (format & ListFormat.Indented) {
+                    decreaseIndent();
+                }
+
+                // Write the closing line terminator or closing whitespace.
+                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
+                    writeLine();
+                }
+                else if (format & ListFormat.SpaceBetweenBraces) {
+                    write(" ");
+                }
+            }
+
+            if (format & ListFormat.BracketsMask) {
+                write(getClosingBracket(format));
+            }
+        }
+
+        function writeIfAny(nodes: NodeArray<Node>, text: string) {
+            if (some(nodes)) {
+                write(text);
+            }
+        }
+
+        function writeIfPresent(node: Node, text: string) {
+            if (node) {
+                write(text);
+            }
+        }
+
+        function writeToken(token: SyntaxKind, pos: number, contextNode?: Node) {
+            return onEmitSourceMapOfToken
+                ? onEmitSourceMapOfToken(contextNode, token, pos, writeTokenText)
+                : writeTokenText(token, pos);
+        }
+
+        function writeTokenText(token: SyntaxKind, pos?: number) {
+            const tokenString = tokenToString(token);
+            write(tokenString);
+            return pos < 0 ? pos : pos + tokenString.length;
+        }
+
+        function writeLineOrSpace(node: Node) {
+            if (getEmitFlags(node) & EmitFlags.SingleLine) {
+                write(" ");
+            }
+            else {
+                writeLine();
+            }
+        }
+
+        function writeLines(text: string): void {
+            const lines = text.split(/\r\n?|\n/g);
+            const indentation = guessIndentation(lines);
+            for (let i = 0; i < lines.length; i++) {
+                const line = indentation ? lines[i].slice(indentation) : lines[i];
+                if (line.length) {
+                    writeLine();
+                    write(line);
+                    writeLine();
+                }
+            }
+        }
+
+        function guessIndentation(lines: string[]) {
+            let indentation: number;
+            for (const line of lines) {
+                for (let i = 0; i < line.length && (indentation === undefined || i < indentation); i++) {
+                    if (!isWhiteSpace(line.charCodeAt(i))) {
+                        if (indentation === undefined || i < indentation) {
+                            indentation = i;
+                            break;
+                        }
+                    }
+                }
+            }
+            return indentation;
+        }
+
+        function increaseIndentIf(value: boolean, valueToWriteWhenNotIndenting?: string) {
+            if (value) {
+                increaseIndent();
+                writeLine();
+            }
+            else if (valueToWriteWhenNotIndenting) {
+                write(valueToWriteWhenNotIndenting);
+            }
+        }
+
+        // Helper function to decrease the indent if we previously indented.  Allows multiple
+        // previous indent values to be considered at a time.  This also allows caller to just
+        // call this once, passing in all their appropriate indent values, instead of needing
+        // to call this helper function multiple times.
+        function decreaseIndentIf(value1: boolean, value2?: boolean) {
+            if (value1) {
+                decreaseIndent();
+            }
+            if (value2) {
+                decreaseIndent();
+            }
+        }
+
+        function shouldWriteLeadingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
+            if (format & ListFormat.MultiLine) {
+                return true;
+            }
+
+            if (format & ListFormat.PreserveLines) {
+                if (format & ListFormat.PreferNewLine) {
+                    return true;
+                }
+
+                const firstChild = children[0];
+                if (firstChild === undefined) {
+                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
+                }
+                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(firstChild)) {
+                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                }
+                else {
+                    return !rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                }
+            }
+            else {
+                return false;
+            }
+        }
+
+        function shouldWriteSeparatingLineTerminator(previousNode: Node, nextNode: Node, format: ListFormat) {
+            if (format & ListFormat.MultiLine) {
+                return true;
+            }
+            else if (format & ListFormat.PreserveLines) {
+                if (previousNode === undefined || nextNode === undefined) {
+                    return false;
+                }
+                else if (nodeIsSynthesized(previousNode) || nodeIsSynthesized(nextNode)) {
+                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                }
+                else {
+                    return !rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                }
+            }
+            else {
+                return nextNode.startsOnNewLine;
+            }
+        }
+
+        function shouldWriteClosingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
+            if (format & ListFormat.MultiLine) {
+                return (format & ListFormat.NoTrailingNewLine) === 0;
+            }
+            else if (format & ListFormat.PreserveLines) {
+                if (format & ListFormat.PreferNewLine) {
+                    return true;
+                }
+
+                const lastChild = lastOrUndefined(children);
+                if (lastChild === undefined) {
+                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
+                }
+                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(lastChild)) {
+                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                }
+                else {
+                    return !rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                }
+            }
+            else {
+                return false;
+            }
+        }
+
+        function synthesizedNodeStartsOnNewLine(node: Node, format?: ListFormat) {
+            if (nodeIsSynthesized(node)) {
+                const startsOnNewLine = node.startsOnNewLine;
+                if (startsOnNewLine === undefined) {
+                    return (format & ListFormat.PreferNewLine) !== 0;
+                }
+
+                return startsOnNewLine;
+            }
+
+            return (format & ListFormat.PreferNewLine) !== 0;
+        }
+
+        function needsIndentation(parent: Node, node1: Node, node2: Node): boolean {
+            parent = skipSynthesizedParentheses(parent);
+            node1 = skipSynthesizedParentheses(node1);
+            node2 = skipSynthesizedParentheses(node2);
+
+            // Always use a newline for synthesized code if the synthesizer desires it.
+            if (node2.startsOnNewLine) {
+                return true;
+            }
+
+            return !nodeIsSynthesized(parent)
+                && !nodeIsSynthesized(node1)
+                && !nodeIsSynthesized(node2)
+                && !rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+        }
+
+        function isSingleLineEmptyBlock(block: Block) {
+            return !block.multiLine
+                && isEmptyBlock(block);
+        }
+
+        function isEmptyBlock(block: BlockLike) {
+            return block.statements.length === 0
+                && rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
+        }
+
+        function skipSynthesizedParentheses(node: Node) {
+            while (node.kind === SyntaxKind.ParenthesizedExpression && nodeIsSynthesized(node)) {
+                node = (<ParenthesizedExpression>node).expression;
+            }
+
+            return node;
+        }
+
+        function getTextOfNode(node: Node, includeTrivia?: boolean): string {
+            if (isGeneratedIdentifier(node)) {
+                return generateName(node);
+            }
+            else if (isIdentifier(node) && (nodeIsSynthesized(node) || !node.parent)) {
+                return unescapeIdentifier(node.text);
+            }
+            else if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
+                return getTextOfNode((<StringLiteral>node).textSourceNode, includeTrivia);
+            }
+            else if (isLiteralExpression(node) && (nodeIsSynthesized(node) || !node.parent)) {
+                return node.text;
+            }
+
+            return getSourceTextOfNodeFromSourceFile(currentSourceFile, node, includeTrivia);
+        }
+
+        function getLiteralTextOfNode(node: LiteralLikeNode): string {
+            if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
+                const textSourceNode = (<StringLiteral>node).textSourceNode;
+                if (isIdentifier(textSourceNode)) {
+                    return "\"" + escapeNonAsciiCharacters(escapeString(getTextOfNode(textSourceNode))) + "\"";
+                }
+                else {
+                    return getLiteralTextOfNode(textSourceNode);
+                }
+            }
+
+            return getLiteralText(node, currentSourceFile, languageVersion);
+        }
+
+        function resetGeneratedNames() {
+            nodeIdToGeneratedName = undefined;
+            autoGeneratedIdToGeneratedName = undefined;
+            generatedNames = undefined;
+            tempFlagsStack = undefined;
+            tempFlags = TempFlags.Auto;
+        }
+
+        function ensureNameGeneration() {
+            if (generatedNames === undefined) {
+                nodeIdToGeneratedName = [];
+                autoGeneratedIdToGeneratedName = [];
+                generatedNames = createMap<string>();
+                tempFlagsStack = [];
+            }
+        }
+
+        /**
+         * Push a new name generation scope.
+         */
+        function pushNameGenerationScope() {
+            ensureNameGeneration();
+            tempFlagsStack.push(tempFlags);
+            tempFlags = 0;
+        }
+
+        /**
+         * Pop the current name generation scope.
+         */
+        function popNameGenerationScope() {
+            ensureNameGeneration();
+            tempFlags = tempFlagsStack.pop();
+        }
+
+        /**
+         * Generate the text for a generated identifier.
+         */
+        function generateName(name: GeneratedIdentifier) {
+            ensureNameGeneration();
+            if (name.autoGenerateKind === GeneratedIdentifierKind.Node) {
+                // Node names generate unique names based on their original node
+                // and are cached based on that node's id.
+                const node = getNodeForGeneratedName(name);
+                return generateNameCached(node, getTextOfNode);
+            }
+            else {
+                // Auto, Loop, and Unique names are cached based on their unique
+                // autoGenerateId.
+                const autoGenerateId = name.autoGenerateId;
+                return autoGeneratedIdToGeneratedName[autoGenerateId] || (autoGeneratedIdToGeneratedName[autoGenerateId] = unescapeIdentifier(makeName(name)));
+            }
+        }
+
+        function generateNameCached(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+            const nodeId = getNodeId(node);
+            return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node, getTextOfNode)));
+        }
+
+        /**
+         * Returns a value indicating whether a name is unique globally, within the current file,
+         * or within the NameGenerator.
+         */
+        function isUniqueName(name: string): boolean {
+            return !(hasGlobalName && hasGlobalName(name))
+                && !currentSourceFile.identifiers.has(name)
+                && !generatedNames.has(name);
+        }
+
+        /**
+         * Returns a value indicating whether a name is unique within a container.
+         */
+        function isUniqueLocalName(name: string, container: Node): boolean {
+            for (let node = container; isNodeDescendantOf(node, container); node = node.nextContainer) {
+                if (node.locals) {
+                    const local = node.locals.get(name);
+                    // We conservatively include alias symbols to cover cases where they're emitted as locals
+                    if (local && local.flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Return the next available name in the pattern _a ... _z, _0, _1, ...
+         * TempFlags._i or TempFlags._n may be used to express a preference for that dedicated name.
+         * Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
+         */
+        function makeTempVariableName(flags: TempFlags): string {
+            if (flags && !(tempFlags & flags)) {
+                const name = flags === TempFlags._i ? "_i" : "_n";
+                if (isUniqueName(name)) {
+                    tempFlags |= flags;
+                    return name;
+                }
+            }
+            while (true) {
+                const count = tempFlags & TempFlags.CountMask;
+                tempFlags++;
+                // Skip over 'i' and 'n'
+                if (count !== 8 && count !== 13) {
+                    const name = count < 26
+                        ? "_" + String.fromCharCode(CharacterCodes.a + count)
+                        : "_" + (count - 26);
+                    if (isUniqueName(name)) {
+                        return name;
+                    }
+                }
+            }
+        }
+
+        /**
+         * Generate a name that is unique within the current file and doesn't conflict with any names
+         * in global scope. The name is formed by adding an '_n' suffix to the specified base name,
+         * where n is a positive integer. Note that names generated by makeTempVariableName and
+         * makeUniqueName are guaranteed to never conflict.
+         */
+        function makeUniqueName(baseName: string): string {
+            // Find the first unique 'name_n', where n is a positive number
+            if (baseName.charCodeAt(baseName.length - 1) !== CharacterCodes._) {
+                baseName += "_";
+            }
+            let i = 1;
+            while (true) {
+                const generatedName = baseName + i;
+                if (isUniqueName(generatedName)) {
+                    generatedNames.set(generatedName, generatedName);
+                    return generatedName;
+                }
+                i++;
+            }
+        }
+
+        /**
+         * Generates a unique name for a ModuleDeclaration or EnumDeclaration.
+         */
+        function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+            const name = getTextOfNode(node.name);
+            // Use module/enum name itself if it is unique, otherwise make a unique variation
+            return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
+        }
+
+        /**
+         * Generates a unique name for an ImportDeclaration or ExportDeclaration.
+         */
+        function generateNameForImportOrExportDeclaration(node: ImportDeclaration | ExportDeclaration) {
+            const expr = getExternalModuleName(node);
+            const baseName = expr.kind === SyntaxKind.StringLiteral ?
+                escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
+            return makeUniqueName(baseName);
+        }
+
+        /**
+         * Generates a unique name for a default export.
+         */
+        function generateNameForExportDefault() {
+            return makeUniqueName("default");
+        }
+
+        /**
+         * Generates a unique name for a class expression.
+         */
+        function generateNameForClassExpression() {
+            return makeUniqueName("class");
+        }
+
+        function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+            if (isIdentifier(node.name)) {
+                return generateNameCached(node.name, getTextOfNode);
+            }
+            return makeTempVariableName(TempFlags.Auto);
+        }
+
+        /**
+         * Generates a unique name from a node.
+         */
+        function generateNameForNode(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string): string {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                    return makeUniqueName(getTextOfNode(node));
+                case SyntaxKind.ModuleDeclaration:
+                case SyntaxKind.EnumDeclaration:
+                    return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node, getTextOfNode);
+                case SyntaxKind.ImportDeclaration:
+                case SyntaxKind.ExportDeclaration:
+                    return generateNameForImportOrExportDeclaration(<ImportDeclaration | ExportDeclaration>node);
+                case SyntaxKind.FunctionDeclaration:
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.ExportAssignment:
+                    return generateNameForExportDefault();
+                case SyntaxKind.ClassExpression:
+                    return generateNameForClassExpression();
+                case SyntaxKind.MethodDeclaration:
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    return generateNameForMethodOrAccessor(<MethodDeclaration | AccessorDeclaration>node, getTextOfNode);
+                default:
+                    return makeTempVariableName(TempFlags.Auto);
+            }
+        }
+
+        /**
+         * Generates a unique identifier for a node.
+         */
+        function makeName(name: GeneratedIdentifier) {
+            switch (name.autoGenerateKind) {
+                case GeneratedIdentifierKind.Auto:
+                    return makeTempVariableName(TempFlags.Auto);
+                case GeneratedIdentifierKind.Loop:
+                    return makeTempVariableName(TempFlags._i);
+                case GeneratedIdentifierKind.Unique:
+                    return makeUniqueName(name.text);
+            }
+
+            Debug.fail("Unsupported GeneratedIdentifierKind.");
+        }
+
+        /**
+         * Gets the node from which a name should be generated.
+         */
+        function getNodeForGeneratedName(name: GeneratedIdentifier) {
+            const autoGenerateId = name.autoGenerateId;
+            let node = name as Node;
+            let original = node.original;
+            while (original) {
+                node = original;
+
+                // if "node" is a different generated name (having a different
+                // "autoGenerateId"), use it and stop traversing.
+                if (isIdentifier(node)
+                    && node.autoGenerateKind === GeneratedIdentifierKind.Node
+                    && node.autoGenerateId !== autoGenerateId) {
+                    break;
+                }
+
+                original = node.original;
+            }
+
+            // otherwise, return the original node for the source;
+            return node;
+        }
+    }
+
+    function createDelimiterMap() {
+        const delimiters: string[] = [];
+        delimiters[ListFormat.None] = "";
+        delimiters[ListFormat.CommaDelimited] = ",";
+        delimiters[ListFormat.BarDelimited] = " |";
+        delimiters[ListFormat.AmpersandDelimited] = " &";
+        return delimiters;
+    }
+
+    function getDelimiter(format: ListFormat) {
+        return delimiters[format & ListFormat.DelimitersMask];
+    }
+
+    function createBracketsMap() {
+        const brackets: string[][] = [];
+        brackets[ListFormat.Braces] = ["{", "}"];
+        brackets[ListFormat.Parenthesis] = ["(", ")"];
+        brackets[ListFormat.AngleBrackets] = ["<", ">"];
+        brackets[ListFormat.SquareBrackets] = ["[", "]"];
+        return brackets;
+    }
+
+    function getOpeningBracket(format: ListFormat) {
+        return brackets[format & ListFormat.BracketsMask][0];
+    }
+
+    function getClosingBracket(format: ListFormat) {
+        return brackets[format & ListFormat.BracketsMask][1];
+    }
+
+    const enum ListFormat {
+        None = 0,
+
+        // Line separators
+        SingleLine = 0,                 // Prints the list on a single line (default).
+        MultiLine = 1 << 0,             // Prints the list on multiple lines.
+        PreserveLines = 1 << 1,         // Prints the list using line preservation if possible.
+        LinesMask = SingleLine | MultiLine | PreserveLines,
+
+        // Delimiters
+        NotDelimited = 0,               // There is no delimiter between list items (default).
+        BarDelimited = 1 << 2,          // Each list item is space-and-bar (" |") delimited.
+        AmpersandDelimited = 1 << 3,    // Each list item is space-and-ampersand (" &") delimited.
+        CommaDelimited = 1 << 4,        // Each list item is comma (",") delimited.
+        DelimitersMask = BarDelimited | AmpersandDelimited | CommaDelimited,
+
+        AllowTrailingComma = 1 << 5,    // Write a trailing comma (",") if present.
+
+        // Whitespace
+        Indented = 1 << 6,              // The list should be indented.
+        SpaceBetweenBraces = 1 << 7,    // Inserts a space after the opening brace and before the closing brace.
+        SpaceBetweenSiblings = 1 << 8,  // Inserts a space between each sibling node.
+
+        // Brackets/Braces
+        Braces = 1 << 9,                 // The list is surrounded by "{" and "}".
+        Parenthesis = 1 << 10,          // The list is surrounded by "(" and ")".
+        AngleBrackets = 1 << 11,        // The list is surrounded by "<" and ">".
+        SquareBrackets = 1 << 12,       // The list is surrounded by "[" and "]".
+        BracketsMask = Braces | Parenthesis | AngleBrackets | SquareBrackets,
+
+        OptionalIfUndefined = 1 << 13,  // Do not emit brackets if the list is undefined.
+        OptionalIfEmpty = 1 << 14,      // Do not emit brackets if the list is empty.
+        Optional = OptionalIfUndefined | OptionalIfEmpty,
+
+        // Other
+        PreferNewLine = 1 << 15,        // Prefer adding a LineTerminator between synthesized nodes.
+        NoTrailingNewLine = 1 << 16,    // Do not emit a trailing NewLine for a MultiLine list.
+        NoInterveningComments = 1 << 17, // Do not emit comments between each node
+
+        // Precomputed Formats
+        Modifiers = SingleLine | SpaceBetweenSiblings,
+        HeritageClauses = SingleLine | SpaceBetweenSiblings,
+        TypeLiteralMembers = MultiLine | Indented,
+        TupleTypeElements = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented,
+        UnionTypeConstituents = BarDelimited | SpaceBetweenSiblings | SingleLine,
+        IntersectionTypeConstituents = AmpersandDelimited | SpaceBetweenSiblings | SingleLine,
+        ObjectBindingPatternElements = SingleLine | AllowTrailingComma | SpaceBetweenBraces | CommaDelimited | SpaceBetweenSiblings,
+        ArrayBindingPatternElements = SingleLine | AllowTrailingComma | CommaDelimited | SpaceBetweenSiblings,
+        ObjectLiteralExpressionProperties = PreserveLines | CommaDelimited | SpaceBetweenSiblings | SpaceBetweenBraces | Indented | Braces,
+        ArrayLiteralExpressionElements = PreserveLines | CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | Indented | SquareBrackets,
+        CallExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis,
+        NewExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis | OptionalIfUndefined,
+        TemplateExpressionSpans = SingleLine | NoInterveningComments,
+        SingleLineBlockStatements = SpaceBetweenBraces | SpaceBetweenSiblings | SingleLine,
+        MultiLineBlockStatements = Indented | MultiLine,
+        VariableDeclarationList = CommaDelimited | SpaceBetweenSiblings | SingleLine,
+        SingleLineFunctionBodyStatements = SingleLine | SpaceBetweenSiblings | SpaceBetweenBraces,
+        MultiLineFunctionBodyStatements = MultiLine,
+        ClassHeritageClauses = SingleLine | SpaceBetweenSiblings,
+        ClassMembers = Indented | MultiLine,
+        InterfaceMembers = Indented | MultiLine,
+        EnumMembers = CommaDelimited | Indented | MultiLine,
+        CaseBlockClauses = Indented | MultiLine,
+        NamedImportsOrExportsElements = CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | SingleLine | SpaceBetweenBraces,
+        JsxElementChildren = SingleLine | NoInterveningComments,
+        JsxElementAttributes = SingleLine | SpaceBetweenSiblings | NoInterveningComments,
+        CaseOrDefaultClauseStatements = Indented | MultiLine | NoTrailingNewLine | OptionalIfEmpty,
+        HeritageClauseTypes = CommaDelimited | SpaceBetweenSiblings | SingleLine,
+        SourceFileStatements = MultiLine | NoTrailingNewLine,
+        Decorators = MultiLine | Optional,
+        TypeArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
+        TypeParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
+        Parameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | Parenthesis,
+        IndexSignatureParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | SquareBrackets,
+    }
+}
\ No newline at end of file
diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts
index 650b9b0ef02..d743f488e75 100644
--- a/src/compiler/sourcemap.ts
+++ b/src/compiler/sourcemap.ts
@@ -8,10 +8,9 @@ namespace ts {
          *
          * @param filePath The path to the generated output file.
          * @param sourceMapFilePath The path to the output source map file.
-         * @param sourceFiles The input source files for the program.
-         * @param isBundledEmit A value indicating whether the generated output file is a bundle.
+         * @param sourceFileOrBundle The input source file or bundle for the program.
          */
-        initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean): void;
+        initialize(filePath: string, sourceMapFilePath: string, sourceFileOrBundle: SourceFile | Bundle): void;
 
         /**
          * Reset the SourceMapWriter to an empty state.
@@ -38,11 +37,11 @@ namespace ts {
         /**
          * Emits a node with possible leading and trailing source maps.
          *
-         * @param emitContext The current emit context
+         * @param hint The current emit context
          * @param node The node to emit.
          * @param emitCallback The callback used to emit the node.
          */
-        emitNodeWithSourceMap(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+        emitNodeWithSourceMap(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
 
         /**
          * Emits a token of a node node with possible leading and trailing source maps.
@@ -115,10 +114,9 @@ namespace ts {
          *
          * @param filePath The path to the generated output file.
          * @param sourceMapFilePath The path to the output source map file.
-         * @param sourceFiles The input source files for the program.
-         * @param isBundledEmit A value indicating whether the generated output file is a bundle.
+         * @param sourceFileOrBundle The input source file or bundle for the program.
          */
-        function initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) {
+        function initialize(filePath: string, sourceMapFilePath: string, sourceFileOrBundle: SourceFile | Bundle) {
             if (disabled) {
                 return;
             }
@@ -161,11 +159,10 @@ namespace ts {
 
             if (compilerOptions.mapRoot) {
                 sourceMapDir = normalizeSlashes(compilerOptions.mapRoot);
-                if (!isBundledEmit) { // emitting single module file
-                    Debug.assert(sourceFiles.length === 1);
+                if (sourceFileOrBundle.kind === SyntaxKind.SourceFile) { // emitting single module file
                     // For modules or multiple emit files the mapRoot will have directory structure like the sources
                     // So if src\a.ts and src\lib\b.ts are compiled together user would be moving the maps into mapRoot\a.js.map and mapRoot\lib\b.js.map
-                    sourceMapDir = getDirectoryPath(getSourceFilePathInNewDir(sourceFiles[0], host, sourceMapDir));
+                    sourceMapDir = getDirectoryPath(getSourceFilePathInNewDir(sourceFileOrBundle, host, sourceMapDir));
                 }
 
                 if (!isRootedDiskPath(sourceMapDir) && !isUrl(sourceMapDir)) {
@@ -311,12 +308,13 @@ namespace ts {
         /**
          * Emits a node with possible leading and trailing source maps.
          *
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to emit.
          * @param emitCallback The callback used to emit the node.
          */
-        function emitNodeWithSourceMap(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) {
+        function emitNodeWithSourceMap(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) {
             if (disabled) {
-                return emitCallback(emitContext, node);
+                return emitCallback(hint, node);
             }
 
             if (node) {
@@ -332,11 +330,11 @@ namespace ts {
 
                 if (emitFlags & EmitFlags.NoNestedSourceMaps) {
                     disabled = true;
-                    emitCallback(emitContext, node);
+                    emitCallback(hint, node);
                     disabled = false;
                 }
                 else {
-                    emitCallback(emitContext, node);
+                    emitCallback(hint, node);
                 }
 
                 if (node.kind !== SyntaxKind.NotEmittedStatement
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index cef8c701455..62469df79c1 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -105,14 +105,16 @@ namespace ts {
             hoistFunctionDeclaration,
             requestEmitHelper,
             readEmitHelpers,
-            onSubstituteNode: (_emitContext, node) => node,
+            onSubstituteNode: (_, node) => node,
             enableSubstitution,
             isSubstitutionEnabled,
-            onEmitNode: (node, emitContext, emitCallback) => emitCallback(node, emitContext),
+            onEmitNode: (hint, node, callback) => callback(hint, node),
             enableEmitNotification,
             isEmitNotificationEnabled
         };
 
+        performance.mark("beforeTransform");
+
         // Chain together and initialize each transformer.
         const transformation = chain(...transformers)(context);
 
@@ -122,6 +124,9 @@ namespace ts {
         // Disable modification of the lexical environment.
         lexicalEnvironmentDisabled = true;
 
+        performance.mark("afterTransform");
+        performance.measure("transformTime", "beforeTransform", "afterTransform");
+
         return {
             transformed,
             emitNodeWithSubstitution,
@@ -159,21 +164,16 @@ namespace ts {
         /**
          * Emits a node with possible substitution.
          *
-         * @param emitContext The current emit context.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to emit.
          * @param emitCallback The callback used to emit the node or its substitute.
          */
-        function emitNodeWithSubstitution(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) {
+        function emitNodeWithSubstitution(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) {
             if (node) {
                 if (isSubstitutionEnabled(node)) {
-                    const substitute = context.onSubstituteNode(emitContext, node);
-                    if (substitute && substitute !== node) {
-                        emitCallback(emitContext, substitute);
-                        return;
-                    }
+                    node = context.onSubstituteNode(hint, node) || node;
                 }
-
-                emitCallback(emitContext, node);
+                emitCallback(hint, node);
             }
         }
 
@@ -196,17 +196,17 @@ namespace ts {
         /**
          * Emits a node with possible emit notification.
          *
-         * @param emitContext The current emit context.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to emit.
          * @param emitCallback The callback used to emit the node.
          */
-        function emitNodeWithNotification(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) {
+        function emitNodeWithNotification(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) {
             if (node) {
                 if (isEmitNotificationEnabled(node)) {
-                    context.onEmitNode(emitContext, node, emitCallback);
+                    context.onEmitNode(hint, node, emitCallback);
                 }
                 else {
-                    emitCallback(emitContext, node);
+                    emitCallback(hint, node);
                 }
             }
         }
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 3b8b4524aab..10ebe648fe2 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -3435,9 +3435,11 @@ namespace ts {
         /**
          * Called by the printer just before a node is printed.
          *
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to be printed.
+         * @param emitCallback The callback used to emit the node.
          */
-        function onEmitNode(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) {
+        function onEmitNode(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) {
             if (enabledSubstitutions & ES2015SubstitutionFlags.CapturedThis && isFunctionLike(node)) {
                 // If we are tracking a captured `this`, keep track of the enclosing function.
                 const ancestorFacts = enterSubtree(
@@ -3445,11 +3447,11 @@ namespace ts {
                     getEmitFlags(node) & EmitFlags.CapturesThis
                         ? HierarchyFacts.FunctionIncludes | HierarchyFacts.CapturesThis
                         : HierarchyFacts.FunctionIncludes);
-                previousOnEmitNode(emitContext, node, emitCallback);
+                previousOnEmitNode(hint, node, emitCallback);
                 exitSubtree(ancestorFacts, HierarchyFacts.None, HierarchyFacts.None);
                 return;
             }
-            previousOnEmitNode(emitContext, node, emitCallback);
+            previousOnEmitNode(hint, node, emitCallback);
         }
 
         /**
@@ -3484,13 +3486,13 @@ namespace ts {
         /**
          * Hooks node substitutions.
          *
-         * @param emitContext The context for the emitter.
+         * @param hint The context for the emitter.
          * @param node The node to substitute.
          */
-        function onSubstituteNode(emitContext: EmitContext, node: Node) {
-            node = previousOnSubstituteNode(emitContext, node);
+        function onSubstituteNode(hint: EmitHint, node: Node) {
+            node = previousOnSubstituteNode(hint, node);
 
-            if (emitContext === EmitContext.Expression) {
+            if (hint === EmitHint.Expression) {
                 return substituteExpression(node);
             }
 
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index c87dbe32518..a7f7b0da0ea 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -396,33 +396,33 @@ namespace ts {
         /**
          * Hook for node emit.
          *
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to emit.
          * @param emit A callback used to emit the node in the printer.
          */
-        function onEmitNode(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void {
+        function onEmitNode(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void {
             // If we need to support substitutions for `super` in an async method,
             // we should track it here.
             if (enabledSubstitutions & ES2017SubstitutionFlags.AsyncMethodsWithSuper && isSuperContainer(node)) {
                 const savedCurrentSuperContainer = currentSuperContainer;
                 currentSuperContainer = node;
-                previousOnEmitNode(emitContext, node, emitCallback);
+                previousOnEmitNode(hint, node, emitCallback);
                 currentSuperContainer = savedCurrentSuperContainer;
             }
             else {
-                previousOnEmitNode(emitContext, node, emitCallback);
+                previousOnEmitNode(hint, node, emitCallback);
             }
         }
 
         /**
          * Hooks node substitutions.
          *
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to substitute.
-         * @param isExpression A value indicating whether the node is to be used in an expression
-         *                     position.
          */
-        function onSubstituteNode(emitContext: EmitContext, node: Node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === EmitContext.Expression) {
+        function onSubstituteNode(hint: EmitHint, node: Node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === EmitHint.Expression) {
                 return substituteExpression(<Expression>node);
             }
 
diff --git a/src/compiler/transformers/es5.ts b/src/compiler/transformers/es5.ts
index c3b011fe36d..8b030642a89 100644
--- a/src/compiler/transformers/es5.ts
+++ b/src/compiler/transformers/es5.ts
@@ -12,7 +12,7 @@ namespace ts {
         const compilerOptions = context.getCompilerOptions();
 
         // enable emit notification only if using --jsx preserve or react-native
-        let previousOnEmitNode: (emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) => void;
+        let previousOnEmitNode: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
         let noSubstitution: boolean[];
         if (compilerOptions.jsx === JsxEmit.Preserve || compilerOptions.jsx === JsxEmit.ReactNative) {
             previousOnEmitNode = context.onEmitNode;
@@ -41,9 +41,11 @@ namespace ts {
         /**
          * Called by the printer just before a node is printed.
          *
-         * @param node The node to be printed.
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emitCallback A callback used to emit the node.
          */
-        function onEmitNode(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) {
+        function onEmitNode(hint: EmitHint, node: Node, emitCallback: (emitContext: EmitHint, node: Node) => void) {
             switch (node.kind) {
                 case SyntaxKind.JsxOpeningElement:
                 case SyntaxKind.JsxClosingElement:
@@ -53,21 +55,21 @@ namespace ts {
                     break;
             }
 
-            previousOnEmitNode(emitContext, node, emitCallback);
+            previousOnEmitNode(hint, node, emitCallback);
         }
 
         /**
          * Hooks node substitutions.
          *
-         * @param emitContext The context for the emitter.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to substitute.
          */
-        function onSubstituteNode(emitContext: EmitContext, node: Node) {
+        function onSubstituteNode(hint: EmitHint, node: Node) {
             if (node.id && noSubstitution && noSubstitution[node.id]) {
-                return previousOnSubstituteNode(emitContext, node);
+                return previousOnSubstituteNode(hint, node);
             }
 
-            node = previousOnSubstituteNode(emitContext, node);
+            node = previousOnSubstituteNode(hint, node);
             if (isPropertyAccessExpression(node)) {
                 return substitutePropertyAccessExpression(node);
             }
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
index 7dcfe76a427..ee17bdacbaf 100644
--- a/src/compiler/transformers/generators.ts
+++ b/src/compiler/transformers/generators.ts
@@ -1909,9 +1909,9 @@ namespace ts {
             return -1;
         }
 
-        function onSubstituteNode(emitContext: EmitContext, node: Node): Node {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === EmitContext.Expression) {
+        function onSubstituteNode(hint: EmitHint, node: Node): Node {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === EmitHint.Expression) {
                 return substituteExpression(<Expression>node);
             }
             return node;
diff --git a/src/compiler/transformers/module/es2015.ts b/src/compiler/transformers/module/es2015.ts
index 5611f890164..86fa1295f7b 100644
--- a/src/compiler/transformers/module/es2015.ts
+++ b/src/compiler/transformers/module/es2015.ts
@@ -71,18 +71,18 @@ namespace ts {
         /**
          * Hook for node emit.
          *
-         * @param emitContext A context hint for the emitter.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to emit.
          * @param emit A callback used to emit the node in the printer.
          */
-        function onEmitNode(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void {
+        function onEmitNode(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void {
             if (isSourceFile(node)) {
                 currentSourceFile = node;
-                previousOnEmitNode(emitContext, node, emitCallback);
+                previousOnEmitNode(hint, node, emitCallback);
                 currentSourceFile = undefined;
             }
             else {
-                previousOnEmitNode(emitContext, node, emitCallback);
+                previousOnEmitNode(hint, node, emitCallback);
             }
         }
 
@@ -93,12 +93,12 @@ namespace ts {
         /**
          * Hooks node substitutions.
          *
-         * @param emitContext A context hint for the emitter.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to substitute.
          */
-        function onSubstituteNode(emitContext: EmitContext, node: Node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (isIdentifier(node) && emitContext === EmitContext.Expression) {
+        function onSubstituteNode(hint: EmitHint, node: Node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (isIdentifier(node) && hint === EmitHint.Expression) {
                 return substituteExpressionIdentifier(node);
             }
             return node;
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 0adea4fd540..e072429292a 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -1207,24 +1207,24 @@ namespace ts {
         /**
          * Hook for node emit notifications.
          *
-         * @param emitContext A context hint for the emitter.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to emit.
          * @param emit A callback used to emit the node in the printer.
          */
-        function onEmitNode(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void {
+        function onEmitNode(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void {
             if (node.kind === SyntaxKind.SourceFile) {
                 currentSourceFile = <SourceFile>node;
                 currentModuleInfo = moduleInfoMap[getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
 
-                previousOnEmitNode(emitContext, node, emitCallback);
+                previousOnEmitNode(hint, node, emitCallback);
 
                 currentSourceFile = undefined;
                 currentModuleInfo = undefined;
                 noSubstitution = undefined;
             }
             else {
-                previousOnEmitNode(emitContext, node, emitCallback);
+                previousOnEmitNode(hint, node, emitCallback);
             }
         }
 
@@ -1235,16 +1235,16 @@ namespace ts {
         /**
          * Hooks node substitutions.
          *
-         * @param emitContext A context hint for the emitter.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to substitute.
          */
-        function onSubstituteNode(emitContext: EmitContext, node: Node) {
-            node = previousOnSubstituteNode(emitContext, node);
+        function onSubstituteNode(hint: EmitHint, node: Node) {
+            node = previousOnSubstituteNode(hint, node);
             if (node.id && noSubstitution[node.id]) {
                 return node;
             }
 
-            if (emitContext === EmitContext.Expression) {
+            if (hint === EmitHint.Expression) {
                 return substituteExpression(<Expression>node);
             }
             else if (isShorthandPropertyAssignment(node)) {
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index 3f1488b649d..6c59ea194cb 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -1548,11 +1548,11 @@ namespace ts {
         /**
          * Hook for node emit notifications.
          *
-         * @param emitContext A context hint for the emitter.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to emit.
-         * @param emit A callback used to emit the node in the printer.
+         * @param emitCallback A callback used to emit the node in the printer.
          */
-        function onEmitNode(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void {
+        function onEmitNode(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void {
             if (node.kind === SyntaxKind.SourceFile) {
                 const id = getOriginalNodeId(node);
                 currentSourceFile = <SourceFile>node;
@@ -1564,7 +1564,7 @@ namespace ts {
                     delete noSubstitutionMap[id];
                 }
 
-                previousOnEmitNode(emitContext, node, emitCallback);
+                previousOnEmitNode(hint, node, emitCallback);
 
                 currentSourceFile = undefined;
                 moduleInfo = undefined;
@@ -1572,7 +1572,7 @@ namespace ts {
                 noSubstitution = undefined;
             }
             else {
-                previousOnEmitNode(emitContext, node, emitCallback);
+                previousOnEmitNode(hint, node, emitCallback);
             }
         }
 
@@ -1583,16 +1583,16 @@ namespace ts {
         /**
          * Hooks node substitutions.
          *
-         * @param emitContext A context hint for the emitter.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to substitute.
          */
-        function onSubstituteNode(emitContext: EmitContext, node: Node) {
-            node = previousOnSubstituteNode(emitContext, node);
+        function onSubstituteNode(hint: EmitHint, node: Node) {
+            node = previousOnSubstituteNode(hint, node);
             if (isSubstitutionPrevented(node)) {
                 return node;
             }
 
-            if (emitContext === EmitContext.Expression) {
+            if (hint === EmitHint.Expression) {
                 return substituteExpression(<Expression>node);
             }
 
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index e2b8b8fe2ec..a61998e8af9 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -3154,11 +3154,11 @@ namespace ts {
         /**
          * Hook for node emit.
          *
-         * @param emitContext A context hint for the emitter.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to emit.
          * @param emit A callback used to emit the node in the printer.
          */
-        function onEmitNode(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void {
+        function onEmitNode(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void {
             const savedApplicableSubstitutions = applicableSubstitutions;
 
             if (enabledSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports && isTransformedModuleDeclaration(node)) {
@@ -3169,7 +3169,7 @@ namespace ts {
                 applicableSubstitutions |= TypeScriptSubstitutionFlags.NonQualifiedEnumMembers;
             }
 
-            previousOnEmitNode(emitContext, node, emitCallback);
+            previousOnEmitNode(hint, node, emitCallback);
 
             applicableSubstitutions = savedApplicableSubstitutions;
         }
@@ -3177,12 +3177,12 @@ namespace ts {
         /**
          * Hooks node substitutions.
          *
-         * @param emitContext A context hint for the emitter.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to substitute.
          */
-        function onSubstituteNode(emitContext: EmitContext, node: Node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === EmitContext.Expression) {
+        function onSubstituteNode(hint: EmitHint, node: Node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === EmitHint.Expression) {
                 return substituteExpression(<Expression>node);
             }
             else if (isShorthandPropertyAssignment(node)) {
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index 52bb92ee1f0..54d5eb77e10 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -34,6 +34,7 @@
         "comments.ts",
         "sourcemap.ts",
         "declarationEmitter.ts",
+        "printer.ts",
         "emitter.ts",
         "program.ts",
         "commandLineParser.ts",
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 8b49af402cf..682cd9e617b 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -348,6 +348,7 @@
         EnumMember,
         // Top-level nodes
         SourceFile,
+        Bundle,
 
         // JSDoc nodes
         JSDocTypeExpression,
@@ -557,15 +558,6 @@
 
     export type ModifiersArray = NodeArray<Modifier>;
 
-    /*@internal*/
-    export const enum GeneratedIdentifierKind {
-        None,   // Not automatically generated.
-        Auto,   // Automatically generated identifier.
-        Loop,   // Automatically generated identifier with a preference for '_i'.
-        Unique, // Unique name based on the 'text' property.
-        Node,   // Unique name based on the node in the 'original' property.
-    }
-
     export interface Identifier extends PrimaryExpression {
         kind: SyntaxKind.Identifier;
         text: string;                                  // Text of identifier (with escapes converted to characters)
@@ -580,7 +572,14 @@
         resolvedSymbol: Symbol;
     }
 
-    /*@internal*/
+    export const enum GeneratedIdentifierKind {
+        None,   // Not automatically generated.
+        Auto,   // Automatically generated identifier.
+        Loop,   // Automatically generated identifier with a preference for '_i'.
+        Unique, // Unique name based on the 'text' property.
+        Node,   // Unique name based on the node in the 'original' property.
+    }
+
     export interface GeneratedIdentifier extends Identifier {
         autoGenerateKind: GeneratedIdentifierKind.Auto
                         | GeneratedIdentifierKind.Loop
@@ -2201,6 +2200,11 @@
         /* @internal */ ambientModuleNames: string[];
     }
 
+    export interface Bundle extends Node {
+        kind: SyntaxKind.Bundle;
+        sourceFiles: SourceFile[];
+    }
+
     export interface ScriptReferenceHost {
         getCompilerOptions(): CompilerOptions;
         getSourceFile(fileName: string): SourceFile;
@@ -3780,8 +3784,7 @@
         LastEmitHelper = Generator
     }
 
-    /* @internal */
-    export const enum EmitContext {
+    export const enum EmitHint {
         SourceFile,         // Emitting a SourceFile
         Expression,         // Emitting an Expression
         IdentifierName,     // Emitting an IdentifierName
@@ -3856,7 +3859,7 @@
          * Hook used by transformers to substitute expressions just before they
          * are emitted by the pretty printer.
          */
-        onSubstituteNode?: (emitContext: EmitContext, node: Node) => Node;
+        onSubstituteNode?: (hint: EmitHint, node: Node) => Node;
 
         /**
          * Enables before/after emit notifications in the pretty printer for the provided
@@ -3874,7 +3877,7 @@
          * Hook used to allow transformers to capture state before or after
          * the printer emits a node.
          */
-        onEmitNode?: (emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) => void;
+        onEmitNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
     }
 
     /* @internal */
@@ -3887,25 +3890,61 @@
         /**
          * Emits the substitute for a node, if one is available; otherwise, emits the node.
          *
-         * @param emitContext The current emit context.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to substitute.
          * @param emitCallback A callback used to emit the node or its substitute.
          */
-        emitNodeWithSubstitution(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+        emitNodeWithSubstitution(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
 
         /**
          * Emits a node with possible notification.
          *
-         * @param emitContext The current emit context.
+         * @param hint A hint as to the intended usage of the node.
          * @param node The node to emit.
          * @param emitCallback A callback used to emit the node.
          */
-        emitNodeWithNotification(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+        emitNodeWithNotification(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
     }
 
     /* @internal */
     export type Transformer = (context: TransformationContext) => (node: SourceFile) => SourceFile;
 
+    export interface EmitTextWriter {
+        write(s: string): void;
+        writeTextOfNode(text: string, node: Node): void;
+        writeLine(): void;
+        increaseIndent(): void;
+        decreaseIndent(): void;
+        getText(): string;
+        rawWrite(s: string): void;
+        writeLiteral(s: string): void;
+        getTextPos(): number;
+        getLine(): number;
+        getColumn(): number;
+        getIndent(): number;
+        isAtStartOfLine(): boolean;
+        reset(): void;
+    }
+
+    export interface Printer {
+        printNode(hint: EmitHint, node: Node, sourceFile: SourceFile): void;
+        printFile(sourceFile: SourceFile): void;
+        printBundle(bundle: Bundle): void;
+    }
+
+    export interface PrinterOptions {
+        hasGlobalName?: (name: string) => boolean;
+        onEmitSourceMapOfNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+        onEmitSourceMapOfToken?: (node: Node, token: SyntaxKind, pos: number, emitCallback: (token: SyntaxKind, pos: number) => number) => number;
+        onEmitCommentsOfNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+        onEmitDetachedCommentsOfNode?: (node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void) => void;
+        onEmitTrailingCommentsOfPosition?: (pos: number) => void;
+        onEmitNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+        onEmitHelpers?: (node: Node, writeLines: (text: string) => void) => void;
+        onSetSourceFile?: (node: SourceFile) => void;
+        onSubstituteNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+    }
+
     export interface TextSpan {
         start: number;
         length: number;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 0a16875f8c0..5c92bfa65cc 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2088,16 +2088,19 @@ namespace ts {
         return undefined;
     }
 
-    export function getOriginalSourceFiles(sourceFiles: SourceFile[]) {
-        const originalSourceFiles: SourceFile[] = [];
-        for (const sourceFile of sourceFiles) {
-            const originalSourceFile = getParseTreeNode(sourceFile, isSourceFile);
-            if (originalSourceFile) {
-                originalSourceFiles.push(originalSourceFile);
-            }
+    export function getOriginalSourceFileOrBundle(sourceFileOrBundle: SourceFile | Bundle) {
+        if (sourceFileOrBundle.kind === SyntaxKind.Bundle) {
+            return updateBundle(sourceFileOrBundle, sameMap(sourceFileOrBundle.sourceFiles, getOriginalSourceFile));
         }
+        return getOriginalSourceFile(sourceFileOrBundle);
+    }
 
-        return originalSourceFiles;
+    function getOriginalSourceFile(sourceFile: SourceFile) {
+        return getParseTreeNode(sourceFile, isSourceFile) || sourceFile;
+    }
+
+    export function getOriginalSourceFiles(sourceFiles: SourceFile[]) {
+        return sameMap(sourceFiles, getOriginalSourceFile);
     }
 
     export function getOriginalNodeId(node: Node) {
@@ -2436,23 +2439,6 @@ namespace ts {
             s;
     }
 
-    export interface EmitTextWriter {
-        write(s: string): void;
-        writeTextOfNode(text: string, node: Node): void;
-        writeLine(): void;
-        increaseIndent(): void;
-        decreaseIndent(): void;
-        getText(): string;
-        rawWrite(s: string): void;
-        writeLiteral(s: string): void;
-        getTextPos(): number;
-        getLine(): number;
-        getColumn(): number;
-        getIndent(): number;
-        isAtStartOfLine(): boolean;
-        reset(): void;
-    }
-
     const indentStrings: string[] = ["", "    "];
     export function getIndentString(level: number) {
         if (indentStrings[level] === undefined) {
@@ -2635,7 +2621,7 @@ namespace ts {
      *   Else, calls `getSourceFilesToEmit` with the (optional) target source file to determine the list of source files to emit.
      */
     export function forEachEmittedFile(
-        host: EmitHost, action: (emitFileNames: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean, emitOnlyDtsFiles: boolean) => void,
+        host: EmitHost, action: (emitFileNames: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle, emitOnlyDtsFiles: boolean) => void,
         sourceFilesOrTargetSourceFile?: SourceFile[] | SourceFile,
         emitOnlyDtsFiles?: boolean) {
 
@@ -2646,7 +2632,7 @@ namespace ts {
                 const jsFilePath = options.outFile || options.out;
                 const sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
                 const declarationFilePath = options.declaration ? removeFileExtension(jsFilePath) + ".d.ts" : undefined;
-                action({ jsFilePath, sourceMapFilePath, declarationFilePath }, sourceFiles, /*isBundledEmit*/true, emitOnlyDtsFiles);
+                action({ jsFilePath, sourceMapFilePath, declarationFilePath }, createBundle(sourceFiles), emitOnlyDtsFiles);
             }
         }
         else {
@@ -2654,7 +2640,7 @@ namespace ts {
                 const jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, getOutputExtension(sourceFile, options));
                 const sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
                 const declarationFilePath = !isSourceFileJavaScript(sourceFile) && (emitOnlyDtsFiles || options.declaration) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
-                action({ jsFilePath, sourceMapFilePath, declarationFilePath }, [sourceFile], /*isBundledEmit*/false, emitOnlyDtsFiles);
+                action({ jsFilePath, sourceMapFilePath, declarationFilePath }, sourceFile, emitOnlyDtsFiles);
             }
         }
     }
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
index ebd07118cc5..d7bb935db89 100644
--- a/src/harness/tsconfig.json
+++ b/src/harness/tsconfig.json
@@ -37,6 +37,7 @@
         "../compiler/comments.ts",
         "../compiler/sourcemap.ts",
         "../compiler/declarationEmitter.ts",
+        "../compiler/printer.ts",
         "../compiler/emitter.ts",
         "../compiler/program.ts",
         "../compiler/commandLineParser.ts",
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index b60e00292f5..493f3b45f93 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -34,6 +34,7 @@
         "../compiler/comments.ts",
         "../compiler/sourcemap.ts",
         "../compiler/declarationEmitter.ts",
+        "../compiler/printer.ts",
         "../compiler/emitter.ts",
         "../compiler/program.ts",
         "../compiler/commandLineParser.ts",

From 56b1dcd8eaa3ce996867e0f586c768f6fa422cae Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 29 Jan 2017 12:39:15 -0800
Subject: [PATCH 032/127] Add tests

---
 .../classes/mixinClassesAnnotated.ts          | 67 +++++++++++++
 .../classes/mixinClassesAnonymous.ts          | 56 +++++++++++
 .../classes/mixinClassesMembers.ts            | 99 +++++++++++++++++++
 3 files changed, 222 insertions(+)
 create mode 100644 tests/cases/conformance/classes/mixinClassesAnnotated.ts
 create mode 100644 tests/cases/conformance/classes/mixinClassesAnonymous.ts
 create mode 100644 tests/cases/conformance/classes/mixinClassesMembers.ts

diff --git a/tests/cases/conformance/classes/mixinClassesAnnotated.ts b/tests/cases/conformance/classes/mixinClassesAnnotated.ts
new file mode 100644
index 00000000000..62f5e30c9a0
--- /dev/null
+++ b/tests/cases/conformance/classes/mixinClassesAnnotated.ts
@@ -0,0 +1,67 @@
+// @declaration: true
+
+type Constructor<T> = new(...args: any[]) => T;
+
+class Base {
+    constructor(public x: number, public y: number) {}
+}
+
+class Derived extends Base {
+    constructor(x: number, y: number, public z: number) {
+        super(x, y);
+    }
+}
+
+interface Printable {
+    print(): void;
+}
+
+const Printable = <T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>
+    class extends superClass {
+        static message = "hello";
+        print() {
+            const output = this.x + "," + this.y;
+        }
+    }
+
+interface Tagged {
+    _tag: string;
+}
+
+function Tagged<T extends Constructor<{}>>(superClass: T): Constructor<Tagged> & T {
+    class C extends superClass {
+        _tag: string;
+        constructor(...args: any[]) {
+            super(...args);
+            this._tag = "hello";
+        }
+    }
+    return C;
+}
+
+const Thing1 = Tagged(Derived);
+const Thing2 = Tagged(Printable(Derived));
+Thing2.message;
+
+function f1() {
+    const thing = new Thing1(1, 2, 3);
+    thing.x;
+    thing._tag;
+}
+
+function f2() {
+    const thing = new Thing2(1, 2, 3);
+    thing.x;
+    thing._tag;
+    thing.print();
+}
+
+class Thing3 extends Thing2 {
+    constructor(tag: string) {
+        super(10, 20, 30);
+        this._tag = tag;
+    }
+    test() {
+        this.print();
+    }
+}
diff --git a/tests/cases/conformance/classes/mixinClassesAnonymous.ts b/tests/cases/conformance/classes/mixinClassesAnonymous.ts
new file mode 100644
index 00000000000..24289b61e3e
--- /dev/null
+++ b/tests/cases/conformance/classes/mixinClassesAnonymous.ts
@@ -0,0 +1,56 @@
+type Constructor<T> = new(...args: any[]) => T;
+
+class Base {
+    constructor(public x: number, public y: number) {}
+}
+
+class Derived extends Base {
+    constructor(x: number, y: number, public z: number) {
+        super(x, y);
+    }
+}
+
+const Printable = <T extends Constructor<Base>>(superClass: T) => class extends superClass {
+    static message = "hello";
+    print() {
+        const output = this.x + "," + this.y;
+    }
+}
+
+function Tagged<T extends Constructor<{}>>(superClass: T) {
+    class C extends superClass {
+        _tag: string;
+        constructor(...args: any[]) {
+            super(...args);
+            this._tag = "hello";
+        }
+    }
+    return C;
+}
+
+const Thing1 = Tagged(Derived);
+const Thing2 = Tagged(Printable(Derived));
+Thing2.message;
+
+function f1() {
+    const thing = new Thing1(1, 2, 3);
+    thing.x;
+    thing._tag;
+}
+
+function f2() {
+    const thing = new Thing2(1, 2, 3);
+    thing.x;
+    thing._tag;
+    thing.print();
+}
+
+class Thing3 extends Thing2 {
+    constructor(tag: string) {
+        super(10, 20, 30);
+        this._tag = tag;
+    }
+    test() {
+        this.print();
+    }
+}
diff --git a/tests/cases/conformance/classes/mixinClassesMembers.ts b/tests/cases/conformance/classes/mixinClassesMembers.ts
new file mode 100644
index 00000000000..905518c88f8
--- /dev/null
+++ b/tests/cases/conformance/classes/mixinClassesMembers.ts
@@ -0,0 +1,99 @@
+// @declaration: true
+
+declare class C1 {
+    public a: number;
+    protected b: number;
+    private c: number;
+    constructor(s: string);
+    constructor(n: number);
+}
+
+declare class M1 {
+    constructor(...args: any[]);
+    p: number;
+    static p: number;
+}
+
+declare class M2 {
+    constructor(...args: any[]);
+    f(): number;
+    static f(): number;
+}
+
+declare const Mixed1: typeof M1 & typeof C1;
+declare const Mixed2: typeof C1 & typeof M1;
+declare const Mixed3: typeof M2 & typeof M1 & typeof C1;
+declare const Mixed4: typeof C1 & typeof M1 & typeof M2;
+declare const Mixed5: typeof M1 & typeof M2;
+
+function f1() {
+    let x1 = new Mixed1("hello");
+    let x2 = new Mixed1(42);
+    let x3 = new Mixed2("hello");
+    let x4 = new Mixed2(42);
+    let x5 = new Mixed3("hello");
+    let x6 = new Mixed3(42);
+    let x7 = new Mixed4("hello");
+    let x8 = new Mixed4(42);
+    let x9 = new Mixed5();
+}
+
+function f2() {
+    let x = new Mixed1("hello");
+    x.a;
+    x.p;
+    Mixed1.p;
+}
+
+function f3() {
+    let x = new Mixed2("hello");
+    x.a;
+    x.p;
+    Mixed2.p;
+}
+
+function f4() {
+    let x = new Mixed3("hello");
+    x.a;
+    x.p;
+    x.f();
+    Mixed3.p;
+    Mixed3.f();
+}
+
+function f5() {
+    let x = new Mixed4("hello");
+    x.a;
+    x.p;
+    x.f();
+    Mixed4.p;
+    Mixed4.f();
+}
+
+function f6() {
+    let x = new Mixed5();
+    x.p;
+    x.f();
+    Mixed5.p;
+    Mixed5.f();
+}
+
+class C2 extends Mixed1 {
+    constructor() {
+        super("hello");
+        this.a;
+        this.b;
+        this.p;
+    }
+}
+
+class C3 extends Mixed3 {
+    constructor() {
+        super(42);
+        this.a;
+        this.b;
+        this.p;
+        this.f();
+    }
+    f() { return super.f(); }
+}

From 004dbf458c3f577140f2c4fbcab06f55ef9250d3 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 29 Jan 2017 12:39:33 -0800
Subject: [PATCH 033/127] Accept new baselines

---
 .../reference/mixinClassesAnnotated.js        | 183 +++++++++
 .../reference/mixinClassesAnnotated.symbols   | 193 ++++++++++
 .../reference/mixinClassesAnnotated.types     | 224 +++++++++++
 .../reference/mixinClassesAnonymous.js        | 140 +++++++
 .../reference/mixinClassesAnonymous.symbols   | 169 +++++++++
 .../reference/mixinClassesAnonymous.types     | 200 ++++++++++
 .../reference/mixinClassesMembers.js          | 220 +++++++++++
 .../reference/mixinClassesMembers.symbols     | 309 +++++++++++++++
 .../reference/mixinClassesMembers.types       | 352 ++++++++++++++++++
 9 files changed, 1990 insertions(+)
 create mode 100644 tests/baselines/reference/mixinClassesAnnotated.js
 create mode 100644 tests/baselines/reference/mixinClassesAnnotated.symbols
 create mode 100644 tests/baselines/reference/mixinClassesAnnotated.types
 create mode 100644 tests/baselines/reference/mixinClassesAnonymous.js
 create mode 100644 tests/baselines/reference/mixinClassesAnonymous.symbols
 create mode 100644 tests/baselines/reference/mixinClassesAnonymous.types
 create mode 100644 tests/baselines/reference/mixinClassesMembers.js
 create mode 100644 tests/baselines/reference/mixinClassesMembers.symbols
 create mode 100644 tests/baselines/reference/mixinClassesMembers.types

diff --git a/tests/baselines/reference/mixinClassesAnnotated.js b/tests/baselines/reference/mixinClassesAnnotated.js
new file mode 100644
index 00000000000..e3a781033ff
--- /dev/null
+++ b/tests/baselines/reference/mixinClassesAnnotated.js
@@ -0,0 +1,183 @@
+//// [mixinClassesAnnotated.ts]
+
+type Constructor<T> = new(...args: any[]) => T;
+
+class Base {
+    constructor(public x: number, public y: number) {}
+}
+
+class Derived extends Base {
+    constructor(x: number, y: number, public z: number) {
+        super(x, y);
+    }
+}
+
+interface Printable {
+    print(): void;
+}
+
+const Printable = <T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>
+    class extends superClass {
+        static message = "hello";
+        print() {
+            const output = this.x + "," + this.y;
+        }
+    }
+
+interface Tagged {
+    _tag: string;
+}
+
+function Tagged<T extends Constructor<{}>>(superClass: T): Constructor<Tagged> & T {
+    class C extends superClass {
+        _tag: string;
+        constructor(...args: any[]) {
+            super(...args);
+            this._tag = "hello";
+        }
+    }
+    return C;
+}
+
+const Thing1 = Tagged(Derived);
+const Thing2 = Tagged(Printable(Derived));
+Thing2.message;
+
+function f1() {
+    const thing = new Thing1(1, 2, 3);
+    thing.x;
+    thing._tag;
+}
+
+function f2() {
+    const thing = new Thing2(1, 2, 3);
+    thing.x;
+    thing._tag;
+    thing.print();
+}
+
+class Thing3 extends Thing2 {
+    constructor(tag: string) {
+        super(10, 20, 30);
+        this._tag = tag;
+    }
+    test() {
+        this.print();
+    }
+}
+
+
+//// [mixinClassesAnnotated.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var Base = (function () {
+    function Base(x, y) {
+        this.x = x;
+        this.y = y;
+    }
+    return Base;
+}());
+var Derived = (function (_super) {
+    __extends(Derived, _super);
+    function Derived(x, y, z) {
+        var _this = _super.call(this, x, y) || this;
+        _this.z = z;
+        return _this;
+    }
+    return Derived;
+}(Base));
+var Printable = function (superClass) { return _a = (function (_super) {
+        __extends(class_1, _super);
+        function class_1() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        class_1.prototype.print = function () {
+            var output = this.x + "," + this.y;
+        };
+        return class_1;
+    }(superClass)),
+    _a.message = "hello",
+    _a; var _a; };
+function Tagged(superClass) {
+    var C = (function (_super) {
+        __extends(C, _super);
+        function C() {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var _this = _super.apply(this, args) || this;
+            _this._tag = "hello";
+            return _this;
+        }
+        return C;
+    }(superClass));
+    return C;
+}
+var Thing1 = Tagged(Derived);
+var Thing2 = Tagged(Printable(Derived));
+Thing2.message;
+function f1() {
+    var thing = new Thing1(1, 2, 3);
+    thing.x;
+    thing._tag;
+}
+function f2() {
+    var thing = new Thing2(1, 2, 3);
+    thing.x;
+    thing._tag;
+    thing.print();
+}
+var Thing3 = (function (_super) {
+    __extends(Thing3, _super);
+    function Thing3(tag) {
+        var _this = _super.call(this, 10, 20, 30) || this;
+        _this._tag = tag;
+        return _this;
+    }
+    Thing3.prototype.test = function () {
+        this.print();
+    };
+    return Thing3;
+}(Thing2));
+
+
+//// [mixinClassesAnnotated.d.ts]
+declare type Constructor<T> = new (...args: any[]) => T;
+declare class Base {
+    x: number;
+    y: number;
+    constructor(x: number, y: number);
+}
+declare class Derived extends Base {
+    z: number;
+    constructor(x: number, y: number, z: number);
+}
+interface Printable {
+    print(): void;
+}
+declare const Printable: <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & {
+    message: string;
+} & T;
+interface Tagged {
+    _tag: string;
+}
+declare function Tagged<T extends Constructor<{}>>(superClass: T): Constructor<Tagged> & T;
+declare const Thing1: Constructor<Tagged> & typeof Derived;
+declare const Thing2: Constructor<Tagged> & Constructor<Printable> & {
+    message: string;
+} & typeof Derived;
+declare function f1(): void;
+declare function f2(): void;
+declare class Thing3 extends Thing2 {
+    constructor(tag: string);
+    test(): void;
+}
diff --git a/tests/baselines/reference/mixinClassesAnnotated.symbols b/tests/baselines/reference/mixinClassesAnnotated.symbols
new file mode 100644
index 00000000000..5a03789e2e6
--- /dev/null
+++ b/tests/baselines/reference/mixinClassesAnnotated.symbols
@@ -0,0 +1,193 @@
+=== tests/cases/conformance/classes/mixinClassesAnnotated.ts ===
+
+type Constructor<T> = new(...args: any[]) => T;
+>Constructor : Symbol(Constructor, Decl(mixinClassesAnnotated.ts, 0, 0))
+>T : Symbol(T, Decl(mixinClassesAnnotated.ts, 1, 17))
+>args : Symbol(args, Decl(mixinClassesAnnotated.ts, 1, 26))
+>T : Symbol(T, Decl(mixinClassesAnnotated.ts, 1, 17))
+
+class Base {
+>Base : Symbol(Base, Decl(mixinClassesAnnotated.ts, 1, 47))
+
+    constructor(public x: number, public y: number) {}
+>x : Symbol(Base.x, Decl(mixinClassesAnnotated.ts, 4, 16))
+>y : Symbol(Base.y, Decl(mixinClassesAnnotated.ts, 4, 33))
+}
+
+class Derived extends Base {
+>Derived : Symbol(Derived, Decl(mixinClassesAnnotated.ts, 5, 1))
+>Base : Symbol(Base, Decl(mixinClassesAnnotated.ts, 1, 47))
+
+    constructor(x: number, y: number, public z: number) {
+>x : Symbol(x, Decl(mixinClassesAnnotated.ts, 8, 16))
+>y : Symbol(y, Decl(mixinClassesAnnotated.ts, 8, 26))
+>z : Symbol(Derived.z, Decl(mixinClassesAnnotated.ts, 8, 37))
+
+        super(x, y);
+>super : Symbol(Base, Decl(mixinClassesAnnotated.ts, 1, 47))
+>x : Symbol(x, Decl(mixinClassesAnnotated.ts, 8, 16))
+>y : Symbol(y, Decl(mixinClassesAnnotated.ts, 8, 26))
+    }
+}
+
+interface Printable {
+>Printable : Symbol(Printable, Decl(mixinClassesAnnotated.ts, 11, 1), Decl(mixinClassesAnnotated.ts, 17, 5))
+
+    print(): void;
+>print : Symbol(Printable.print, Decl(mixinClassesAnnotated.ts, 13, 21))
+}
+
+const Printable = <T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>
+>Printable : Symbol(Printable, Decl(mixinClassesAnnotated.ts, 11, 1), Decl(mixinClassesAnnotated.ts, 17, 5))
+>T : Symbol(T, Decl(mixinClassesAnnotated.ts, 17, 19))
+>Constructor : Symbol(Constructor, Decl(mixinClassesAnnotated.ts, 0, 0))
+>Base : Symbol(Base, Decl(mixinClassesAnnotated.ts, 1, 47))
+>superClass : Symbol(superClass, Decl(mixinClassesAnnotated.ts, 17, 48))
+>T : Symbol(T, Decl(mixinClassesAnnotated.ts, 17, 19))
+>Constructor : Symbol(Constructor, Decl(mixinClassesAnnotated.ts, 0, 0))
+>Printable : Symbol(Printable, Decl(mixinClassesAnnotated.ts, 11, 1), Decl(mixinClassesAnnotated.ts, 17, 5))
+>message : Symbol(message, Decl(mixinClassesAnnotated.ts, 17, 90))
+>T : Symbol(T, Decl(mixinClassesAnnotated.ts, 17, 19))
+
+    class extends superClass {
+>superClass : Symbol(superClass, Decl(mixinClassesAnnotated.ts, 17, 48))
+
+        static message = "hello";
+>message : Symbol((Anonymous class).message, Decl(mixinClassesAnnotated.ts, 18, 30))
+
+        print() {
+>print : Symbol((Anonymous class).print, Decl(mixinClassesAnnotated.ts, 19, 33))
+
+            const output = this.x + "," + this.y;
+>output : Symbol(output, Decl(mixinClassesAnnotated.ts, 21, 17))
+>this.x : Symbol(Base.x, Decl(mixinClassesAnnotated.ts, 4, 16))
+>this : Symbol((Anonymous class), Decl(mixinClassesAnnotated.ts, 17, 115))
+>x : Symbol(Base.x, Decl(mixinClassesAnnotated.ts, 4, 16))
+>this.y : Symbol(Base.y, Decl(mixinClassesAnnotated.ts, 4, 33))
+>this : Symbol((Anonymous class), Decl(mixinClassesAnnotated.ts, 17, 115))
+>y : Symbol(Base.y, Decl(mixinClassesAnnotated.ts, 4, 33))
+        }
+    }
+
+interface Tagged {
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 23, 5), Decl(mixinClassesAnnotated.ts, 27, 1))
+
+    _tag: string;
+>_tag : Symbol(Tagged._tag, Decl(mixinClassesAnnotated.ts, 25, 18))
+}
+
+function Tagged<T extends Constructor<{}>>(superClass: T): Constructor<Tagged> & T {
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 23, 5), Decl(mixinClassesAnnotated.ts, 27, 1))
+>T : Symbol(T, Decl(mixinClassesAnnotated.ts, 29, 16))
+>Constructor : Symbol(Constructor, Decl(mixinClassesAnnotated.ts, 0, 0))
+>superClass : Symbol(superClass, Decl(mixinClassesAnnotated.ts, 29, 43))
+>T : Symbol(T, Decl(mixinClassesAnnotated.ts, 29, 16))
+>Constructor : Symbol(Constructor, Decl(mixinClassesAnnotated.ts, 0, 0))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 23, 5), Decl(mixinClassesAnnotated.ts, 27, 1))
+>T : Symbol(T, Decl(mixinClassesAnnotated.ts, 29, 16))
+
+    class C extends superClass {
+>C : Symbol(C, Decl(mixinClassesAnnotated.ts, 29, 84))
+>superClass : Symbol(superClass, Decl(mixinClassesAnnotated.ts, 29, 43))
+
+        _tag: string;
+>_tag : Symbol(C._tag, Decl(mixinClassesAnnotated.ts, 30, 32))
+
+        constructor(...args: any[]) {
+>args : Symbol(args, Decl(mixinClassesAnnotated.ts, 32, 20))
+
+            super(...args);
+>super : Symbol(T, Decl(mixinClassesAnnotated.ts, 29, 16))
+>args : Symbol(args, Decl(mixinClassesAnnotated.ts, 32, 20))
+
+            this._tag = "hello";
+>this._tag : Symbol(C._tag, Decl(mixinClassesAnnotated.ts, 30, 32))
+>this : Symbol(C, Decl(mixinClassesAnnotated.ts, 29, 84))
+>_tag : Symbol(C._tag, Decl(mixinClassesAnnotated.ts, 30, 32))
+        }
+    }
+    return C;
+>C : Symbol(C, Decl(mixinClassesAnnotated.ts, 29, 84))
+}
+
+const Thing1 = Tagged(Derived);
+>Thing1 : Symbol(Thing1, Decl(mixinClassesAnnotated.ts, 40, 5))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 23, 5), Decl(mixinClassesAnnotated.ts, 27, 1))
+>Derived : Symbol(Derived, Decl(mixinClassesAnnotated.ts, 5, 1))
+
+const Thing2 = Tagged(Printable(Derived));
+>Thing2 : Symbol(Thing2, Decl(mixinClassesAnnotated.ts, 41, 5))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 23, 5), Decl(mixinClassesAnnotated.ts, 27, 1))
+>Printable : Symbol(Printable, Decl(mixinClassesAnnotated.ts, 11, 1), Decl(mixinClassesAnnotated.ts, 17, 5))
+>Derived : Symbol(Derived, Decl(mixinClassesAnnotated.ts, 5, 1))
+
+Thing2.message;
+>Thing2.message : Symbol(message, Decl(mixinClassesAnnotated.ts, 17, 90))
+>Thing2 : Symbol(Thing2, Decl(mixinClassesAnnotated.ts, 41, 5))
+>message : Symbol(message, Decl(mixinClassesAnnotated.ts, 17, 90))
+
+function f1() {
+>f1 : Symbol(f1, Decl(mixinClassesAnnotated.ts, 42, 15))
+
+    const thing = new Thing1(1, 2, 3);
+>thing : Symbol(thing, Decl(mixinClassesAnnotated.ts, 45, 9))
+>Thing1 : Symbol(Thing1, Decl(mixinClassesAnnotated.ts, 40, 5))
+
+    thing.x;
+>thing.x : Symbol(Base.x, Decl(mixinClassesAnnotated.ts, 4, 16))
+>thing : Symbol(thing, Decl(mixinClassesAnnotated.ts, 45, 9))
+>x : Symbol(Base.x, Decl(mixinClassesAnnotated.ts, 4, 16))
+
+    thing._tag;
+>thing._tag : Symbol(Tagged._tag, Decl(mixinClassesAnnotated.ts, 25, 18))
+>thing : Symbol(thing, Decl(mixinClassesAnnotated.ts, 45, 9))
+>_tag : Symbol(Tagged._tag, Decl(mixinClassesAnnotated.ts, 25, 18))
+}
+
+function f2() {
+>f2 : Symbol(f2, Decl(mixinClassesAnnotated.ts, 48, 1))
+
+    const thing = new Thing2(1, 2, 3);
+>thing : Symbol(thing, Decl(mixinClassesAnnotated.ts, 51, 9))
+>Thing2 : Symbol(Thing2, Decl(mixinClassesAnnotated.ts, 41, 5))
+
+    thing.x;
+>thing.x : Symbol(Base.x, Decl(mixinClassesAnnotated.ts, 4, 16))
+>thing : Symbol(thing, Decl(mixinClassesAnnotated.ts, 51, 9))
+>x : Symbol(Base.x, Decl(mixinClassesAnnotated.ts, 4, 16))
+
+    thing._tag;
+>thing._tag : Symbol(Tagged._tag, Decl(mixinClassesAnnotated.ts, 25, 18))
+>thing : Symbol(thing, Decl(mixinClassesAnnotated.ts, 51, 9))
+>_tag : Symbol(Tagged._tag, Decl(mixinClassesAnnotated.ts, 25, 18))
+
+    thing.print();
+>thing.print : Symbol(Printable.print, Decl(mixinClassesAnnotated.ts, 13, 21))
+>thing : Symbol(thing, Decl(mixinClassesAnnotated.ts, 51, 9))
+>print : Symbol(Printable.print, Decl(mixinClassesAnnotated.ts, 13, 21))
+}
+
+class Thing3 extends Thing2 {
+>Thing3 : Symbol(Thing3, Decl(mixinClassesAnnotated.ts, 55, 1))
+>Thing2 : Symbol(Thing2, Decl(mixinClassesAnnotated.ts, 41, 5))
+
+    constructor(tag: string) {
+>tag : Symbol(tag, Decl(mixinClassesAnnotated.ts, 58, 16))
+
+        super(10, 20, 30);
+        this._tag = tag;
+>this._tag : Symbol(Tagged._tag, Decl(mixinClassesAnnotated.ts, 25, 18))
+>this : Symbol(Thing3, Decl(mixinClassesAnnotated.ts, 55, 1))
+>_tag : Symbol(Tagged._tag, Decl(mixinClassesAnnotated.ts, 25, 18))
+>tag : Symbol(tag, Decl(mixinClassesAnnotated.ts, 58, 16))
+    }
+    test() {
+>test : Symbol(Thing3.test, Decl(mixinClassesAnnotated.ts, 61, 5))
+
+        this.print();
+>this.print : Symbol(Printable.print, Decl(mixinClassesAnnotated.ts, 13, 21))
+>this : Symbol(Thing3, Decl(mixinClassesAnnotated.ts, 55, 1))
+>print : Symbol(Printable.print, Decl(mixinClassesAnnotated.ts, 13, 21))
+    }
+}
+
diff --git a/tests/baselines/reference/mixinClassesAnnotated.types b/tests/baselines/reference/mixinClassesAnnotated.types
new file mode 100644
index 00000000000..afaf4c4d25e
--- /dev/null
+++ b/tests/baselines/reference/mixinClassesAnnotated.types
@@ -0,0 +1,224 @@
+=== tests/cases/conformance/classes/mixinClassesAnnotated.ts ===
+
+type Constructor<T> = new(...args: any[]) => T;
+>Constructor : Constructor<T>
+>T : T
+>args : any[]
+>T : T
+
+class Base {
+>Base : Base
+
+    constructor(public x: number, public y: number) {}
+>x : number
+>y : number
+}
+
+class Derived extends Base {
+>Derived : Derived
+>Base : Base
+
+    constructor(x: number, y: number, public z: number) {
+>x : number
+>y : number
+>z : number
+
+        super(x, y);
+>super(x, y) : void
+>super : typeof Base
+>x : number
+>y : number
+    }
+}
+
+interface Printable {
+>Printable : Printable
+
+    print(): void;
+>print : () => void
+}
+
+const Printable = <T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>
+>Printable : <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & { message: string; } & T
+><T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>    class extends superClass {        static message = "hello";        print() {            const output = this.x + "," + this.y;        }    } : <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & { message: string; } & T
+>T : T
+>Constructor : Constructor<T>
+>Base : Base
+>superClass : T
+>T : T
+>Constructor : Constructor<T>
+>Printable : Printable
+>message : string
+>T : T
+
+    class extends superClass {
+>class extends superClass {        static message = "hello";        print() {            const output = this.x + "," + this.y;        }    } : { new (...args: any[]): (Anonymous class); prototype: <any>.(Anonymous class); message: string; } & T
+>superClass : Base
+
+        static message = "hello";
+>message : string
+>"hello" : "hello"
+
+        print() {
+>print : () => void
+
+            const output = this.x + "," + this.y;
+>output : string
+>this.x + "," + this.y : string
+>this.x + "," : string
+>this.x : number
+>this : this
+>x : number
+>"," : ","
+>this.y : number
+>this : this
+>y : number
+        }
+    }
+
+interface Tagged {
+>Tagged : Tagged
+
+    _tag: string;
+>_tag : string
+}
+
+function Tagged<T extends Constructor<{}>>(superClass: T): Constructor<Tagged> & T {
+>Tagged : <T extends Constructor<{}>>(superClass: T) => Constructor<Tagged> & T
+>T : T
+>Constructor : Constructor<T>
+>superClass : T
+>T : T
+>Constructor : Constructor<T>
+>Tagged : Tagged
+>T : T
+
+    class C extends superClass {
+>C : C
+>superClass : {}
+
+        _tag: string;
+>_tag : string
+
+        constructor(...args: any[]) {
+>args : any[]
+
+            super(...args);
+>super(...args) : void
+>super : T
+>...args : any
+>args : any[]
+
+            this._tag = "hello";
+>this._tag = "hello" : "hello"
+>this._tag : string
+>this : this
+>_tag : string
+>"hello" : "hello"
+        }
+    }
+    return C;
+>C : { new (...args: any[]): C; prototype: Tagged<any>.C; } & T
+}
+
+const Thing1 = Tagged(Derived);
+>Thing1 : Constructor<Tagged> & typeof Derived
+>Tagged(Derived) : Constructor<Tagged> & typeof Derived
+>Tagged : <T extends Constructor<{}>>(superClass: T) => Constructor<Tagged> & T
+>Derived : typeof Derived
+
+const Thing2 = Tagged(Printable(Derived));
+>Thing2 : Constructor<Tagged> & Constructor<Printable> & { message: string; } & typeof Derived
+>Tagged(Printable(Derived)) : Constructor<Tagged> & Constructor<Printable> & { message: string; } & typeof Derived
+>Tagged : <T extends Constructor<{}>>(superClass: T) => Constructor<Tagged> & T
+>Printable(Derived) : Constructor<Printable> & { message: string; } & typeof Derived
+>Printable : <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & { message: string; } & T
+>Derived : typeof Derived
+
+Thing2.message;
+>Thing2.message : string
+>Thing2 : Constructor<Tagged> & Constructor<Printable> & { message: string; } & typeof Derived
+>message : string
+
+function f1() {
+>f1 : () => void
+
+    const thing = new Thing1(1, 2, 3);
+>thing : Tagged & Derived
+>new Thing1(1, 2, 3) : Tagged & Derived
+>Thing1 : Constructor<Tagged> & typeof Derived
+>1 : 1
+>2 : 2
+>3 : 3
+
+    thing.x;
+>thing.x : number
+>thing : Tagged & Derived
+>x : number
+
+    thing._tag;
+>thing._tag : string
+>thing : Tagged & Derived
+>_tag : string
+}
+
+function f2() {
+>f2 : () => void
+
+    const thing = new Thing2(1, 2, 3);
+>thing : Tagged & Printable & Derived
+>new Thing2(1, 2, 3) : Tagged & Printable & Derived
+>Thing2 : Constructor<Tagged> & Constructor<Printable> & { message: string; } & typeof Derived
+>1 : 1
+>2 : 2
+>3 : 3
+
+    thing.x;
+>thing.x : number
+>thing : Tagged & Printable & Derived
+>x : number
+
+    thing._tag;
+>thing._tag : string
+>thing : Tagged & Printable & Derived
+>_tag : string
+
+    thing.print();
+>thing.print() : void
+>thing.print : () => void
+>thing : Tagged & Printable & Derived
+>print : () => void
+}
+
+class Thing3 extends Thing2 {
+>Thing3 : Thing3
+>Thing2 : Tagged & Printable & Derived
+
+    constructor(tag: string) {
+>tag : string
+
+        super(10, 20, 30);
+>super(10, 20, 30) : void
+>super : Constructor<Tagged> & Constructor<Printable> & { message: string; } & typeof Derived
+>10 : 10
+>20 : 20
+>30 : 30
+
+        this._tag = tag;
+>this._tag = tag : string
+>this._tag : string
+>this : this
+>_tag : string
+>tag : string
+    }
+    test() {
+>test : () => void
+
+        this.print();
+>this.print() : void
+>this.print : () => void
+>this : this
+>print : () => void
+    }
+}
+
diff --git a/tests/baselines/reference/mixinClassesAnonymous.js b/tests/baselines/reference/mixinClassesAnonymous.js
new file mode 100644
index 00000000000..c7b8ab5fd63
--- /dev/null
+++ b/tests/baselines/reference/mixinClassesAnonymous.js
@@ -0,0 +1,140 @@
+//// [mixinClassesAnonymous.ts]
+type Constructor<T> = new(...args: any[]) => T;
+
+class Base {
+    constructor(public x: number, public y: number) {}
+}
+
+class Derived extends Base {
+    constructor(x: number, y: number, public z: number) {
+        super(x, y);
+    }
+}
+
+const Printable = <T extends Constructor<Base>>(superClass: T) => class extends superClass {
+    static message = "hello";
+    print() {
+        const output = this.x + "," + this.y;
+    }
+}
+
+function Tagged<T extends Constructor<{}>>(superClass: T) {
+    class C extends superClass {
+        _tag: string;
+        constructor(...args: any[]) {
+            super(...args);
+            this._tag = "hello";
+        }
+    }
+    return C;
+}
+
+const Thing1 = Tagged(Derived);
+const Thing2 = Tagged(Printable(Derived));
+Thing2.message;
+
+function f1() {
+    const thing = new Thing1(1, 2, 3);
+    thing.x;
+    thing._tag;
+}
+
+function f2() {
+    const thing = new Thing2(1, 2, 3);
+    thing.x;
+    thing._tag;
+    thing.print();
+}
+
+class Thing3 extends Thing2 {
+    constructor(tag: string) {
+        super(10, 20, 30);
+        this._tag = tag;
+    }
+    test() {
+        this.print();
+    }
+}
+
+
+//// [mixinClassesAnonymous.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var Base = (function () {
+    function Base(x, y) {
+        this.x = x;
+        this.y = y;
+    }
+    return Base;
+}());
+var Derived = (function (_super) {
+    __extends(Derived, _super);
+    function Derived(x, y, z) {
+        var _this = _super.call(this, x, y) || this;
+        _this.z = z;
+        return _this;
+    }
+    return Derived;
+}(Base));
+var Printable = function (superClass) { return _a = (function (_super) {
+        __extends(class_1, _super);
+        function class_1() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        class_1.prototype.print = function () {
+            var output = this.x + "," + this.y;
+        };
+        return class_1;
+    }(superClass)),
+    _a.message = "hello",
+    _a; var _a; };
+function Tagged(superClass) {
+    var C = (function (_super) {
+        __extends(C, _super);
+        function C() {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var _this = _super.apply(this, args) || this;
+            _this._tag = "hello";
+            return _this;
+        }
+        return C;
+    }(superClass));
+    return C;
+}
+var Thing1 = Tagged(Derived);
+var Thing2 = Tagged(Printable(Derived));
+Thing2.message;
+function f1() {
+    var thing = new Thing1(1, 2, 3);
+    thing.x;
+    thing._tag;
+}
+function f2() {
+    var thing = new Thing2(1, 2, 3);
+    thing.x;
+    thing._tag;
+    thing.print();
+}
+var Thing3 = (function (_super) {
+    __extends(Thing3, _super);
+    function Thing3(tag) {
+        var _this = _super.call(this, 10, 20, 30) || this;
+        _this._tag = tag;
+        return _this;
+    }
+    Thing3.prototype.test = function () {
+        this.print();
+    };
+    return Thing3;
+}(Thing2));
diff --git a/tests/baselines/reference/mixinClassesAnonymous.symbols b/tests/baselines/reference/mixinClassesAnonymous.symbols
new file mode 100644
index 00000000000..204d9c589fd
--- /dev/null
+++ b/tests/baselines/reference/mixinClassesAnonymous.symbols
@@ -0,0 +1,169 @@
+=== tests/cases/conformance/classes/mixinClassesAnonymous.ts ===
+type Constructor<T> = new(...args: any[]) => T;
+>Constructor : Symbol(Constructor, Decl(mixinClassesAnonymous.ts, 0, 0))
+>T : Symbol(T, Decl(mixinClassesAnonymous.ts, 0, 17))
+>args : Symbol(args, Decl(mixinClassesAnonymous.ts, 0, 26))
+>T : Symbol(T, Decl(mixinClassesAnonymous.ts, 0, 17))
+
+class Base {
+>Base : Symbol(Base, Decl(mixinClassesAnonymous.ts, 0, 47))
+
+    constructor(public x: number, public y: number) {}
+>x : Symbol(Base.x, Decl(mixinClassesAnonymous.ts, 3, 16))
+>y : Symbol(Base.y, Decl(mixinClassesAnonymous.ts, 3, 33))
+}
+
+class Derived extends Base {
+>Derived : Symbol(Derived, Decl(mixinClassesAnonymous.ts, 4, 1))
+>Base : Symbol(Base, Decl(mixinClassesAnonymous.ts, 0, 47))
+
+    constructor(x: number, y: number, public z: number) {
+>x : Symbol(x, Decl(mixinClassesAnonymous.ts, 7, 16))
+>y : Symbol(y, Decl(mixinClassesAnonymous.ts, 7, 26))
+>z : Symbol(Derived.z, Decl(mixinClassesAnonymous.ts, 7, 37))
+
+        super(x, y);
+>super : Symbol(Base, Decl(mixinClassesAnonymous.ts, 0, 47))
+>x : Symbol(x, Decl(mixinClassesAnonymous.ts, 7, 16))
+>y : Symbol(y, Decl(mixinClassesAnonymous.ts, 7, 26))
+    }
+}
+
+const Printable = <T extends Constructor<Base>>(superClass: T) => class extends superClass {
+>Printable : Symbol(Printable, Decl(mixinClassesAnonymous.ts, 12, 5))
+>T : Symbol(T, Decl(mixinClassesAnonymous.ts, 12, 19))
+>Constructor : Symbol(Constructor, Decl(mixinClassesAnonymous.ts, 0, 0))
+>Base : Symbol(Base, Decl(mixinClassesAnonymous.ts, 0, 47))
+>superClass : Symbol(superClass, Decl(mixinClassesAnonymous.ts, 12, 48))
+>T : Symbol(T, Decl(mixinClassesAnonymous.ts, 12, 19))
+>superClass : Symbol(superClass, Decl(mixinClassesAnonymous.ts, 12, 48))
+
+    static message = "hello";
+>message : Symbol((Anonymous class).message, Decl(mixinClassesAnonymous.ts, 12, 92))
+
+    print() {
+>print : Symbol((Anonymous class).print, Decl(mixinClassesAnonymous.ts, 13, 29))
+
+        const output = this.x + "," + this.y;
+>output : Symbol(output, Decl(mixinClassesAnonymous.ts, 15, 13))
+>this.x : Symbol(Base.x, Decl(mixinClassesAnonymous.ts, 3, 16))
+>this : Symbol((Anonymous class), Decl(mixinClassesAnonymous.ts, 12, 65))
+>x : Symbol(Base.x, Decl(mixinClassesAnonymous.ts, 3, 16))
+>this.y : Symbol(Base.y, Decl(mixinClassesAnonymous.ts, 3, 33))
+>this : Symbol((Anonymous class), Decl(mixinClassesAnonymous.ts, 12, 65))
+>y : Symbol(Base.y, Decl(mixinClassesAnonymous.ts, 3, 33))
+    }
+}
+
+function Tagged<T extends Constructor<{}>>(superClass: T) {
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnonymous.ts, 17, 1))
+>T : Symbol(T, Decl(mixinClassesAnonymous.ts, 19, 16))
+>Constructor : Symbol(Constructor, Decl(mixinClassesAnonymous.ts, 0, 0))
+>superClass : Symbol(superClass, Decl(mixinClassesAnonymous.ts, 19, 43))
+>T : Symbol(T, Decl(mixinClassesAnonymous.ts, 19, 16))
+
+    class C extends superClass {
+>C : Symbol(C, Decl(mixinClassesAnonymous.ts, 19, 59))
+>superClass : Symbol(superClass, Decl(mixinClassesAnonymous.ts, 19, 43))
+
+        _tag: string;
+>_tag : Symbol(C._tag, Decl(mixinClassesAnonymous.ts, 20, 32))
+
+        constructor(...args: any[]) {
+>args : Symbol(args, Decl(mixinClassesAnonymous.ts, 22, 20))
+
+            super(...args);
+>super : Symbol(T, Decl(mixinClassesAnonymous.ts, 19, 16))
+>args : Symbol(args, Decl(mixinClassesAnonymous.ts, 22, 20))
+
+            this._tag = "hello";
+>this._tag : Symbol(C._tag, Decl(mixinClassesAnonymous.ts, 20, 32))
+>this : Symbol(C, Decl(mixinClassesAnonymous.ts, 19, 59))
+>_tag : Symbol(C._tag, Decl(mixinClassesAnonymous.ts, 20, 32))
+        }
+    }
+    return C;
+>C : Symbol(C, Decl(mixinClassesAnonymous.ts, 19, 59))
+}
+
+const Thing1 = Tagged(Derived);
+>Thing1 : Symbol(Thing1, Decl(mixinClassesAnonymous.ts, 30, 5))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnonymous.ts, 17, 1))
+>Derived : Symbol(Derived, Decl(mixinClassesAnonymous.ts, 4, 1))
+
+const Thing2 = Tagged(Printable(Derived));
+>Thing2 : Symbol(Thing2, Decl(mixinClassesAnonymous.ts, 31, 5))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnonymous.ts, 17, 1))
+>Printable : Symbol(Printable, Decl(mixinClassesAnonymous.ts, 12, 5))
+>Derived : Symbol(Derived, Decl(mixinClassesAnonymous.ts, 4, 1))
+
+Thing2.message;
+>Thing2.message : Symbol((Anonymous class).message, Decl(mixinClassesAnonymous.ts, 12, 92))
+>Thing2 : Symbol(Thing2, Decl(mixinClassesAnonymous.ts, 31, 5))
+>message : Symbol((Anonymous class).message, Decl(mixinClassesAnonymous.ts, 12, 92))
+
+function f1() {
+>f1 : Symbol(f1, Decl(mixinClassesAnonymous.ts, 32, 15))
+
+    const thing = new Thing1(1, 2, 3);
+>thing : Symbol(thing, Decl(mixinClassesAnonymous.ts, 35, 9))
+>Thing1 : Symbol(Thing1, Decl(mixinClassesAnonymous.ts, 30, 5))
+
+    thing.x;
+>thing.x : Symbol(Base.x, Decl(mixinClassesAnonymous.ts, 3, 16))
+>thing : Symbol(thing, Decl(mixinClassesAnonymous.ts, 35, 9))
+>x : Symbol(Base.x, Decl(mixinClassesAnonymous.ts, 3, 16))
+
+    thing._tag;
+>thing._tag : Symbol(C._tag, Decl(mixinClassesAnonymous.ts, 20, 32))
+>thing : Symbol(thing, Decl(mixinClassesAnonymous.ts, 35, 9))
+>_tag : Symbol(C._tag, Decl(mixinClassesAnonymous.ts, 20, 32))
+}
+
+function f2() {
+>f2 : Symbol(f2, Decl(mixinClassesAnonymous.ts, 38, 1))
+
+    const thing = new Thing2(1, 2, 3);
+>thing : Symbol(thing, Decl(mixinClassesAnonymous.ts, 41, 9))
+>Thing2 : Symbol(Thing2, Decl(mixinClassesAnonymous.ts, 31, 5))
+
+    thing.x;
+>thing.x : Symbol(Base.x, Decl(mixinClassesAnonymous.ts, 3, 16))
+>thing : Symbol(thing, Decl(mixinClassesAnonymous.ts, 41, 9))
+>x : Symbol(Base.x, Decl(mixinClassesAnonymous.ts, 3, 16))
+
+    thing._tag;
+>thing._tag : Symbol(C._tag, Decl(mixinClassesAnonymous.ts, 20, 32))
+>thing : Symbol(thing, Decl(mixinClassesAnonymous.ts, 41, 9))
+>_tag : Symbol(C._tag, Decl(mixinClassesAnonymous.ts, 20, 32))
+
+    thing.print();
+>thing.print : Symbol((Anonymous class).print, Decl(mixinClassesAnonymous.ts, 13, 29))
+>thing : Symbol(thing, Decl(mixinClassesAnonymous.ts, 41, 9))
+>print : Symbol((Anonymous class).print, Decl(mixinClassesAnonymous.ts, 13, 29))
+}
+
+class Thing3 extends Thing2 {
+>Thing3 : Symbol(Thing3, Decl(mixinClassesAnonymous.ts, 45, 1))
+>Thing2 : Symbol(Thing2, Decl(mixinClassesAnonymous.ts, 31, 5))
+
+    constructor(tag: string) {
+>tag : Symbol(tag, Decl(mixinClassesAnonymous.ts, 48, 16))
+
+        super(10, 20, 30);
+        this._tag = tag;
+>this._tag : Symbol(C._tag, Decl(mixinClassesAnonymous.ts, 20, 32))
+>this : Symbol(Thing3, Decl(mixinClassesAnonymous.ts, 45, 1))
+>_tag : Symbol(C._tag, Decl(mixinClassesAnonymous.ts, 20, 32))
+>tag : Symbol(tag, Decl(mixinClassesAnonymous.ts, 48, 16))
+    }
+    test() {
+>test : Symbol(Thing3.test, Decl(mixinClassesAnonymous.ts, 51, 5))
+
+        this.print();
+>this.print : Symbol((Anonymous class).print, Decl(mixinClassesAnonymous.ts, 13, 29))
+>this : Symbol(Thing3, Decl(mixinClassesAnonymous.ts, 45, 1))
+>print : Symbol((Anonymous class).print, Decl(mixinClassesAnonymous.ts, 13, 29))
+    }
+}
+
diff --git a/tests/baselines/reference/mixinClassesAnonymous.types b/tests/baselines/reference/mixinClassesAnonymous.types
new file mode 100644
index 00000000000..54b1c2c3819
--- /dev/null
+++ b/tests/baselines/reference/mixinClassesAnonymous.types
@@ -0,0 +1,200 @@
+=== tests/cases/conformance/classes/mixinClassesAnonymous.ts ===
+type Constructor<T> = new(...args: any[]) => T;
+>Constructor : Constructor<T>
+>T : T
+>args : any[]
+>T : T
+
+class Base {
+>Base : Base
+
+    constructor(public x: number, public y: number) {}
+>x : number
+>y : number
+}
+
+class Derived extends Base {
+>Derived : Derived
+>Base : Base
+
+    constructor(x: number, y: number, public z: number) {
+>x : number
+>y : number
+>z : number
+
+        super(x, y);
+>super(x, y) : void
+>super : typeof Base
+>x : number
+>y : number
+    }
+}
+
+const Printable = <T extends Constructor<Base>>(superClass: T) => class extends superClass {
+>Printable : <T extends Constructor<Base>>(superClass: T) => { new (...args: any[]): (Anonymous class); prototype: <any>.(Anonymous class); message: string; } & T
+><T extends Constructor<Base>>(superClass: T) => class extends superClass {    static message = "hello";    print() {        const output = this.x + "," + this.y;    }} : <T extends Constructor<Base>>(superClass: T) => { new (...args: any[]): (Anonymous class); prototype: <any>.(Anonymous class); message: string; } & T
+>T : T
+>Constructor : Constructor<T>
+>Base : Base
+>superClass : T
+>T : T
+>class extends superClass {    static message = "hello";    print() {        const output = this.x + "," + this.y;    }} : { new (...args: any[]): (Anonymous class); prototype: <any>.(Anonymous class); message: string; } & T
+>superClass : Base
+
+    static message = "hello";
+>message : string
+>"hello" : "hello"
+
+    print() {
+>print : () => void
+
+        const output = this.x + "," + this.y;
+>output : string
+>this.x + "," + this.y : string
+>this.x + "," : string
+>this.x : number
+>this : this
+>x : number
+>"," : ","
+>this.y : number
+>this : this
+>y : number
+    }
+}
+
+function Tagged<T extends Constructor<{}>>(superClass: T) {
+>Tagged : <T extends Constructor<{}>>(superClass: T) => { new (...args: any[]): C; prototype: Tagged<any>.C; } & T
+>T : T
+>Constructor : Constructor<T>
+>superClass : T
+>T : T
+
+    class C extends superClass {
+>C : C
+>superClass : {}
+
+        _tag: string;
+>_tag : string
+
+        constructor(...args: any[]) {
+>args : any[]
+
+            super(...args);
+>super(...args) : void
+>super : T
+>...args : any
+>args : any[]
+
+            this._tag = "hello";
+>this._tag = "hello" : "hello"
+>this._tag : string
+>this : this
+>_tag : string
+>"hello" : "hello"
+        }
+    }
+    return C;
+>C : { new (...args: any[]): C; prototype: Tagged<any>.C; } & T
+}
+
+const Thing1 = Tagged(Derived);
+>Thing1 : { new (...args: any[]): Tagged<typeof Derived>.C; prototype: Tagged<any>.C; } & typeof Derived
+>Tagged(Derived) : { new (...args: any[]): Tagged<typeof Derived>.C; prototype: Tagged<any>.C; } & typeof Derived
+>Tagged : <T extends Constructor<{}>>(superClass: T) => { new (...args: any[]): C; prototype: Tagged<any>.C; } & T
+>Derived : typeof Derived
+
+const Thing2 = Tagged(Printable(Derived));
+>Thing2 : { new (...args: any[]): Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C; prototype: Tagged<any>.C; } & { new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived
+>Tagged(Printable(Derived)) : { new (...args: any[]): Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C; prototype: Tagged<any>.C; } & { new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived
+>Tagged : <T extends Constructor<{}>>(superClass: T) => { new (...args: any[]): C; prototype: Tagged<any>.C; } & T
+>Printable(Derived) : { new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived
+>Printable : <T extends Constructor<Base>>(superClass: T) => { new (...args: any[]): (Anonymous class); prototype: <any>.(Anonymous class); message: string; } & T
+>Derived : typeof Derived
+
+Thing2.message;
+>Thing2.message : string
+>Thing2 : { new (...args: any[]): Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C; prototype: Tagged<any>.C; } & { new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived
+>message : string
+
+function f1() {
+>f1 : () => void
+
+    const thing = new Thing1(1, 2, 3);
+>thing : Tagged<typeof Derived>.C & Derived
+>new Thing1(1, 2, 3) : Tagged<typeof Derived>.C & Derived
+>Thing1 : { new (...args: any[]): Tagged<typeof Derived>.C; prototype: Tagged<any>.C; } & typeof Derived
+>1 : 1
+>2 : 2
+>3 : 3
+
+    thing.x;
+>thing.x : number
+>thing : Tagged<typeof Derived>.C & Derived
+>x : number
+
+    thing._tag;
+>thing._tag : string
+>thing : Tagged<typeof Derived>.C & Derived
+>_tag : string
+}
+
+function f2() {
+>f2 : () => void
+
+    const thing = new Thing2(1, 2, 3);
+>thing : Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C & <typeof Derived>.(Anonymous class) & Derived
+>new Thing2(1, 2, 3) : Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C & <typeof Derived>.(Anonymous class) & Derived
+>Thing2 : { new (...args: any[]): Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C; prototype: Tagged<any>.C; } & { new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived
+>1 : 1
+>2 : 2
+>3 : 3
+
+    thing.x;
+>thing.x : number
+>thing : Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C & <typeof Derived>.(Anonymous class) & Derived
+>x : number
+
+    thing._tag;
+>thing._tag : string
+>thing : Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C & <typeof Derived>.(Anonymous class) & Derived
+>_tag : string
+
+    thing.print();
+>thing.print() : void
+>thing.print : () => void
+>thing : Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C & <typeof Derived>.(Anonymous class) & Derived
+>print : () => void
+}
+
+class Thing3 extends Thing2 {
+>Thing3 : Thing3
+>Thing2 : Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C & <typeof Derived>.(Anonymous class) & Derived
+
+    constructor(tag: string) {
+>tag : string
+
+        super(10, 20, 30);
+>super(10, 20, 30) : void
+>super : { new (...args: any[]): Tagged<{ new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived>.C; prototype: Tagged<any>.C; } & { new (...args: any[]): <typeof Derived>.(Anonymous class); prototype: <any>.(Anonymous class); message: string; } & typeof Derived
+>10 : 10
+>20 : 20
+>30 : 30
+
+        this._tag = tag;
+>this._tag = tag : string
+>this._tag : string
+>this : this
+>_tag : string
+>tag : string
+    }
+    test() {
+>test : () => void
+
+        this.print();
+>this.print() : void
+>this.print : () => void
+>this : this
+>print : () => void
+    }
+}
+
diff --git a/tests/baselines/reference/mixinClassesMembers.js b/tests/baselines/reference/mixinClassesMembers.js
new file mode 100644
index 00000000000..01fc1bb0032
--- /dev/null
+++ b/tests/baselines/reference/mixinClassesMembers.js
@@ -0,0 +1,220 @@
+//// [mixinClassesMembers.ts]
+
+declare class C1 {
+    public a: number;
+    protected b: number;
+    private c: number;
+    constructor(s: string);
+    constructor(n: number);
+}
+
+declare class M1 {
+    constructor(...args: any[]);
+    p: number;
+    static p: number;
+}
+
+declare class M2 {
+    constructor(...args: any[]);
+    f(): number;
+    static f(): number;
+}
+
+declare const Mixed1: typeof M1 & typeof C1;
+declare const Mixed2: typeof C1 & typeof M1;
+declare const Mixed3: typeof M2 & typeof M1 & typeof C1;
+declare const Mixed4: typeof C1 & typeof M1 & typeof M2;
+declare const Mixed5: typeof M1 & typeof M2;
+
+function f1() {
+    let x1 = new Mixed1("hello");
+    let x2 = new Mixed1(42);
+    let x3 = new Mixed2("hello");
+    let x4 = new Mixed2(42);
+    let x5 = new Mixed3("hello");
+    let x6 = new Mixed3(42);
+    let x7 = new Mixed4("hello");
+    let x8 = new Mixed4(42);
+    let x9 = new Mixed5();
+}
+
+function f2() {
+    let x = new Mixed1("hello");
+    x.a;
+    x.p;
+    Mixed1.p;
+}
+
+function f3() {
+    let x = new Mixed2("hello");
+    x.a;
+    x.p;
+    Mixed2.p;
+}
+
+function f4() {
+    let x = new Mixed3("hello");
+    x.a;
+    x.p;
+    x.f();
+    Mixed3.p;
+    Mixed3.f();
+}
+
+function f5() {
+    let x = new Mixed4("hello");
+    x.a;
+    x.p;
+    x.f();
+    Mixed4.p;
+    Mixed4.f();
+}
+
+function f6() {
+    let x = new Mixed5();
+    x.p;
+    x.f();
+    Mixed5.p;
+    Mixed5.f();
+}
+
+class C2 extends Mixed1 {
+    constructor() {
+        super("hello");
+        this.a;
+        this.b;
+        this.p;
+    }
+}
+
+class C3 extends Mixed3 {
+    constructor() {
+        super(42);
+        this.a;
+        this.b;
+        this.p;
+        this.f();
+    }
+    f() { return super.f(); }
+}
+
+
+//// [mixinClassesMembers.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+function f1() {
+    var x1 = new Mixed1("hello");
+    var x2 = new Mixed1(42);
+    var x3 = new Mixed2("hello");
+    var x4 = new Mixed2(42);
+    var x5 = new Mixed3("hello");
+    var x6 = new Mixed3(42);
+    var x7 = new Mixed4("hello");
+    var x8 = new Mixed4(42);
+    var x9 = new Mixed5();
+}
+function f2() {
+    var x = new Mixed1("hello");
+    x.a;
+    x.p;
+    Mixed1.p;
+}
+function f3() {
+    var x = new Mixed2("hello");
+    x.a;
+    x.p;
+    Mixed2.p;
+}
+function f4() {
+    var x = new Mixed3("hello");
+    x.a;
+    x.p;
+    x.f();
+    Mixed3.p;
+    Mixed3.f();
+}
+function f5() {
+    var x = new Mixed4("hello");
+    x.a;
+    x.p;
+    x.f();
+    Mixed4.p;
+    Mixed4.f();
+}
+function f6() {
+    var x = new Mixed5();
+    x.p;
+    x.f();
+    Mixed5.p;
+    Mixed5.f();
+}
+var C2 = (function (_super) {
+    __extends(C2, _super);
+    function C2() {
+        var _this = _super.call(this, "hello") || this;
+        _this.a;
+        _this.b;
+        _this.p;
+        return _this;
+    }
+    return C2;
+}(Mixed1));
+var C3 = (function (_super) {
+    __extends(C3, _super);
+    function C3() {
+        var _this = _super.call(this, 42) || this;
+        _this.a;
+        _this.b;
+        _this.p;
+        _this.f();
+        return _this;
+    }
+    C3.prototype.f = function () { return _super.prototype.f.call(this); };
+    return C3;
+}(Mixed3));
+
+
+//// [mixinClassesMembers.d.ts]
+declare class C1 {
+    a: number;
+    protected b: number;
+    private c;
+    constructor(s: string);
+    constructor(n: number);
+}
+declare class M1 {
+    constructor(...args: any[]);
+    p: number;
+    static p: number;
+}
+declare class M2 {
+    constructor(...args: any[]);
+    f(): number;
+    static f(): number;
+}
+declare const Mixed1: typeof M1 & typeof C1;
+declare const Mixed2: typeof C1 & typeof M1;
+declare const Mixed3: typeof M2 & typeof M1 & typeof C1;
+declare const Mixed4: typeof C1 & typeof M1 & typeof M2;
+declare const Mixed5: typeof M1 & typeof M2;
+declare function f1(): void;
+declare function f2(): void;
+declare function f3(): void;
+declare function f4(): void;
+declare function f5(): void;
+declare function f6(): void;
+declare class C2 extends Mixed1 {
+    constructor();
+}
+declare class C3 extends Mixed3 {
+    constructor();
+    f(): number;
+}
diff --git a/tests/baselines/reference/mixinClassesMembers.symbols b/tests/baselines/reference/mixinClassesMembers.symbols
new file mode 100644
index 00000000000..fabfe7e6d86
--- /dev/null
+++ b/tests/baselines/reference/mixinClassesMembers.symbols
@@ -0,0 +1,309 @@
+=== tests/cases/conformance/classes/mixinClassesMembers.ts ===
+
+declare class C1 {
+>C1 : Symbol(C1, Decl(mixinClassesMembers.ts, 0, 0))
+
+    public a: number;
+>a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+
+    protected b: number;
+>b : Symbol(C1.b, Decl(mixinClassesMembers.ts, 2, 21))
+
+    private c: number;
+>c : Symbol(C1.c, Decl(mixinClassesMembers.ts, 3, 24))
+
+    constructor(s: string);
+>s : Symbol(s, Decl(mixinClassesMembers.ts, 5, 16))
+
+    constructor(n: number);
+>n : Symbol(n, Decl(mixinClassesMembers.ts, 6, 16))
+}
+
+declare class M1 {
+>M1 : Symbol(M1, Decl(mixinClassesMembers.ts, 7, 1))
+
+    constructor(...args: any[]);
+>args : Symbol(args, Decl(mixinClassesMembers.ts, 10, 16))
+
+    p: number;
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+
+    static p: number;
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+}
+
+declare class M2 {
+>M2 : Symbol(M2, Decl(mixinClassesMembers.ts, 13, 1))
+
+    constructor(...args: any[]);
+>args : Symbol(args, Decl(mixinClassesMembers.ts, 16, 16))
+
+    f(): number;
+>f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 16, 32))
+
+    static f(): number;
+>f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 17, 16))
+}
+
+declare const Mixed1: typeof M1 & typeof C1;
+>Mixed1 : Symbol(Mixed1, Decl(mixinClassesMembers.ts, 21, 13))
+>M1 : Symbol(M1, Decl(mixinClassesMembers.ts, 7, 1))
+>C1 : Symbol(C1, Decl(mixinClassesMembers.ts, 0, 0))
+
+declare const Mixed2: typeof C1 & typeof M1;
+>Mixed2 : Symbol(Mixed2, Decl(mixinClassesMembers.ts, 22, 13))
+>C1 : Symbol(C1, Decl(mixinClassesMembers.ts, 0, 0))
+>M1 : Symbol(M1, Decl(mixinClassesMembers.ts, 7, 1))
+
+declare const Mixed3: typeof M2 & typeof M1 & typeof C1;
+>Mixed3 : Symbol(Mixed3, Decl(mixinClassesMembers.ts, 23, 13))
+>M2 : Symbol(M2, Decl(mixinClassesMembers.ts, 13, 1))
+>M1 : Symbol(M1, Decl(mixinClassesMembers.ts, 7, 1))
+>C1 : Symbol(C1, Decl(mixinClassesMembers.ts, 0, 0))
+
+declare const Mixed4: typeof C1 & typeof M1 & typeof M2;
+>Mixed4 : Symbol(Mixed4, Decl(mixinClassesMembers.ts, 24, 13))
+>C1 : Symbol(C1, Decl(mixinClassesMembers.ts, 0, 0))
+>M1 : Symbol(M1, Decl(mixinClassesMembers.ts, 7, 1))
+>M2 : Symbol(M2, Decl(mixinClassesMembers.ts, 13, 1))
+
+declare const Mixed5: typeof M1 & typeof M2;
+>Mixed5 : Symbol(Mixed5, Decl(mixinClassesMembers.ts, 25, 13))
+>M1 : Symbol(M1, Decl(mixinClassesMembers.ts, 7, 1))
+>M2 : Symbol(M2, Decl(mixinClassesMembers.ts, 13, 1))
+
+function f1() {
+>f1 : Symbol(f1, Decl(mixinClassesMembers.ts, 25, 44))
+
+    let x1 = new Mixed1("hello");
+>x1 : Symbol(x1, Decl(mixinClassesMembers.ts, 28, 7))
+>Mixed1 : Symbol(Mixed1, Decl(mixinClassesMembers.ts, 21, 13))
+
+    let x2 = new Mixed1(42);
+>x2 : Symbol(x2, Decl(mixinClassesMembers.ts, 29, 7))
+>Mixed1 : Symbol(Mixed1, Decl(mixinClassesMembers.ts, 21, 13))
+
+    let x3 = new Mixed2("hello");
+>x3 : Symbol(x3, Decl(mixinClassesMembers.ts, 30, 7))
+>Mixed2 : Symbol(Mixed2, Decl(mixinClassesMembers.ts, 22, 13))
+
+    let x4 = new Mixed2(42);
+>x4 : Symbol(x4, Decl(mixinClassesMembers.ts, 31, 7))
+>Mixed2 : Symbol(Mixed2, Decl(mixinClassesMembers.ts, 22, 13))
+
+    let x5 = new Mixed3("hello");
+>x5 : Symbol(x5, Decl(mixinClassesMembers.ts, 32, 7))
+>Mixed3 : Symbol(Mixed3, Decl(mixinClassesMembers.ts, 23, 13))
+
+    let x6 = new Mixed3(42);
+>x6 : Symbol(x6, Decl(mixinClassesMembers.ts, 33, 7))
+>Mixed3 : Symbol(Mixed3, Decl(mixinClassesMembers.ts, 23, 13))
+
+    let x7 = new Mixed4("hello");
+>x7 : Symbol(x7, Decl(mixinClassesMembers.ts, 34, 7))
+>Mixed4 : Symbol(Mixed4, Decl(mixinClassesMembers.ts, 24, 13))
+
+    let x8 = new Mixed4(42);
+>x8 : Symbol(x8, Decl(mixinClassesMembers.ts, 35, 7))
+>Mixed4 : Symbol(Mixed4, Decl(mixinClassesMembers.ts, 24, 13))
+
+    let x9 = new Mixed5();
+>x9 : Symbol(x9, Decl(mixinClassesMembers.ts, 36, 7))
+>Mixed5 : Symbol(Mixed5, Decl(mixinClassesMembers.ts, 25, 13))
+}
+
+function f2() {
+>f2 : Symbol(f2, Decl(mixinClassesMembers.ts, 37, 1))
+
+    let x = new Mixed1("hello");
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 40, 7))
+>Mixed1 : Symbol(Mixed1, Decl(mixinClassesMembers.ts, 21, 13))
+
+    x.a;
+>x.a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 40, 7))
+>a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+
+    x.p;
+>x.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 40, 7))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+
+    Mixed1.p;
+>Mixed1.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+>Mixed1 : Symbol(Mixed1, Decl(mixinClassesMembers.ts, 21, 13))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+}
+
+function f3() {
+>f3 : Symbol(f3, Decl(mixinClassesMembers.ts, 44, 1))
+
+    let x = new Mixed2("hello");
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 47, 7))
+>Mixed2 : Symbol(Mixed2, Decl(mixinClassesMembers.ts, 22, 13))
+
+    x.a;
+>x.a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 47, 7))
+>a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+
+    x.p;
+>x.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 47, 7))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+
+    Mixed2.p;
+>Mixed2.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+>Mixed2 : Symbol(Mixed2, Decl(mixinClassesMembers.ts, 22, 13))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+}
+
+function f4() {
+>f4 : Symbol(f4, Decl(mixinClassesMembers.ts, 51, 1))
+
+    let x = new Mixed3("hello");
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 54, 7))
+>Mixed3 : Symbol(Mixed3, Decl(mixinClassesMembers.ts, 23, 13))
+
+    x.a;
+>x.a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 54, 7))
+>a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+
+    x.p;
+>x.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 54, 7))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+
+    x.f();
+>x.f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 16, 32))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 54, 7))
+>f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 16, 32))
+
+    Mixed3.p;
+>Mixed3.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+>Mixed3 : Symbol(Mixed3, Decl(mixinClassesMembers.ts, 23, 13))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+
+    Mixed3.f();
+>Mixed3.f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 17, 16))
+>Mixed3 : Symbol(Mixed3, Decl(mixinClassesMembers.ts, 23, 13))
+>f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 17, 16))
+}
+
+function f5() {
+>f5 : Symbol(f5, Decl(mixinClassesMembers.ts, 60, 1))
+
+    let x = new Mixed4("hello");
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 63, 7))
+>Mixed4 : Symbol(Mixed4, Decl(mixinClassesMembers.ts, 24, 13))
+
+    x.a;
+>x.a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 63, 7))
+>a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+
+    x.p;
+>x.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 63, 7))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+
+    x.f();
+>x.f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 16, 32))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 63, 7))
+>f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 16, 32))
+
+    Mixed4.p;
+>Mixed4.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+>Mixed4 : Symbol(Mixed4, Decl(mixinClassesMembers.ts, 24, 13))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+
+    Mixed4.f();
+>Mixed4.f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 17, 16))
+>Mixed4 : Symbol(Mixed4, Decl(mixinClassesMembers.ts, 24, 13))
+>f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 17, 16))
+}
+
+function f6() {
+>f6 : Symbol(f6, Decl(mixinClassesMembers.ts, 69, 1))
+
+    let x = new Mixed5();
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 72, 7))
+>Mixed5 : Symbol(Mixed5, Decl(mixinClassesMembers.ts, 25, 13))
+
+    x.p;
+>x.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 72, 7))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+
+    x.f();
+>x.f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 16, 32))
+>x : Symbol(x, Decl(mixinClassesMembers.ts, 72, 7))
+>f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 16, 32))
+
+    Mixed5.p;
+>Mixed5.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+>Mixed5 : Symbol(Mixed5, Decl(mixinClassesMembers.ts, 25, 13))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 11, 14))
+
+    Mixed5.f();
+>Mixed5.f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 17, 16))
+>Mixed5 : Symbol(Mixed5, Decl(mixinClassesMembers.ts, 25, 13))
+>f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 17, 16))
+}
+
+class C2 extends Mixed1 {
+>C2 : Symbol(C2, Decl(mixinClassesMembers.ts, 77, 1))
+>Mixed1 : Symbol(Mixed1, Decl(mixinClassesMembers.ts, 21, 13))
+
+    constructor() {
+        super("hello");
+        this.a;
+>this.a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+>this : Symbol(C2, Decl(mixinClassesMembers.ts, 77, 1))
+>a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+
+        this.b;
+>this.b : Symbol(C1.b, Decl(mixinClassesMembers.ts, 2, 21))
+>this : Symbol(C2, Decl(mixinClassesMembers.ts, 77, 1))
+>b : Symbol(C1.b, Decl(mixinClassesMembers.ts, 2, 21))
+
+        this.p;
+>this.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+>this : Symbol(C2, Decl(mixinClassesMembers.ts, 77, 1))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+    }
+}
+
+class C3 extends Mixed3 {
+>C3 : Symbol(C3, Decl(mixinClassesMembers.ts, 86, 1))
+>Mixed3 : Symbol(Mixed3, Decl(mixinClassesMembers.ts, 23, 13))
+
+    constructor() {
+        super(42);
+        this.a;
+>this.a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+>this : Symbol(C3, Decl(mixinClassesMembers.ts, 86, 1))
+>a : Symbol(C1.a, Decl(mixinClassesMembers.ts, 1, 18))
+
+        this.b;
+>this.b : Symbol(C1.b, Decl(mixinClassesMembers.ts, 2, 21))
+>this : Symbol(C3, Decl(mixinClassesMembers.ts, 86, 1))
+>b : Symbol(C1.b, Decl(mixinClassesMembers.ts, 2, 21))
+
+        this.p;
+>this.p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+>this : Symbol(C3, Decl(mixinClassesMembers.ts, 86, 1))
+>p : Symbol(M1.p, Decl(mixinClassesMembers.ts, 10, 32))
+
+        this.f();
+>this.f : Symbol(C3.f, Decl(mixinClassesMembers.ts, 95, 5))
+>this : Symbol(C3, Decl(mixinClassesMembers.ts, 86, 1))
+>f : Symbol(C3.f, Decl(mixinClassesMembers.ts, 95, 5))
+    }
+    f() { return super.f(); }
+>f : Symbol(C3.f, Decl(mixinClassesMembers.ts, 95, 5))
+>super.f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 16, 32))
+>f : Symbol(M2.f, Decl(mixinClassesMembers.ts, 16, 32))
+}
+
diff --git a/tests/baselines/reference/mixinClassesMembers.types b/tests/baselines/reference/mixinClassesMembers.types
new file mode 100644
index 00000000000..c8b29175415
--- /dev/null
+++ b/tests/baselines/reference/mixinClassesMembers.types
@@ -0,0 +1,352 @@
+=== tests/cases/conformance/classes/mixinClassesMembers.ts ===
+
+declare class C1 {
+>C1 : C1
+
+    public a: number;
+>a : number
+
+    protected b: number;
+>b : number
+
+    private c: number;
+>c : number
+
+    constructor(s: string);
+>s : string
+
+    constructor(n: number);
+>n : number
+}
+
+declare class M1 {
+>M1 : M1
+
+    constructor(...args: any[]);
+>args : any[]
+
+    p: number;
+>p : number
+
+    static p: number;
+>p : number
+}
+
+declare class M2 {
+>M2 : M2
+
+    constructor(...args: any[]);
+>args : any[]
+
+    f(): number;
+>f : () => number
+
+    static f(): number;
+>f : () => number
+}
+
+declare const Mixed1: typeof M1 & typeof C1;
+>Mixed1 : typeof M1 & typeof C1
+>M1 : typeof M1
+>C1 : typeof C1
+
+declare const Mixed2: typeof C1 & typeof M1;
+>Mixed2 : typeof C1 & typeof M1
+>C1 : typeof C1
+>M1 : typeof M1
+
+declare const Mixed3: typeof M2 & typeof M1 & typeof C1;
+>Mixed3 : typeof M2 & typeof M1 & typeof C1
+>M2 : typeof M2
+>M1 : typeof M1
+>C1 : typeof C1
+
+declare const Mixed4: typeof C1 & typeof M1 & typeof M2;
+>Mixed4 : typeof C1 & typeof M1 & typeof M2
+>C1 : typeof C1
+>M1 : typeof M1
+>M2 : typeof M2
+
+declare const Mixed5: typeof M1 & typeof M2;
+>Mixed5 : typeof M1 & typeof M2
+>M1 : typeof M1
+>M2 : typeof M2
+
+function f1() {
+>f1 : () => void
+
+    let x1 = new Mixed1("hello");
+>x1 : M1 & C1
+>new Mixed1("hello") : M1 & C1
+>Mixed1 : typeof M1 & typeof C1
+>"hello" : "hello"
+
+    let x2 = new Mixed1(42);
+>x2 : M1 & C1
+>new Mixed1(42) : M1 & C1
+>Mixed1 : typeof M1 & typeof C1
+>42 : 42
+
+    let x3 = new Mixed2("hello");
+>x3 : C1 & M1
+>new Mixed2("hello") : C1 & M1
+>Mixed2 : typeof C1 & typeof M1
+>"hello" : "hello"
+
+    let x4 = new Mixed2(42);
+>x4 : C1 & M1
+>new Mixed2(42) : C1 & M1
+>Mixed2 : typeof C1 & typeof M1
+>42 : 42
+
+    let x5 = new Mixed3("hello");
+>x5 : M2 & M1 & C1
+>new Mixed3("hello") : M2 & M1 & C1
+>Mixed3 : typeof M2 & typeof M1 & typeof C1
+>"hello" : "hello"
+
+    let x6 = new Mixed3(42);
+>x6 : M2 & M1 & C1
+>new Mixed3(42) : M2 & M1 & C1
+>Mixed3 : typeof M2 & typeof M1 & typeof C1
+>42 : 42
+
+    let x7 = new Mixed4("hello");
+>x7 : C1 & M1 & M2
+>new Mixed4("hello") : C1 & M1 & M2
+>Mixed4 : typeof C1 & typeof M1 & typeof M2
+>"hello" : "hello"
+
+    let x8 = new Mixed4(42);
+>x8 : C1 & M1 & M2
+>new Mixed4(42) : C1 & M1 & M2
+>Mixed4 : typeof C1 & typeof M1 & typeof M2
+>42 : 42
+
+    let x9 = new Mixed5();
+>x9 : M1 & M2
+>new Mixed5() : M1 & M2
+>Mixed5 : typeof M1 & typeof M2
+}
+
+function f2() {
+>f2 : () => void
+
+    let x = new Mixed1("hello");
+>x : M1 & C1
+>new Mixed1("hello") : M1 & C1
+>Mixed1 : typeof M1 & typeof C1
+>"hello" : "hello"
+
+    x.a;
+>x.a : number
+>x : M1 & C1
+>a : number
+
+    x.p;
+>x.p : number
+>x : M1 & C1
+>p : number
+
+    Mixed1.p;
+>Mixed1.p : number
+>Mixed1 : typeof M1 & typeof C1
+>p : number
+}
+
+function f3() {
+>f3 : () => void
+
+    let x = new Mixed2("hello");
+>x : C1 & M1
+>new Mixed2("hello") : C1 & M1
+>Mixed2 : typeof C1 & typeof M1
+>"hello" : "hello"
+
+    x.a;
+>x.a : number
+>x : C1 & M1
+>a : number
+
+    x.p;
+>x.p : number
+>x : C1 & M1
+>p : number
+
+    Mixed2.p;
+>Mixed2.p : number
+>Mixed2 : typeof C1 & typeof M1
+>p : number
+}
+
+function f4() {
+>f4 : () => void
+
+    let x = new Mixed3("hello");
+>x : M2 & M1 & C1
+>new Mixed3("hello") : M2 & M1 & C1
+>Mixed3 : typeof M2 & typeof M1 & typeof C1
+>"hello" : "hello"
+
+    x.a;
+>x.a : number
+>x : M2 & M1 & C1
+>a : number
+
+    x.p;
+>x.p : number
+>x : M2 & M1 & C1
+>p : number
+
+    x.f();
+>x.f() : number
+>x.f : () => number
+>x : M2 & M1 & C1
+>f : () => number
+
+    Mixed3.p;
+>Mixed3.p : number
+>Mixed3 : typeof M2 & typeof M1 & typeof C1
+>p : number
+
+    Mixed3.f();
+>Mixed3.f() : number
+>Mixed3.f : () => number
+>Mixed3 : typeof M2 & typeof M1 & typeof C1
+>f : () => number
+}
+
+function f5() {
+>f5 : () => void
+
+    let x = new Mixed4("hello");
+>x : C1 & M1 & M2
+>new Mixed4("hello") : C1 & M1 & M2
+>Mixed4 : typeof C1 & typeof M1 & typeof M2
+>"hello" : "hello"
+
+    x.a;
+>x.a : number
+>x : C1 & M1 & M2
+>a : number
+
+    x.p;
+>x.p : number
+>x : C1 & M1 & M2
+>p : number
+
+    x.f();
+>x.f() : number
+>x.f : () => number
+>x : C1 & M1 & M2
+>f : () => number
+
+    Mixed4.p;
+>Mixed4.p : number
+>Mixed4 : typeof C1 & typeof M1 & typeof M2
+>p : number
+
+    Mixed4.f();
+>Mixed4.f() : number
+>Mixed4.f : () => number
+>Mixed4 : typeof C1 & typeof M1 & typeof M2
+>f : () => number
+}
+
+function f6() {
+>f6 : () => void
+
+    let x = new Mixed5();
+>x : M1 & M2
+>new Mixed5() : M1 & M2
+>Mixed5 : typeof M1 & typeof M2
+
+    x.p;
+>x.p : number
+>x : M1 & M2
+>p : number
+
+    x.f();
+>x.f() : number
+>x.f : () => number
+>x : M1 & M2
+>f : () => number
+
+    Mixed5.p;
+>Mixed5.p : number
+>Mixed5 : typeof M1 & typeof M2
+>p : number
+
+    Mixed5.f();
+>Mixed5.f() : number
+>Mixed5.f : () => number
+>Mixed5 : typeof M1 & typeof M2
+>f : () => number
+}
+
+class C2 extends Mixed1 {
+>C2 : C2
+>Mixed1 : M1 & C1
+
+    constructor() {
+        super("hello");
+>super("hello") : void
+>super : typeof M1 & typeof C1
+>"hello" : "hello"
+
+        this.a;
+>this.a : number
+>this : this
+>a : number
+
+        this.b;
+>this.b : number
+>this : this
+>b : number
+
+        this.p;
+>this.p : number
+>this : this
+>p : number
+    }
+}
+
+class C3 extends Mixed3 {
+>C3 : C3
+>Mixed3 : M2 & M1 & C1
+
+    constructor() {
+        super(42);
+>super(42) : void
+>super : typeof M2 & typeof M1 & typeof C1
+>42 : 42
+
+        this.a;
+>this.a : number
+>this : this
+>a : number
+
+        this.b;
+>this.b : number
+>this : this
+>b : number
+
+        this.p;
+>this.p : number
+>this : this
+>p : number
+
+        this.f();
+>this.f() : number
+>this.f : () => number
+>this : this
+>f : () => number
+    }
+    f() { return super.f(); }
+>f : () => number
+>super.f() : number
+>super.f : () => number
+>super : M2 & M1 & C1
+>f : () => number
+}
+

From cc8bd6fc09f160aff2d2e77e9c84c3afd95022ff Mon Sep 17 00:00:00 2001
From: gdh1995 <gdh1995@qq.com>
Date: Sat, 28 Jan 2017 13:40:46 +0800
Subject: [PATCH 034/127] remove an odd new-line for catch clause

---
 src/compiler/emitter.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 27285a4c2dc..8517d16d4e7 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1923,7 +1923,6 @@ namespace ts {
         }
 
         function emitCatchClause(node: CatchClause) {
-            writeLine();
             const openParenPos = writeToken(SyntaxKind.CatchKeyword, node.pos);
             write(" ");
             writeToken(SyntaxKind.OpenParenToken, openParenPos);

From 5282a8d0f5c1ddcf104eb44b36923f7f8d26a240 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 30 Jan 2017 08:55:32 -0800
Subject: [PATCH 035/127] ES6 target uses Object.assign for emitting spread

Also omits the __assign helper
---
 src/compiler/transformers/esnext.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 0a529a8e871..ee92ec7c613 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -402,6 +402,11 @@ namespace ts {
     };
 
     export function createAssignHelper(context: TransformationContext, attributesSegments: Expression[]) {
+        if (context.getCompilerOptions().target === ScriptTarget.ES2015) {
+            return createCall(createPropertyAccess(createIdentifier("Object"), "assign"),
+                              /*typeArguments*/ undefined,
+                              attributesSegments);
+        }
         context.requestEmitHelper(assignHelper);
         return createCall(
             getHelperName("__assign"),

From a67a7493317d2ceff8037a0da5f1cebb356e2960 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 30 Jan 2017 10:42:11 -0800
Subject: [PATCH 036/127] Emit Object.assign for spread for targets >= ES6

---
 src/compiler/transformers/esnext.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index ee92ec7c613..8b5a095a17e 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -402,7 +402,7 @@ namespace ts {
     };
 
     export function createAssignHelper(context: TransformationContext, attributesSegments: Expression[]) {
-        if (context.getCompilerOptions().target === ScriptTarget.ES2015) {
+        if (context.getCompilerOptions().target >= ScriptTarget.ES2015) {
             return createCall(createPropertyAccess(createIdentifier("Object"), "assign"),
                               /*typeArguments*/ undefined,
                               attributesSegments);

From 46cdac1ec73a58fd8b0350e517d314395b9f0f0e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 30 Jan 2017 10:42:39 -0800
Subject: [PATCH 037/127] Update baselines

---
 tests/baselines/reference/objectRest2.js     | 10 +---------
 tests/baselines/reference/objectRestForOf.js | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/tests/baselines/reference/objectRest2.js b/tests/baselines/reference/objectRest2.js
index 6abff9e56a1..e46d22db80a 100644
--- a/tests/baselines/reference/objectRest2.js
+++ b/tests/baselines/reference/objectRest2.js
@@ -15,14 +15,6 @@ rootConnection('test');
 
 
 //// [objectRest2.js]
-var __assign = (this && this.__assign) || Object.assign || function(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-        s = arguments[i];
-        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-            t[p] = s[p];
-    }
-    return t;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -35,7 +27,7 @@ function rootConnection(name) {
     return {
         resolve: (context, args) => __awaiter(this, void 0, void 0, function* () {
             const { objects } = yield { objects: 12 };
-            return __assign({}, connectionFromArray(objects, args));
+            return Object.assign({}, connectionFromArray(objects, args));
         })
     };
 }
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index fd81f77512e..f8a88fe2868 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -15,14 +15,6 @@ for (const norest of array.map(a => ({ ...a, x: 'a string' }))) {
 
 
 //// [objectRestForOf.js]
-var __assign = (this && this.__assign) || Object.assign || function(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-        s = arguments[i];
-        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-            t[p] = s[p];
-    }
-    return t;
-};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -43,6 +35,6 @@ for (let _b of array) {
     ({ x: xx } = _b, rrestOff = __rest(_b, ["x"]));
     [xx, rrestOff];
 }
-for (const norest of array.map(a => (__assign({}, a, { x: 'a string' })))) {
+for (const norest of array.map(a => (Object.assign({}, a, { x: 'a string' })))) {
     [norest.x, norest.y];
 }

From 0165b71549533e3e6d810ffbe4dfb781b8794abc Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 30 Jan 2017 12:27:24 -0800
Subject: [PATCH 038/127] Embed comment emit inside of printer

---
 Jakefile.js                |    2 -
 src/compiler/comments.ts   |   30 +-
 src/compiler/core.ts       |    4 +-
 src/compiler/emitter.ts    | 2734 +++++++++++++++++++++++++++++++++++-
 src/compiler/printer.ts    | 2659 -----------------------------------
 src/compiler/tsconfig.json |    1 -
 src/compiler/types.ts      |   72 +-
 src/compiler/utilities.ts  |   19 +-
 src/harness/tsconfig.json  |    1 -
 src/services/tsconfig.json |    1 -
 10 files changed, 2793 insertions(+), 2730 deletions(-)
 delete mode 100644 src/compiler/printer.ts

diff --git a/Jakefile.js b/Jakefile.js
index a23b9cbe03c..3ee8476c842 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -84,7 +84,6 @@ var compilerSources = [
     "sourcemap.ts",
     "comments.ts",
     "declarationEmitter.ts",
-    "printer.ts",
     "emitter.ts",
     "program.ts",
     "commandLineParser.ts",
@@ -122,7 +121,6 @@ var servicesSources = [
     "sourcemap.ts",
     "comments.ts",
     "declarationEmitter.ts",
-    "printer.ts",
     "emitter.ts",
     "program.ts",
     "commandLineParser.ts",
diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
index 3106d3ccfec..f69b4c546a0 100644
--- a/src/compiler/comments.ts
+++ b/src/compiler/comments.ts
@@ -5,13 +5,16 @@ namespace ts {
     export interface CommentWriter {
         reset(): void;
         setSourceFile(sourceFile: SourceFile): void;
+        setWriter(writer: EmitTextWriter): void;
         emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
         emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void): void;
         emitTrailingCommentsOfPosition(pos: number): void;
     }
 
-    export function createCommentWriter(writer: EmitTextWriter, compilerOptions: CompilerOptions, newLine: string, emitPos: (pos: number) => void): CommentWriter {
-        const extendedDiagnostics = compilerOptions.extendedDiagnostics;
+    export function createCommentWriter(printerOptions: PrinterOptions, emitPos: (pos: number) => void): CommentWriter {
+        const extendedDiagnostics = printerOptions.extendedDiagnostics;
+        const newLine = getNewLineCharacter(printerOptions);
+        let writer: EmitTextWriter;
         let containerPos = -1;
         let containerEnd = -1;
         let declarationListContainerEnd = -1;
@@ -20,10 +23,11 @@ namespace ts {
         let currentLineMap: number[];
         let detachedCommentsInfo: { nodePos: number, detachedCommentEndPos: number}[];
         let hasWrittenComment = false;
-        let disabled: boolean = compilerOptions.removeComments;
+        let disabled: boolean = printerOptions.removeComments;
 
         return {
             reset,
+            setWriter,
             setSourceFile,
             emitNodeWithComments,
             emitBodyWithDetachedComments,
@@ -194,9 +198,9 @@ namespace ts {
             }
 
             // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-            emitPos(commentPos);
+            if (emitPos) emitPos(commentPos);
             writeCommentRange(currentText, currentLineMap, writer, commentPos, commentEnd, newLine);
-            emitPos(commentEnd);
+            if (emitPos) emitPos(commentEnd);
 
             if (hasTrailingNewLine) {
                 writer.writeLine();
@@ -216,9 +220,9 @@ namespace ts {
                 writer.write(" ");
             }
 
-            emitPos(commentPos);
+            if (emitPos) emitPos(commentPos);
             writeCommentRange(currentText, currentLineMap, writer, commentPos, commentEnd, newLine);
-            emitPos(commentEnd);
+            if (emitPos) emitPos(commentEnd);
 
             if (hasTrailingNewLine) {
                 writer.writeLine();
@@ -244,9 +248,9 @@ namespace ts {
         function emitTrailingCommentOfPosition(commentPos: number, commentEnd: number, _kind: SyntaxKind, hasTrailingNewLine: boolean) {
             // trailing comments of a position are emitted at /*trailing comment1 */space/*trailing comment*/space
 
-            emitPos(commentPos);
+            if (emitPos) emitPos(commentPos);
             writeCommentRange(currentText, currentLineMap, writer, commentPos, commentEnd, newLine);
-            emitPos(commentEnd);
+            if (emitPos) emitPos(commentEnd);
 
             if (hasTrailingNewLine) {
                 writer.writeLine();
@@ -282,6 +286,10 @@ namespace ts {
             detachedCommentsInfo = undefined;
         }
 
+        function setWriter(output: EmitTextWriter): void {
+            writer = output;
+        }
+
         function setSourceFile(sourceFile: SourceFile) {
             currentSourceFile = sourceFile;
             currentText = currentSourceFile.text;
@@ -319,9 +327,9 @@ namespace ts {
         }
 
         function writeComment(text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) {
-            emitPos(commentPos);
+            if (emitPos) emitPos(commentPos);
             writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine);
-            emitPos(commentEnd);
+            if (emitPos) emitPos(commentEnd);
         }
 
         /**
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index de3472afd88..b8097acaa71 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1447,11 +1447,11 @@ namespace ts {
         return /^\.\.?($|[\\/])/.test(moduleName);
     }
 
-    export function getEmitScriptTarget(compilerOptions: CompilerOptions) {
+    export function getEmitScriptTarget(compilerOptions: CompilerOptions | PrinterOptions) {
         return compilerOptions.target || ScriptTarget.ES3;
     }
 
-    export function getEmitModuleKind(compilerOptions: CompilerOptions) {
+    export function getEmitModuleKind(compilerOptions: CompilerOptions | PrinterOptions) {
         return typeof compilerOptions.module === "number" ?
             compilerOptions.module :
             getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015 ? ModuleKind.ES2015 : ModuleKind.CommonJS;
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index dd823cf7994..b3bd594ae88 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -3,13 +3,12 @@
 /// <reference path="declarationEmitter.ts" />
 /// <reference path="sourcemap.ts" />
 /// <reference path="comments.ts" />
-/// <reference path="printer.ts" />
 
-/* @internal */
 namespace ts {
-    const id = (s: SourceFile) => s;
-    const nullTransformers: Transformer[] = [_ => id];
+    const delimiters = createDelimiterMap();
+    const brackets = createBracketsMap();
 
+    /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
     export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile, emitOnlyDtsFiles?: boolean): EmitResult {
         const compilerOptions = host.getCompilerOptions();
@@ -17,10 +16,9 @@ namespace ts {
         const emittedFilesList: string[] = compilerOptions.listEmittedFiles ? [] : undefined;
         const emitterDiagnostics = createDiagnosticCollection();
         const newLine = host.getNewLine();
-        const transformers: Transformer[] = emitOnlyDtsFiles ? nullTransformers : getTransformers(compilerOptions);
+        const transformers = emitOnlyDtsFiles ? [] : getTransformers(compilerOptions);
         const writer = createTextWriter(newLine);
         const sourceMap = createSourceMapWriter(host, writer);
-        const comments = createCommentWriter(writer, compilerOptions, newLine, sourceMap.emitPos);
 
         let currentSourceFile: SourceFile;
         let bundledHelpers: Map<boolean>;
@@ -33,7 +31,7 @@ namespace ts {
         const transform = transformFiles(resolver, host, sourceFiles, transformers);
 
         // Create a printer to print the nodes
-        const printer = createPrinter(writer, compilerOptions, {
+        const printer = createPrinter(compilerOptions, {
             // resolver hooks
             hasGlobalName: resolver.hasGlobalName,
 
@@ -44,11 +42,7 @@ namespace ts {
             // sourcemap hooks
             onEmitSourceMapOfNode: sourceMap.emitNodeWithSourceMap,
             onEmitSourceMapOfToken: sourceMap.emitTokenWithSourceMap,
-
-            // comment hooks
-            onEmitCommentsOfNode: comments.emitNodeWithComments,
-            onEmitDetachedCommentsOfNode: comments.emitBodyWithDetachedComments,
-            onEmitTrailingCommentsOfPosition: comments.emitTrailingCommentsOfPosition,
+            onEmitSourceMapOfPosition: sourceMap.emitPos,
 
             // emitter hooks
             onEmitHelpers: emitHelpers,
@@ -109,11 +103,11 @@ namespace ts {
             if (bundle) {
                 bundledHelpers = createMap<boolean>();
                 isOwnFileEmit = false;
-                printer.printBundle(bundle);
+                printer.writeBundle(bundle, writer);
             }
             else {
                 isOwnFileEmit = true;
-                printer.printFile(sourceFile);
+                printer.writeFile(sourceFile, writer);
             }
 
             writer.writeLine();
@@ -138,7 +132,6 @@ namespace ts {
 
             // Reset state
             sourceMap.reset();
-            comments.reset();
             writer.reset();
 
             currentSourceFile = undefined;
@@ -149,7 +142,6 @@ namespace ts {
         function setSourceFile(node: SourceFile) {
             currentSourceFile = node;
             sourceMap.setSourceFile(node);
-            comments.setSourceFile(node);
         }
 
         function emitHelpers(node: Node, writeLines: (text: string) => void) {
@@ -194,4 +186,2714 @@ namespace ts {
             return helpersEmitted;
         }
     }
+
+    export function createPrinter(printerOptions: PrinterOptions = {}, handlers: PrintHandlers = {}): Printer {
+        const {
+            hasGlobalName,
+            onEmitSourceMapOfNode,
+            onEmitSourceMapOfToken,
+            onEmitSourceMapOfPosition,
+            onEmitNode,
+            onEmitHelpers,
+            onSetSourceFile,
+            onSubstituteNode,
+        } = handlers;
+
+        const newLine = getNewLineCharacter(printerOptions);
+        const languageVersion = getEmitScriptTarget(printerOptions);
+        const moduleKind = getEmitModuleKind(printerOptions);
+        const comments = createCommentWriter(printerOptions, onEmitSourceMapOfPosition);
+        const {
+            emitNodeWithComments,
+            emitBodyWithDetachedComments,
+            emitTrailingCommentsOfPosition,
+        } = comments;
+
+        let currentSourceFile: SourceFile;
+        let nodeIdToGeneratedName: string[]; // Map of generated names for specific nodes.
+        let autoGeneratedIdToGeneratedName: string[]; // Map of generated names for temp and loop variables.
+        let generatedNames: Map<string>; // Set of names generated by the NameGenerator.
+        let tempFlagsStack: TempFlags[]; // Stack of enclosing name generation scopes.
+        let tempFlags: TempFlags; // TempFlags for the current name generation scope.
+        let writer: EmitTextWriter;
+        let ownWriter: EmitTextWriter;
+
+        reset();
+        return {
+            // public API
+            printNode,
+            printFile,
+            printBundle,
+
+            // internal API
+            writeNode,
+            writeFile,
+            writeBundle
+        };
+
+        function printNode(hint: EmitHint, node: Node, sourceFile: SourceFile): string {
+            writeNode(hint, node, sourceFile, beginPrint());
+            return endPrint();
+        }
+
+        function printBundle(bundle: Bundle): string {
+            writeBundle(bundle, beginPrint());
+            return endPrint();
+        }
+
+        function printFile(sourceFile: SourceFile): string {
+            writeFile(sourceFile, beginPrint());
+            return endPrint();
+        }
+
+        function writeNode(hint: EmitHint, node: Node, sourceFile: SourceFile, output: EmitTextWriter) {
+            const previousWriter = writer;
+            setWriter(output);
+            print(hint, node, sourceFile);
+            reset();
+            writer = previousWriter;
+        }
+
+        function writeBundle(bundle: Bundle, output: EmitTextWriter) {
+            const previousWriter = writer;
+            setWriter(output);
+            if (moduleKind) {
+                emitHelpersIndirect(bundle);
+            }
+            for (const sourceFile of bundle.sourceFiles) {
+                print(EmitHint.SourceFile, sourceFile, sourceFile);
+            }
+            reset();
+            writer = previousWriter;
+        }
+
+        function writeFile(sourceFile: SourceFile, output: EmitTextWriter) {
+            const previousWriter = writer;
+            setWriter(output);
+            print(EmitHint.SourceFile, sourceFile, sourceFile);
+            reset();
+            writer = previousWriter;
+        }
+
+        function beginPrint() {
+            return ownWriter || (ownWriter = createTextWriter(newLine));
+        }
+
+        function endPrint() {
+            const text = writer.getText();
+            if (writer === ownWriter) {
+                writer.reset();
+            }
+
+            return text;
+        }
+
+        function print(hint: EmitHint, node: Node, sourceFile: SourceFile) {
+            setSourceFile(sourceFile);
+            pipelineEmitWithNotification(hint, node);
+        }
+
+        function setSourceFile(sourceFile: SourceFile) {
+            currentSourceFile = sourceFile;
+            comments.setSourceFile(sourceFile);
+            if (onSetSourceFile) {
+                onSetSourceFile(sourceFile);
+            }
+        }
+
+        function setWriter(output: EmitTextWriter | undefined) {
+            writer = output;
+            comments.setWriter(output);
+        }
+
+        function reset() {
+            nodeIdToGeneratedName = [];
+            autoGeneratedIdToGeneratedName = [];
+            generatedNames = createMap<string>();
+            tempFlagsStack = [];
+            tempFlags = TempFlags.Auto;
+            comments.reset();
+            setWriter(/*output*/ undefined);
+        }
+
+        function emit(node: Node, hint = EmitHint.Unspecified) {
+            pipelineEmitWithNotification(hint, node);
+        }
+
+        function emitIdentifierName(node: Identifier) {
+            pipelineEmitWithNotification(EmitHint.IdentifierName, node);
+        }
+
+        function emitExpression(node: Expression) {
+            pipelineEmitWithNotification(EmitHint.Expression, node);
+        }
+
+        function pipelineEmitWithNotification(hint: EmitHint, node: Node) {
+            if (onEmitNode) {
+                onEmitNode(hint, node, pipelineEmitWithComments);
+            }
+            else {
+                pipelineEmitWithComments(hint, node);
+            }
+        }
+
+        function pipelineEmitWithComments(hint: EmitHint, node: Node) {
+            if (emitNodeWithComments && hint !== EmitHint.SourceFile) {
+                emitNodeWithComments(hint, node, pipelineEmitWithSourceMap);
+            }
+            else {
+                pipelineEmitWithSourceMap(hint, node);
+            }
+        }
+
+        function pipelineEmitWithSourceMap(hint: EmitHint, node: Node) {
+            if (onEmitSourceMapOfNode && hint !== EmitHint.SourceFile && hint !== EmitHint.IdentifierName) {
+                onEmitSourceMapOfNode(hint, node, pipelineEmitWithSubstitution);
+            }
+            else {
+                pipelineEmitWithSubstitution(hint, node);
+            }
+        }
+
+        function pipelineEmitWithSubstitution(hint: EmitHint, node: Node) {
+            if (onSubstituteNode) {
+                onSubstituteNode(hint, node, pipelineEmitWithHint);
+            }
+            else {
+                pipelineEmitWithHint(hint, node);
+            }
+        }
+
+        function pipelineEmitWithHint(hint: EmitHint, node: Node): void {
+            switch (hint) {
+                case EmitHint.SourceFile: return pipelineEmitSourceFile(node);
+                case EmitHint.IdentifierName: return pipelineEmitIdentifierName(node);
+                case EmitHint.Expression: return pipelineEmitExpression(node);
+                case EmitHint.Unspecified: return pipelineEmitUnspecified(node);
+            }
+        }
+
+        function pipelineEmitSourceFile(node: Node): void {
+            Debug.assertNode(node, isSourceFile);
+            emitSourceFile(<SourceFile>node);
+        }
+
+        function pipelineEmitIdentifierName(node: Node): void {
+            Debug.assertNode(node, isIdentifier);
+            emitIdentifier(<Identifier>node);
+        }
+
+        function pipelineEmitUnspecified(node: Node): void {
+            const kind = node.kind;
+            switch (kind) {
+                // Pseudo-literals
+                case SyntaxKind.TemplateHead:
+                case SyntaxKind.TemplateMiddle:
+                case SyntaxKind.TemplateTail:
+                    return emitLiteral(<LiteralExpression>node);
+
+                // Identifiers
+                case SyntaxKind.Identifier:
+                    return emitIdentifier(<Identifier>node);
+
+                // Reserved words
+                case SyntaxKind.ConstKeyword:
+                case SyntaxKind.DefaultKeyword:
+                case SyntaxKind.ExportKeyword:
+                case SyntaxKind.VoidKeyword:
+
+                // Strict mode reserved words
+                case SyntaxKind.PrivateKeyword:
+                case SyntaxKind.ProtectedKeyword:
+                case SyntaxKind.PublicKeyword:
+                case SyntaxKind.StaticKeyword:
+
+                // Contextual keywords
+                case SyntaxKind.AbstractKeyword:
+                case SyntaxKind.AsKeyword:
+                case SyntaxKind.AnyKeyword:
+                case SyntaxKind.AsyncKeyword:
+                case SyntaxKind.AwaitKeyword:
+                case SyntaxKind.BooleanKeyword:
+                case SyntaxKind.ConstructorKeyword:
+                case SyntaxKind.DeclareKeyword:
+                case SyntaxKind.GetKeyword:
+                case SyntaxKind.IsKeyword:
+                case SyntaxKind.ModuleKeyword:
+                case SyntaxKind.NamespaceKeyword:
+                case SyntaxKind.NeverKeyword:
+                case SyntaxKind.ReadonlyKeyword:
+                case SyntaxKind.RequireKeyword:
+                case SyntaxKind.NumberKeyword:
+                case SyntaxKind.SetKeyword:
+                case SyntaxKind.StringKeyword:
+                case SyntaxKind.SymbolKeyword:
+                case SyntaxKind.TypeKeyword:
+                case SyntaxKind.UndefinedKeyword:
+                case SyntaxKind.FromKeyword:
+                case SyntaxKind.GlobalKeyword:
+                case SyntaxKind.OfKeyword:
+                    writeTokenText(kind);
+                    return;
+
+                // Parse tree nodes
+
+                // Names
+                case SyntaxKind.QualifiedName:
+                    return emitQualifiedName(<QualifiedName>node);
+                case SyntaxKind.ComputedPropertyName:
+                    return emitComputedPropertyName(<ComputedPropertyName>node);
+
+                // Signature elements
+                case SyntaxKind.TypeParameter:
+                    return emitTypeParameter(<TypeParameterDeclaration>node);
+                case SyntaxKind.Parameter:
+                    return emitParameter(<ParameterDeclaration>node);
+                case SyntaxKind.Decorator:
+                    return emitDecorator(<Decorator>node);
+
+                // Type members
+                case SyntaxKind.PropertySignature:
+                    return emitPropertySignature(<PropertySignature>node);
+                case SyntaxKind.PropertyDeclaration:
+                    return emitPropertyDeclaration(<PropertyDeclaration>node);
+                case SyntaxKind.MethodSignature:
+                    return emitMethodSignature(<MethodSignature>node);
+                case SyntaxKind.MethodDeclaration:
+                    return emitMethodDeclaration(<MethodDeclaration>node);
+                case SyntaxKind.Constructor:
+                    return emitConstructor(<ConstructorDeclaration>node);
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    return emitAccessorDeclaration(<AccessorDeclaration>node);
+                case SyntaxKind.CallSignature:
+                    return emitCallSignature(<CallSignatureDeclaration>node);
+                case SyntaxKind.ConstructSignature:
+                    return emitConstructSignature(<ConstructSignatureDeclaration>node);
+                case SyntaxKind.IndexSignature:
+                    return emitIndexSignature(<IndexSignatureDeclaration>node);
+
+                // Types
+                case SyntaxKind.TypePredicate:
+                    return emitTypePredicate(<TypePredicateNode>node);
+                case SyntaxKind.TypeReference:
+                    return emitTypeReference(<TypeReferenceNode>node);
+                case SyntaxKind.FunctionType:
+                    return emitFunctionType(<FunctionTypeNode>node);
+                case SyntaxKind.ConstructorType:
+                    return emitConstructorType(<ConstructorTypeNode>node);
+                case SyntaxKind.TypeQuery:
+                    return emitTypeQuery(<TypeQueryNode>node);
+                case SyntaxKind.TypeLiteral:
+                    return emitTypeLiteral(<TypeLiteralNode>node);
+                case SyntaxKind.ArrayType:
+                    return emitArrayType(<ArrayTypeNode>node);
+                case SyntaxKind.TupleType:
+                    return emitTupleType(<TupleTypeNode>node);
+                case SyntaxKind.UnionType:
+                    return emitUnionType(<UnionTypeNode>node);
+                case SyntaxKind.IntersectionType:
+                    return emitIntersectionType(<IntersectionTypeNode>node);
+                case SyntaxKind.ParenthesizedType:
+                    return emitParenthesizedType(<ParenthesizedTypeNode>node);
+                case SyntaxKind.ExpressionWithTypeArguments:
+                    return emitExpressionWithTypeArguments(<ExpressionWithTypeArguments>node);
+                case SyntaxKind.ThisType:
+                    return emitThisType();
+                case SyntaxKind.TypeOperator:
+                    return emitTypeOperator(<TypeOperatorNode>node);
+                case SyntaxKind.IndexedAccessType:
+                    return emitIndexedAccessType(<IndexedAccessTypeNode>node);
+                case SyntaxKind.MappedType:
+                    return emitMappedType(<MappedTypeNode>node);
+                case SyntaxKind.LiteralType:
+                    return emitLiteralType(<LiteralTypeNode>node);
+
+                // Binding patterns
+                case SyntaxKind.ObjectBindingPattern:
+                    return emitObjectBindingPattern(<ObjectBindingPattern>node);
+                case SyntaxKind.ArrayBindingPattern:
+                    return emitArrayBindingPattern(<ArrayBindingPattern>node);
+                case SyntaxKind.BindingElement:
+                    return emitBindingElement(<BindingElement>node);
+
+                // Misc
+                case SyntaxKind.TemplateSpan:
+                    return emitTemplateSpan(<TemplateSpan>node);
+                case SyntaxKind.SemicolonClassElement:
+                    return emitSemicolonClassElement();
+
+                // Statements
+                case SyntaxKind.Block:
+                    return emitBlock(<Block>node);
+                case SyntaxKind.VariableStatement:
+                    return emitVariableStatement(<VariableStatement>node);
+                case SyntaxKind.EmptyStatement:
+                    return emitEmptyStatement();
+                case SyntaxKind.ExpressionStatement:
+                    return emitExpressionStatement(<ExpressionStatement>node);
+                case SyntaxKind.IfStatement:
+                    return emitIfStatement(<IfStatement>node);
+                case SyntaxKind.DoStatement:
+                    return emitDoStatement(<DoStatement>node);
+                case SyntaxKind.WhileStatement:
+                    return emitWhileStatement(<WhileStatement>node);
+                case SyntaxKind.ForStatement:
+                    return emitForStatement(<ForStatement>node);
+                case SyntaxKind.ForInStatement:
+                    return emitForInStatement(<ForInStatement>node);
+                case SyntaxKind.ForOfStatement:
+                    return emitForOfStatement(<ForOfStatement>node);
+                case SyntaxKind.ContinueStatement:
+                    return emitContinueStatement(<ContinueStatement>node);
+                case SyntaxKind.BreakStatement:
+                    return emitBreakStatement(<BreakStatement>node);
+                case SyntaxKind.ReturnStatement:
+                    return emitReturnStatement(<ReturnStatement>node);
+                case SyntaxKind.WithStatement:
+                    return emitWithStatement(<WithStatement>node);
+                case SyntaxKind.SwitchStatement:
+                    return emitSwitchStatement(<SwitchStatement>node);
+                case SyntaxKind.LabeledStatement:
+                    return emitLabeledStatement(<LabeledStatement>node);
+                case SyntaxKind.ThrowStatement:
+                    return emitThrowStatement(<ThrowStatement>node);
+                case SyntaxKind.TryStatement:
+                    return emitTryStatement(<TryStatement>node);
+                case SyntaxKind.DebuggerStatement:
+                    return emitDebuggerStatement(<DebuggerStatement>node);
+
+                // Declarations
+                case SyntaxKind.VariableDeclaration:
+                    return emitVariableDeclaration(<VariableDeclaration>node);
+                case SyntaxKind.VariableDeclarationList:
+                    return emitVariableDeclarationList(<VariableDeclarationList>node);
+                case SyntaxKind.FunctionDeclaration:
+                    return emitFunctionDeclaration(<FunctionDeclaration>node);
+                case SyntaxKind.ClassDeclaration:
+                    return emitClassDeclaration(<ClassDeclaration>node);
+                case SyntaxKind.InterfaceDeclaration:
+                    return emitInterfaceDeclaration(<InterfaceDeclaration>node);
+                case SyntaxKind.TypeAliasDeclaration:
+                    return emitTypeAliasDeclaration(<TypeAliasDeclaration>node);
+                case SyntaxKind.EnumDeclaration:
+                    return emitEnumDeclaration(<EnumDeclaration>node);
+                case SyntaxKind.ModuleDeclaration:
+                    return emitModuleDeclaration(<ModuleDeclaration>node);
+                case SyntaxKind.ModuleBlock:
+                    return emitModuleBlock(<ModuleBlock>node);
+                case SyntaxKind.CaseBlock:
+                    return emitCaseBlock(<CaseBlock>node);
+                case SyntaxKind.ImportEqualsDeclaration:
+                    return emitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
+                case SyntaxKind.ImportDeclaration:
+                    return emitImportDeclaration(<ImportDeclaration>node);
+                case SyntaxKind.ImportClause:
+                    return emitImportClause(<ImportClause>node);
+                case SyntaxKind.NamespaceImport:
+                    return emitNamespaceImport(<NamespaceImport>node);
+                case SyntaxKind.NamedImports:
+                    return emitNamedImports(<NamedImports>node);
+                case SyntaxKind.ImportSpecifier:
+                    return emitImportSpecifier(<ImportSpecifier>node);
+                case SyntaxKind.ExportAssignment:
+                    return emitExportAssignment(<ExportAssignment>node);
+                case SyntaxKind.ExportDeclaration:
+                    return emitExportDeclaration(<ExportDeclaration>node);
+                case SyntaxKind.NamedExports:
+                    return emitNamedExports(<NamedExports>node);
+                case SyntaxKind.ExportSpecifier:
+                    return emitExportSpecifier(<ExportSpecifier>node);
+                case SyntaxKind.MissingDeclaration:
+                    return;
+
+                // Module references
+                case SyntaxKind.ExternalModuleReference:
+                    return emitExternalModuleReference(<ExternalModuleReference>node);
+
+                // JSX (non-expression)
+                case SyntaxKind.JsxText:
+                    return emitJsxText(<JsxText>node);
+                case SyntaxKind.JsxOpeningElement:
+                    return emitJsxOpeningElement(<JsxOpeningElement>node);
+                case SyntaxKind.JsxClosingElement:
+                    return emitJsxClosingElement(<JsxClosingElement>node);
+                case SyntaxKind.JsxAttribute:
+                    return emitJsxAttribute(<JsxAttribute>node);
+                case SyntaxKind.JsxSpreadAttribute:
+                    return emitJsxSpreadAttribute(<JsxSpreadAttribute>node);
+                case SyntaxKind.JsxExpression:
+                    return emitJsxExpression(<JsxExpression>node);
+
+                // Clauses
+                case SyntaxKind.CaseClause:
+                    return emitCaseClause(<CaseClause>node);
+                case SyntaxKind.DefaultClause:
+                    return emitDefaultClause(<DefaultClause>node);
+                case SyntaxKind.HeritageClause:
+                    return emitHeritageClause(<HeritageClause>node);
+                case SyntaxKind.CatchClause:
+                    return emitCatchClause(<CatchClause>node);
+
+                // Property assignments
+                case SyntaxKind.PropertyAssignment:
+                    return emitPropertyAssignment(<PropertyAssignment>node);
+                case SyntaxKind.ShorthandPropertyAssignment:
+                    return emitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
+                case SyntaxKind.SpreadAssignment:
+                    return emitSpreadAssignment(node as SpreadAssignment);
+
+                // Enum
+                case SyntaxKind.EnumMember:
+                    return emitEnumMember(<EnumMember>node);
+
+                // JSDoc nodes (ignored)
+                // Transformation nodes (ignored)
+            }
+
+            // If the node is an expression, try to emit it as an expression with
+            // substitution.
+            if (isExpression(node)) {
+                return pipelineEmitWithSubstitution(EmitHint.Expression, node);
+            }
+        }
+
+        function pipelineEmitExpression(node: Node): void {
+            const kind = node.kind;
+            switch (kind) {
+                // Literals
+                case SyntaxKind.NumericLiteral:
+                    return emitNumericLiteral(<NumericLiteral>node);
+
+                case SyntaxKind.StringLiteral:
+                case SyntaxKind.RegularExpressionLiteral:
+                case SyntaxKind.NoSubstitutionTemplateLiteral:
+                    return emitLiteral(<LiteralExpression>node);
+
+                // Identifiers
+                case SyntaxKind.Identifier:
+                    return emitIdentifier(<Identifier>node);
+
+                // Reserved words
+                case SyntaxKind.FalseKeyword:
+                case SyntaxKind.NullKeyword:
+                case SyntaxKind.SuperKeyword:
+                case SyntaxKind.TrueKeyword:
+                case SyntaxKind.ThisKeyword:
+                    writeTokenText(kind);
+                    return;
+
+                // Expressions
+                case SyntaxKind.ArrayLiteralExpression:
+                    return emitArrayLiteralExpression(<ArrayLiteralExpression>node);
+                case SyntaxKind.ObjectLiteralExpression:
+                    return emitObjectLiteralExpression(<ObjectLiteralExpression>node);
+                case SyntaxKind.PropertyAccessExpression:
+                    return emitPropertyAccessExpression(<PropertyAccessExpression>node);
+                case SyntaxKind.ElementAccessExpression:
+                    return emitElementAccessExpression(<ElementAccessExpression>node);
+                case SyntaxKind.CallExpression:
+                    return emitCallExpression(<CallExpression>node);
+                case SyntaxKind.NewExpression:
+                    return emitNewExpression(<NewExpression>node);
+                case SyntaxKind.TaggedTemplateExpression:
+                    return emitTaggedTemplateExpression(<TaggedTemplateExpression>node);
+                case SyntaxKind.TypeAssertionExpression:
+                    return emitTypeAssertionExpression(<TypeAssertion>node);
+                case SyntaxKind.ParenthesizedExpression:
+                    return emitParenthesizedExpression(<ParenthesizedExpression>node);
+                case SyntaxKind.FunctionExpression:
+                    return emitFunctionExpression(<FunctionExpression>node);
+                case SyntaxKind.ArrowFunction:
+                    return emitArrowFunction(<ArrowFunction>node);
+                case SyntaxKind.DeleteExpression:
+                    return emitDeleteExpression(<DeleteExpression>node);
+                case SyntaxKind.TypeOfExpression:
+                    return emitTypeOfExpression(<TypeOfExpression>node);
+                case SyntaxKind.VoidExpression:
+                    return emitVoidExpression(<VoidExpression>node);
+                case SyntaxKind.AwaitExpression:
+                    return emitAwaitExpression(<AwaitExpression>node);
+                case SyntaxKind.PrefixUnaryExpression:
+                    return emitPrefixUnaryExpression(<PrefixUnaryExpression>node);
+                case SyntaxKind.PostfixUnaryExpression:
+                    return emitPostfixUnaryExpression(<PostfixUnaryExpression>node);
+                case SyntaxKind.BinaryExpression:
+                    return emitBinaryExpression(<BinaryExpression>node);
+                case SyntaxKind.ConditionalExpression:
+                    return emitConditionalExpression(<ConditionalExpression>node);
+                case SyntaxKind.TemplateExpression:
+                    return emitTemplateExpression(<TemplateExpression>node);
+                case SyntaxKind.YieldExpression:
+                    return emitYieldExpression(<YieldExpression>node);
+                case SyntaxKind.SpreadElement:
+                    return emitSpreadExpression(<SpreadElement>node);
+                case SyntaxKind.ClassExpression:
+                    return emitClassExpression(<ClassExpression>node);
+                case SyntaxKind.OmittedExpression:
+                    return;
+                case SyntaxKind.AsExpression:
+                    return emitAsExpression(<AsExpression>node);
+                case SyntaxKind.NonNullExpression:
+                    return emitNonNullExpression(<NonNullExpression>node);
+                case SyntaxKind.MetaProperty:
+                    return emitMetaProperty(<MetaProperty>node);
+
+                // JSX
+                case SyntaxKind.JsxElement:
+                    return emitJsxElement(<JsxElement>node);
+                case SyntaxKind.JsxSelfClosingElement:
+                    return emitJsxSelfClosingElement(<JsxSelfClosingElement>node);
+
+                // Transformation nodes
+                case SyntaxKind.PartiallyEmittedExpression:
+                    return emitPartiallyEmittedExpression(<PartiallyEmittedExpression>node);
+            }
+        }
+
+        function emitBodyIndirect(node: Node, elements: NodeArray<Node>, emitCallback: (node: Node) => void): void {
+            if (emitBodyWithDetachedComments) {
+                emitBodyWithDetachedComments(node, elements, emitCallback);
+            }
+            else {
+                emitCallback(node);
+            }
+        }
+
+        function emitHelpersIndirect(node: Node) {
+            if (onEmitHelpers) {
+                onEmitHelpers(node, writeLines);
+            }
+        }
+
+        //
+        // Literals/Pseudo-literals
+        //
+
+        // SyntaxKind.NumericLiteral
+        function emitNumericLiteral(node: NumericLiteral) {
+            emitLiteral(node);
+            if (node.trailingComment) {
+                write(` /*${node.trailingComment}*/`);
+            }
+        }
+
+        // SyntaxKind.StringLiteral
+        // SyntaxKind.RegularExpressionLiteral
+        // SyntaxKind.NoSubstitutionTemplateLiteral
+        // SyntaxKind.TemplateHead
+        // SyntaxKind.TemplateMiddle
+        // SyntaxKind.TemplateTail
+        function emitLiteral(node: LiteralLikeNode) {
+            const text = getLiteralTextOfNode(node);
+            if ((printerOptions.sourceMap || printerOptions.inlineSourceMap)
+                && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
+                writer.writeLiteral(text);
+            }
+            else {
+                write(text);
+            }
+        }
+
+        //
+        // Identifiers
+        //
+
+        function emitIdentifier(node: Identifier) {
+            write(getTextOfNode(node, /*includeTrivia*/ false));
+        }
+
+        //
+        // Names
+        //
+
+        function emitQualifiedName(node: QualifiedName) {
+            emitEntityName(node.left);
+            write(".");
+            emit(node.right);
+        }
+
+        function emitEntityName(node: EntityName) {
+            if (node.kind === SyntaxKind.Identifier) {
+                emitExpression(<Identifier>node);
+            }
+            else {
+                emit(node);
+            }
+        }
+
+        function emitComputedPropertyName(node: ComputedPropertyName) {
+            write("[");
+            emitExpression(node.expression);
+            write("]");
+        }
+
+        //
+        // Signature elements
+        //
+
+        function emitTypeParameter(node: TypeParameterDeclaration) {
+            emit(node.name);
+            emitWithPrefix(" extends ", node.constraint);
+        }
+
+        function emitParameter(node: ParameterDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeIfPresent(node.dotDotDotToken, "...");
+            emit(node.name);
+            writeIfPresent(node.questionToken, "?");
+            emitExpressionWithPrefix(" = ", node.initializer);
+            emitWithPrefix(": ", node.type);
+        }
+
+        function emitDecorator(decorator: Decorator) {
+            write("@");
+            emitExpression(decorator.expression);
+        }
+
+        //
+        // Type members
+        //
+
+        function emitPropertySignature(node: PropertySignature) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            writeIfPresent(node.questionToken, "?");
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitPropertyDeclaration(node: PropertyDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            emitWithPrefix(": ", node.type);
+            emitExpressionWithPrefix(" = ", node.initializer);
+            write(";");
+        }
+
+        function emitMethodSignature(node: MethodSignature) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            writeIfPresent(node.questionToken, "?");
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitMethodDeclaration(node: MethodDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeIfPresent(node.asteriskToken, "*");
+            emit(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitConstructor(node: ConstructorDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("constructor");
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitAccessorDeclaration(node: AccessorDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write(node.kind === SyntaxKind.GetAccessor ? "get " : "set ");
+            emit(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitCallSignature(node: CallSignatureDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitConstructSignature(node: ConstructSignatureDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("new ");
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitIndexSignature(node: IndexSignatureDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitParametersForIndexSignature(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(";");
+        }
+
+        function emitSemicolonClassElement() {
+            write(";");
+        }
+
+        //
+        // Types
+        //
+
+        function emitTypePredicate(node: TypePredicateNode) {
+            emit(node.parameterName);
+            write(" is ");
+            emit(node.type);
+        }
+
+        function emitTypeReference(node: TypeReferenceNode) {
+            emit(node.typeName);
+            emitTypeArguments(node, node.typeArguments);
+        }
+
+        function emitFunctionType(node: FunctionTypeNode) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            write(" => ");
+            emit(node.type);
+        }
+
+        function emitConstructorType(node: ConstructorTypeNode) {
+            write("new ");
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            write(" => ");
+            emit(node.type);
+        }
+
+        function emitTypeQuery(node: TypeQueryNode) {
+            write("typeof ");
+            emit(node.exprName);
+        }
+
+        function emitTypeLiteral(node: TypeLiteralNode) {
+            write("{");
+            emitList(node, node.members, ListFormat.TypeLiteralMembers);
+            write("}");
+        }
+
+        function emitArrayType(node: ArrayTypeNode) {
+            emit(node.elementType);
+            write("[]");
+        }
+
+        function emitTupleType(node: TupleTypeNode) {
+            write("[");
+            emitList(node, node.elementTypes, ListFormat.TupleTypeElements);
+            write("]");
+        }
+
+        function emitUnionType(node: UnionTypeNode) {
+            emitList(node, node.types, ListFormat.UnionTypeConstituents);
+        }
+
+        function emitIntersectionType(node: IntersectionTypeNode) {
+            emitList(node, node.types, ListFormat.IntersectionTypeConstituents);
+        }
+
+        function emitParenthesizedType(node: ParenthesizedTypeNode) {
+            write("(");
+            emit(node.type);
+            write(")");
+        }
+
+        function emitThisType() {
+            write("this");
+        }
+
+        function emitTypeOperator(node: TypeOperatorNode) {
+            writeTokenText(node.operator);
+            write(" ");
+            emit(node.type);
+        }
+
+        function emitIndexedAccessType(node: IndexedAccessTypeNode) {
+            emit(node.objectType);
+            write("[");
+            emit(node.indexType);
+            write("]");
+        }
+
+        function emitMappedType(node: MappedTypeNode) {
+            write("{");
+            writeLine();
+            increaseIndent();
+            writeIfPresent(node.readonlyToken, "readonly ");
+            write("[");
+            emit(node.typeParameter.name);
+            write(" in ");
+            emit(node.typeParameter.constraint);
+            write("]");
+            writeIfPresent(node.questionToken, "?");
+            write(": ");
+            emit(node.type);
+            write(";");
+            writeLine();
+            decreaseIndent();
+            write("}");
+        }
+
+        function emitLiteralType(node: LiteralTypeNode) {
+            emitExpression(node.literal);
+        }
+
+        //
+        // Binding patterns
+        //
+
+        function emitObjectBindingPattern(node: ObjectBindingPattern) {
+            const elements = node.elements;
+            if (elements.length === 0) {
+                write("{}");
+            }
+            else {
+                write("{");
+                emitList(node, elements, ListFormat.ObjectBindingPatternElements);
+                write("}");
+            }
+        }
+
+        function emitArrayBindingPattern(node: ArrayBindingPattern) {
+            const elements = node.elements;
+            if (elements.length === 0) {
+                write("[]");
+            }
+            else {
+                write("[");
+                emitList(node, node.elements, ListFormat.ArrayBindingPatternElements);
+                write("]");
+            }
+        }
+
+        function emitBindingElement(node: BindingElement) {
+            emitWithSuffix(node.propertyName, ": ");
+            writeIfPresent(node.dotDotDotToken, "...");
+            emit(node.name);
+            emitExpressionWithPrefix(" = ", node.initializer);
+        }
+
+        //
+        // Expressions
+        //
+
+        function emitArrayLiteralExpression(node: ArrayLiteralExpression) {
+            const elements = node.elements;
+            if (elements.length === 0) {
+                write("[]");
+            }
+            else {
+                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
+                emitExpressionList(node, elements, ListFormat.ArrayLiteralExpressionElements | preferNewLine);
+            }
+        }
+
+        function emitObjectLiteralExpression(node: ObjectLiteralExpression) {
+            const properties = node.properties;
+            if (properties.length === 0) {
+                write("{}");
+            }
+            else {
+                const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
+                if (indentedFlag) {
+                    increaseIndent();
+                }
+
+                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
+                const allowTrailingComma = languageVersion >= ScriptTarget.ES5 ? ListFormat.AllowTrailingComma : ListFormat.None;
+                emitList(node, properties, ListFormat.ObjectLiteralExpressionProperties | allowTrailingComma | preferNewLine);
+
+                if (indentedFlag) {
+                    decreaseIndent();
+                }
+            }
+        }
+
+        function emitPropertyAccessExpression(node: PropertyAccessExpression) {
+            let indentBeforeDot = false;
+            let indentAfterDot = false;
+            if (!(getEmitFlags(node) & EmitFlags.NoIndentation)) {
+                const dotRangeStart = node.expression.end;
+                const dotRangeEnd = skipTrivia(currentSourceFile.text, node.expression.end) + 1;
+                const dotToken = <Node>{ kind: SyntaxKind.DotToken, pos: dotRangeStart, end: dotRangeEnd };
+                indentBeforeDot = needsIndentation(node, node.expression, dotToken);
+                indentAfterDot = needsIndentation(node, dotToken, node.name);
+            }
+
+            emitExpression(node.expression);
+            increaseIndentIf(indentBeforeDot);
+
+            const shouldEmitDotDot = !indentBeforeDot && needsDotDotForPropertyAccess(node.expression);
+            write(shouldEmitDotDot ? ".." : ".");
+
+            increaseIndentIf(indentAfterDot);
+            emit(node.name);
+            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+        }
+
+        // 1..toString is a valid property access, emit a dot after the literal
+        // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
+        function needsDotDotForPropertyAccess(expression: Expression) {
+            if (expression.kind === SyntaxKind.NumericLiteral) {
+                // check if numeric literal is a decimal literal that was originally written with a dot
+                const text = getLiteralTextOfNode(<LiteralExpression>expression);
+                return getNumericLiteralFlags(text, /*hint*/ NumericLiteralFlags.All) === NumericLiteralFlags.None
+                    && !(<LiteralExpression>expression).isOctalLiteral
+                    && text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
+            }
+            else if (isPropertyAccessExpression(expression) || isElementAccessExpression(expression)) {
+                // check if constant enum value is integer
+                const constantValue = getConstantValue(expression);
+                // isFinite handles cases when constantValue is undefined
+                return isFinite(constantValue)
+                    && Math.floor(constantValue) === constantValue
+                    && printerOptions.removeComments;
+            }
+        }
+
+        function emitElementAccessExpression(node: ElementAccessExpression) {
+            emitExpression(node.expression);
+            write("[");
+            emitExpression(node.argumentExpression);
+            write("]");
+        }
+
+        function emitCallExpression(node: CallExpression) {
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+            emitExpressionList(node, node.arguments, ListFormat.CallExpressionArguments);
+        }
+
+        function emitNewExpression(node: NewExpression) {
+            write("new ");
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+            emitExpressionList(node, node.arguments, ListFormat.NewExpressionArguments);
+        }
+
+        function emitTaggedTemplateExpression(node: TaggedTemplateExpression) {
+            emitExpression(node.tag);
+            write(" ");
+            emitExpression(node.template);
+        }
+
+        function emitTypeAssertionExpression(node: TypeAssertion) {
+            write("<");
+            emit(node.type);
+            write(">");
+            emitExpression(node.expression);
+        }
+
+        function emitParenthesizedExpression(node: ParenthesizedExpression) {
+            write("(");
+            emitExpression(node.expression);
+            write(")");
+        }
+
+        function emitFunctionExpression(node: FunctionExpression) {
+            emitFunctionDeclarationOrExpression(node);
+        }
+
+        function emitArrowFunction(node: ArrowFunction) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitSignatureAndBody(node, emitArrowFunctionHead);
+        }
+
+        function emitArrowFunctionHead(node: ArrowFunction) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+            write(" =>");
+        }
+
+        function emitDeleteExpression(node: DeleteExpression) {
+            write("delete ");
+            emitExpression(node.expression);
+        }
+
+        function emitTypeOfExpression(node: TypeOfExpression) {
+            write("typeof ");
+            emitExpression(node.expression);
+        }
+
+        function emitVoidExpression(node: VoidExpression) {
+            write("void ");
+            emitExpression(node.expression);
+        }
+
+        function emitAwaitExpression(node: AwaitExpression) {
+            write("await ");
+            emitExpression(node.expression);
+        }
+
+        function emitPrefixUnaryExpression(node: PrefixUnaryExpression) {
+            writeTokenText(node.operator);
+            if (shouldEmitWhitespaceBeforeOperand(node)) {
+                write(" ");
+            }
+            emitExpression(node.operand);
+        }
+
+        function shouldEmitWhitespaceBeforeOperand(node: PrefixUnaryExpression) {
+            // In some cases, we need to emit a space between the operator and the operand. One obvious case
+            // is when the operator is an identifier, like delete or typeof. We also need to do this for plus
+            // and minus expressions in certain cases. Specifically, consider the following two cases (parens
+            // are just for clarity of exposition, and not part of the source code):
+            //
+            //  (+(+1))
+            //  (+(++1))
+            //
+            // We need to emit a space in both cases. In the first case, the absence of a space will make
+            // the resulting expression a prefix increment operation. And in the second, it will make the resulting
+            // expression a prefix increment whose operand is a plus expression - (++(+x))
+            // The same is true of minus of course.
+            const operand = node.operand;
+            return operand.kind === SyntaxKind.PrefixUnaryExpression
+                && ((node.operator === SyntaxKind.PlusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusPlusToken))
+                || (node.operator === SyntaxKind.MinusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusMinusToken)));
+        }
+
+        function emitPostfixUnaryExpression(node: PostfixUnaryExpression) {
+            emitExpression(node.operand);
+            writeTokenText(node.operator);
+        }
+
+        function emitBinaryExpression(node: BinaryExpression) {
+            const isCommaOperator = node.operatorToken.kind !== SyntaxKind.CommaToken;
+            const indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
+            const indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
+
+            emitExpression(node.left);
+            increaseIndentIf(indentBeforeOperator, isCommaOperator ? " " : undefined);
+            writeTokenText(node.operatorToken.kind);
+            increaseIndentIf(indentAfterOperator, " ");
+            emitExpression(node.right);
+            decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+        }
+
+        function emitConditionalExpression(node: ConditionalExpression) {
+            const indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
+            const indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
+            const indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
+            const indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+
+            emitExpression(node.condition);
+            increaseIndentIf(indentBeforeQuestion, " ");
+            write("?");
+            increaseIndentIf(indentAfterQuestion, " ");
+            emitExpression(node.whenTrue);
+            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
+
+            increaseIndentIf(indentBeforeColon, " ");
+            write(":");
+            increaseIndentIf(indentAfterColon, " ");
+            emitExpression(node.whenFalse);
+            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+        }
+
+        function emitTemplateExpression(node: TemplateExpression) {
+            emit(node.head);
+            emitList(node, node.templateSpans, ListFormat.TemplateExpressionSpans);
+        }
+
+        function emitYieldExpression(node: YieldExpression) {
+            write(node.asteriskToken ? "yield*" : "yield");
+            emitExpressionWithPrefix(" ", node.expression);
+        }
+
+        function emitSpreadExpression(node: SpreadElement) {
+            write("...");
+            emitExpression(node.expression);
+        }
+
+        function emitClassExpression(node: ClassExpression) {
+            emitClassDeclarationOrExpression(node);
+        }
+
+        function emitExpressionWithTypeArguments(node: ExpressionWithTypeArguments) {
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+        }
+
+        function emitAsExpression(node: AsExpression) {
+            emitExpression(node.expression);
+            if (node.type) {
+                write(" as ");
+                emit(node.type);
+            }
+        }
+
+        function emitNonNullExpression(node: NonNullExpression) {
+            emitExpression(node.expression);
+            write("!");
+        }
+
+        function emitMetaProperty(node: MetaProperty) {
+            writeToken(node.keywordToken, node.pos);
+            write(".");
+            emit(node.name);
+        }
+
+        //
+        // Misc
+        //
+
+        function emitTemplateSpan(node: TemplateSpan) {
+            emitExpression(node.expression);
+            emit(node.literal);
+        }
+
+        //
+        // Statements
+        //
+
+        function emitBlock(node: Block) {
+            if (isSingleLineEmptyBlock(node)) {
+                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
+                write(" ");
+                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
+            }
+            else {
+                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
+                emitBlockStatements(node);
+                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
+            }
+        }
+
+        function emitBlockStatements(node: BlockLike) {
+            if (getEmitFlags(node) & EmitFlags.SingleLine) {
+                emitList(node, node.statements, ListFormat.SingleLineBlockStatements);
+            }
+            else {
+                emitList(node, node.statements, ListFormat.MultiLineBlockStatements);
+            }
+        }
+
+        function emitVariableStatement(node: VariableStatement) {
+            emitModifiers(node, node.modifiers);
+            emit(node.declarationList);
+            write(";");
+        }
+
+        function emitEmptyStatement() {
+            write(";");
+        }
+
+        function emitExpressionStatement(node: ExpressionStatement) {
+            emitExpression(node.expression);
+            write(";");
+        }
+
+        function emitIfStatement(node: IfStatement) {
+            const openParenPos = writeToken(SyntaxKind.IfKeyword, node.pos, node);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos, node);
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end, node);
+            emitEmbeddedStatement(node, node.thenStatement);
+            if (node.elseStatement) {
+                writeLineOrSpace(node);
+                writeToken(SyntaxKind.ElseKeyword, node.thenStatement.end, node);
+                if (node.elseStatement.kind === SyntaxKind.IfStatement) {
+                    write(" ");
+                    emit(node.elseStatement);
+                }
+                else {
+                    emitEmbeddedStatement(node, node.elseStatement);
+                }
+            }
+        }
+
+        function emitDoStatement(node: DoStatement) {
+            write("do");
+            emitEmbeddedStatement(node, node.statement);
+            if (isBlock(node.statement)) {
+                write(" ");
+            }
+            else {
+                writeLineOrSpace(node);
+            }
+
+            write("while (");
+            emitExpression(node.expression);
+            write(");");
+        }
+
+        function emitWhileStatement(node: WhileStatement) {
+            write("while (");
+            emitExpression(node.expression);
+            write(")");
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitForStatement(node: ForStatement) {
+            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos, /*contextNode*/ node);
+            emitForBinding(node.initializer);
+            write(";");
+            emitExpressionWithPrefix(" ", node.condition);
+            write(";");
+            emitExpressionWithPrefix(" ", node.incrementor);
+            write(")");
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitForInStatement(node: ForInStatement) {
+            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emitForBinding(node.initializer);
+            write(" in ");
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitForOfStatement(node: ForOfStatement) {
+            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emitForBinding(node.initializer);
+            write(" of ");
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitForBinding(node: VariableDeclarationList | Expression) {
+            if (node !== undefined) {
+                if (node.kind === SyntaxKind.VariableDeclarationList) {
+                    emit(node);
+                }
+                else {
+                    emitExpression(<Expression>node);
+                }
+            }
+        }
+
+        function emitContinueStatement(node: ContinueStatement) {
+            writeToken(SyntaxKind.ContinueKeyword, node.pos);
+            emitWithPrefix(" ", node.label);
+            write(";");
+        }
+
+        function emitBreakStatement(node: BreakStatement) {
+            writeToken(SyntaxKind.BreakKeyword, node.pos);
+            emitWithPrefix(" ", node.label);
+            write(";");
+        }
+
+        function emitReturnStatement(node: ReturnStatement) {
+            writeToken(SyntaxKind.ReturnKeyword, node.pos, /*contextNode*/ node);
+            emitExpressionWithPrefix(" ", node.expression);
+            write(";");
+        }
+
+        function emitWithStatement(node: WithStatement) {
+            write("with (");
+            emitExpression(node.expression);
+            write(")");
+            emitEmbeddedStatement(node, node.statement);
+        }
+
+        function emitSwitchStatement(node: SwitchStatement) {
+            const openParenPos = writeToken(SyntaxKind.SwitchKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emitExpression(node.expression);
+            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+            write(" ");
+            emit(node.caseBlock);
+        }
+
+        function emitLabeledStatement(node: LabeledStatement) {
+            emit(node.label);
+            write(": ");
+            emit(node.statement);
+        }
+
+        function emitThrowStatement(node: ThrowStatement) {
+            write("throw");
+            emitExpressionWithPrefix(" ", node.expression);
+            write(";");
+        }
+
+        function emitTryStatement(node: TryStatement) {
+            write("try ");
+            emit(node.tryBlock);
+            if (node.catchClause) {
+                writeLineOrSpace(node);
+                emit(node.catchClause);
+            }
+            if (node.finallyBlock) {
+                writeLineOrSpace(node);
+                write("finally ");
+                emit(node.finallyBlock);
+            }
+        }
+
+        function emitDebuggerStatement(node: DebuggerStatement) {
+            writeToken(SyntaxKind.DebuggerKeyword, node.pos);
+            write(";");
+        }
+
+        //
+        // Declarations
+        //
+
+        function emitVariableDeclaration(node: VariableDeclaration) {
+            emit(node.name);
+            emitWithPrefix(": ", node.type);
+            emitExpressionWithPrefix(" = ", node.initializer);
+        }
+
+        function emitVariableDeclarationList(node: VariableDeclarationList) {
+            write(isLet(node) ? "let " : isConst(node) ? "const " : "var ");
+            emitList(node, node.declarations, ListFormat.VariableDeclarationList);
+        }
+
+        function emitFunctionDeclaration(node: FunctionDeclaration) {
+            emitFunctionDeclarationOrExpression(node);
+        }
+
+        function emitFunctionDeclarationOrExpression(node: FunctionDeclaration | FunctionExpression) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write(node.asteriskToken ? "function* " : "function ");
+            emitIdentifierName(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+
+        function emitSignatureAndBody(node: FunctionLikeDeclaration, emitSignatureHead: (node: SignatureDeclaration) => void) {
+            const body = node.body;
+            if (body) {
+                if (isBlock(body)) {
+                    const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
+                    if (indentedFlag) {
+                        increaseIndent();
+                    }
+
+                    if (getEmitFlags(node) & EmitFlags.ReuseTempVariableScope) {
+                        emitSignatureHead(node);
+                        emitBlockFunctionBody(body);
+                    }
+                    else {
+                        pushNameGenerationScope();
+                        emitSignatureHead(node);
+                        emitBlockFunctionBody(body);
+                        popNameGenerationScope();
+                    }
+
+                    if (indentedFlag) {
+                        decreaseIndent();
+                    }
+                }
+                else {
+                    emitSignatureHead(node);
+                    write(" ");
+                    emitExpression(body);
+                }
+            }
+            else {
+                emitSignatureHead(node);
+                write(";");
+            }
+
+        }
+
+        function emitSignatureHead(node: FunctionDeclaration | FunctionExpression | MethodDeclaration | AccessorDeclaration | ConstructorDeclaration) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitWithPrefix(": ", node.type);
+        }
+
+        function shouldEmitBlockFunctionBodyOnSingleLine(body: Block) {
+            // We must emit a function body as a single-line body in the following case:
+            // * The body has NodeEmitFlags.SingleLine specified.
+
+            // We must emit a function body as a multi-line body in the following cases:
+            // * The body is explicitly marked as multi-line.
+            // * A non-synthesized body's start and end position are on different lines.
+            // * Any statement in the body starts on a new line.
+
+            if (getEmitFlags(body) & EmitFlags.SingleLine) {
+                return true;
+            }
+
+            if (body.multiLine) {
+                return false;
+            }
+
+            if (!nodeIsSynthesized(body) && !rangeIsOnSingleLine(body, currentSourceFile)) {
+                return false;
+            }
+
+            if (shouldWriteLeadingLineTerminator(body, body.statements, ListFormat.PreserveLines)
+                || shouldWriteClosingLineTerminator(body, body.statements, ListFormat.PreserveLines)) {
+                return false;
+            }
+
+            let previousStatement: Statement;
+            for (const statement of body.statements) {
+                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, ListFormat.PreserveLines)) {
+                    return false;
+                }
+
+                previousStatement = statement;
+            }
+
+            return true;
+        }
+
+        function emitBlockFunctionBody(body: Block) {
+            write(" {");
+            increaseIndent();
+
+            const emitBlockFunctionBody = shouldEmitBlockFunctionBodyOnSingleLine(body)
+                ? emitBlockFunctionBodyOnSingleLine
+                : emitBlockFunctionBodyWorker;
+
+            emitBodyIndirect(body, body.statements, emitBlockFunctionBody);
+
+            decreaseIndent();
+            writeToken(SyntaxKind.CloseBraceToken, body.statements.end, body);
+        }
+
+        function emitBlockFunctionBodyOnSingleLine(body: Block) {
+            emitBlockFunctionBodyWorker(body, /*emitBlockFunctionBodyOnSingleLine*/ true);
+        }
+
+        function emitBlockFunctionBodyWorker(body: Block, emitBlockFunctionBodyOnSingleLine?: boolean) {
+            // Emit all the prologue directives (like "use strict").
+            const statementOffset = emitPrologueDirectives(body.statements, /*startWithNewLine*/ true);
+            const pos = writer.getTextPos();
+            emitHelpersIndirect(body);
+            if (statementOffset === 0 && pos === writer.getTextPos() && emitBlockFunctionBodyOnSingleLine) {
+                decreaseIndent();
+                emitList(body, body.statements, ListFormat.SingleLineFunctionBodyStatements);
+                increaseIndent();
+            }
+            else {
+                emitList(body, body.statements, ListFormat.MultiLineFunctionBodyStatements, statementOffset);
+            }
+        }
+
+        function emitClassDeclaration(node: ClassDeclaration) {
+            emitClassDeclarationOrExpression(node);
+        }
+
+        function emitClassDeclarationOrExpression(node: ClassDeclaration | ClassExpression) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("class");
+            emitNodeWithPrefix(" ", node.name, emitIdentifierName);
+
+            const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
+            if (indentedFlag) {
+                increaseIndent();
+            }
+
+            emitTypeParameters(node, node.typeParameters);
+            emitList(node, node.heritageClauses, ListFormat.ClassHeritageClauses);
+
+            pushNameGenerationScope();
+            write(" {");
+            emitList(node, node.members, ListFormat.ClassMembers);
+            write("}");
+            popNameGenerationScope();
+
+            if (indentedFlag) {
+                decreaseIndent();
+            }
+        }
+
+        function emitInterfaceDeclaration(node: InterfaceDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("interface ");
+            emit(node.name);
+            emitTypeParameters(node, node.typeParameters);
+            emitList(node, node.heritageClauses, ListFormat.HeritageClauses);
+            write(" {");
+            emitList(node, node.members, ListFormat.InterfaceMembers);
+            write("}");
+        }
+
+        function emitTypeAliasDeclaration(node: TypeAliasDeclaration) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            write("type ");
+            emit(node.name);
+            emitTypeParameters(node, node.typeParameters);
+            write(" = ");
+            emit(node.type);
+            write(";");
+        }
+
+        function emitEnumDeclaration(node: EnumDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("enum ");
+            emit(node.name);
+            pushNameGenerationScope();
+            write(" {");
+            emitList(node, node.members, ListFormat.EnumMembers);
+            write("}");
+            popNameGenerationScope();
+        }
+
+        function emitModuleDeclaration(node: ModuleDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write(node.flags & NodeFlags.Namespace ? "namespace " : "module ");
+            emit(node.name);
+
+            let body = node.body;
+            while (body.kind === SyntaxKind.ModuleDeclaration) {
+                write(".");
+                emit((<ModuleDeclaration>body).name);
+                body = (<ModuleDeclaration>body).body;
+            }
+
+            write(" ");
+            emit(body);
+        }
+
+        function emitModuleBlock(node: ModuleBlock) {
+            if (isEmptyBlock(node)) {
+                write("{ }");
+            }
+            else {
+                pushNameGenerationScope();
+                write("{");
+                increaseIndent();
+                emitBlockStatements(node);
+                write("}");
+                popNameGenerationScope();
+            }
+        }
+
+        function emitCaseBlock(node: CaseBlock) {
+            writeToken(SyntaxKind.OpenBraceToken, node.pos);
+            emitList(node, node.clauses, ListFormat.CaseBlockClauses);
+            writeToken(SyntaxKind.CloseBraceToken, node.clauses.end);
+        }
+
+        function emitImportEqualsDeclaration(node: ImportEqualsDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("import ");
+            emit(node.name);
+            write(" = ");
+            emitModuleReference(node.moduleReference);
+            write(";");
+        }
+
+        function emitModuleReference(node: ModuleReference) {
+            if (node.kind === SyntaxKind.Identifier) {
+                emitExpression(<Identifier>node);
+            }
+            else {
+                emit(node);
+            }
+        }
+
+        function emitImportDeclaration(node: ImportDeclaration) {
+            emitModifiers(node, node.modifiers);
+            write("import ");
+            if (node.importClause) {
+                emit(node.importClause);
+                write(" from ");
+            }
+            emitExpression(node.moduleSpecifier);
+            write(";");
+        }
+
+        function emitImportClause(node: ImportClause) {
+            emit(node.name);
+            if (node.name && node.namedBindings) {
+                write(", ");
+            }
+            emit(node.namedBindings);
+        }
+
+        function emitNamespaceImport(node: NamespaceImport) {
+            write("* as ");
+            emit(node.name);
+        }
+
+        function emitNamedImports(node: NamedImports) {
+            emitNamedImportsOrExports(node);
+        }
+
+        function emitImportSpecifier(node: ImportSpecifier) {
+            emitImportOrExportSpecifier(node);
+        }
+
+        function emitExportAssignment(node: ExportAssignment) {
+            write(node.isExportEquals ? "export = " : "export default ");
+            emitExpression(node.expression);
+            write(";");
+        }
+
+        function emitExportDeclaration(node: ExportDeclaration) {
+            write("export ");
+            if (node.exportClause) {
+                emit(node.exportClause);
+            }
+            else {
+                write("*");
+            }
+            if (node.moduleSpecifier) {
+                write(" from ");
+                emitExpression(node.moduleSpecifier);
+            }
+            write(";");
+        }
+
+        function emitNamedExports(node: NamedExports) {
+            emitNamedImportsOrExports(node);
+        }
+
+        function emitExportSpecifier(node: ExportSpecifier) {
+            emitImportOrExportSpecifier(node);
+        }
+
+        function emitNamedImportsOrExports(node: NamedImportsOrExports) {
+            write("{");
+            emitList(node, node.elements, ListFormat.NamedImportsOrExportsElements);
+            write("}");
+        }
+
+        function emitImportOrExportSpecifier(node: ImportOrExportSpecifier) {
+            if (node.propertyName) {
+                emit(node.propertyName);
+                write(" as ");
+            }
+
+            emit(node.name);
+        }
+
+        //
+        // Module references
+        //
+
+        function emitExternalModuleReference(node: ExternalModuleReference) {
+            write("require(");
+            emitExpression(node.expression);
+            write(")");
+        }
+
+        //
+        // JSX
+        //
+
+        function emitJsxElement(node: JsxElement) {
+            emit(node.openingElement);
+            emitList(node, node.children, ListFormat.JsxElementChildren);
+            emit(node.closingElement);
+        }
+
+        function emitJsxSelfClosingElement(node: JsxSelfClosingElement) {
+            write("<");
+            emitJsxTagName(node.tagName);
+            write(" ");
+            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
+            write("/>");
+        }
+
+        function emitJsxOpeningElement(node: JsxOpeningElement) {
+            write("<");
+            emitJsxTagName(node.tagName);
+            writeIfAny(node.attributes, " ");
+            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
+            write(">");
+        }
+
+        function emitJsxText(node: JsxText) {
+            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+        }
+
+        function emitJsxClosingElement(node: JsxClosingElement) {
+            write("</");
+            emitJsxTagName(node.tagName);
+            write(">");
+        }
+
+        function emitJsxAttribute(node: JsxAttribute) {
+            emit(node.name);
+            emitWithPrefix("=", node.initializer);
+        }
+
+        function emitJsxSpreadAttribute(node: JsxSpreadAttribute) {
+            write("{...");
+            emitExpression(node.expression);
+            write("}");
+        }
+
+        function emitJsxExpression(node: JsxExpression) {
+            if (node.expression) {
+                write("{");
+                if (node.dotDotDotToken) {
+                    write("...");
+                }
+                emitExpression(node.expression);
+                write("}");
+            }
+        }
+
+        function emitJsxTagName(node: JsxTagNameExpression) {
+            if (node.kind === SyntaxKind.Identifier) {
+                emitExpression(<Identifier>node);
+            }
+            else {
+                emit(node);
+            }
+        }
+
+        //
+        // Clauses
+        //
+
+        function emitCaseClause(node: CaseClause) {
+            write("case ");
+            emitExpression(node.expression);
+            write(":");
+
+            emitCaseOrDefaultClauseStatements(node, node.statements);
+        }
+
+        function emitDefaultClause(node: DefaultClause) {
+            write("default:");
+            emitCaseOrDefaultClauseStatements(node, node.statements);
+        }
+
+        function emitCaseOrDefaultClauseStatements(parentNode: Node, statements: NodeArray<Statement>) {
+            const emitAsSingleStatement =
+                statements.length === 1 &&
+                (
+                    // treat synthesized nodes as located on the same line for emit purposes
+                    nodeIsSynthesized(parentNode) ||
+                    nodeIsSynthesized(statements[0]) ||
+                    rangeStartPositionsAreOnSameLine(parentNode, statements[0], currentSourceFile)
+                );
+
+            if (emitAsSingleStatement) {
+                write(" ");
+                emit(statements[0]);
+            }
+            else {
+                emitList(parentNode, statements, ListFormat.CaseOrDefaultClauseStatements);
+            }
+        }
+
+        function emitHeritageClause(node: HeritageClause) {
+            write(" ");
+            writeTokenText(node.token);
+            write(" ");
+            emitList(node, node.types, ListFormat.HeritageClauseTypes);
+        }
+
+        function emitCatchClause(node: CatchClause) {
+            writeLine();
+            const openParenPos = writeToken(SyntaxKind.CatchKeyword, node.pos);
+            write(" ");
+            writeToken(SyntaxKind.OpenParenToken, openParenPos);
+            emit(node.variableDeclaration);
+            writeToken(SyntaxKind.CloseParenToken, node.variableDeclaration ? node.variableDeclaration.end : openParenPos);
+            write(" ");
+            emit(node.block);
+        }
+
+        //
+        // Property assignments
+        //
+
+        function emitPropertyAssignment(node: PropertyAssignment) {
+            emit(node.name);
+            write(": ");
+            // This is to ensure that we emit comment in the following case:
+            //      For example:
+            //          obj = {
+            //              id: /*comment1*/ ()=>void
+            //          }
+            // "comment1" is not considered to be leading comment for node.initializer
+            // but rather a trailing comment on the previous node.
+            const initializer = node.initializer;
+            if (emitTrailingCommentsOfPosition && (getEmitFlags(initializer) & EmitFlags.NoLeadingComments) === 0) {
+                const commentRange = getCommentRange(initializer);
+                emitTrailingCommentsOfPosition(commentRange.pos);
+            }
+            emitExpression(initializer);
+        }
+
+        function emitShorthandPropertyAssignment(node: ShorthandPropertyAssignment) {
+            emit(node.name);
+            if (node.objectAssignmentInitializer) {
+                write(" = ");
+                emitExpression(node.objectAssignmentInitializer);
+            }
+        }
+
+        function emitSpreadAssignment(node: SpreadAssignment) {
+            if (node.expression) {
+                write("...");
+                emitExpression(node.expression);
+            }
+        }
+
+        //
+        // Enum
+        //
+
+        function emitEnumMember(node: EnumMember) {
+            emit(node.name);
+            emitExpressionWithPrefix(" = ", node.initializer);
+        }
+
+        //
+        // Top-level nodes
+        //
+
+        function emitSourceFile(node: SourceFile) {
+            writeLine();
+            emitShebang();
+            emitBodyIndirect(node, node.statements, emitSourceFileWorker);
+        }
+
+        function emitSourceFileWorker(node: SourceFile) {
+            const statements = node.statements;
+            const statementOffset = emitPrologueDirectives(statements);
+            pushNameGenerationScope();
+            emitHelpersIndirect(node);
+            emitList(node, statements, ListFormat.MultiLine, statementOffset);
+            popNameGenerationScope();
+        }
+
+        // Transformation nodes
+
+        function emitPartiallyEmittedExpression(node: PartiallyEmittedExpression) {
+            emitExpression(node.expression);
+        }
+
+        /**
+         * Emits any prologue directives at the start of a Statement list, returning the
+         * number of prologue directives written to the output.
+         */
+        function emitPrologueDirectives(statements: Node[], startWithNewLine?: boolean): number {
+            for (let i = 0; i < statements.length; i++) {
+                if (isPrologueDirective(statements[i])) {
+                    if (startWithNewLine || i > 0) {
+                        writeLine();
+                    }
+                    emit(statements[i]);
+                }
+                else {
+                    // return index of the first non prologue directive
+                    return i;
+                }
+            }
+
+            return statements.length;
+        }
+
+        //
+        // Helpers
+        //
+
+        function emitShebang() {
+            const shebang = getShebang(currentSourceFile.text);
+            if (shebang) {
+                write(shebang);
+                writeLine();
+            }
+        }
+
+        function emitModifiers(node: Node, modifiers: NodeArray<Modifier>) {
+            if (modifiers && modifiers.length) {
+                emitList(node, modifiers, ListFormat.Modifiers);
+                write(" ");
+            }
+        }
+
+        function emitWithPrefix(prefix: string, node: Node) {
+            emitNodeWithPrefix(prefix, node, emit);
+        }
+
+        function emitExpressionWithPrefix(prefix: string, node: Node) {
+            emitNodeWithPrefix(prefix, node, emitExpression);
+        }
+
+        function emitNodeWithPrefix(prefix: string, node: Node, emit: (node: Node) => void) {
+            if (node) {
+                write(prefix);
+                emit(node);
+            }
+        }
+
+        function emitWithSuffix(node: Node, suffix: string) {
+            if (node) {
+                emit(node);
+                write(suffix);
+            }
+        }
+
+        function emitEmbeddedStatement(parent: Node, node: Statement) {
+            if (isBlock(node) || getEmitFlags(parent) & EmitFlags.SingleLine) {
+                write(" ");
+                emit(node);
+            }
+            else {
+                writeLine();
+                increaseIndent();
+                emit(node);
+                decreaseIndent();
+            }
+        }
+
+        function emitDecorators(parentNode: Node, decorators: NodeArray<Decorator>) {
+            emitList(parentNode, decorators, ListFormat.Decorators);
+        }
+
+        function emitTypeArguments(parentNode: Node, typeArguments: NodeArray<TypeNode>) {
+            emitList(parentNode, typeArguments, ListFormat.TypeArguments);
+        }
+
+        function emitTypeParameters(parentNode: Node, typeParameters: NodeArray<TypeParameterDeclaration>) {
+            emitList(parentNode, typeParameters, ListFormat.TypeParameters);
+        }
+
+        function emitParameters(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
+            emitList(parentNode, parameters, ListFormat.Parameters);
+        }
+
+        function emitParametersForArrow(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
+            if (parameters &&
+                parameters.length === 1 &&
+                parameters[0].type === undefined &&
+                parameters[0].pos === parentNode.pos) {
+                emit(parameters[0]);
+            }
+            else {
+                emitParameters(parentNode, parameters);
+            }
+        }
+
+        function emitParametersForIndexSignature(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
+            emitList(parentNode, parameters, ListFormat.IndexSignatureParameters);
+        }
+
+        function emitList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
+            emitNodeList(emit, parentNode, children, format, start, count);
+        }
+
+        function emitExpressionList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
+            emitNodeList(emitExpression, parentNode, children, format, start, count);
+        }
+
+        function emitNodeList(emit: (node: Node) => void, parentNode: Node, children: NodeArray<Node>, format: ListFormat, start = 0, count = children ? children.length - start : 0) {
+            const isUndefined = children === undefined;
+            if (isUndefined && format & ListFormat.OptionalIfUndefined) {
+                return;
+            }
+
+            const isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0;
+            if (isEmpty && format & ListFormat.OptionalIfEmpty) {
+                return;
+            }
+
+            if (format & ListFormat.BracketsMask) {
+                write(getOpeningBracket(format));
+            }
+
+            if (isEmpty) {
+                // Write a line terminator if the parent node was multi-line
+                if (format & ListFormat.MultiLine) {
+                    writeLine();
+                }
+                else if (format & ListFormat.SpaceBetweenBraces) {
+                    write(" ");
+                }
+            }
+            else {
+                // Write the opening line terminator or leading whitespace.
+                const mayEmitInterveningComments = (format & ListFormat.NoInterveningComments) === 0;
+                let shouldEmitInterveningComments = mayEmitInterveningComments;
+                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) {
+                    writeLine();
+                    shouldEmitInterveningComments = false;
+                }
+                else if (format & ListFormat.SpaceBetweenBraces) {
+                    write(" ");
+                }
+
+                // Increase the indent, if requested.
+                if (format & ListFormat.Indented) {
+                    increaseIndent();
+                }
+
+                // Emit each child.
+                let previousSibling: Node;
+                let shouldDecreaseIndentAfterEmit: boolean;
+                const delimiter = getDelimiter(format);
+                for (let i = 0; i < count; i++) {
+                    const child = children[start + i];
+
+                    // Write the delimiter if this is not the first node.
+                    if (previousSibling) {
+                        write(delimiter);
+
+                        // Write either a line terminator or whitespace to separate the elements.
+                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                            // If a synthesized node in a single-line list starts on a new
+                            // line, we should increase the indent.
+                            if ((format & (ListFormat.LinesMask | ListFormat.Indented)) === ListFormat.SingleLine) {
+                                increaseIndent();
+                                shouldDecreaseIndentAfterEmit = true;
+                            }
+
+                            writeLine();
+                            shouldEmitInterveningComments = false;
+                        }
+                        else if (previousSibling && format & ListFormat.SpaceBetweenSiblings) {
+                            write(" ");
+                        }
+                    }
+
+                    // Emit this child.
+                    if (shouldEmitInterveningComments) {
+                        if (emitTrailingCommentsOfPosition) {
+                            const commentRange = getCommentRange(child);
+                            emitTrailingCommentsOfPosition(commentRange.pos);
+                        }
+                    }
+                    else {
+                        shouldEmitInterveningComments = mayEmitInterveningComments;
+                    }
+
+                    emit(child);
+
+                    if (shouldDecreaseIndentAfterEmit) {
+                        decreaseIndent();
+                        shouldDecreaseIndentAfterEmit = false;
+                    }
+
+                    previousSibling = child;
+                }
+
+                // Write a trailing comma, if requested.
+                const hasTrailingComma = (format & ListFormat.AllowTrailingComma) && children.hasTrailingComma;
+                if (format & ListFormat.CommaDelimited && hasTrailingComma) {
+                    write(",");
+                }
+
+                // Decrease the indent, if requested.
+                if (format & ListFormat.Indented) {
+                    decreaseIndent();
+                }
+
+                // Write the closing line terminator or closing whitespace.
+                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
+                    writeLine();
+                }
+                else if (format & ListFormat.SpaceBetweenBraces) {
+                    write(" ");
+                }
+            }
+
+            if (format & ListFormat.BracketsMask) {
+                write(getClosingBracket(format));
+            }
+        }
+
+        function write(s: string) {
+            writer.write(s);
+        }
+
+        function writeLine() {
+            writer.writeLine();
+        }
+
+        function increaseIndent() {
+            writer.increaseIndent();
+        }
+
+        function decreaseIndent() {
+            writer.decreaseIndent();
+        }
+
+        function writeIfAny(nodes: NodeArray<Node>, text: string) {
+            if (some(nodes)) {
+                write(text);
+            }
+        }
+
+        function writeIfPresent(node: Node, text: string) {
+            if (node) {
+                write(text);
+            }
+        }
+
+        function writeToken(token: SyntaxKind, pos: number, contextNode?: Node) {
+            return onEmitSourceMapOfToken
+                ? onEmitSourceMapOfToken(contextNode, token, pos, writeTokenText)
+                : writeTokenText(token, pos);
+        }
+
+        function writeTokenText(token: SyntaxKind, pos?: number) {
+            const tokenString = tokenToString(token);
+            write(tokenString);
+            return pos < 0 ? pos : pos + tokenString.length;
+        }
+
+        function writeLineOrSpace(node: Node) {
+            if (getEmitFlags(node) & EmitFlags.SingleLine) {
+                write(" ");
+            }
+            else {
+                writeLine();
+            }
+        }
+
+        function writeLines(text: string): void {
+            const lines = text.split(/\r\n?|\n/g);
+            const indentation = guessIndentation(lines);
+            for (let i = 0; i < lines.length; i++) {
+                const line = indentation ? lines[i].slice(indentation) : lines[i];
+                if (line.length) {
+                    writeLine();
+                    write(line);
+                    writeLine();
+                }
+            }
+        }
+
+        function guessIndentation(lines: string[]) {
+            let indentation: number;
+            for (const line of lines) {
+                for (let i = 0; i < line.length && (indentation === undefined || i < indentation); i++) {
+                    if (!isWhiteSpace(line.charCodeAt(i))) {
+                        if (indentation === undefined || i < indentation) {
+                            indentation = i;
+                            break;
+                        }
+                    }
+                }
+            }
+            return indentation;
+        }
+
+        function increaseIndentIf(value: boolean, valueToWriteWhenNotIndenting?: string) {
+            if (value) {
+                increaseIndent();
+                writeLine();
+            }
+            else if (valueToWriteWhenNotIndenting) {
+                write(valueToWriteWhenNotIndenting);
+            }
+        }
+
+        // Helper function to decrease the indent if we previously indented.  Allows multiple
+        // previous indent values to be considered at a time.  This also allows caller to just
+        // call this once, passing in all their appropriate indent values, instead of needing
+        // to call this helper function multiple times.
+        function decreaseIndentIf(value1: boolean, value2?: boolean) {
+            if (value1) {
+                decreaseIndent();
+            }
+            if (value2) {
+                decreaseIndent();
+            }
+        }
+
+        function shouldWriteLeadingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
+            if (format & ListFormat.MultiLine) {
+                return true;
+            }
+
+            if (format & ListFormat.PreserveLines) {
+                if (format & ListFormat.PreferNewLine) {
+                    return true;
+                }
+
+                const firstChild = children[0];
+                if (firstChild === undefined) {
+                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
+                }
+                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(firstChild)) {
+                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                }
+                else {
+                    return !rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                }
+            }
+            else {
+                return false;
+            }
+        }
+
+        function shouldWriteSeparatingLineTerminator(previousNode: Node, nextNode: Node, format: ListFormat) {
+            if (format & ListFormat.MultiLine) {
+                return true;
+            }
+            else if (format & ListFormat.PreserveLines) {
+                if (previousNode === undefined || nextNode === undefined) {
+                    return false;
+                }
+                else if (nodeIsSynthesized(previousNode) || nodeIsSynthesized(nextNode)) {
+                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                }
+                else {
+                    return !rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                }
+            }
+            else {
+                return nextNode.startsOnNewLine;
+            }
+        }
+
+        function shouldWriteClosingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
+            if (format & ListFormat.MultiLine) {
+                return (format & ListFormat.NoTrailingNewLine) === 0;
+            }
+            else if (format & ListFormat.PreserveLines) {
+                if (format & ListFormat.PreferNewLine) {
+                    return true;
+                }
+
+                const lastChild = lastOrUndefined(children);
+                if (lastChild === undefined) {
+                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
+                }
+                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(lastChild)) {
+                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                }
+                else {
+                    return !rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                }
+            }
+            else {
+                return false;
+            }
+        }
+
+        function synthesizedNodeStartsOnNewLine(node: Node, format?: ListFormat) {
+            if (nodeIsSynthesized(node)) {
+                const startsOnNewLine = node.startsOnNewLine;
+                if (startsOnNewLine === undefined) {
+                    return (format & ListFormat.PreferNewLine) !== 0;
+                }
+
+                return startsOnNewLine;
+            }
+
+            return (format & ListFormat.PreferNewLine) !== 0;
+        }
+
+        function needsIndentation(parent: Node, node1: Node, node2: Node): boolean {
+            parent = skipSynthesizedParentheses(parent);
+            node1 = skipSynthesizedParentheses(node1);
+            node2 = skipSynthesizedParentheses(node2);
+
+            // Always use a newline for synthesized code if the synthesizer desires it.
+            if (node2.startsOnNewLine) {
+                return true;
+            }
+
+            return !nodeIsSynthesized(parent)
+                && !nodeIsSynthesized(node1)
+                && !nodeIsSynthesized(node2)
+                && !rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+        }
+
+        function isSingleLineEmptyBlock(block: Block) {
+            return !block.multiLine
+                && isEmptyBlock(block);
+        }
+
+        function isEmptyBlock(block: BlockLike) {
+            return block.statements.length === 0
+                && rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
+        }
+
+        function skipSynthesizedParentheses(node: Node) {
+            while (node.kind === SyntaxKind.ParenthesizedExpression && nodeIsSynthesized(node)) {
+                node = (<ParenthesizedExpression>node).expression;
+            }
+
+            return node;
+        }
+
+        function getTextOfNode(node: Node, includeTrivia?: boolean): string {
+            if (isGeneratedIdentifier(node)) {
+                return generateName(node);
+            }
+            else if (isIdentifier(node) && (nodeIsSynthesized(node) || !node.parent)) {
+                return unescapeIdentifier(node.text);
+            }
+            else if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
+                return getTextOfNode((<StringLiteral>node).textSourceNode, includeTrivia);
+            }
+            else if (isLiteralExpression(node) && (nodeIsSynthesized(node) || !node.parent)) {
+                return node.text;
+            }
+
+            return getSourceTextOfNodeFromSourceFile(currentSourceFile, node, includeTrivia);
+        }
+
+        function getLiteralTextOfNode(node: LiteralLikeNode): string {
+            if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
+                const textSourceNode = (<StringLiteral>node).textSourceNode;
+                if (isIdentifier(textSourceNode)) {
+                    return "\"" + escapeNonAsciiCharacters(escapeString(getTextOfNode(textSourceNode))) + "\"";
+                }
+                else {
+                    return getLiteralTextOfNode(textSourceNode);
+                }
+            }
+
+            return getLiteralText(node, currentSourceFile, languageVersion);
+        }
+
+        /**
+         * Push a new name generation scope.
+         */
+        function pushNameGenerationScope() {
+            tempFlagsStack.push(tempFlags);
+            tempFlags = 0;
+        }
+
+        /**
+         * Pop the current name generation scope.
+         */
+        function popNameGenerationScope() {
+            tempFlags = tempFlagsStack.pop();
+        }
+
+        /**
+         * Generate the text for a generated identifier.
+         */
+        function generateName(name: GeneratedIdentifier) {
+            if (name.autoGenerateKind === GeneratedIdentifierKind.Node) {
+                // Node names generate unique names based on their original node
+                // and are cached based on that node's id.
+                const node = getNodeForGeneratedName(name);
+                return generateNameCached(node, getTextOfNode);
+            }
+            else {
+                // Auto, Loop, and Unique names are cached based on their unique
+                // autoGenerateId.
+                const autoGenerateId = name.autoGenerateId;
+                return autoGeneratedIdToGeneratedName[autoGenerateId] || (autoGeneratedIdToGeneratedName[autoGenerateId] = unescapeIdentifier(makeName(name)));
+            }
+        }
+
+        function generateNameCached(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+            const nodeId = getNodeId(node);
+            return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node, getTextOfNode)));
+        }
+
+        /**
+         * Returns a value indicating whether a name is unique globally, within the current file,
+         * or within the NameGenerator.
+         */
+        function isUniqueName(name: string): boolean {
+            return !(hasGlobalName && hasGlobalName(name))
+                && !currentSourceFile.identifiers.has(name)
+                && !generatedNames.has(name);
+        }
+
+        /**
+         * Returns a value indicating whether a name is unique within a container.
+         */
+        function isUniqueLocalName(name: string, container: Node): boolean {
+            for (let node = container; isNodeDescendantOf(node, container); node = node.nextContainer) {
+                if (node.locals) {
+                    const local = node.locals.get(name);
+                    // We conservatively include alias symbols to cover cases where they're emitted as locals
+                    if (local && local.flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Return the next available name in the pattern _a ... _z, _0, _1, ...
+         * TempFlags._i or TempFlags._n may be used to express a preference for that dedicated name.
+         * Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
+         */
+        function makeTempVariableName(flags: TempFlags): string {
+            if (flags && !(tempFlags & flags)) {
+                const name = flags === TempFlags._i ? "_i" : "_n";
+                if (isUniqueName(name)) {
+                    tempFlags |= flags;
+                    return name;
+                }
+            }
+            while (true) {
+                const count = tempFlags & TempFlags.CountMask;
+                tempFlags++;
+                // Skip over 'i' and 'n'
+                if (count !== 8 && count !== 13) {
+                    const name = count < 26
+                        ? "_" + String.fromCharCode(CharacterCodes.a + count)
+                        : "_" + (count - 26);
+                    if (isUniqueName(name)) {
+                        return name;
+                    }
+                }
+            }
+        }
+
+        /**
+         * Generate a name that is unique within the current file and doesn't conflict with any names
+         * in global scope. The name is formed by adding an '_n' suffix to the specified base name,
+         * where n is a positive integer. Note that names generated by makeTempVariableName and
+         * makeUniqueName are guaranteed to never conflict.
+         */
+        function makeUniqueName(baseName: string): string {
+            // Find the first unique 'name_n', where n is a positive number
+            if (baseName.charCodeAt(baseName.length - 1) !== CharacterCodes._) {
+                baseName += "_";
+            }
+            let i = 1;
+            while (true) {
+                const generatedName = baseName + i;
+                if (isUniqueName(generatedName)) {
+                    generatedNames.set(generatedName, generatedName);
+                    return generatedName;
+                }
+                i++;
+            }
+        }
+
+        /**
+         * Generates a unique name for a ModuleDeclaration or EnumDeclaration.
+         */
+        function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+            const name = getTextOfNode(node.name);
+            // Use module/enum name itself if it is unique, otherwise make a unique variation
+            return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
+        }
+
+        /**
+         * Generates a unique name for an ImportDeclaration or ExportDeclaration.
+         */
+        function generateNameForImportOrExportDeclaration(node: ImportDeclaration | ExportDeclaration) {
+            const expr = getExternalModuleName(node);
+            const baseName = expr.kind === SyntaxKind.StringLiteral ?
+                escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
+            return makeUniqueName(baseName);
+        }
+
+        /**
+         * Generates a unique name for a default export.
+         */
+        function generateNameForExportDefault() {
+            return makeUniqueName("default");
+        }
+
+        /**
+         * Generates a unique name for a class expression.
+         */
+        function generateNameForClassExpression() {
+            return makeUniqueName("class");
+        }
+
+        function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+            if (isIdentifier(node.name)) {
+                return generateNameCached(node.name, getTextOfNode);
+            }
+            return makeTempVariableName(TempFlags.Auto);
+        }
+
+        /**
+         * Generates a unique name from a node.
+         */
+        function generateNameForNode(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string): string {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                    return makeUniqueName(getTextOfNode(node));
+                case SyntaxKind.ModuleDeclaration:
+                case SyntaxKind.EnumDeclaration:
+                    return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node, getTextOfNode);
+                case SyntaxKind.ImportDeclaration:
+                case SyntaxKind.ExportDeclaration:
+                    return generateNameForImportOrExportDeclaration(<ImportDeclaration | ExportDeclaration>node);
+                case SyntaxKind.FunctionDeclaration:
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.ExportAssignment:
+                    return generateNameForExportDefault();
+                case SyntaxKind.ClassExpression:
+                    return generateNameForClassExpression();
+                case SyntaxKind.MethodDeclaration:
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    return generateNameForMethodOrAccessor(<MethodDeclaration | AccessorDeclaration>node, getTextOfNode);
+                default:
+                    return makeTempVariableName(TempFlags.Auto);
+            }
+        }
+
+        /**
+         * Generates a unique identifier for a node.
+         */
+        function makeName(name: GeneratedIdentifier) {
+            switch (name.autoGenerateKind) {
+                case GeneratedIdentifierKind.Auto:
+                    return makeTempVariableName(TempFlags.Auto);
+                case GeneratedIdentifierKind.Loop:
+                    return makeTempVariableName(TempFlags._i);
+                case GeneratedIdentifierKind.Unique:
+                    return makeUniqueName(name.text);
+            }
+
+            Debug.fail("Unsupported GeneratedIdentifierKind.");
+        }
+
+        /**
+         * Gets the node from which a name should be generated.
+         */
+        function getNodeForGeneratedName(name: GeneratedIdentifier) {
+            const autoGenerateId = name.autoGenerateId;
+            let node = name as Node;
+            let original = node.original;
+            while (original) {
+                node = original;
+
+                // if "node" is a different generated name (having a different
+                // "autoGenerateId"), use it and stop traversing.
+                if (isIdentifier(node)
+                    && node.autoGenerateKind === GeneratedIdentifierKind.Node
+                    && node.autoGenerateId !== autoGenerateId) {
+                    break;
+                }
+
+                original = node.original;
+            }
+
+            // otherwise, return the original node for the source;
+            return node;
+        }
+    }
+
+    function createDelimiterMap() {
+        const delimiters: string[] = [];
+        delimiters[ListFormat.None] = "";
+        delimiters[ListFormat.CommaDelimited] = ",";
+        delimiters[ListFormat.BarDelimited] = " |";
+        delimiters[ListFormat.AmpersandDelimited] = " &";
+        return delimiters;
+    }
+
+    function getDelimiter(format: ListFormat) {
+        return delimiters[format & ListFormat.DelimitersMask];
+    }
+
+    function createBracketsMap() {
+        const brackets: string[][] = [];
+        brackets[ListFormat.Braces] = ["{", "}"];
+        brackets[ListFormat.Parenthesis] = ["(", ")"];
+        brackets[ListFormat.AngleBrackets] = ["<", ">"];
+        brackets[ListFormat.SquareBrackets] = ["[", "]"];
+        return brackets;
+    }
+
+    function getOpeningBracket(format: ListFormat) {
+        return brackets[format & ListFormat.BracketsMask][0];
+    }
+
+    function getClosingBracket(format: ListFormat) {
+        return brackets[format & ListFormat.BracketsMask][1];
+    }
+
+    // Flags enum to track count of temp variables and a few dedicated names
+    const enum TempFlags {
+        Auto      = 0x00000000,  // No preferred name
+        CountMask = 0x0FFFFFFF,  // Temp variable counter
+        _i        = 0x10000000,  // Use/preference flag for '_i'
+    }
+
+    const enum ListFormat {
+        None = 0,
+
+        // Line separators
+        SingleLine = 0,                 // Prints the list on a single line (default).
+        MultiLine = 1 << 0,             // Prints the list on multiple lines.
+        PreserveLines = 1 << 1,         // Prints the list using line preservation if possible.
+        LinesMask = SingleLine | MultiLine | PreserveLines,
+
+        // Delimiters
+        NotDelimited = 0,               // There is no delimiter between list items (default).
+        BarDelimited = 1 << 2,          // Each list item is space-and-bar (" |") delimited.
+        AmpersandDelimited = 1 << 3,    // Each list item is space-and-ampersand (" &") delimited.
+        CommaDelimited = 1 << 4,        // Each list item is comma (",") delimited.
+        DelimitersMask = BarDelimited | AmpersandDelimited | CommaDelimited,
+
+        AllowTrailingComma = 1 << 5,    // Write a trailing comma (",") if present.
+
+        // Whitespace
+        Indented = 1 << 6,              // The list should be indented.
+        SpaceBetweenBraces = 1 << 7,    // Inserts a space after the opening brace and before the closing brace.
+        SpaceBetweenSiblings = 1 << 8,  // Inserts a space between each sibling node.
+
+        // Brackets/Braces
+        Braces = 1 << 9,                // The list is surrounded by "{" and "}".
+        Parenthesis = 1 << 10,          // The list is surrounded by "(" and ")".
+        AngleBrackets = 1 << 11,        // The list is surrounded by "<" and ">".
+        SquareBrackets = 1 << 12,       // The list is surrounded by "[" and "]".
+        BracketsMask = Braces | Parenthesis | AngleBrackets | SquareBrackets,
+
+        OptionalIfUndefined = 1 << 13,  // Do not emit brackets if the list is undefined.
+        OptionalIfEmpty = 1 << 14,      // Do not emit brackets if the list is empty.
+        Optional = OptionalIfUndefined | OptionalIfEmpty,
+
+        // Other
+        PreferNewLine = 1 << 15,        // Prefer adding a LineTerminator between synthesized nodes.
+        NoTrailingNewLine = 1 << 16,    // Do not emit a trailing NewLine for a MultiLine list.
+        NoInterveningComments = 1 << 17, // Do not emit comments between each node
+
+        // Precomputed Formats
+        Modifiers = SingleLine | SpaceBetweenSiblings,
+        HeritageClauses = SingleLine | SpaceBetweenSiblings,
+        TypeLiteralMembers = MultiLine | Indented,
+        TupleTypeElements = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented,
+        UnionTypeConstituents = BarDelimited | SpaceBetweenSiblings | SingleLine,
+        IntersectionTypeConstituents = AmpersandDelimited | SpaceBetweenSiblings | SingleLine,
+        ObjectBindingPatternElements = SingleLine | AllowTrailingComma | SpaceBetweenBraces | CommaDelimited | SpaceBetweenSiblings,
+        ArrayBindingPatternElements = SingleLine | AllowTrailingComma | CommaDelimited | SpaceBetweenSiblings,
+        ObjectLiteralExpressionProperties = PreserveLines | CommaDelimited | SpaceBetweenSiblings | SpaceBetweenBraces | Indented | Braces,
+        ArrayLiteralExpressionElements = PreserveLines | CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | Indented | SquareBrackets,
+        CallExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis,
+        NewExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis | OptionalIfUndefined,
+        TemplateExpressionSpans = SingleLine | NoInterveningComments,
+        SingleLineBlockStatements = SpaceBetweenBraces | SpaceBetweenSiblings | SingleLine,
+        MultiLineBlockStatements = Indented | MultiLine,
+        VariableDeclarationList = CommaDelimited | SpaceBetweenSiblings | SingleLine,
+        SingleLineFunctionBodyStatements = SingleLine | SpaceBetweenSiblings | SpaceBetweenBraces,
+        MultiLineFunctionBodyStatements = MultiLine,
+        ClassHeritageClauses = SingleLine | SpaceBetweenSiblings,
+        ClassMembers = Indented | MultiLine,
+        InterfaceMembers = Indented | MultiLine,
+        EnumMembers = CommaDelimited | Indented | MultiLine,
+        CaseBlockClauses = Indented | MultiLine,
+        NamedImportsOrExportsElements = CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | SingleLine | SpaceBetweenBraces,
+        JsxElementChildren = SingleLine | NoInterveningComments,
+        JsxElementAttributes = SingleLine | SpaceBetweenSiblings | NoInterveningComments,
+        CaseOrDefaultClauseStatements = Indented | MultiLine | NoTrailingNewLine | OptionalIfEmpty,
+        HeritageClauseTypes = CommaDelimited | SpaceBetweenSiblings | SingleLine,
+        SourceFileStatements = MultiLine | NoTrailingNewLine,
+        Decorators = MultiLine | Optional,
+        TypeArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
+        TypeParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
+        Parameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | Parenthesis,
+        IndexSignatureParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | SquareBrackets,
+    }
 }
\ No newline at end of file
diff --git a/src/compiler/printer.ts b/src/compiler/printer.ts
deleted file mode 100644
index 9ae824dac67..00000000000
--- a/src/compiler/printer.ts
+++ /dev/null
@@ -1,2659 +0,0 @@
-/// <reference path="checker.ts"/>
-
-namespace ts {
-    // Flags enum to track count of temp variables and a few dedicated names
-    const enum TempFlags {
-        Auto      = 0x00000000,  // No preferred name
-        CountMask = 0x0FFFFFFF,  // Temp variable counter
-        _i        = 0x10000000,  // Use/preference flag for '_i'
-    }
-
-    const delimiters = createDelimiterMap();
-    const brackets = createBracketsMap();
-
-    export function createPrinter(writer: EmitTextWriter, compilerOptions: CompilerOptions, printerOptions: PrinterOptions = {}): Printer {
-        const languageVersion = getEmitScriptTarget(compilerOptions);
-        const moduleKind = getEmitModuleKind(compilerOptions);
-        const {
-            hasGlobalName,
-            onEmitSourceMapOfNode,
-            onEmitSourceMapOfToken,
-            onEmitCommentsOfNode,
-            onEmitDetachedCommentsOfNode,
-            onEmitTrailingCommentsOfPosition,
-            onEmitNode,
-            onEmitHelpers,
-            onSetSourceFile,
-            onSubstituteNode,
-        } = printerOptions;
-        const {
-            write,
-            writeLine,
-            increaseIndent,
-            decreaseIndent
-        } = writer;
-
-        let currentSourceFile: SourceFile;
-        let nodeIdToGeneratedName: string[]; // Map of generated names for specific nodes.
-        let autoGeneratedIdToGeneratedName: string[]; // Map of generated names for temp and loop variables.
-        let generatedNames: Map<string>; // Set of names generated by the NameGenerator.
-        let tempFlagsStack: TempFlags[]; // Stack of enclosing name generation scopes.
-        let tempFlags: TempFlags; // TempFlags for the current name generation scope.
-
-        return {
-            printNode,
-            printFile,
-            printBundle
-        };
-
-        function printNode(hint: EmitHint, node: Node, sourceFile: SourceFile) {
-            print(hint, node, sourceFile);
-            resetGeneratedNames();
-        }
-
-        function printBundle(bundle: Bundle) {
-            if (moduleKind) {
-                emitHelpersIndirect(bundle);
-            }
-            for (const sourceFile of bundle.sourceFiles) {
-                print(EmitHint.SourceFile, sourceFile, sourceFile);
-            }
-            resetGeneratedNames();
-        }
-
-        function printFile(sourceFile: SourceFile) {
-            print(EmitHint.SourceFile, sourceFile, sourceFile);
-            resetGeneratedNames();
-        }
-
-        function print(hint: EmitHint, node: Node, sourceFile: SourceFile) {
-            setSourceFile(sourceFile);
-            pipelineEmitWithNotification(hint, node);
-        }
-
-        function setSourceFile(sourceFile: SourceFile) {
-            currentSourceFile = sourceFile;
-
-            if (onSetSourceFile) {
-                onSetSourceFile(sourceFile);
-            }
-        }
-
-        function emit(node: Node, hint = EmitHint.Unspecified) {
-            pipelineEmitWithNotification(hint, node);
-        }
-
-        function emitIdentifierName(node: Identifier) {
-            pipelineEmitWithNotification(EmitHint.IdentifierName, node);
-        }
-
-        function emitExpression(node: Expression) {
-            pipelineEmitWithNotification(EmitHint.Expression, node);
-        }
-
-        function pipelineEmitWithNotification(hint: EmitHint, node: Node) {
-            if (onEmitNode) {
-                onEmitNode(hint, node, pipelineEmitWithComments);
-            }
-            else {
-                pipelineEmitWithComments(hint, node);
-            }
-        }
-
-        function pipelineEmitWithComments(hint: EmitHint, node: Node) {
-            if (onEmitCommentsOfNode && hint !== EmitHint.SourceFile) {
-                onEmitCommentsOfNode(hint, node, pipelineEmitWithSourceMap);
-            }
-            else {
-                pipelineEmitWithSourceMap(hint, node);
-            }
-        }
-
-        function pipelineEmitWithSourceMap(hint: EmitHint, node: Node) {
-            if (onEmitSourceMapOfNode && hint !== EmitHint.SourceFile && hint !== EmitHint.IdentifierName) {
-                onEmitSourceMapOfNode(hint, node, pipelineEmitWithSubstitution);
-            }
-            else {
-                pipelineEmitWithSubstitution(hint, node);
-            }
-        }
-
-        function pipelineEmitWithSubstitution(hint: EmitHint, node: Node) {
-            if (onSubstituteNode) {
-                onSubstituteNode(hint, node, pipelineEmitWithHint);
-            }
-            else {
-                pipelineEmitWithHint(hint, node);
-            }
-        }
-
-        function pipelineEmitWithHint(hint: EmitHint, node: Node): void {
-            switch (hint) {
-                case EmitHint.SourceFile: return pipelineEmitSourceFile(node);
-                case EmitHint.IdentifierName: return pipelineEmitIdentifierName(node);
-                case EmitHint.Expression: return pipelineEmitExpression(node);
-                case EmitHint.Unspecified: return pipelineEmitUnspecified(node);
-            }
-        }
-
-        function pipelineEmitSourceFile(node: Node): void {
-            Debug.assertNode(node, isSourceFile);
-            emitSourceFile(<SourceFile>node);
-        }
-
-        function pipelineEmitIdentifierName(node: Node): void {
-            Debug.assertNode(node, isIdentifier);
-            emitIdentifier(<Identifier>node);
-        }
-
-        function pipelineEmitUnspecified(node: Node): void {
-            const kind = node.kind;
-            switch (kind) {
-                // Pseudo-literals
-                case SyntaxKind.TemplateHead:
-                case SyntaxKind.TemplateMiddle:
-                case SyntaxKind.TemplateTail:
-                    return emitLiteral(<LiteralExpression>node);
-
-                // Identifiers
-                case SyntaxKind.Identifier:
-                    return emitIdentifier(<Identifier>node);
-
-                // Reserved words
-                case SyntaxKind.ConstKeyword:
-                case SyntaxKind.DefaultKeyword:
-                case SyntaxKind.ExportKeyword:
-                case SyntaxKind.VoidKeyword:
-
-                // Strict mode reserved words
-                case SyntaxKind.PrivateKeyword:
-                case SyntaxKind.ProtectedKeyword:
-                case SyntaxKind.PublicKeyword:
-                case SyntaxKind.StaticKeyword:
-
-                // Contextual keywords
-                case SyntaxKind.AbstractKeyword:
-                case SyntaxKind.AsKeyword:
-                case SyntaxKind.AnyKeyword:
-                case SyntaxKind.AsyncKeyword:
-                case SyntaxKind.AwaitKeyword:
-                case SyntaxKind.BooleanKeyword:
-                case SyntaxKind.ConstructorKeyword:
-                case SyntaxKind.DeclareKeyword:
-                case SyntaxKind.GetKeyword:
-                case SyntaxKind.IsKeyword:
-                case SyntaxKind.ModuleKeyword:
-                case SyntaxKind.NamespaceKeyword:
-                case SyntaxKind.NeverKeyword:
-                case SyntaxKind.ReadonlyKeyword:
-                case SyntaxKind.RequireKeyword:
-                case SyntaxKind.NumberKeyword:
-                case SyntaxKind.SetKeyword:
-                case SyntaxKind.StringKeyword:
-                case SyntaxKind.SymbolKeyword:
-                case SyntaxKind.TypeKeyword:
-                case SyntaxKind.UndefinedKeyword:
-                case SyntaxKind.FromKeyword:
-                case SyntaxKind.GlobalKeyword:
-                case SyntaxKind.OfKeyword:
-                    writeTokenText(kind);
-                    return;
-
-                // Parse tree nodes
-
-                // Names
-                case SyntaxKind.QualifiedName:
-                    return emitQualifiedName(<QualifiedName>node);
-                case SyntaxKind.ComputedPropertyName:
-                    return emitComputedPropertyName(<ComputedPropertyName>node);
-
-                // Signature elements
-                case SyntaxKind.TypeParameter:
-                    return emitTypeParameter(<TypeParameterDeclaration>node);
-                case SyntaxKind.Parameter:
-                    return emitParameter(<ParameterDeclaration>node);
-                case SyntaxKind.Decorator:
-                    return emitDecorator(<Decorator>node);
-
-                // Type members
-                case SyntaxKind.PropertySignature:
-                    return emitPropertySignature(<PropertySignature>node);
-                case SyntaxKind.PropertyDeclaration:
-                    return emitPropertyDeclaration(<PropertyDeclaration>node);
-                case SyntaxKind.MethodSignature:
-                    return emitMethodSignature(<MethodSignature>node);
-                case SyntaxKind.MethodDeclaration:
-                    return emitMethodDeclaration(<MethodDeclaration>node);
-                case SyntaxKind.Constructor:
-                    return emitConstructor(<ConstructorDeclaration>node);
-                case SyntaxKind.GetAccessor:
-                case SyntaxKind.SetAccessor:
-                    return emitAccessorDeclaration(<AccessorDeclaration>node);
-                case SyntaxKind.CallSignature:
-                    return emitCallSignature(<CallSignatureDeclaration>node);
-                case SyntaxKind.ConstructSignature:
-                    return emitConstructSignature(<ConstructSignatureDeclaration>node);
-                case SyntaxKind.IndexSignature:
-                    return emitIndexSignature(<IndexSignatureDeclaration>node);
-
-                // Types
-                case SyntaxKind.TypePredicate:
-                    return emitTypePredicate(<TypePredicateNode>node);
-                case SyntaxKind.TypeReference:
-                    return emitTypeReference(<TypeReferenceNode>node);
-                case SyntaxKind.FunctionType:
-                    return emitFunctionType(<FunctionTypeNode>node);
-                case SyntaxKind.ConstructorType:
-                    return emitConstructorType(<ConstructorTypeNode>node);
-                case SyntaxKind.TypeQuery:
-                    return emitTypeQuery(<TypeQueryNode>node);
-                case SyntaxKind.TypeLiteral:
-                    return emitTypeLiteral(<TypeLiteralNode>node);
-                case SyntaxKind.ArrayType:
-                    return emitArrayType(<ArrayTypeNode>node);
-                case SyntaxKind.TupleType:
-                    return emitTupleType(<TupleTypeNode>node);
-                case SyntaxKind.UnionType:
-                    return emitUnionType(<UnionTypeNode>node);
-                case SyntaxKind.IntersectionType:
-                    return emitIntersectionType(<IntersectionTypeNode>node);
-                case SyntaxKind.ParenthesizedType:
-                    return emitParenthesizedType(<ParenthesizedTypeNode>node);
-                case SyntaxKind.ExpressionWithTypeArguments:
-                    return emitExpressionWithTypeArguments(<ExpressionWithTypeArguments>node);
-                case SyntaxKind.ThisType:
-                    return emitThisType();
-                case SyntaxKind.TypeOperator:
-                    return emitTypeOperator(<TypeOperatorNode>node);
-                case SyntaxKind.IndexedAccessType:
-                    return emitIndexedAccessType(<IndexedAccessTypeNode>node);
-                case SyntaxKind.MappedType:
-                    return emitMappedType(<MappedTypeNode>node);
-                case SyntaxKind.LiteralType:
-                    return emitLiteralType(<LiteralTypeNode>node);
-
-                // Binding patterns
-                case SyntaxKind.ObjectBindingPattern:
-                    return emitObjectBindingPattern(<ObjectBindingPattern>node);
-                case SyntaxKind.ArrayBindingPattern:
-                    return emitArrayBindingPattern(<ArrayBindingPattern>node);
-                case SyntaxKind.BindingElement:
-                    return emitBindingElement(<BindingElement>node);
-
-                // Misc
-                case SyntaxKind.TemplateSpan:
-                    return emitTemplateSpan(<TemplateSpan>node);
-                case SyntaxKind.SemicolonClassElement:
-                    return emitSemicolonClassElement();
-
-                // Statements
-                case SyntaxKind.Block:
-                    return emitBlock(<Block>node);
-                case SyntaxKind.VariableStatement:
-                    return emitVariableStatement(<VariableStatement>node);
-                case SyntaxKind.EmptyStatement:
-                    return emitEmptyStatement();
-                case SyntaxKind.ExpressionStatement:
-                    return emitExpressionStatement(<ExpressionStatement>node);
-                case SyntaxKind.IfStatement:
-                    return emitIfStatement(<IfStatement>node);
-                case SyntaxKind.DoStatement:
-                    return emitDoStatement(<DoStatement>node);
-                case SyntaxKind.WhileStatement:
-                    return emitWhileStatement(<WhileStatement>node);
-                case SyntaxKind.ForStatement:
-                    return emitForStatement(<ForStatement>node);
-                case SyntaxKind.ForInStatement:
-                    return emitForInStatement(<ForInStatement>node);
-                case SyntaxKind.ForOfStatement:
-                    return emitForOfStatement(<ForOfStatement>node);
-                case SyntaxKind.ContinueStatement:
-                    return emitContinueStatement(<ContinueStatement>node);
-                case SyntaxKind.BreakStatement:
-                    return emitBreakStatement(<BreakStatement>node);
-                case SyntaxKind.ReturnStatement:
-                    return emitReturnStatement(<ReturnStatement>node);
-                case SyntaxKind.WithStatement:
-                    return emitWithStatement(<WithStatement>node);
-                case SyntaxKind.SwitchStatement:
-                    return emitSwitchStatement(<SwitchStatement>node);
-                case SyntaxKind.LabeledStatement:
-                    return emitLabeledStatement(<LabeledStatement>node);
-                case SyntaxKind.ThrowStatement:
-                    return emitThrowStatement(<ThrowStatement>node);
-                case SyntaxKind.TryStatement:
-                    return emitTryStatement(<TryStatement>node);
-                case SyntaxKind.DebuggerStatement:
-                    return emitDebuggerStatement(<DebuggerStatement>node);
-
-                // Declarations
-                case SyntaxKind.VariableDeclaration:
-                    return emitVariableDeclaration(<VariableDeclaration>node);
-                case SyntaxKind.VariableDeclarationList:
-                    return emitVariableDeclarationList(<VariableDeclarationList>node);
-                case SyntaxKind.FunctionDeclaration:
-                    return emitFunctionDeclaration(<FunctionDeclaration>node);
-                case SyntaxKind.ClassDeclaration:
-                    return emitClassDeclaration(<ClassDeclaration>node);
-                case SyntaxKind.InterfaceDeclaration:
-                    return emitInterfaceDeclaration(<InterfaceDeclaration>node);
-                case SyntaxKind.TypeAliasDeclaration:
-                    return emitTypeAliasDeclaration(<TypeAliasDeclaration>node);
-                case SyntaxKind.EnumDeclaration:
-                    return emitEnumDeclaration(<EnumDeclaration>node);
-                case SyntaxKind.ModuleDeclaration:
-                    return emitModuleDeclaration(<ModuleDeclaration>node);
-                case SyntaxKind.ModuleBlock:
-                    return emitModuleBlock(<ModuleBlock>node);
-                case SyntaxKind.CaseBlock:
-                    return emitCaseBlock(<CaseBlock>node);
-                case SyntaxKind.ImportEqualsDeclaration:
-                    return emitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
-                case SyntaxKind.ImportDeclaration:
-                    return emitImportDeclaration(<ImportDeclaration>node);
-                case SyntaxKind.ImportClause:
-                    return emitImportClause(<ImportClause>node);
-                case SyntaxKind.NamespaceImport:
-                    return emitNamespaceImport(<NamespaceImport>node);
-                case SyntaxKind.NamedImports:
-                    return emitNamedImports(<NamedImports>node);
-                case SyntaxKind.ImportSpecifier:
-                    return emitImportSpecifier(<ImportSpecifier>node);
-                case SyntaxKind.ExportAssignment:
-                    return emitExportAssignment(<ExportAssignment>node);
-                case SyntaxKind.ExportDeclaration:
-                    return emitExportDeclaration(<ExportDeclaration>node);
-                case SyntaxKind.NamedExports:
-                    return emitNamedExports(<NamedExports>node);
-                case SyntaxKind.ExportSpecifier:
-                    return emitExportSpecifier(<ExportSpecifier>node);
-                case SyntaxKind.MissingDeclaration:
-                    return;
-
-                // Module references
-                case SyntaxKind.ExternalModuleReference:
-                    return emitExternalModuleReference(<ExternalModuleReference>node);
-
-                // JSX (non-expression)
-                case SyntaxKind.JsxText:
-                    return emitJsxText(<JsxText>node);
-                case SyntaxKind.JsxOpeningElement:
-                    return emitJsxOpeningElement(<JsxOpeningElement>node);
-                case SyntaxKind.JsxClosingElement:
-                    return emitJsxClosingElement(<JsxClosingElement>node);
-                case SyntaxKind.JsxAttribute:
-                    return emitJsxAttribute(<JsxAttribute>node);
-                case SyntaxKind.JsxSpreadAttribute:
-                    return emitJsxSpreadAttribute(<JsxSpreadAttribute>node);
-                case SyntaxKind.JsxExpression:
-                    return emitJsxExpression(<JsxExpression>node);
-
-                // Clauses
-                case SyntaxKind.CaseClause:
-                    return emitCaseClause(<CaseClause>node);
-                case SyntaxKind.DefaultClause:
-                    return emitDefaultClause(<DefaultClause>node);
-                case SyntaxKind.HeritageClause:
-                    return emitHeritageClause(<HeritageClause>node);
-                case SyntaxKind.CatchClause:
-                    return emitCatchClause(<CatchClause>node);
-
-                // Property assignments
-                case SyntaxKind.PropertyAssignment:
-                    return emitPropertyAssignment(<PropertyAssignment>node);
-                case SyntaxKind.ShorthandPropertyAssignment:
-                    return emitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
-                case SyntaxKind.SpreadAssignment:
-                    return emitSpreadAssignment(node as SpreadAssignment);
-
-                // Enum
-                case SyntaxKind.EnumMember:
-                    return emitEnumMember(<EnumMember>node);
-
-                // JSDoc nodes (ignored)
-                // Transformation nodes (ignored)
-            }
-
-            // If the node is an expression, try to emit it as an expression with
-            // substitution.
-            if (isExpression(node)) {
-                return pipelineEmitWithSubstitution(EmitHint.Expression, node);
-            }
-        }
-
-        function pipelineEmitExpression(node: Node): void {
-            const kind = node.kind;
-            switch (kind) {
-                // Literals
-                case SyntaxKind.NumericLiteral:
-                    return emitNumericLiteral(<NumericLiteral>node);
-
-                case SyntaxKind.StringLiteral:
-                case SyntaxKind.RegularExpressionLiteral:
-                case SyntaxKind.NoSubstitutionTemplateLiteral:
-                    return emitLiteral(<LiteralExpression>node);
-
-                // Identifiers
-                case SyntaxKind.Identifier:
-                    return emitIdentifier(<Identifier>node);
-
-                // Reserved words
-                case SyntaxKind.FalseKeyword:
-                case SyntaxKind.NullKeyword:
-                case SyntaxKind.SuperKeyword:
-                case SyntaxKind.TrueKeyword:
-                case SyntaxKind.ThisKeyword:
-                    writeTokenText(kind);
-                    return;
-
-                // Expressions
-                case SyntaxKind.ArrayLiteralExpression:
-                    return emitArrayLiteralExpression(<ArrayLiteralExpression>node);
-                case SyntaxKind.ObjectLiteralExpression:
-                    return emitObjectLiteralExpression(<ObjectLiteralExpression>node);
-                case SyntaxKind.PropertyAccessExpression:
-                    return emitPropertyAccessExpression(<PropertyAccessExpression>node);
-                case SyntaxKind.ElementAccessExpression:
-                    return emitElementAccessExpression(<ElementAccessExpression>node);
-                case SyntaxKind.CallExpression:
-                    return emitCallExpression(<CallExpression>node);
-                case SyntaxKind.NewExpression:
-                    return emitNewExpression(<NewExpression>node);
-                case SyntaxKind.TaggedTemplateExpression:
-                    return emitTaggedTemplateExpression(<TaggedTemplateExpression>node);
-                case SyntaxKind.TypeAssertionExpression:
-                    return emitTypeAssertionExpression(<TypeAssertion>node);
-                case SyntaxKind.ParenthesizedExpression:
-                    return emitParenthesizedExpression(<ParenthesizedExpression>node);
-                case SyntaxKind.FunctionExpression:
-                    return emitFunctionExpression(<FunctionExpression>node);
-                case SyntaxKind.ArrowFunction:
-                    return emitArrowFunction(<ArrowFunction>node);
-                case SyntaxKind.DeleteExpression:
-                    return emitDeleteExpression(<DeleteExpression>node);
-                case SyntaxKind.TypeOfExpression:
-                    return emitTypeOfExpression(<TypeOfExpression>node);
-                case SyntaxKind.VoidExpression:
-                    return emitVoidExpression(<VoidExpression>node);
-                case SyntaxKind.AwaitExpression:
-                    return emitAwaitExpression(<AwaitExpression>node);
-                case SyntaxKind.PrefixUnaryExpression:
-                    return emitPrefixUnaryExpression(<PrefixUnaryExpression>node);
-                case SyntaxKind.PostfixUnaryExpression:
-                    return emitPostfixUnaryExpression(<PostfixUnaryExpression>node);
-                case SyntaxKind.BinaryExpression:
-                    return emitBinaryExpression(<BinaryExpression>node);
-                case SyntaxKind.ConditionalExpression:
-                    return emitConditionalExpression(<ConditionalExpression>node);
-                case SyntaxKind.TemplateExpression:
-                    return emitTemplateExpression(<TemplateExpression>node);
-                case SyntaxKind.YieldExpression:
-                    return emitYieldExpression(<YieldExpression>node);
-                case SyntaxKind.SpreadElement:
-                    return emitSpreadExpression(<SpreadElement>node);
-                case SyntaxKind.ClassExpression:
-                    return emitClassExpression(<ClassExpression>node);
-                case SyntaxKind.OmittedExpression:
-                    return;
-                case SyntaxKind.AsExpression:
-                    return emitAsExpression(<AsExpression>node);
-                case SyntaxKind.NonNullExpression:
-                    return emitNonNullExpression(<NonNullExpression>node);
-                case SyntaxKind.MetaProperty:
-                    return emitMetaProperty(<MetaProperty>node);
-
-                // JSX
-                case SyntaxKind.JsxElement:
-                    return emitJsxElement(<JsxElement>node);
-                case SyntaxKind.JsxSelfClosingElement:
-                    return emitJsxSelfClosingElement(<JsxSelfClosingElement>node);
-
-                // Transformation nodes
-                case SyntaxKind.PartiallyEmittedExpression:
-                    return emitPartiallyEmittedExpression(<PartiallyEmittedExpression>node);
-            }
-        }
-
-        function emitBodyIndirect(node: Node, elements: NodeArray<Node>, emitCallback: (node: Node) => void): void {
-            if (onEmitDetachedCommentsOfNode) {
-                onEmitDetachedCommentsOfNode(node, elements, emitCallback);
-            }
-            else {
-                emitCallback(node);
-            }
-        }
-
-        function emitHelpersIndirect(node: Node) {
-            if (onEmitHelpers) {
-                onEmitHelpers(node, writeLines);
-            }
-        }
-
-        //
-        // Literals/Pseudo-literals
-        //
-
-        // SyntaxKind.NumericLiteral
-        function emitNumericLiteral(node: NumericLiteral) {
-            emitLiteral(node);
-            if (node.trailingComment) {
-                write(` /*${node.trailingComment}*/`);
-            }
-        }
-
-        // SyntaxKind.StringLiteral
-        // SyntaxKind.RegularExpressionLiteral
-        // SyntaxKind.NoSubstitutionTemplateLiteral
-        // SyntaxKind.TemplateHead
-        // SyntaxKind.TemplateMiddle
-        // SyntaxKind.TemplateTail
-        function emitLiteral(node: LiteralLikeNode) {
-            const text = getLiteralTextOfNode(node);
-            if ((compilerOptions.sourceMap || compilerOptions.inlineSourceMap)
-                && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
-                writer.writeLiteral(text);
-            }
-            else {
-                write(text);
-            }
-        }
-
-        //
-        // Identifiers
-        //
-
-        function emitIdentifier(node: Identifier) {
-            write(getTextOfNode(node, /*includeTrivia*/ false));
-        }
-
-        //
-        // Names
-        //
-
-        function emitQualifiedName(node: QualifiedName) {
-            emitEntityName(node.left);
-            write(".");
-            emit(node.right);
-        }
-
-        function emitEntityName(node: EntityName) {
-            if (node.kind === SyntaxKind.Identifier) {
-                emitExpression(<Identifier>node);
-            }
-            else {
-                emit(node);
-            }
-        }
-
-        function emitComputedPropertyName(node: ComputedPropertyName) {
-            write("[");
-            emitExpression(node.expression);
-            write("]");
-        }
-
-        //
-        // Signature elements
-        //
-
-        function emitTypeParameter(node: TypeParameterDeclaration) {
-            emit(node.name);
-            emitWithPrefix(" extends ", node.constraint);
-        }
-
-        function emitParameter(node: ParameterDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            writeIfPresent(node.dotDotDotToken, "...");
-            emit(node.name);
-            writeIfPresent(node.questionToken, "?");
-            emitExpressionWithPrefix(" = ", node.initializer);
-            emitWithPrefix(": ", node.type);
-        }
-
-        function emitDecorator(decorator: Decorator) {
-            write("@");
-            emitExpression(decorator.expression);
-        }
-
-        //
-        // Type members
-        //
-
-        function emitPropertySignature(node: PropertySignature) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emit(node.name);
-            writeIfPresent(node.questionToken, "?");
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitPropertyDeclaration(node: PropertyDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emit(node.name);
-            emitWithPrefix(": ", node.type);
-            emitExpressionWithPrefix(" = ", node.initializer);
-            write(";");
-        }
-
-        function emitMethodSignature(node: MethodSignature) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emit(node.name);
-            writeIfPresent(node.questionToken, "?");
-            emitTypeParameters(node, node.typeParameters);
-            emitParameters(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitMethodDeclaration(node: MethodDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            writeIfPresent(node.asteriskToken, "*");
-            emit(node.name);
-            emitSignatureAndBody(node, emitSignatureHead);
-        }
-
-        function emitConstructor(node: ConstructorDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write("constructor");
-            emitSignatureAndBody(node, emitSignatureHead);
-        }
-
-        function emitAccessorDeclaration(node: AccessorDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write(node.kind === SyntaxKind.GetAccessor ? "get " : "set ");
-            emit(node.name);
-            emitSignatureAndBody(node, emitSignatureHead);
-        }
-
-        function emitCallSignature(node: CallSignatureDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emitTypeParameters(node, node.typeParameters);
-            emitParameters(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitConstructSignature(node: ConstructSignatureDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write("new ");
-            emitTypeParameters(node, node.typeParameters);
-            emitParameters(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitIndexSignature(node: IndexSignatureDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emitParametersForIndexSignature(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(";");
-        }
-
-        function emitSemicolonClassElement() {
-            write(";");
-        }
-
-        //
-        // Types
-        //
-
-        function emitTypePredicate(node: TypePredicateNode) {
-            emit(node.parameterName);
-            write(" is ");
-            emit(node.type);
-        }
-
-        function emitTypeReference(node: TypeReferenceNode) {
-            emit(node.typeName);
-            emitTypeArguments(node, node.typeArguments);
-        }
-
-        function emitFunctionType(node: FunctionTypeNode) {
-            emitTypeParameters(node, node.typeParameters);
-            emitParametersForArrow(node, node.parameters);
-            write(" => ");
-            emit(node.type);
-        }
-
-        function emitConstructorType(node: ConstructorTypeNode) {
-            write("new ");
-            emitTypeParameters(node, node.typeParameters);
-            emitParametersForArrow(node, node.parameters);
-            write(" => ");
-            emit(node.type);
-        }
-
-        function emitTypeQuery(node: TypeQueryNode) {
-            write("typeof ");
-            emit(node.exprName);
-        }
-
-        function emitTypeLiteral(node: TypeLiteralNode) {
-            write("{");
-            emitList(node, node.members, ListFormat.TypeLiteralMembers);
-            write("}");
-        }
-
-        function emitArrayType(node: ArrayTypeNode) {
-            emit(node.elementType);
-            write("[]");
-        }
-
-        function emitTupleType(node: TupleTypeNode) {
-            write("[");
-            emitList(node, node.elementTypes, ListFormat.TupleTypeElements);
-            write("]");
-        }
-
-        function emitUnionType(node: UnionTypeNode) {
-            emitList(node, node.types, ListFormat.UnionTypeConstituents);
-        }
-
-        function emitIntersectionType(node: IntersectionTypeNode) {
-            emitList(node, node.types, ListFormat.IntersectionTypeConstituents);
-        }
-
-        function emitParenthesizedType(node: ParenthesizedTypeNode) {
-            write("(");
-            emit(node.type);
-            write(")");
-        }
-
-        function emitThisType() {
-            write("this");
-        }
-
-        function emitTypeOperator(node: TypeOperatorNode) {
-            writeTokenText(node.operator);
-            write(" ");
-            emit(node.type);
-        }
-
-        function emitIndexedAccessType(node: IndexedAccessTypeNode) {
-            emit(node.objectType);
-            write("[");
-            emit(node.indexType);
-            write("]");
-        }
-
-        function emitMappedType(node: MappedTypeNode) {
-            write("{");
-            writeLine();
-            increaseIndent();
-            writeIfPresent(node.readonlyToken, "readonly ");
-            write("[");
-            emit(node.typeParameter.name);
-            write(" in ");
-            emit(node.typeParameter.constraint);
-            write("]");
-            writeIfPresent(node.questionToken, "?");
-            write(": ");
-            emit(node.type);
-            write(";");
-            writeLine();
-            decreaseIndent();
-            write("}");
-        }
-
-        function emitLiteralType(node: LiteralTypeNode) {
-            emitExpression(node.literal);
-        }
-
-        //
-        // Binding patterns
-        //
-
-        function emitObjectBindingPattern(node: ObjectBindingPattern) {
-            const elements = node.elements;
-            if (elements.length === 0) {
-                write("{}");
-            }
-            else {
-                write("{");
-                emitList(node, elements, ListFormat.ObjectBindingPatternElements);
-                write("}");
-            }
-        }
-
-        function emitArrayBindingPattern(node: ArrayBindingPattern) {
-            const elements = node.elements;
-            if (elements.length === 0) {
-                write("[]");
-            }
-            else {
-                write("[");
-                emitList(node, node.elements, ListFormat.ArrayBindingPatternElements);
-                write("]");
-            }
-        }
-
-        function emitBindingElement(node: BindingElement) {
-            emitWithSuffix(node.propertyName, ": ");
-            writeIfPresent(node.dotDotDotToken, "...");
-            emit(node.name);
-            emitExpressionWithPrefix(" = ", node.initializer);
-        }
-
-        //
-        // Expressions
-        //
-
-        function emitArrayLiteralExpression(node: ArrayLiteralExpression) {
-            const elements = node.elements;
-            if (elements.length === 0) {
-                write("[]");
-            }
-            else {
-                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
-                emitExpressionList(node, elements, ListFormat.ArrayLiteralExpressionElements | preferNewLine);
-            }
-        }
-
-        function emitObjectLiteralExpression(node: ObjectLiteralExpression) {
-            const properties = node.properties;
-            if (properties.length === 0) {
-                write("{}");
-            }
-            else {
-                const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
-                if (indentedFlag) {
-                    increaseIndent();
-                }
-
-                const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
-                const allowTrailingComma = languageVersion >= ScriptTarget.ES5 ? ListFormat.AllowTrailingComma : ListFormat.None;
-                emitList(node, properties, ListFormat.ObjectLiteralExpressionProperties | allowTrailingComma | preferNewLine);
-
-                if (indentedFlag) {
-                    decreaseIndent();
-                }
-            }
-        }
-
-        function emitPropertyAccessExpression(node: PropertyAccessExpression) {
-            let indentBeforeDot = false;
-            let indentAfterDot = false;
-            if (!(getEmitFlags(node) & EmitFlags.NoIndentation)) {
-                const dotRangeStart = node.expression.end;
-                const dotRangeEnd = skipTrivia(currentSourceFile.text, node.expression.end) + 1;
-                const dotToken = <Node>{ kind: SyntaxKind.DotToken, pos: dotRangeStart, end: dotRangeEnd };
-                indentBeforeDot = needsIndentation(node, node.expression, dotToken);
-                indentAfterDot = needsIndentation(node, dotToken, node.name);
-            }
-
-            emitExpression(node.expression);
-            increaseIndentIf(indentBeforeDot);
-
-            const shouldEmitDotDot = !indentBeforeDot && needsDotDotForPropertyAccess(node.expression);
-            write(shouldEmitDotDot ? ".." : ".");
-
-            increaseIndentIf(indentAfterDot);
-            emit(node.name);
-            decreaseIndentIf(indentBeforeDot, indentAfterDot);
-        }
-
-        // 1..toString is a valid property access, emit a dot after the literal
-        // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
-        function needsDotDotForPropertyAccess(expression: Expression) {
-            if (expression.kind === SyntaxKind.NumericLiteral) {
-                // check if numeric literal is a decimal literal that was originally written with a dot
-                const text = getLiteralTextOfNode(<LiteralExpression>expression);
-                return getNumericLiteralFlags(text, /*hint*/ NumericLiteralFlags.All) === NumericLiteralFlags.None
-                    && !(<LiteralExpression>expression).isOctalLiteral
-                    && text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
-            }
-            else if (isPropertyAccessExpression(expression) || isElementAccessExpression(expression)) {
-                // check if constant enum value is integer
-                const constantValue = getConstantValue(expression);
-                // isFinite handles cases when constantValue is undefined
-                return isFinite(constantValue)
-                    && Math.floor(constantValue) === constantValue
-                    && compilerOptions.removeComments;
-            }
-        }
-
-        function emitElementAccessExpression(node: ElementAccessExpression) {
-            emitExpression(node.expression);
-            write("[");
-            emitExpression(node.argumentExpression);
-            write("]");
-        }
-
-        function emitCallExpression(node: CallExpression) {
-            emitExpression(node.expression);
-            emitTypeArguments(node, node.typeArguments);
-            emitExpressionList(node, node.arguments, ListFormat.CallExpressionArguments);
-        }
-
-        function emitNewExpression(node: NewExpression) {
-            write("new ");
-            emitExpression(node.expression);
-            emitTypeArguments(node, node.typeArguments);
-            emitExpressionList(node, node.arguments, ListFormat.NewExpressionArguments);
-        }
-
-        function emitTaggedTemplateExpression(node: TaggedTemplateExpression) {
-            emitExpression(node.tag);
-            write(" ");
-            emitExpression(node.template);
-        }
-
-        function emitTypeAssertionExpression(node: TypeAssertion) {
-            write("<");
-            emit(node.type);
-            write(">");
-            emitExpression(node.expression);
-        }
-
-        function emitParenthesizedExpression(node: ParenthesizedExpression) {
-            write("(");
-            emitExpression(node.expression);
-            write(")");
-        }
-
-        function emitFunctionExpression(node: FunctionExpression) {
-            emitFunctionDeclarationOrExpression(node);
-        }
-
-        function emitArrowFunction(node: ArrowFunction) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            emitSignatureAndBody(node, emitArrowFunctionHead);
-        }
-
-        function emitArrowFunctionHead(node: ArrowFunction) {
-            emitTypeParameters(node, node.typeParameters);
-            emitParametersForArrow(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-            write(" =>");
-        }
-
-        function emitDeleteExpression(node: DeleteExpression) {
-            write("delete ");
-            emitExpression(node.expression);
-        }
-
-        function emitTypeOfExpression(node: TypeOfExpression) {
-            write("typeof ");
-            emitExpression(node.expression);
-        }
-
-        function emitVoidExpression(node: VoidExpression) {
-            write("void ");
-            emitExpression(node.expression);
-        }
-
-        function emitAwaitExpression(node: AwaitExpression) {
-            write("await ");
-            emitExpression(node.expression);
-        }
-
-        function emitPrefixUnaryExpression(node: PrefixUnaryExpression) {
-            writeTokenText(node.operator);
-            if (shouldEmitWhitespaceBeforeOperand(node)) {
-                write(" ");
-            }
-            emitExpression(node.operand);
-        }
-
-        function shouldEmitWhitespaceBeforeOperand(node: PrefixUnaryExpression) {
-            // In some cases, we need to emit a space between the operator and the operand. One obvious case
-            // is when the operator is an identifier, like delete or typeof. We also need to do this for plus
-            // and minus expressions in certain cases. Specifically, consider the following two cases (parens
-            // are just for clarity of exposition, and not part of the source code):
-            //
-            //  (+(+1))
-            //  (+(++1))
-            //
-            // We need to emit a space in both cases. In the first case, the absence of a space will make
-            // the resulting expression a prefix increment operation. And in the second, it will make the resulting
-            // expression a prefix increment whose operand is a plus expression - (++(+x))
-            // The same is true of minus of course.
-            const operand = node.operand;
-            return operand.kind === SyntaxKind.PrefixUnaryExpression
-                && ((node.operator === SyntaxKind.PlusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.PlusPlusToken))
-                || (node.operator === SyntaxKind.MinusToken && ((<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusToken || (<PrefixUnaryExpression>operand).operator === SyntaxKind.MinusMinusToken)));
-        }
-
-        function emitPostfixUnaryExpression(node: PostfixUnaryExpression) {
-            emitExpression(node.operand);
-            writeTokenText(node.operator);
-        }
-
-        function emitBinaryExpression(node: BinaryExpression) {
-            const isCommaOperator = node.operatorToken.kind !== SyntaxKind.CommaToken;
-            const indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-            const indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-
-            emitExpression(node.left);
-            increaseIndentIf(indentBeforeOperator, isCommaOperator ? " " : undefined);
-            writeTokenText(node.operatorToken.kind);
-            increaseIndentIf(indentAfterOperator, " ");
-            emitExpression(node.right);
-            decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
-        }
-
-        function emitConditionalExpression(node: ConditionalExpression) {
-            const indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
-            const indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
-            const indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
-            const indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
-
-            emitExpression(node.condition);
-            increaseIndentIf(indentBeforeQuestion, " ");
-            write("?");
-            increaseIndentIf(indentAfterQuestion, " ");
-            emitExpression(node.whenTrue);
-            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
-
-            increaseIndentIf(indentBeforeColon, " ");
-            write(":");
-            increaseIndentIf(indentAfterColon, " ");
-            emitExpression(node.whenFalse);
-            decreaseIndentIf(indentBeforeColon, indentAfterColon);
-        }
-
-        function emitTemplateExpression(node: TemplateExpression) {
-            emit(node.head);
-            emitList(node, node.templateSpans, ListFormat.TemplateExpressionSpans);
-        }
-
-        function emitYieldExpression(node: YieldExpression) {
-            write(node.asteriskToken ? "yield*" : "yield");
-            emitExpressionWithPrefix(" ", node.expression);
-        }
-
-        function emitSpreadExpression(node: SpreadElement) {
-            write("...");
-            emitExpression(node.expression);
-        }
-
-        function emitClassExpression(node: ClassExpression) {
-            emitClassDeclarationOrExpression(node);
-        }
-
-        function emitExpressionWithTypeArguments(node: ExpressionWithTypeArguments) {
-            emitExpression(node.expression);
-            emitTypeArguments(node, node.typeArguments);
-        }
-
-        function emitAsExpression(node: AsExpression) {
-            emitExpression(node.expression);
-            if (node.type) {
-                write(" as ");
-                emit(node.type);
-            }
-        }
-
-        function emitNonNullExpression(node: NonNullExpression) {
-            emitExpression(node.expression);
-            write("!");
-        }
-
-        function emitMetaProperty(node: MetaProperty) {
-            writeToken(node.keywordToken, node.pos);
-            write(".");
-            emit(node.name);
-        }
-
-        //
-        // Misc
-        //
-
-        function emitTemplateSpan(node: TemplateSpan) {
-            emitExpression(node.expression);
-            emit(node.literal);
-        }
-
-        //
-        // Statements
-        //
-
-        function emitBlock(node: Block) {
-            if (isSingleLineEmptyBlock(node)) {
-                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
-                write(" ");
-                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
-            }
-            else {
-                writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
-                emitBlockStatements(node);
-                writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
-            }
-        }
-
-        function emitBlockStatements(node: BlockLike) {
-            if (getEmitFlags(node) & EmitFlags.SingleLine) {
-                emitList(node, node.statements, ListFormat.SingleLineBlockStatements);
-            }
-            else {
-                emitList(node, node.statements, ListFormat.MultiLineBlockStatements);
-            }
-        }
-
-        function emitVariableStatement(node: VariableStatement) {
-            emitModifiers(node, node.modifiers);
-            emit(node.declarationList);
-            write(";");
-        }
-
-        function emitEmptyStatement() {
-            write(";");
-        }
-
-        function emitExpressionStatement(node: ExpressionStatement) {
-            emitExpression(node.expression);
-            write(";");
-        }
-
-        function emitIfStatement(node: IfStatement) {
-            const openParenPos = writeToken(SyntaxKind.IfKeyword, node.pos, node);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos, node);
-            emitExpression(node.expression);
-            writeToken(SyntaxKind.CloseParenToken, node.expression.end, node);
-            emitEmbeddedStatement(node, node.thenStatement);
-            if (node.elseStatement) {
-                writeLineOrSpace(node);
-                writeToken(SyntaxKind.ElseKeyword, node.thenStatement.end, node);
-                if (node.elseStatement.kind === SyntaxKind.IfStatement) {
-                    write(" ");
-                    emit(node.elseStatement);
-                }
-                else {
-                    emitEmbeddedStatement(node, node.elseStatement);
-                }
-            }
-        }
-
-        function emitDoStatement(node: DoStatement) {
-            write("do");
-            emitEmbeddedStatement(node, node.statement);
-            if (isBlock(node.statement)) {
-                write(" ");
-            }
-            else {
-                writeLineOrSpace(node);
-            }
-
-            write("while (");
-            emitExpression(node.expression);
-            write(");");
-        }
-
-        function emitWhileStatement(node: WhileStatement) {
-            write("while (");
-            emitExpression(node.expression);
-            write(")");
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitForStatement(node: ForStatement) {
-            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos, /*contextNode*/ node);
-            emitForBinding(node.initializer);
-            write(";");
-            emitExpressionWithPrefix(" ", node.condition);
-            write(";");
-            emitExpressionWithPrefix(" ", node.incrementor);
-            write(")");
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitForInStatement(node: ForInStatement) {
-            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos);
-            emitForBinding(node.initializer);
-            write(" in ");
-            emitExpression(node.expression);
-            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitForOfStatement(node: ForOfStatement) {
-            const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos);
-            emitForBinding(node.initializer);
-            write(" of ");
-            emitExpression(node.expression);
-            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitForBinding(node: VariableDeclarationList | Expression) {
-            if (node !== undefined) {
-                if (node.kind === SyntaxKind.VariableDeclarationList) {
-                    emit(node);
-                }
-                else {
-                    emitExpression(<Expression>node);
-                }
-            }
-        }
-
-        function emitContinueStatement(node: ContinueStatement) {
-            writeToken(SyntaxKind.ContinueKeyword, node.pos);
-            emitWithPrefix(" ", node.label);
-            write(";");
-        }
-
-        function emitBreakStatement(node: BreakStatement) {
-            writeToken(SyntaxKind.BreakKeyword, node.pos);
-            emitWithPrefix(" ", node.label);
-            write(";");
-        }
-
-        function emitReturnStatement(node: ReturnStatement) {
-            writeToken(SyntaxKind.ReturnKeyword, node.pos, /*contextNode*/ node);
-            emitExpressionWithPrefix(" ", node.expression);
-            write(";");
-        }
-
-        function emitWithStatement(node: WithStatement) {
-            write("with (");
-            emitExpression(node.expression);
-            write(")");
-            emitEmbeddedStatement(node, node.statement);
-        }
-
-        function emitSwitchStatement(node: SwitchStatement) {
-            const openParenPos = writeToken(SyntaxKind.SwitchKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos);
-            emitExpression(node.expression);
-            writeToken(SyntaxKind.CloseParenToken, node.expression.end);
-            write(" ");
-            emit(node.caseBlock);
-        }
-
-        function emitLabeledStatement(node: LabeledStatement) {
-            emit(node.label);
-            write(": ");
-            emit(node.statement);
-        }
-
-        function emitThrowStatement(node: ThrowStatement) {
-            write("throw");
-            emitExpressionWithPrefix(" ", node.expression);
-            write(";");
-        }
-
-        function emitTryStatement(node: TryStatement) {
-            write("try ");
-            emit(node.tryBlock);
-            if (node.catchClause) {
-                writeLineOrSpace(node);
-                emit(node.catchClause);
-            }
-            if (node.finallyBlock) {
-                writeLineOrSpace(node);
-                write("finally ");
-                emit(node.finallyBlock);
-            }
-        }
-
-        function emitDebuggerStatement(node: DebuggerStatement) {
-            writeToken(SyntaxKind.DebuggerKeyword, node.pos);
-            write(";");
-        }
-
-        //
-        // Declarations
-        //
-
-        function emitVariableDeclaration(node: VariableDeclaration) {
-            emit(node.name);
-            emitWithPrefix(": ", node.type);
-            emitExpressionWithPrefix(" = ", node.initializer);
-        }
-
-        function emitVariableDeclarationList(node: VariableDeclarationList) {
-            write(isLet(node) ? "let " : isConst(node) ? "const " : "var ");
-            emitList(node, node.declarations, ListFormat.VariableDeclarationList);
-        }
-
-        function emitFunctionDeclaration(node: FunctionDeclaration) {
-            emitFunctionDeclarationOrExpression(node);
-        }
-
-        function emitFunctionDeclarationOrExpression(node: FunctionDeclaration | FunctionExpression) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write(node.asteriskToken ? "function* " : "function ");
-            emitIdentifierName(node.name);
-            emitSignatureAndBody(node, emitSignatureHead);
-        }
-
-        function emitSignatureAndBody(node: FunctionLikeDeclaration, emitSignatureHead: (node: SignatureDeclaration) => void) {
-            const body = node.body;
-            if (body) {
-                if (isBlock(body)) {
-                    const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
-                    if (indentedFlag) {
-                        increaseIndent();
-                    }
-
-                    if (getEmitFlags(node) & EmitFlags.ReuseTempVariableScope) {
-                        emitSignatureHead(node);
-                        emitBlockFunctionBody(body);
-                    }
-                    else {
-                        pushNameGenerationScope();
-                        emitSignatureHead(node);
-                        emitBlockFunctionBody(body);
-                        popNameGenerationScope();
-                    }
-
-                    if (indentedFlag) {
-                        decreaseIndent();
-                    }
-                }
-                else {
-                    emitSignatureHead(node);
-                    write(" ");
-                    emitExpression(body);
-                }
-            }
-            else {
-                emitSignatureHead(node);
-                write(";");
-            }
-
-        }
-
-        function emitSignatureHead(node: FunctionDeclaration | FunctionExpression | MethodDeclaration | AccessorDeclaration | ConstructorDeclaration) {
-            emitTypeParameters(node, node.typeParameters);
-            emitParameters(node, node.parameters);
-            emitWithPrefix(": ", node.type);
-        }
-
-        function shouldEmitBlockFunctionBodyOnSingleLine(body: Block) {
-            // We must emit a function body as a single-line body in the following case:
-            // * The body has NodeEmitFlags.SingleLine specified.
-
-            // We must emit a function body as a multi-line body in the following cases:
-            // * The body is explicitly marked as multi-line.
-            // * A non-synthesized body's start and end position are on different lines.
-            // * Any statement in the body starts on a new line.
-
-            if (getEmitFlags(body) & EmitFlags.SingleLine) {
-                return true;
-            }
-
-            if (body.multiLine) {
-                return false;
-            }
-
-            if (!nodeIsSynthesized(body) && !rangeIsOnSingleLine(body, currentSourceFile)) {
-                return false;
-            }
-
-            if (shouldWriteLeadingLineTerminator(body, body.statements, ListFormat.PreserveLines)
-                || shouldWriteClosingLineTerminator(body, body.statements, ListFormat.PreserveLines)) {
-                return false;
-            }
-
-            let previousStatement: Statement;
-            for (const statement of body.statements) {
-                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, ListFormat.PreserveLines)) {
-                    return false;
-                }
-
-                previousStatement = statement;
-            }
-
-            return true;
-        }
-
-        function emitBlockFunctionBody(body: Block) {
-            write(" {");
-            increaseIndent();
-
-            const emitBlockFunctionBody = shouldEmitBlockFunctionBodyOnSingleLine(body)
-                ? emitBlockFunctionBodyOnSingleLine
-                : emitBlockFunctionBodyWorker;
-
-            emitBodyIndirect(body, body.statements, emitBlockFunctionBody);
-
-            decreaseIndent();
-            writeToken(SyntaxKind.CloseBraceToken, body.statements.end, body);
-        }
-
-        function emitBlockFunctionBodyOnSingleLine(body: Block) {
-            emitBlockFunctionBodyWorker(body, /*emitBlockFunctionBodyOnSingleLine*/ true);
-        }
-
-        function emitBlockFunctionBodyWorker(body: Block, emitBlockFunctionBodyOnSingleLine?: boolean) {
-            // Emit all the prologue directives (like "use strict").
-            const statementOffset = emitPrologueDirectives(body.statements, /*startWithNewLine*/ true);
-            const pos = writer.getTextPos();
-            emitHelpersIndirect(body);
-            if (statementOffset === 0 && pos === writer.getTextPos() && emitBlockFunctionBodyOnSingleLine) {
-                decreaseIndent();
-                emitList(body, body.statements, ListFormat.SingleLineFunctionBodyStatements);
-                increaseIndent();
-            }
-            else {
-                emitList(body, body.statements, ListFormat.MultiLineFunctionBodyStatements, statementOffset);
-            }
-        }
-
-        function emitClassDeclaration(node: ClassDeclaration) {
-            emitClassDeclarationOrExpression(node);
-        }
-
-        function emitClassDeclarationOrExpression(node: ClassDeclaration | ClassExpression) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write("class");
-            emitNodeWithPrefix(" ", node.name, emitIdentifierName);
-
-            const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
-            if (indentedFlag) {
-                increaseIndent();
-            }
-
-            emitTypeParameters(node, node.typeParameters);
-            emitList(node, node.heritageClauses, ListFormat.ClassHeritageClauses);
-
-            pushNameGenerationScope();
-            write(" {");
-            emitList(node, node.members, ListFormat.ClassMembers);
-            write("}");
-            popNameGenerationScope();
-
-            if (indentedFlag) {
-                decreaseIndent();
-            }
-        }
-
-        function emitInterfaceDeclaration(node: InterfaceDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write("interface ");
-            emit(node.name);
-            emitTypeParameters(node, node.typeParameters);
-            emitList(node, node.heritageClauses, ListFormat.HeritageClauses);
-            write(" {");
-            emitList(node, node.members, ListFormat.InterfaceMembers);
-            write("}");
-        }
-
-        function emitTypeAliasDeclaration(node: TypeAliasDeclaration) {
-            emitDecorators(node, node.decorators);
-            emitModifiers(node, node.modifiers);
-            write("type ");
-            emit(node.name);
-            emitTypeParameters(node, node.typeParameters);
-            write(" = ");
-            emit(node.type);
-            write(";");
-        }
-
-        function emitEnumDeclaration(node: EnumDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write("enum ");
-            emit(node.name);
-            pushNameGenerationScope();
-            write(" {");
-            emitList(node, node.members, ListFormat.EnumMembers);
-            write("}");
-            popNameGenerationScope();
-        }
-
-        function emitModuleDeclaration(node: ModuleDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write(node.flags & NodeFlags.Namespace ? "namespace " : "module ");
-            emit(node.name);
-
-            let body = node.body;
-            while (body.kind === SyntaxKind.ModuleDeclaration) {
-                write(".");
-                emit((<ModuleDeclaration>body).name);
-                body = (<ModuleDeclaration>body).body;
-            }
-
-            write(" ");
-            emit(body);
-        }
-
-        function emitModuleBlock(node: ModuleBlock) {
-            if (isEmptyBlock(node)) {
-                write("{ }");
-            }
-            else {
-                pushNameGenerationScope();
-                write("{");
-                increaseIndent();
-                emitBlockStatements(node);
-                write("}");
-                popNameGenerationScope();
-            }
-        }
-
-        function emitCaseBlock(node: CaseBlock) {
-            writeToken(SyntaxKind.OpenBraceToken, node.pos);
-            emitList(node, node.clauses, ListFormat.CaseBlockClauses);
-            writeToken(SyntaxKind.CloseBraceToken, node.clauses.end);
-        }
-
-        function emitImportEqualsDeclaration(node: ImportEqualsDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write("import ");
-            emit(node.name);
-            write(" = ");
-            emitModuleReference(node.moduleReference);
-            write(";");
-        }
-
-        function emitModuleReference(node: ModuleReference) {
-            if (node.kind === SyntaxKind.Identifier) {
-                emitExpression(<Identifier>node);
-            }
-            else {
-                emit(node);
-            }
-        }
-
-        function emitImportDeclaration(node: ImportDeclaration) {
-            emitModifiers(node, node.modifiers);
-            write("import ");
-            if (node.importClause) {
-                emit(node.importClause);
-                write(" from ");
-            }
-            emitExpression(node.moduleSpecifier);
-            write(";");
-        }
-
-        function emitImportClause(node: ImportClause) {
-            emit(node.name);
-            if (node.name && node.namedBindings) {
-                write(", ");
-            }
-            emit(node.namedBindings);
-        }
-
-        function emitNamespaceImport(node: NamespaceImport) {
-            write("* as ");
-            emit(node.name);
-        }
-
-        function emitNamedImports(node: NamedImports) {
-            emitNamedImportsOrExports(node);
-        }
-
-        function emitImportSpecifier(node: ImportSpecifier) {
-            emitImportOrExportSpecifier(node);
-        }
-
-        function emitExportAssignment(node: ExportAssignment) {
-            write(node.isExportEquals ? "export = " : "export default ");
-            emitExpression(node.expression);
-            write(";");
-        }
-
-        function emitExportDeclaration(node: ExportDeclaration) {
-            write("export ");
-            if (node.exportClause) {
-                emit(node.exportClause);
-            }
-            else {
-                write("*");
-            }
-            if (node.moduleSpecifier) {
-                write(" from ");
-                emitExpression(node.moduleSpecifier);
-            }
-            write(";");
-        }
-
-        function emitNamedExports(node: NamedExports) {
-            emitNamedImportsOrExports(node);
-        }
-
-        function emitExportSpecifier(node: ExportSpecifier) {
-            emitImportOrExportSpecifier(node);
-        }
-
-        function emitNamedImportsOrExports(node: NamedImportsOrExports) {
-            write("{");
-            emitList(node, node.elements, ListFormat.NamedImportsOrExportsElements);
-            write("}");
-        }
-
-        function emitImportOrExportSpecifier(node: ImportOrExportSpecifier) {
-            if (node.propertyName) {
-                emit(node.propertyName);
-                write(" as ");
-            }
-
-            emit(node.name);
-        }
-
-        //
-        // Module references
-        //
-
-        function emitExternalModuleReference(node: ExternalModuleReference) {
-            write("require(");
-            emitExpression(node.expression);
-            write(")");
-        }
-
-        //
-        // JSX
-        //
-
-        function emitJsxElement(node: JsxElement) {
-            emit(node.openingElement);
-            emitList(node, node.children, ListFormat.JsxElementChildren);
-            emit(node.closingElement);
-        }
-
-        function emitJsxSelfClosingElement(node: JsxSelfClosingElement) {
-            write("<");
-            emitJsxTagName(node.tagName);
-            write(" ");
-            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
-            write("/>");
-        }
-
-        function emitJsxOpeningElement(node: JsxOpeningElement) {
-            write("<");
-            emitJsxTagName(node.tagName);
-            writeIfAny(node.attributes, " ");
-            emitList(node, node.attributes, ListFormat.JsxElementAttributes);
-            write(">");
-        }
-
-        function emitJsxText(node: JsxText) {
-            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
-        }
-
-        function emitJsxClosingElement(node: JsxClosingElement) {
-            write("</");
-            emitJsxTagName(node.tagName);
-            write(">");
-        }
-
-        function emitJsxAttribute(node: JsxAttribute) {
-            emit(node.name);
-            emitWithPrefix("=", node.initializer);
-        }
-
-        function emitJsxSpreadAttribute(node: JsxSpreadAttribute) {
-            write("{...");
-            emitExpression(node.expression);
-            write("}");
-        }
-
-        function emitJsxExpression(node: JsxExpression) {
-            if (node.expression) {
-                write("{");
-                if (node.dotDotDotToken) {
-                    write("...");
-                }
-                emitExpression(node.expression);
-                write("}");
-            }
-        }
-
-        function emitJsxTagName(node: JsxTagNameExpression) {
-            if (node.kind === SyntaxKind.Identifier) {
-                emitExpression(<Identifier>node);
-            }
-            else {
-                emit(node);
-            }
-        }
-
-        //
-        // Clauses
-        //
-
-        function emitCaseClause(node: CaseClause) {
-            write("case ");
-            emitExpression(node.expression);
-            write(":");
-
-            emitCaseOrDefaultClauseStatements(node, node.statements);
-        }
-
-        function emitDefaultClause(node: DefaultClause) {
-            write("default:");
-            emitCaseOrDefaultClauseStatements(node, node.statements);
-        }
-
-        function emitCaseOrDefaultClauseStatements(parentNode: Node, statements: NodeArray<Statement>) {
-            const emitAsSingleStatement =
-                statements.length === 1 &&
-                (
-                    // treat synthesized nodes as located on the same line for emit purposes
-                    nodeIsSynthesized(parentNode) ||
-                    nodeIsSynthesized(statements[0]) ||
-                    rangeStartPositionsAreOnSameLine(parentNode, statements[0], currentSourceFile)
-                );
-
-            if (emitAsSingleStatement) {
-                write(" ");
-                emit(statements[0]);
-            }
-            else {
-                emitList(parentNode, statements, ListFormat.CaseOrDefaultClauseStatements);
-            }
-        }
-
-        function emitHeritageClause(node: HeritageClause) {
-            write(" ");
-            writeTokenText(node.token);
-            write(" ");
-            emitList(node, node.types, ListFormat.HeritageClauseTypes);
-        }
-
-        function emitCatchClause(node: CatchClause) {
-            writeLine();
-            const openParenPos = writeToken(SyntaxKind.CatchKeyword, node.pos);
-            write(" ");
-            writeToken(SyntaxKind.OpenParenToken, openParenPos);
-            emit(node.variableDeclaration);
-            writeToken(SyntaxKind.CloseParenToken, node.variableDeclaration ? node.variableDeclaration.end : openParenPos);
-            write(" ");
-            emit(node.block);
-        }
-
-        //
-        // Property assignments
-        //
-
-        function emitPropertyAssignment(node: PropertyAssignment) {
-            emit(node.name);
-            write(": ");
-            // This is to ensure that we emit comment in the following case:
-            //      For example:
-            //          obj = {
-            //              id: /*comment1*/ ()=>void
-            //          }
-            // "comment1" is not considered to be leading comment for node.initializer
-            // but rather a trailing comment on the previous node.
-            const initializer = node.initializer;
-            if (onEmitTrailingCommentsOfPosition && (getEmitFlags(initializer) & EmitFlags.NoLeadingComments) === 0) {
-                const commentRange = getCommentRange(initializer);
-                onEmitTrailingCommentsOfPosition(commentRange.pos);
-            }
-            emitExpression(initializer);
-        }
-
-        function emitShorthandPropertyAssignment(node: ShorthandPropertyAssignment) {
-            emit(node.name);
-            if (node.objectAssignmentInitializer) {
-                write(" = ");
-                emitExpression(node.objectAssignmentInitializer);
-            }
-        }
-
-        function emitSpreadAssignment(node: SpreadAssignment) {
-            if (node.expression) {
-                write("...");
-                emitExpression(node.expression);
-            }
-        }
-
-        //
-        // Enum
-        //
-
-        function emitEnumMember(node: EnumMember) {
-            emit(node.name);
-            emitExpressionWithPrefix(" = ", node.initializer);
-        }
-
-        //
-        // Top-level nodes
-        //
-
-        function emitSourceFile(node: SourceFile) {
-            writeLine();
-            emitShebang();
-            emitBodyIndirect(node, node.statements, emitSourceFileWorker);
-        }
-
-        function emitSourceFileWorker(node: SourceFile) {
-            const statements = node.statements;
-            const statementOffset = emitPrologueDirectives(statements);
-            pushNameGenerationScope();
-            emitHelpersIndirect(node);
-            emitList(node, statements, ListFormat.MultiLine, statementOffset);
-            popNameGenerationScope();
-        }
-
-        // Transformation nodes
-
-        function emitPartiallyEmittedExpression(node: PartiallyEmittedExpression) {
-            emitExpression(node.expression);
-        }
-
-        /**
-         * Emits any prologue directives at the start of a Statement list, returning the
-         * number of prologue directives written to the output.
-         */
-        function emitPrologueDirectives(statements: Node[], startWithNewLine?: boolean): number {
-            for (let i = 0; i < statements.length; i++) {
-                if (isPrologueDirective(statements[i])) {
-                    if (startWithNewLine || i > 0) {
-                        writeLine();
-                    }
-                    emit(statements[i]);
-                }
-                else {
-                    // return index of the first non prologue directive
-                    return i;
-                }
-            }
-
-            return statements.length;
-        }
-
-        //
-        // Helpers
-        //
-
-        function emitShebang() {
-            const shebang = getShebang(currentSourceFile.text);
-            if (shebang) {
-                write(shebang);
-                writeLine();
-            }
-        }
-
-        function emitModifiers(node: Node, modifiers: NodeArray<Modifier>) {
-            if (modifiers && modifiers.length) {
-                emitList(node, modifiers, ListFormat.Modifiers);
-                write(" ");
-            }
-        }
-
-        function emitWithPrefix(prefix: string, node: Node) {
-            emitNodeWithPrefix(prefix, node, emit);
-        }
-
-        function emitExpressionWithPrefix(prefix: string, node: Node) {
-            emitNodeWithPrefix(prefix, node, emitExpression);
-        }
-
-        function emitNodeWithPrefix(prefix: string, node: Node, emit: (node: Node) => void) {
-            if (node) {
-                write(prefix);
-                emit(node);
-            }
-        }
-
-        function emitWithSuffix(node: Node, suffix: string) {
-            if (node) {
-                emit(node);
-                write(suffix);
-            }
-        }
-
-        function emitEmbeddedStatement(parent: Node, node: Statement) {
-            if (isBlock(node) || getEmitFlags(parent) & EmitFlags.SingleLine) {
-                write(" ");
-                emit(node);
-            }
-            else {
-                writeLine();
-                increaseIndent();
-                emit(node);
-                decreaseIndent();
-            }
-        }
-
-        function emitDecorators(parentNode: Node, decorators: NodeArray<Decorator>) {
-            emitList(parentNode, decorators, ListFormat.Decorators);
-        }
-
-        function emitTypeArguments(parentNode: Node, typeArguments: NodeArray<TypeNode>) {
-            emitList(parentNode, typeArguments, ListFormat.TypeArguments);
-        }
-
-        function emitTypeParameters(parentNode: Node, typeParameters: NodeArray<TypeParameterDeclaration>) {
-            emitList(parentNode, typeParameters, ListFormat.TypeParameters);
-        }
-
-        function emitParameters(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
-            emitList(parentNode, parameters, ListFormat.Parameters);
-        }
-
-        function emitParametersForArrow(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
-            if (parameters &&
-                parameters.length === 1 &&
-                parameters[0].type === undefined &&
-                parameters[0].pos === parentNode.pos) {
-                emit(parameters[0]);
-            }
-            else {
-                emitParameters(parentNode, parameters);
-            }
-        }
-
-        function emitParametersForIndexSignature(parentNode: Node, parameters: NodeArray<ParameterDeclaration>) {
-            emitList(parentNode, parameters, ListFormat.IndexSignatureParameters);
-        }
-
-        function emitList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
-            emitNodeList(emit, parentNode, children, format, start, count);
-        }
-
-        function emitExpressionList(parentNode: Node, children: NodeArray<Node>, format: ListFormat, start?: number, count?: number) {
-            emitNodeList(emitExpression, parentNode, children, format, start, count);
-        }
-
-        function emitNodeList(emit: (node: Node) => void, parentNode: Node, children: NodeArray<Node>, format: ListFormat, start = 0, count = children ? children.length - start : 0) {
-            const isUndefined = children === undefined;
-            if (isUndefined && format & ListFormat.OptionalIfUndefined) {
-                return;
-            }
-
-            const isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0;
-            if (isEmpty && format & ListFormat.OptionalIfEmpty) {
-                return;
-            }
-
-            if (format & ListFormat.BracketsMask) {
-                write(getOpeningBracket(format));
-            }
-
-            if (isEmpty) {
-                // Write a line terminator if the parent node was multi-line
-                if (format & ListFormat.MultiLine) {
-                    writeLine();
-                }
-                else if (format & ListFormat.SpaceBetweenBraces) {
-                    write(" ");
-                }
-            }
-            else {
-                // Write the opening line terminator or leading whitespace.
-                const mayEmitInterveningComments = (format & ListFormat.NoInterveningComments) === 0;
-                let shouldEmitInterveningComments = mayEmitInterveningComments;
-                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) {
-                    writeLine();
-                    shouldEmitInterveningComments = false;
-                }
-                else if (format & ListFormat.SpaceBetweenBraces) {
-                    write(" ");
-                }
-
-                // Increase the indent, if requested.
-                if (format & ListFormat.Indented) {
-                    increaseIndent();
-                }
-
-                // Emit each child.
-                let previousSibling: Node;
-                let shouldDecreaseIndentAfterEmit: boolean;
-                const delimiter = getDelimiter(format);
-                for (let i = 0; i < count; i++) {
-                    const child = children[start + i];
-
-                    // Write the delimiter if this is not the first node.
-                    if (previousSibling) {
-                        write(delimiter);
-
-                        // Write either a line terminator or whitespace to separate the elements.
-                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
-                            // If a synthesized node in a single-line list starts on a new
-                            // line, we should increase the indent.
-                            if ((format & (ListFormat.LinesMask | ListFormat.Indented)) === ListFormat.SingleLine) {
-                                increaseIndent();
-                                shouldDecreaseIndentAfterEmit = true;
-                            }
-
-                            writeLine();
-                            shouldEmitInterveningComments = false;
-                        }
-                        else if (previousSibling && format & ListFormat.SpaceBetweenSiblings) {
-                            write(" ");
-                        }
-                    }
-
-                    // Emit this child.
-                    if (shouldEmitInterveningComments) {
-                        if (onEmitTrailingCommentsOfPosition) {
-                            const commentRange = getCommentRange(child);
-                            onEmitTrailingCommentsOfPosition(commentRange.pos);
-                        }
-                    }
-                    else {
-                        shouldEmitInterveningComments = mayEmitInterveningComments;
-                    }
-
-                    emit(child);
-
-                    if (shouldDecreaseIndentAfterEmit) {
-                        decreaseIndent();
-                        shouldDecreaseIndentAfterEmit = false;
-                    }
-
-                    previousSibling = child;
-                }
-
-                // Write a trailing comma, if requested.
-                const hasTrailingComma = (format & ListFormat.AllowTrailingComma) && children.hasTrailingComma;
-                if (format & ListFormat.CommaDelimited && hasTrailingComma) {
-                    write(",");
-                }
-
-                // Decrease the indent, if requested.
-                if (format & ListFormat.Indented) {
-                    decreaseIndent();
-                }
-
-                // Write the closing line terminator or closing whitespace.
-                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
-                    writeLine();
-                }
-                else if (format & ListFormat.SpaceBetweenBraces) {
-                    write(" ");
-                }
-            }
-
-            if (format & ListFormat.BracketsMask) {
-                write(getClosingBracket(format));
-            }
-        }
-
-        function writeIfAny(nodes: NodeArray<Node>, text: string) {
-            if (some(nodes)) {
-                write(text);
-            }
-        }
-
-        function writeIfPresent(node: Node, text: string) {
-            if (node) {
-                write(text);
-            }
-        }
-
-        function writeToken(token: SyntaxKind, pos: number, contextNode?: Node) {
-            return onEmitSourceMapOfToken
-                ? onEmitSourceMapOfToken(contextNode, token, pos, writeTokenText)
-                : writeTokenText(token, pos);
-        }
-
-        function writeTokenText(token: SyntaxKind, pos?: number) {
-            const tokenString = tokenToString(token);
-            write(tokenString);
-            return pos < 0 ? pos : pos + tokenString.length;
-        }
-
-        function writeLineOrSpace(node: Node) {
-            if (getEmitFlags(node) & EmitFlags.SingleLine) {
-                write(" ");
-            }
-            else {
-                writeLine();
-            }
-        }
-
-        function writeLines(text: string): void {
-            const lines = text.split(/\r\n?|\n/g);
-            const indentation = guessIndentation(lines);
-            for (let i = 0; i < lines.length; i++) {
-                const line = indentation ? lines[i].slice(indentation) : lines[i];
-                if (line.length) {
-                    writeLine();
-                    write(line);
-                    writeLine();
-                }
-            }
-        }
-
-        function guessIndentation(lines: string[]) {
-            let indentation: number;
-            for (const line of lines) {
-                for (let i = 0; i < line.length && (indentation === undefined || i < indentation); i++) {
-                    if (!isWhiteSpace(line.charCodeAt(i))) {
-                        if (indentation === undefined || i < indentation) {
-                            indentation = i;
-                            break;
-                        }
-                    }
-                }
-            }
-            return indentation;
-        }
-
-        function increaseIndentIf(value: boolean, valueToWriteWhenNotIndenting?: string) {
-            if (value) {
-                increaseIndent();
-                writeLine();
-            }
-            else if (valueToWriteWhenNotIndenting) {
-                write(valueToWriteWhenNotIndenting);
-            }
-        }
-
-        // Helper function to decrease the indent if we previously indented.  Allows multiple
-        // previous indent values to be considered at a time.  This also allows caller to just
-        // call this once, passing in all their appropriate indent values, instead of needing
-        // to call this helper function multiple times.
-        function decreaseIndentIf(value1: boolean, value2?: boolean) {
-            if (value1) {
-                decreaseIndent();
-            }
-            if (value2) {
-                decreaseIndent();
-            }
-        }
-
-        function shouldWriteLeadingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
-            if (format & ListFormat.MultiLine) {
-                return true;
-            }
-
-            if (format & ListFormat.PreserveLines) {
-                if (format & ListFormat.PreferNewLine) {
-                    return true;
-                }
-
-                const firstChild = children[0];
-                if (firstChild === undefined) {
-                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
-                }
-                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(firstChild)) {
-                    return synthesizedNodeStartsOnNewLine(firstChild, format);
-                }
-                else {
-                    return !rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
-                }
-            }
-            else {
-                return false;
-            }
-        }
-
-        function shouldWriteSeparatingLineTerminator(previousNode: Node, nextNode: Node, format: ListFormat) {
-            if (format & ListFormat.MultiLine) {
-                return true;
-            }
-            else if (format & ListFormat.PreserveLines) {
-                if (previousNode === undefined || nextNode === undefined) {
-                    return false;
-                }
-                else if (nodeIsSynthesized(previousNode) || nodeIsSynthesized(nextNode)) {
-                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
-                }
-                else {
-                    return !rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
-                }
-            }
-            else {
-                return nextNode.startsOnNewLine;
-            }
-        }
-
-        function shouldWriteClosingLineTerminator(parentNode: Node, children: NodeArray<Node>, format: ListFormat) {
-            if (format & ListFormat.MultiLine) {
-                return (format & ListFormat.NoTrailingNewLine) === 0;
-            }
-            else if (format & ListFormat.PreserveLines) {
-                if (format & ListFormat.PreferNewLine) {
-                    return true;
-                }
-
-                const lastChild = lastOrUndefined(children);
-                if (lastChild === undefined) {
-                    return !rangeIsOnSingleLine(parentNode, currentSourceFile);
-                }
-                else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(lastChild)) {
-                    return synthesizedNodeStartsOnNewLine(lastChild, format);
-                }
-                else {
-                    return !rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
-                }
-            }
-            else {
-                return false;
-            }
-        }
-
-        function synthesizedNodeStartsOnNewLine(node: Node, format?: ListFormat) {
-            if (nodeIsSynthesized(node)) {
-                const startsOnNewLine = node.startsOnNewLine;
-                if (startsOnNewLine === undefined) {
-                    return (format & ListFormat.PreferNewLine) !== 0;
-                }
-
-                return startsOnNewLine;
-            }
-
-            return (format & ListFormat.PreferNewLine) !== 0;
-        }
-
-        function needsIndentation(parent: Node, node1: Node, node2: Node): boolean {
-            parent = skipSynthesizedParentheses(parent);
-            node1 = skipSynthesizedParentheses(node1);
-            node2 = skipSynthesizedParentheses(node2);
-
-            // Always use a newline for synthesized code if the synthesizer desires it.
-            if (node2.startsOnNewLine) {
-                return true;
-            }
-
-            return !nodeIsSynthesized(parent)
-                && !nodeIsSynthesized(node1)
-                && !nodeIsSynthesized(node2)
-                && !rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
-        }
-
-        function isSingleLineEmptyBlock(block: Block) {
-            return !block.multiLine
-                && isEmptyBlock(block);
-        }
-
-        function isEmptyBlock(block: BlockLike) {
-            return block.statements.length === 0
-                && rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
-        }
-
-        function skipSynthesizedParentheses(node: Node) {
-            while (node.kind === SyntaxKind.ParenthesizedExpression && nodeIsSynthesized(node)) {
-                node = (<ParenthesizedExpression>node).expression;
-            }
-
-            return node;
-        }
-
-        function getTextOfNode(node: Node, includeTrivia?: boolean): string {
-            if (isGeneratedIdentifier(node)) {
-                return generateName(node);
-            }
-            else if (isIdentifier(node) && (nodeIsSynthesized(node) || !node.parent)) {
-                return unescapeIdentifier(node.text);
-            }
-            else if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
-                return getTextOfNode((<StringLiteral>node).textSourceNode, includeTrivia);
-            }
-            else if (isLiteralExpression(node) && (nodeIsSynthesized(node) || !node.parent)) {
-                return node.text;
-            }
-
-            return getSourceTextOfNodeFromSourceFile(currentSourceFile, node, includeTrivia);
-        }
-
-        function getLiteralTextOfNode(node: LiteralLikeNode): string {
-            if (node.kind === SyntaxKind.StringLiteral && (<StringLiteral>node).textSourceNode) {
-                const textSourceNode = (<StringLiteral>node).textSourceNode;
-                if (isIdentifier(textSourceNode)) {
-                    return "\"" + escapeNonAsciiCharacters(escapeString(getTextOfNode(textSourceNode))) + "\"";
-                }
-                else {
-                    return getLiteralTextOfNode(textSourceNode);
-                }
-            }
-
-            return getLiteralText(node, currentSourceFile, languageVersion);
-        }
-
-        function resetGeneratedNames() {
-            nodeIdToGeneratedName = undefined;
-            autoGeneratedIdToGeneratedName = undefined;
-            generatedNames = undefined;
-            tempFlagsStack = undefined;
-            tempFlags = TempFlags.Auto;
-        }
-
-        function ensureNameGeneration() {
-            if (generatedNames === undefined) {
-                nodeIdToGeneratedName = [];
-                autoGeneratedIdToGeneratedName = [];
-                generatedNames = createMap<string>();
-                tempFlagsStack = [];
-            }
-        }
-
-        /**
-         * Push a new name generation scope.
-         */
-        function pushNameGenerationScope() {
-            ensureNameGeneration();
-            tempFlagsStack.push(tempFlags);
-            tempFlags = 0;
-        }
-
-        /**
-         * Pop the current name generation scope.
-         */
-        function popNameGenerationScope() {
-            ensureNameGeneration();
-            tempFlags = tempFlagsStack.pop();
-        }
-
-        /**
-         * Generate the text for a generated identifier.
-         */
-        function generateName(name: GeneratedIdentifier) {
-            ensureNameGeneration();
-            if (name.autoGenerateKind === GeneratedIdentifierKind.Node) {
-                // Node names generate unique names based on their original node
-                // and are cached based on that node's id.
-                const node = getNodeForGeneratedName(name);
-                return generateNameCached(node, getTextOfNode);
-            }
-            else {
-                // Auto, Loop, and Unique names are cached based on their unique
-                // autoGenerateId.
-                const autoGenerateId = name.autoGenerateId;
-                return autoGeneratedIdToGeneratedName[autoGenerateId] || (autoGeneratedIdToGeneratedName[autoGenerateId] = unescapeIdentifier(makeName(name)));
-            }
-        }
-
-        function generateNameCached(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
-            const nodeId = getNodeId(node);
-            return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node, getTextOfNode)));
-        }
-
-        /**
-         * Returns a value indicating whether a name is unique globally, within the current file,
-         * or within the NameGenerator.
-         */
-        function isUniqueName(name: string): boolean {
-            return !(hasGlobalName && hasGlobalName(name))
-                && !currentSourceFile.identifiers.has(name)
-                && !generatedNames.has(name);
-        }
-
-        /**
-         * Returns a value indicating whether a name is unique within a container.
-         */
-        function isUniqueLocalName(name: string, container: Node): boolean {
-            for (let node = container; isNodeDescendantOf(node, container); node = node.nextContainer) {
-                if (node.locals) {
-                    const local = node.locals.get(name);
-                    // We conservatively include alias symbols to cover cases where they're emitted as locals
-                    if (local && local.flags & (SymbolFlags.Value | SymbolFlags.ExportValue | SymbolFlags.Alias)) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        /**
-         * Return the next available name in the pattern _a ... _z, _0, _1, ...
-         * TempFlags._i or TempFlags._n may be used to express a preference for that dedicated name.
-         * Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
-         */
-        function makeTempVariableName(flags: TempFlags): string {
-            if (flags && !(tempFlags & flags)) {
-                const name = flags === TempFlags._i ? "_i" : "_n";
-                if (isUniqueName(name)) {
-                    tempFlags |= flags;
-                    return name;
-                }
-            }
-            while (true) {
-                const count = tempFlags & TempFlags.CountMask;
-                tempFlags++;
-                // Skip over 'i' and 'n'
-                if (count !== 8 && count !== 13) {
-                    const name = count < 26
-                        ? "_" + String.fromCharCode(CharacterCodes.a + count)
-                        : "_" + (count - 26);
-                    if (isUniqueName(name)) {
-                        return name;
-                    }
-                }
-            }
-        }
-
-        /**
-         * Generate a name that is unique within the current file and doesn't conflict with any names
-         * in global scope. The name is formed by adding an '_n' suffix to the specified base name,
-         * where n is a positive integer. Note that names generated by makeTempVariableName and
-         * makeUniqueName are guaranteed to never conflict.
-         */
-        function makeUniqueName(baseName: string): string {
-            // Find the first unique 'name_n', where n is a positive number
-            if (baseName.charCodeAt(baseName.length - 1) !== CharacterCodes._) {
-                baseName += "_";
-            }
-            let i = 1;
-            while (true) {
-                const generatedName = baseName + i;
-                if (isUniqueName(generatedName)) {
-                    generatedNames.set(generatedName, generatedName);
-                    return generatedName;
-                }
-                i++;
-            }
-        }
-
-        /**
-         * Generates a unique name for a ModuleDeclaration or EnumDeclaration.
-         */
-        function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
-            const name = getTextOfNode(node.name);
-            // Use module/enum name itself if it is unique, otherwise make a unique variation
-            return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
-        }
-
-        /**
-         * Generates a unique name for an ImportDeclaration or ExportDeclaration.
-         */
-        function generateNameForImportOrExportDeclaration(node: ImportDeclaration | ExportDeclaration) {
-            const expr = getExternalModuleName(node);
-            const baseName = expr.kind === SyntaxKind.StringLiteral ?
-                escapeIdentifier(makeIdentifierFromModuleName((<LiteralExpression>expr).text)) : "module";
-            return makeUniqueName(baseName);
-        }
-
-        /**
-         * Generates a unique name for a default export.
-         */
-        function generateNameForExportDefault() {
-            return makeUniqueName("default");
-        }
-
-        /**
-         * Generates a unique name for a class expression.
-         */
-        function generateNameForClassExpression() {
-            return makeUniqueName("class");
-        }
-
-        function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
-            if (isIdentifier(node.name)) {
-                return generateNameCached(node.name, getTextOfNode);
-            }
-            return makeTempVariableName(TempFlags.Auto);
-        }
-
-        /**
-         * Generates a unique name from a node.
-         */
-        function generateNameForNode(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string): string {
-            switch (node.kind) {
-                case SyntaxKind.Identifier:
-                    return makeUniqueName(getTextOfNode(node));
-                case SyntaxKind.ModuleDeclaration:
-                case SyntaxKind.EnumDeclaration:
-                    return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node, getTextOfNode);
-                case SyntaxKind.ImportDeclaration:
-                case SyntaxKind.ExportDeclaration:
-                    return generateNameForImportOrExportDeclaration(<ImportDeclaration | ExportDeclaration>node);
-                case SyntaxKind.FunctionDeclaration:
-                case SyntaxKind.ClassDeclaration:
-                case SyntaxKind.ExportAssignment:
-                    return generateNameForExportDefault();
-                case SyntaxKind.ClassExpression:
-                    return generateNameForClassExpression();
-                case SyntaxKind.MethodDeclaration:
-                case SyntaxKind.GetAccessor:
-                case SyntaxKind.SetAccessor:
-                    return generateNameForMethodOrAccessor(<MethodDeclaration | AccessorDeclaration>node, getTextOfNode);
-                default:
-                    return makeTempVariableName(TempFlags.Auto);
-            }
-        }
-
-        /**
-         * Generates a unique identifier for a node.
-         */
-        function makeName(name: GeneratedIdentifier) {
-            switch (name.autoGenerateKind) {
-                case GeneratedIdentifierKind.Auto:
-                    return makeTempVariableName(TempFlags.Auto);
-                case GeneratedIdentifierKind.Loop:
-                    return makeTempVariableName(TempFlags._i);
-                case GeneratedIdentifierKind.Unique:
-                    return makeUniqueName(name.text);
-            }
-
-            Debug.fail("Unsupported GeneratedIdentifierKind.");
-        }
-
-        /**
-         * Gets the node from which a name should be generated.
-         */
-        function getNodeForGeneratedName(name: GeneratedIdentifier) {
-            const autoGenerateId = name.autoGenerateId;
-            let node = name as Node;
-            let original = node.original;
-            while (original) {
-                node = original;
-
-                // if "node" is a different generated name (having a different
-                // "autoGenerateId"), use it and stop traversing.
-                if (isIdentifier(node)
-                    && node.autoGenerateKind === GeneratedIdentifierKind.Node
-                    && node.autoGenerateId !== autoGenerateId) {
-                    break;
-                }
-
-                original = node.original;
-            }
-
-            // otherwise, return the original node for the source;
-            return node;
-        }
-    }
-
-    function createDelimiterMap() {
-        const delimiters: string[] = [];
-        delimiters[ListFormat.None] = "";
-        delimiters[ListFormat.CommaDelimited] = ",";
-        delimiters[ListFormat.BarDelimited] = " |";
-        delimiters[ListFormat.AmpersandDelimited] = " &";
-        return delimiters;
-    }
-
-    function getDelimiter(format: ListFormat) {
-        return delimiters[format & ListFormat.DelimitersMask];
-    }
-
-    function createBracketsMap() {
-        const brackets: string[][] = [];
-        brackets[ListFormat.Braces] = ["{", "}"];
-        brackets[ListFormat.Parenthesis] = ["(", ")"];
-        brackets[ListFormat.AngleBrackets] = ["<", ">"];
-        brackets[ListFormat.SquareBrackets] = ["[", "]"];
-        return brackets;
-    }
-
-    function getOpeningBracket(format: ListFormat) {
-        return brackets[format & ListFormat.BracketsMask][0];
-    }
-
-    function getClosingBracket(format: ListFormat) {
-        return brackets[format & ListFormat.BracketsMask][1];
-    }
-
-    const enum ListFormat {
-        None = 0,
-
-        // Line separators
-        SingleLine = 0,                 // Prints the list on a single line (default).
-        MultiLine = 1 << 0,             // Prints the list on multiple lines.
-        PreserveLines = 1 << 1,         // Prints the list using line preservation if possible.
-        LinesMask = SingleLine | MultiLine | PreserveLines,
-
-        // Delimiters
-        NotDelimited = 0,               // There is no delimiter between list items (default).
-        BarDelimited = 1 << 2,          // Each list item is space-and-bar (" |") delimited.
-        AmpersandDelimited = 1 << 3,    // Each list item is space-and-ampersand (" &") delimited.
-        CommaDelimited = 1 << 4,        // Each list item is comma (",") delimited.
-        DelimitersMask = BarDelimited | AmpersandDelimited | CommaDelimited,
-
-        AllowTrailingComma = 1 << 5,    // Write a trailing comma (",") if present.
-
-        // Whitespace
-        Indented = 1 << 6,              // The list should be indented.
-        SpaceBetweenBraces = 1 << 7,    // Inserts a space after the opening brace and before the closing brace.
-        SpaceBetweenSiblings = 1 << 8,  // Inserts a space between each sibling node.
-
-        // Brackets/Braces
-        Braces = 1 << 9,                 // The list is surrounded by "{" and "}".
-        Parenthesis = 1 << 10,          // The list is surrounded by "(" and ")".
-        AngleBrackets = 1 << 11,        // The list is surrounded by "<" and ">".
-        SquareBrackets = 1 << 12,       // The list is surrounded by "[" and "]".
-        BracketsMask = Braces | Parenthesis | AngleBrackets | SquareBrackets,
-
-        OptionalIfUndefined = 1 << 13,  // Do not emit brackets if the list is undefined.
-        OptionalIfEmpty = 1 << 14,      // Do not emit brackets if the list is empty.
-        Optional = OptionalIfUndefined | OptionalIfEmpty,
-
-        // Other
-        PreferNewLine = 1 << 15,        // Prefer adding a LineTerminator between synthesized nodes.
-        NoTrailingNewLine = 1 << 16,    // Do not emit a trailing NewLine for a MultiLine list.
-        NoInterveningComments = 1 << 17, // Do not emit comments between each node
-
-        // Precomputed Formats
-        Modifiers = SingleLine | SpaceBetweenSiblings,
-        HeritageClauses = SingleLine | SpaceBetweenSiblings,
-        TypeLiteralMembers = MultiLine | Indented,
-        TupleTypeElements = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented,
-        UnionTypeConstituents = BarDelimited | SpaceBetweenSiblings | SingleLine,
-        IntersectionTypeConstituents = AmpersandDelimited | SpaceBetweenSiblings | SingleLine,
-        ObjectBindingPatternElements = SingleLine | AllowTrailingComma | SpaceBetweenBraces | CommaDelimited | SpaceBetweenSiblings,
-        ArrayBindingPatternElements = SingleLine | AllowTrailingComma | CommaDelimited | SpaceBetweenSiblings,
-        ObjectLiteralExpressionProperties = PreserveLines | CommaDelimited | SpaceBetweenSiblings | SpaceBetweenBraces | Indented | Braces,
-        ArrayLiteralExpressionElements = PreserveLines | CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | Indented | SquareBrackets,
-        CallExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis,
-        NewExpressionArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis | OptionalIfUndefined,
-        TemplateExpressionSpans = SingleLine | NoInterveningComments,
-        SingleLineBlockStatements = SpaceBetweenBraces | SpaceBetweenSiblings | SingleLine,
-        MultiLineBlockStatements = Indented | MultiLine,
-        VariableDeclarationList = CommaDelimited | SpaceBetweenSiblings | SingleLine,
-        SingleLineFunctionBodyStatements = SingleLine | SpaceBetweenSiblings | SpaceBetweenBraces,
-        MultiLineFunctionBodyStatements = MultiLine,
-        ClassHeritageClauses = SingleLine | SpaceBetweenSiblings,
-        ClassMembers = Indented | MultiLine,
-        InterfaceMembers = Indented | MultiLine,
-        EnumMembers = CommaDelimited | Indented | MultiLine,
-        CaseBlockClauses = Indented | MultiLine,
-        NamedImportsOrExportsElements = CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | SingleLine | SpaceBetweenBraces,
-        JsxElementChildren = SingleLine | NoInterveningComments,
-        JsxElementAttributes = SingleLine | SpaceBetweenSiblings | NoInterveningComments,
-        CaseOrDefaultClauseStatements = Indented | MultiLine | NoTrailingNewLine | OptionalIfEmpty,
-        HeritageClauseTypes = CommaDelimited | SpaceBetweenSiblings | SingleLine,
-        SourceFileStatements = MultiLine | NoTrailingNewLine,
-        Decorators = MultiLine | Optional,
-        TypeArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
-        TypeParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | AngleBrackets | Optional,
-        Parameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | Parenthesis,
-        IndexSignatureParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented | SquareBrackets,
-    }
-}
\ No newline at end of file
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index 54d5eb77e10..52bb92ee1f0 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -34,7 +34,6 @@
         "comments.ts",
         "sourcemap.ts",
         "declarationEmitter.ts",
-        "printer.ts",
         "emitter.ts",
         "program.ts",
         "commandLineParser.ts",
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 682cd9e617b..99cdca407b6 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -558,6 +558,15 @@
 
     export type ModifiersArray = NodeArray<Modifier>;
 
+    /*@internal*/
+    export const enum GeneratedIdentifierKind {
+        None,   // Not automatically generated.
+        Auto,   // Automatically generated identifier.
+        Loop,   // Automatically generated identifier with a preference for '_i'.
+        Unique, // Unique name based on the 'text' property.
+        Node,   // Unique name based on the node in the 'original' property.
+    }
+
     export interface Identifier extends PrimaryExpression {
         kind: SyntaxKind.Identifier;
         text: string;                                  // Text of identifier (with escapes converted to characters)
@@ -572,14 +581,7 @@
         resolvedSymbol: Symbol;
     }
 
-    export const enum GeneratedIdentifierKind {
-        None,   // Not automatically generated.
-        Auto,   // Automatically generated identifier.
-        Loop,   // Automatically generated identifier with a preference for '_i'.
-        Unique, // Unique name based on the 'text' property.
-        Node,   // Unique name based on the node in the 'original' property.
-    }
-
+    /*@internal*/
     export interface GeneratedIdentifier extends Identifier {
         autoGenerateKind: GeneratedIdentifierKind.Auto
                         | GeneratedIdentifierKind.Loop
@@ -3909,40 +3911,38 @@
     /* @internal */
     export type Transformer = (context: TransformationContext) => (node: SourceFile) => SourceFile;
 
-    export interface EmitTextWriter {
-        write(s: string): void;
-        writeTextOfNode(text: string, node: Node): void;
-        writeLine(): void;
-        increaseIndent(): void;
-        decreaseIndent(): void;
-        getText(): string;
-        rawWrite(s: string): void;
-        writeLiteral(s: string): void;
-        getTextPos(): number;
-        getLine(): number;
-        getColumn(): number;
-        getIndent(): number;
-        isAtStartOfLine(): boolean;
-        reset(): void;
+    export interface Printer {
+        printNode(hint: EmitHint, node: Node, sourceFile: SourceFile): string;
+        printFile(sourceFile: SourceFile): string;
+        printBundle(bundle: Bundle): string;
     }
 
+    /*@internal*/
     export interface Printer {
-        printNode(hint: EmitHint, node: Node, sourceFile: SourceFile): void;
-        printFile(sourceFile: SourceFile): void;
-        printBundle(bundle: Bundle): void;
+        writeNode(hint: EmitHint, node: Node, sourceFile: SourceFile, writer: EmitTextWriter): void;
+        writeFile(sourceFile: SourceFile, writer: EmitTextWriter): void;
+        writeBundle(bundle: Bundle, writer: EmitTextWriter): void;
+    }
+
+    export interface PrintHandlers {
+        hasGlobalName?: (name: string) => boolean;
+        onEmitNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+        onSubstituteNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+        /*@internal*/ onEmitSourceMapOfNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+        /*@internal*/ onEmitSourceMapOfToken?: (node: Node, token: SyntaxKind, pos: number, emitCallback: (token: SyntaxKind, pos: number) => number) => number;
+        /*@internal*/ onEmitSourceMapOfPosition?: (pos: number) => void;
+        /*@internal*/ onEmitHelpers?: (node: Node, writeLines: (text: string) => void) => void;
+        /*@internal*/ onSetSourceFile?: (node: SourceFile) => void;
     }
 
     export interface PrinterOptions {
-        hasGlobalName?: (name: string) => boolean;
-        onEmitSourceMapOfNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
-        onEmitSourceMapOfToken?: (node: Node, token: SyntaxKind, pos: number, emitCallback: (token: SyntaxKind, pos: number) => number) => number;
-        onEmitCommentsOfNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
-        onEmitDetachedCommentsOfNode?: (node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void) => void;
-        onEmitTrailingCommentsOfPosition?: (pos: number) => void;
-        onEmitNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
-        onEmitHelpers?: (node: Node, writeLines: (text: string) => void) => void;
-        onSetSourceFile?: (node: SourceFile) => void;
-        onSubstituteNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+        target?: ScriptTarget;
+        module?: ModuleKind;
+        removeComments?: boolean;
+        newLine?: NewLineKind;
+        /*@internal*/ sourceMap?: boolean;
+        /*@internal*/ inlineSourceMap?: boolean;
+        /*@internal*/ extendedDiagnostics?: boolean;
     }
 
     export interface TextSpan {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 5c92bfa65cc..8d85ebeca99 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2439,6 +2439,23 @@ namespace ts {
             s;
     }
 
+    export interface EmitTextWriter {
+        write(s: string): void;
+        writeTextOfNode(text: string, node: Node): void;
+        writeLine(): void;
+        increaseIndent(): void;
+        decreaseIndent(): void;
+        getText(): string;
+        rawWrite(s: string): void;
+        writeLiteral(s: string): void;
+        getTextPos(): number;
+        getLine(): number;
+        getColumn(): number;
+        getIndent(): number;
+        isAtStartOfLine(): boolean;
+        reset(): void;
+    }
+
     const indentStrings: string[] = ["", "    "];
     export function getIndentString(level: number) {
         if (indentStrings[level] === undefined) {
@@ -3215,7 +3232,7 @@ namespace ts {
 
     const carriageReturnLineFeed = "\r\n";
     const lineFeed = "\n";
-    export function getNewLineCharacter(options: CompilerOptions): string {
+    export function getNewLineCharacter(options: CompilerOptions | PrinterOptions): string {
         if (options.newLine === NewLineKind.CarriageReturnLineFeed) {
             return carriageReturnLineFeed;
         }
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
index d7bb935db89..ebd07118cc5 100644
--- a/src/harness/tsconfig.json
+++ b/src/harness/tsconfig.json
@@ -37,7 +37,6 @@
         "../compiler/comments.ts",
         "../compiler/sourcemap.ts",
         "../compiler/declarationEmitter.ts",
-        "../compiler/printer.ts",
         "../compiler/emitter.ts",
         "../compiler/program.ts",
         "../compiler/commandLineParser.ts",
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 493f3b45f93..b60e00292f5 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -34,7 +34,6 @@
         "../compiler/comments.ts",
         "../compiler/sourcemap.ts",
         "../compiler/declarationEmitter.ts",
-        "../compiler/printer.ts",
         "../compiler/emitter.ts",
         "../compiler/program.ts",
         "../compiler/commandLineParser.ts",

From cca68adf877f5c91fcb8dd00842e985cecfdaa63 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 30 Jan 2017 12:42:19 -0800
Subject: [PATCH 039/127] Import helpers skips __assign when target >= ES6

Instead, Object.assign is emitted.
---
 src/compiler/checker.ts                          |  2 +-
 tests/baselines/reference/importHelpersES6.js    |  6 +++++-
 .../baselines/reference/importHelpersES6.symbols | 13 ++++++++-----
 tests/baselines/reference/importHelpersES6.types | 16 +++++++++++-----
 tests/cases/compiler/importHelpersES6.ts         |  4 +++-
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7d0f2cb0bbb..95dff83cd94 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11721,7 +11721,7 @@ namespace ts {
                     member = prop;
                 }
                 else if (memberDecl.kind === SyntaxKind.SpreadAssignment) {
-                    if (languageVersion < ScriptTarget.ESNext) {
+                    if (languageVersion < ScriptTarget.ES2015) {
                         checkExternalEmitHelpers(memberDecl, ExternalEmitHelpers.Assign);
                     }
                     if (propertiesArray.length > 0) {
diff --git a/tests/baselines/reference/importHelpersES6.js b/tests/baselines/reference/importHelpersES6.js
index 209f3c34588..bc17939e2cc 100644
--- a/tests/baselines/reference/importHelpersES6.js
+++ b/tests/baselines/reference/importHelpersES6.js
@@ -5,10 +5,12 @@ declare var dec: any;
 @dec export class A {
 
 }
+
+const o = { a: 1 };
+const y = { ...o };
 
 //// [tslib.d.ts]
 export declare function __extends(d: Function, b: Function): void;
-export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 export declare function __param(paramIndex: number, decorator: Function): Function;
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
@@ -23,3 +25,5 @@ A = tslib_1.__decorate([
     dec
 ], A);
 export { A };
+const o = { a: 1 };
+const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/importHelpersES6.symbols b/tests/baselines/reference/importHelpersES6.symbols
index 284a2251a6b..66a8b131aec 100644
--- a/tests/baselines/reference/importHelpersES6.symbols
+++ b/tests/baselines/reference/importHelpersES6.symbols
@@ -8,6 +8,14 @@ declare var dec: any;
 
 }
 
+const o = { a: 1 };
+>o : Symbol(o, Decl(a.ts, 5, 5))
+>a : Symbol(a, Decl(a.ts, 5, 11))
+
+const y = { ...o };
+>y : Symbol(y, Decl(a.ts, 6, 5))
+>o : Symbol(o, Decl(a.ts, 5, 5))
+
 === tests/cases/compiler/tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
 >__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
@@ -16,11 +24,6 @@ export declare function __extends(d: Function, b: Function): void;
 >b : Symbol(b, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
-export declare function __assign(t: any, ...sources: any[]): any;
->__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
->t : Symbol(t, Decl(tslib.d.ts, --, --))
->sources : Symbol(sources, Decl(tslib.d.ts, --, --))
-
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
 >decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
diff --git a/tests/baselines/reference/importHelpersES6.types b/tests/baselines/reference/importHelpersES6.types
index ebfd5a5a2a5..26f30e32e58 100644
--- a/tests/baselines/reference/importHelpersES6.types
+++ b/tests/baselines/reference/importHelpersES6.types
@@ -8,6 +8,17 @@ declare var dec: any;
 
 }
 
+const o = { a: 1 };
+>o : { a: number; }
+>{ a: 1 } : { a: number; }
+>a : number
+>1 : 1
+
+const y = { ...o };
+>y : { a: number; }
+>{ ...o } : { a: number; }
+>o : { a: number; }
+
 === tests/cases/compiler/tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
@@ -16,11 +27,6 @@ export declare function __extends(d: Function, b: Function): void;
 >b : Function
 >Function : Function
 
-export declare function __assign(t: any, ...sources: any[]): any;
->__assign : (t: any, ...sources: any[]) => any
->t : any
->sources : any[]
-
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
diff --git a/tests/cases/compiler/importHelpersES6.ts b/tests/cases/compiler/importHelpersES6.ts
index 9be680a88d6..0267156cf7e 100644
--- a/tests/cases/compiler/importHelpersES6.ts
+++ b/tests/cases/compiler/importHelpersES6.ts
@@ -7,9 +7,11 @@ declare var dec: any;
 
 }
 
+const o = { a: 1 };
+const y = { ...o };
+
 // @filename: tslib.d.ts
 export declare function __extends(d: Function, b: Function): void;
-export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 export declare function __param(paramIndex: number, decorator: Function): Function;
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;

From 9b6f9305d99ed4424ac473f85955a9b10314d805 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 30 Jan 2017 13:19:44 -0800
Subject: [PATCH 040/127] support untyped imports in shims (#13758)

---
 src/services/shims.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/services/shims.ts b/src/services/shims.ts
index cf6bceb816c..487947ee458 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -385,7 +385,10 @@ namespace ts {
             if (settingsJson == null || settingsJson == "") {
                 throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
             }
-            return <CompilerOptions>JSON.parse(settingsJson);
+            const compilerOptions = <CompilerOptions>JSON.parse(settingsJson);
+            // permit language service to handle all files (filtering should be performed on the host side)
+            compilerOptions.allowNonTsExtensions = true;
+            return compilerOptions;
         }
 
         public getScriptFileNames(): string[] {
@@ -1061,12 +1064,6 @@ namespace ts {
                 const compilerOptions = <CompilerOptions>JSON.parse(compilerOptionsJson);
                 const result = resolveModuleName(moduleName, normalizeSlashes(fileName), compilerOptions, this.host);
                 const resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
-                if (resolvedFileName && !compilerOptions.allowJs && fileExtensionIs(resolvedFileName, ".js")) {
-                    return {
-                        resolvedFileName: undefined,
-                        failedLookupLocations: []
-                    };
-                }
                 return {
                     resolvedFileName,
                     failedLookupLocations: result.failedLookupLocations

From f0563ac2874190ef79549f17fdcf1da883add655 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 30 Jan 2017 13:40:42 -0800
Subject: [PATCH 041/127] Printer API unit tests

---
 Jakefile.js                                   |  1 +
 src/compiler/core.ts                          |  2 +-
 src/compiler/emitter.ts                       | 66 ++++---------
 src/compiler/types.ts                         |  1 -
 src/harness/tsconfig.json                     |  3 +-
 src/harness/unittests/printer.ts              | 97 +++++++++++++++++++
 .../printsBundleCorrectly.default.js          |  6 ++
 .../printsBundleCorrectly.removeComments.js   |  4 +
 .../printerApi/printsFileCorrectly.default.js | 25 +++++
 .../printsFileCorrectly.removeComments.js     | 17 ++++
 .../printerApi/printsNodeCorrectly.class.js   |  3 +
 11 files changed, 173 insertions(+), 52 deletions(-)
 create mode 100644 src/harness/unittests/printer.ts
 create mode 100644 tests/baselines/reference/printerApi/printsBundleCorrectly.default.js
 create mode 100644 tests/baselines/reference/printerApi/printsBundleCorrectly.removeComments.js
 create mode 100644 tests/baselines/reference/printerApi/printsFileCorrectly.default.js
 create mode 100644 tests/baselines/reference/printerApi/printsFileCorrectly.removeComments.js
 create mode 100644 tests/baselines/reference/printerApi/printsNodeCorrectly.class.js

diff --git a/Jakefile.js b/Jakefile.js
index 3ee8476c842..0b3a26dbb77 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -269,6 +269,7 @@ var harnessSources = harnessCoreSources.concat([
     "projectErrors.ts",
     "matchFiles.ts",
     "initializeTSConfig.ts",
+    "printer.ts",
 ].map(function (f) {
     return path.join(unittestsDirectory, f);
 })).concat([
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index b8097acaa71..304fba69b26 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1451,7 +1451,7 @@ namespace ts {
         return compilerOptions.target || ScriptTarget.ES3;
     }
 
-    export function getEmitModuleKind(compilerOptions: CompilerOptions | PrinterOptions) {
+    export function getEmitModuleKind(compilerOptions: CompilerOptions) {
         return typeof compilerOptions.module === "number" ?
             compilerOptions.module :
             getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015 ? ModuleKind.ES2015 : ModuleKind.CommonJS;
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index b3bd594ae88..f20a7944a0f 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -12,6 +12,7 @@ namespace ts {
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
     export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile, emitOnlyDtsFiles?: boolean): EmitResult {
         const compilerOptions = host.getCompilerOptions();
+        const moduleKind = getEmitModuleKind(compilerOptions);
         const sourceMapDataList: SourceMapData[] = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
         const emittedFilesList: string[] = compilerOptions.listEmittedFiles ? [] : undefined;
         const emitterDiagnostics = createDiagnosticCollection();
@@ -147,6 +148,10 @@ namespace ts {
         function emitHelpers(node: Node, writeLines: (text: string) => void) {
             let helpersEmitted = false;
             const bundle = node.kind === SyntaxKind.Bundle ? <Bundle>node : undefined;
+            if (bundle && moduleKind === ModuleKind.None) {
+                return;
+            }
+
             const numNodes = bundle ? bundle.sourceFiles.length : 1;
             for (let i = 0; i < numNodes; i++) {
                 const currentNode = bundle ? bundle.sourceFiles[i] : node;
@@ -201,7 +206,6 @@ namespace ts {
 
         const newLine = getNewLineCharacter(printerOptions);
         const languageVersion = getEmitScriptTarget(printerOptions);
-        const moduleKind = getEmitModuleKind(printerOptions);
         const comments = createCommentWriter(printerOptions, onEmitSourceMapOfPosition);
         const {
             emitNodeWithComments,
@@ -257,9 +261,7 @@ namespace ts {
         function writeBundle(bundle: Bundle, output: EmitTextWriter) {
             const previousWriter = writer;
             setWriter(output);
-            if (moduleKind) {
-                emitHelpersIndirect(bundle);
-            }
+            emitHelpersIndirect(bundle);
             for (const sourceFile of bundle.sourceFiles) {
                 print(EmitHint.SourceFile, sourceFile, sourceFile);
             }
@@ -280,11 +282,8 @@ namespace ts {
         }
 
         function endPrint() {
-            const text = writer.getText();
-            if (writer === ownWriter) {
-                writer.reset();
-            }
-
+            const text = ownWriter.getText();
+            ownWriter.reset();
             return text;
         }
 
@@ -385,6 +384,15 @@ namespace ts {
 
         function pipelineEmitUnspecified(node: Node): void {
             const kind = node.kind;
+
+            // Reserved words
+            // Strict mode reserved words
+            // Contextual keywords
+            if (isKeyword(kind)) {
+                writeTokenText(kind);
+                return;
+            }
+
             switch (kind) {
                 // Pseudo-literals
                 case SyntaxKind.TemplateHead:
@@ -396,46 +404,6 @@ namespace ts {
                 case SyntaxKind.Identifier:
                     return emitIdentifier(<Identifier>node);
 
-                // Reserved words
-                case SyntaxKind.ConstKeyword:
-                case SyntaxKind.DefaultKeyword:
-                case SyntaxKind.ExportKeyword:
-                case SyntaxKind.VoidKeyword:
-
-                // Strict mode reserved words
-                case SyntaxKind.PrivateKeyword:
-                case SyntaxKind.ProtectedKeyword:
-                case SyntaxKind.PublicKeyword:
-                case SyntaxKind.StaticKeyword:
-
-                // Contextual keywords
-                case SyntaxKind.AbstractKeyword:
-                case SyntaxKind.AsKeyword:
-                case SyntaxKind.AnyKeyword:
-                case SyntaxKind.AsyncKeyword:
-                case SyntaxKind.AwaitKeyword:
-                case SyntaxKind.BooleanKeyword:
-                case SyntaxKind.ConstructorKeyword:
-                case SyntaxKind.DeclareKeyword:
-                case SyntaxKind.GetKeyword:
-                case SyntaxKind.IsKeyword:
-                case SyntaxKind.ModuleKeyword:
-                case SyntaxKind.NamespaceKeyword:
-                case SyntaxKind.NeverKeyword:
-                case SyntaxKind.ReadonlyKeyword:
-                case SyntaxKind.RequireKeyword:
-                case SyntaxKind.NumberKeyword:
-                case SyntaxKind.SetKeyword:
-                case SyntaxKind.StringKeyword:
-                case SyntaxKind.SymbolKeyword:
-                case SyntaxKind.TypeKeyword:
-                case SyntaxKind.UndefinedKeyword:
-                case SyntaxKind.FromKeyword:
-                case SyntaxKind.GlobalKeyword:
-                case SyntaxKind.OfKeyword:
-                    writeTokenText(kind);
-                    return;
-
                 // Parse tree nodes
 
                 // Names
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 99cdca407b6..7e097ef40b1 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3937,7 +3937,6 @@
 
     export interface PrinterOptions {
         target?: ScriptTarget;
-        module?: ModuleKind;
         removeComments?: boolean;
         newLine?: NewLineKind;
         /*@internal*/ sourceMap?: boolean;
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
index ebd07118cc5..bea688d358b 100644
--- a/src/harness/tsconfig.json
+++ b/src/harness/tsconfig.json
@@ -118,6 +118,7 @@
         "./unittests/initializeTSConfig.ts",
         "./unittests/compileOnSave.ts",
         "./unittests/typingsInstaller.ts",
-        "./unittests/projectErrors.ts"
+        "./unittests/projectErrors.ts",
+        "./unittests/printer.ts"
     ]
 }
diff --git a/src/harness/unittests/printer.ts b/src/harness/unittests/printer.ts
new file mode 100644
index 00000000000..2496a880bc5
--- /dev/null
+++ b/src/harness/unittests/printer.ts
@@ -0,0 +1,97 @@
+/// <reference path="..\..\compiler\emitter.ts" />
+/// <reference path="..\harness.ts" />
+
+namespace ts {
+    describe("PrinterAPI", () => {
+        function makePrintsCorrectly(prefix: string) {
+            return function printsCorrectly(name: string, options: PrinterOptions, printCallback: (printer: Printer) => string) {
+                it(name, () => {
+                    Harness.Baseline.runBaseline(`printerApi/${prefix}.${name}.js`, () =>
+                        printCallback(createPrinter({ newLine: NewLineKind.CarriageReturnLineFeed, ...options })));
+                });
+            }
+        }
+
+        describe("printFile", () => {
+            const printsCorrectly = makePrintsCorrectly("printsFileCorrectly");
+            const sourceFile = createSourceFile("source.ts", `
+                interface A<T> {
+                    // comment1
+                    readonly prop?: T;
+
+                    // comment2
+                    method(): void;
+
+                    // comment3
+                    new <T>(): A<T>;
+
+                    // comment4
+                    <T>(): A<T>;
+                }
+
+                // comment5
+                type B = number | string | object;
+                type C = A<number> & { x: string; }; // comment6
+
+                // comment7
+                enum E1 {
+                    // comment8
+                    first
+                }
+
+                const enum E2 {
+                    second
+                }
+
+                // comment9
+                console.log(1 + 2);
+            `, ScriptTarget.ES2015);
+
+            printsCorrectly("default", {}, printer => printer.printFile(sourceFile));
+            printsCorrectly("removeComments", { removeComments: true }, printer => printer.printFile(sourceFile));
+        });
+
+        describe("printBundle", () => {
+            const printsCorrectly = makePrintsCorrectly("printsBundleCorrectly");
+            const bundle = createBundle([
+                createSourceFile("a.ts", `
+                    /*! [a.ts] */
+
+                    // comment0
+                    const a = 1;
+                `, ScriptTarget.ES2015),
+                createSourceFile("b.ts", `
+                    /*! [b.ts] */
+
+                    // comment1
+                    const b = 2;
+                `, ScriptTarget.ES2015)
+            ]);
+            printsCorrectly("default", {}, printer => printer.printBundle(bundle));
+            printsCorrectly("removeComments", { removeComments: true }, printer => printer.printBundle(bundle));
+        });
+
+        describe("printNode", () => {
+            const printsCorrectly = makePrintsCorrectly("printsNodeCorrectly");
+            const sourceFile = createSourceFile("source.ts", "", ScriptTarget.ES2015);
+            const syntheticNode = createClassDeclaration(
+                undefined,
+                undefined,
+                /*name*/ createIdentifier("C"),
+                undefined,
+                undefined,
+                createNodeArray([
+                    createProperty(
+                        undefined,
+                        createNodeArray([createToken(SyntaxKind.PublicKeyword)]),
+                        createIdentifier("prop"),
+                        undefined,
+                        undefined,
+                        undefined
+                    )
+                ])
+            );
+            printsCorrectly("class", {}, printer => printer.printNode(EmitHint.Unspecified, syntheticNode, sourceFile));
+        });
+    });
+}
diff --git a/tests/baselines/reference/printerApi/printsBundleCorrectly.default.js b/tests/baselines/reference/printerApi/printsBundleCorrectly.default.js
new file mode 100644
index 00000000000..2d86cc0c09c
--- /dev/null
+++ b/tests/baselines/reference/printerApi/printsBundleCorrectly.default.js
@@ -0,0 +1,6 @@
+/*! [a.ts] */
+// comment0
+const a = 1;
+/*! [b.ts] */
+// comment1
+const b = 2;
diff --git a/tests/baselines/reference/printerApi/printsBundleCorrectly.removeComments.js b/tests/baselines/reference/printerApi/printsBundleCorrectly.removeComments.js
new file mode 100644
index 00000000000..22b03719cf3
--- /dev/null
+++ b/tests/baselines/reference/printerApi/printsBundleCorrectly.removeComments.js
@@ -0,0 +1,4 @@
+/*! [a.ts] */
+const a = 1;
+/*! [b.ts] */
+const b = 2;
diff --git a/tests/baselines/reference/printerApi/printsFileCorrectly.default.js b/tests/baselines/reference/printerApi/printsFileCorrectly.default.js
new file mode 100644
index 00000000000..9bff9d656b3
--- /dev/null
+++ b/tests/baselines/reference/printerApi/printsFileCorrectly.default.js
@@ -0,0 +1,25 @@
+interface A<T> {
+    // comment1
+    readonly prop?: T;
+    // comment2
+    method(): void;
+    // comment3
+    new <T>(): A<T>;
+    // comment4
+    <T>(): A<T>;
+}
+// comment5
+type B = number | string | object;
+type C = A<number> & {
+    x: string;
+}; // comment6
+// comment7
+enum E1 {
+    // comment8
+    first
+}
+const enum E2 {
+    second
+}
+// comment9
+console.log(1 + 2);
diff --git a/tests/baselines/reference/printerApi/printsFileCorrectly.removeComments.js b/tests/baselines/reference/printerApi/printsFileCorrectly.removeComments.js
new file mode 100644
index 00000000000..b511aff5e78
--- /dev/null
+++ b/tests/baselines/reference/printerApi/printsFileCorrectly.removeComments.js
@@ -0,0 +1,17 @@
+interface A<T> {
+    readonly prop?: T;
+    method(): void;
+    new <T>(): A<T>;
+    <T>(): A<T>;
+}
+type B = number | string | object;
+type C = A<number> & {
+    x: string;
+};
+enum E1 {
+    first
+}
+const enum E2 {
+    second
+}
+console.log(1 + 2);
diff --git a/tests/baselines/reference/printerApi/printsNodeCorrectly.class.js b/tests/baselines/reference/printerApi/printsNodeCorrectly.class.js
new file mode 100644
index 00000000000..fa19e836fed
--- /dev/null
+++ b/tests/baselines/reference/printerApi/printsNodeCorrectly.class.js
@@ -0,0 +1,3 @@
+class C {
+    public prop;
+}
\ No newline at end of file

From 64ff691a2e9c2cf4f5eb651bffc2a19d82adccd3 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 30 Jan 2017 14:21:52 -0800
Subject: [PATCH 042/127] Move EmitTextWriter to types.ts

---
 src/compiler/types.ts     | 28 +++++++++++++++++++++-------
 src/compiler/utilities.ts | 17 -----------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 7e097ef40b1..03098fd4129 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3915,13 +3915,9 @@
         printNode(hint: EmitHint, node: Node, sourceFile: SourceFile): string;
         printFile(sourceFile: SourceFile): string;
         printBundle(bundle: Bundle): string;
-    }
-
-    /*@internal*/
-    export interface Printer {
-        writeNode(hint: EmitHint, node: Node, sourceFile: SourceFile, writer: EmitTextWriter): void;
-        writeFile(sourceFile: SourceFile, writer: EmitTextWriter): void;
-        writeBundle(bundle: Bundle, writer: EmitTextWriter): void;
+        /*@internal*/ writeNode(hint: EmitHint, node: Node, sourceFile: SourceFile, writer: EmitTextWriter): void;
+        /*@internal*/ writeFile(sourceFile: SourceFile, writer: EmitTextWriter): void;
+        /*@internal*/ writeBundle(bundle: Bundle, writer: EmitTextWriter): void;
     }
 
     export interface PrintHandlers {
@@ -3944,6 +3940,24 @@
         /*@internal*/ extendedDiagnostics?: boolean;
     }
 
+    /*@internal*/
+    export interface EmitTextWriter {
+        write(s: string): void;
+        writeTextOfNode(text: string, node: Node): void;
+        writeLine(): void;
+        increaseIndent(): void;
+        decreaseIndent(): void;
+        getText(): string;
+        rawWrite(s: string): void;
+        writeLiteral(s: string): void;
+        getTextPos(): number;
+        getLine(): number;
+        getColumn(): number;
+        getIndent(): number;
+        isAtStartOfLine(): boolean;
+        reset(): void;
+    }
+
     export interface TextSpan {
         start: number;
         length: number;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 8d85ebeca99..a2c5cbd15a3 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2439,23 +2439,6 @@ namespace ts {
             s;
     }
 
-    export interface EmitTextWriter {
-        write(s: string): void;
-        writeTextOfNode(text: string, node: Node): void;
-        writeLine(): void;
-        increaseIndent(): void;
-        decreaseIndent(): void;
-        getText(): string;
-        rawWrite(s: string): void;
-        writeLiteral(s: string): void;
-        getTextPos(): number;
-        getLine(): number;
-        getColumn(): number;
-        getIndent(): number;
-        isAtStartOfLine(): boolean;
-        reset(): void;
-    }
-
     const indentStrings: string[] = ["", "    "];
     export function getIndentString(level: number) {
         if (indentStrings[level] === undefined) {

From 16103a9ca2ba1d23e6e781fb16da83950eb073b8 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 30 Jan 2017 15:40:31 -0800
Subject: [PATCH 043/127] Fix isSymbolInScopeOfMappedTypeParameter to include
 mapped types

---
 src/compiler/checker.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index c2e0c66ce3f..780bda03b0a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6864,6 +6864,11 @@ namespace ts {
                             }
                         }
                         break;
+                    case SyntaxKind.MappedType:
+                        if (contains(mappedTypes, getDeclaredTypeOfTypeParameter(getSymbolOfNode((<MappedTypeNode>node).typeParameter)))) {
+                            return true;
+                        }
+                        break;
                     case SyntaxKind.JSDocFunctionType:
                         const func = node as JSDocFunctionType;
                         for (const p of func.parameters) {

From 34b4dbb26000d726600c4565ccb75cbc4eb53d06 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 30 Jan 2017 15:47:18 -0800
Subject: [PATCH 044/127] Add regression test

---
 .../conformance/types/keyof/keyofAndIndexedAccess.ts   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 04c26fbe8f7..a8a5acd450f 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -517,3 +517,13 @@ class B extends A<{ x: number}> {
 		p.x;
 	}
 }
+
+// Repro from #13749
+
+class Form<T> {
+    private childFormFactories: {[K in keyof T]: (v: T[K]) => Form<T[K]>}
+
+    public set<K extends keyof T>(prop: K, value: T[K]) {
+        this.childFormFactories[prop](value)
+    }
+}

From ebba3d6ba672458aa9f98ceef665e153c570505c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 30 Jan 2017 15:47:24 -0800
Subject: [PATCH 045/127] Accept new baselines

---
 .../reference/keyofAndIndexedAccess.js        | 23 +++++++++++
 .../reference/keyofAndIndexedAccess.symbols   | 36 ++++++++++++++++++
 .../reference/keyofAndIndexedAccess.types     | 38 +++++++++++++++++++
 3 files changed, 97 insertions(+)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index e7df8bbd5a1..62b848e97df 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -516,6 +516,16 @@ class B extends A<{ x: number}> {
 		p.x;
 	}
 }
+
+// Repro from #13749
+
+class Form<T> {
+    private childFormFactories: {[K in keyof T]: (v: T[K]) => Form<T[K]>}
+
+    public set<K extends keyof T>(prop: K, value: T[K]) {
+        this.childFormFactories[prop](value)
+    }
+}
 
 
 //// [keyofAndIndexedAccess.js]
@@ -862,6 +872,15 @@ var B = (function (_super) {
     };
     return B;
 }(A));
+// Repro from #13749
+var Form = (function () {
+    function Form() {
+    }
+    Form.prototype.set = function (prop, value) {
+        this.childFormFactories[prop](value);
+    };
+    return Form;
+}());
 
 
 //// [keyofAndIndexedAccess.d.ts]
@@ -1104,3 +1123,7 @@ declare class B extends A<{
 }> {
     f(p: this["props"]): void;
 }
+declare class Form<T> {
+    private childFormFactories;
+    set<K extends keyof T>(prop: K, value: T[K]): void;
+}
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index 01501cd719c..54fff19f428 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -1844,3 +1844,39 @@ class B extends A<{ x: number}> {
 	}
 }
 
+// Repro from #13749
+
+class Form<T> {
+>Form : Symbol(Form, Decl(keyofAndIndexedAccess.ts, 516, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 520, 11))
+
+    private childFormFactories: {[K in keyof T]: (v: T[K]) => Form<T[K]>}
+>childFormFactories : Symbol(Form.childFormFactories, Decl(keyofAndIndexedAccess.ts, 520, 15))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 521, 34))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 520, 11))
+>v : Symbol(v, Decl(keyofAndIndexedAccess.ts, 521, 50))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 520, 11))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 521, 34))
+>Form : Symbol(Form, Decl(keyofAndIndexedAccess.ts, 516, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 520, 11))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 521, 34))
+
+    public set<K extends keyof T>(prop: K, value: T[K]) {
+>set : Symbol(Form.set, Decl(keyofAndIndexedAccess.ts, 521, 73))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 523, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 520, 11))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 523, 34))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 523, 15))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 523, 42))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 520, 11))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 523, 15))
+
+        this.childFormFactories[prop](value)
+>this.childFormFactories : Symbol(Form.childFormFactories, Decl(keyofAndIndexedAccess.ts, 520, 15))
+>this : Symbol(Form, Decl(keyofAndIndexedAccess.ts, 516, 1))
+>childFormFactories : Symbol(Form.childFormFactories, Decl(keyofAndIndexedAccess.ts, 520, 15))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 523, 34))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 523, 42))
+    }
+}
+
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 21c9d645ce4..e987ee9043b 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -2166,3 +2166,41 @@ class B extends A<{ x: number}> {
 	}
 }
 
+// Repro from #13749
+
+class Form<T> {
+>Form : Form<T>
+>T : T
+
+    private childFormFactories: {[K in keyof T]: (v: T[K]) => Form<T[K]>}
+>childFormFactories : { [K in keyof T]: (v: T[K]) => Form<T[K]>; }
+>K : K
+>T : T
+>v : T[K]
+>T : T
+>K : K
+>Form : Form<T>
+>T : T
+>K : K
+
+    public set<K extends keyof T>(prop: K, value: T[K]) {
+>set : <K extends keyof T>(prop: K, value: T[K]) => void
+>K : K
+>T : T
+>prop : K
+>K : K
+>value : T[K]
+>T : T
+>K : K
+
+        this.childFormFactories[prop](value)
+>this.childFormFactories[prop](value) : Form<T[K]>
+>this.childFormFactories[prop] : (v: T[K]) => Form<T[K]>
+>this.childFormFactories : { [K in keyof T]: (v: T[K]) => Form<T[K]>; }
+>this : this
+>childFormFactories : { [K in keyof T]: (v: T[K]) => Form<T[K]>; }
+>prop : K
+>value : T[K]
+    }
+}
+

From 7e7057a89d6780f0b093fef4be26c4ddeb4c62ef Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 30 Jan 2017 16:53:31 -0800
Subject: [PATCH 046/127] Empty object type assignable to mapped type with
 optional properties

---
 src/compiler/checker.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 780bda03b0a..26c27cb3be2 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -7687,7 +7687,7 @@ namespace ts {
             function isKnownProperty(type: Type, name: string): boolean {
                 if (type.flags & TypeFlags.Object) {
                     const resolved = resolveStructuredTypeMembers(<ObjectType>type);
-                    if ((relation === assignableRelation || relation === comparableRelation) && (type === globalObjectType || isEmptyObjectType(resolved)) ||
+                    if ((relation === assignableRelation || relation === comparableRelation) && (type === globalObjectType || isEmptyResolvedType(resolved)) ||
                         resolved.stringIndexInfo ||
                         (resolved.numberIndexInfo && isNumericLiteralName(name)) ||
                         getPropertyOfType(type, name)) {
@@ -7704,7 +7704,7 @@ namespace ts {
                 return false;
             }
 
-            function isEmptyObjectType(t: ResolvedType) {
+            function isEmptyResolvedType(t: ResolvedType) {
                 return t.properties.length === 0 &&
                     t.callSignatures.length === 0 &&
                     t.constructSignatures.length === 0 &&
@@ -7712,6 +7712,10 @@ namespace ts {
                     !t.numberIndexInfo;
             }
 
+            function isEmptyObjectType(type: Type) {
+                return type.flags & TypeFlags.Object && isEmptyResolvedType(resolveStructuredTypeMembers(<ObjectType>type));
+            }
+
             function hasExcessProperties(source: FreshObjectLiteralType, target: Type, reportErrors: boolean): boolean {
                 if (maybeTypeOfKind(target, TypeFlags.Object) && !(getObjectFlags(target) & ObjectFlags.ObjectLiteralPatternWithComputedProperties)) {
                     for (const prop of getPropertiesOfObjectType(source)) {
@@ -7925,10 +7929,14 @@ namespace ts {
                             }
                         }
                     }
+                    else if ((<MappedType>target).declaration.questionToken && isEmptyObjectType(source)) {
+                        return Ternary.True;
+
+                    }
                 }
                 else if (relation !== identityRelation) {
                     const resolved = resolveStructuredTypeMembers(<ObjectType>target);
-                    if (isEmptyObjectType(resolved) || resolved.stringIndexInfo && resolved.stringIndexInfo.type.flags & TypeFlags.Any) {
+                    if (isEmptyResolvedType(resolved) || resolved.stringIndexInfo && resolved.stringIndexInfo.type.flags & TypeFlags.Any) {
                         return Ternary.True;
                     }
                 }

From 647e1836c3a8898d85b5c5a9371cd9bb98eec2b1 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 30 Jan 2017 16:53:43 -0800
Subject: [PATCH 047/127] Add tests

---
 .../types/mapped/mappedTypesAndObjects.ts     | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/tests/cases/conformance/types/mapped/mappedTypesAndObjects.ts b/tests/cases/conformance/types/mapped/mappedTypesAndObjects.ts
index 8023f6e7d8d..b3530b46965 100644
--- a/tests/cases/conformance/types/mapped/mappedTypesAndObjects.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypesAndObjects.ts
@@ -13,23 +13,33 @@ function f2<T>(x: Partial<T>, y: Readonly<T>) {
     obj = y;
 }
 
+function f3<T>(x: Partial<T>) {
+    x = {};
+}
+
 // Repro from #12900
 
 interface Base {
-   foo: { [key: string]: any };
-   bar: any;
-   baz: any;
+    foo: { [key: string]: any };
+    bar: any;
+    baz: any;
 }
 
 interface E1<T> extends Base {
-  foo: T;
+    foo: T;
 }
 
 interface Something { name: string, value: string };
 interface E2 extends Base {
-  foo: Partial<Something>;  // or other mapped type
+    foo: Partial<Something>;  // or other mapped type
 }
 
 interface E3<T> extends Base {
-  foo: Partial<T>; // or other mapped type
-}
\ No newline at end of file
+    foo: Partial<T>; // or other mapped type
+}
+
+// Repro from #13747
+
+class Form<T> {
+    private values: {[P in keyof T]?: T[P]} = {}
+}

From 86591016186b41fc8b9db73fbbe8bdd3036c638d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 30 Jan 2017 16:57:11 -0800
Subject: [PATCH 048/127] Accept new baselines

---
 .../reference/mappedTypesAndObjects.js        | 39 +++++++--
 .../reference/mappedTypesAndObjects.symbols   | 82 ++++++++++++-------
 .../reference/mappedTypesAndObjects.types     | 41 ++++++++--
 3 files changed, 121 insertions(+), 41 deletions(-)

diff --git a/tests/baselines/reference/mappedTypesAndObjects.js b/tests/baselines/reference/mappedTypesAndObjects.js
index 53b39209693..f320cc9624e 100644
--- a/tests/baselines/reference/mappedTypesAndObjects.js
+++ b/tests/baselines/reference/mappedTypesAndObjects.js
@@ -12,26 +12,37 @@ function f2<T>(x: Partial<T>, y: Readonly<T>) {
     obj = y;
 }
 
+function f3<T>(x: Partial<T>) {
+    x = {};
+}
+
 // Repro from #12900
 
 interface Base {
-   foo: { [key: string]: any };
-   bar: any;
-   baz: any;
+    foo: { [key: string]: any };
+    bar: any;
+    baz: any;
 }
 
 interface E1<T> extends Base {
-  foo: T;
+    foo: T;
 }
 
 interface Something { name: string, value: string };
 interface E2 extends Base {
-  foo: Partial<Something>;  // or other mapped type
+    foo: Partial<Something>;  // or other mapped type
 }
 
 interface E3<T> extends Base {
-  foo: Partial<T>; // or other mapped type
-}
+    foo: Partial<T>; // or other mapped type
+}
+
+// Repro from #13747
+
+class Form<T> {
+    private values: {[P in keyof T]?: T[P]} = {}
+}
+
 
 //// [mappedTypesAndObjects.js]
 function f1(x, y) {
@@ -44,12 +55,23 @@ function f2(x, y) {
     obj = x;
     obj = y;
 }
+function f3(x) {
+    x = {};
+}
 ;
+// Repro from #13747
+var Form = (function () {
+    function Form() {
+        this.values = {};
+    }
+    return Form;
+}());
 
 
 //// [mappedTypesAndObjects.d.ts]
 declare function f1<T>(x: Partial<T>, y: Readonly<T>): void;
 declare function f2<T>(x: Partial<T>, y: Readonly<T>): void;
+declare function f3<T>(x: Partial<T>): void;
 interface Base {
     foo: {
         [key: string]: any;
@@ -70,3 +92,6 @@ interface E2 extends Base {
 interface E3<T> extends Base {
     foo: Partial<T>;
 }
+declare class Form<T> {
+    private values;
+}
diff --git a/tests/baselines/reference/mappedTypesAndObjects.symbols b/tests/baselines/reference/mappedTypesAndObjects.symbols
index 1690f1b6b04..6fb5d720fb3 100644
--- a/tests/baselines/reference/mappedTypesAndObjects.symbols
+++ b/tests/baselines/reference/mappedTypesAndObjects.symbols
@@ -45,54 +45,80 @@ function f2<T>(x: Partial<T>, y: Readonly<T>) {
 >y : Symbol(y, Decl(mappedTypesAndObjects.ts, 7, 29))
 }
 
+function f3<T>(x: Partial<T>) {
+>f3 : Symbol(f3, Decl(mappedTypesAndObjects.ts, 11, 1))
+>T : Symbol(T, Decl(mappedTypesAndObjects.ts, 13, 12))
+>x : Symbol(x, Decl(mappedTypesAndObjects.ts, 13, 15))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypesAndObjects.ts, 13, 12))
+
+    x = {};
+>x : Symbol(x, Decl(mappedTypesAndObjects.ts, 13, 15))
+}
+
 // Repro from #12900
 
 interface Base {
->Base : Symbol(Base, Decl(mappedTypesAndObjects.ts, 11, 1))
+>Base : Symbol(Base, Decl(mappedTypesAndObjects.ts, 15, 1))
 
-   foo: { [key: string]: any };
->foo : Symbol(Base.foo, Decl(mappedTypesAndObjects.ts, 15, 16))
->key : Symbol(key, Decl(mappedTypesAndObjects.ts, 16, 11))
+    foo: { [key: string]: any };
+>foo : Symbol(Base.foo, Decl(mappedTypesAndObjects.ts, 19, 16))
+>key : Symbol(key, Decl(mappedTypesAndObjects.ts, 20, 12))
 
-   bar: any;
->bar : Symbol(Base.bar, Decl(mappedTypesAndObjects.ts, 16, 31))
+    bar: any;
+>bar : Symbol(Base.bar, Decl(mappedTypesAndObjects.ts, 20, 32))
 
-   baz: any;
->baz : Symbol(Base.baz, Decl(mappedTypesAndObjects.ts, 17, 12))
+    baz: any;
+>baz : Symbol(Base.baz, Decl(mappedTypesAndObjects.ts, 21, 13))
 }
 
 interface E1<T> extends Base {
->E1 : Symbol(E1, Decl(mappedTypesAndObjects.ts, 19, 1))
->T : Symbol(T, Decl(mappedTypesAndObjects.ts, 21, 13))
->Base : Symbol(Base, Decl(mappedTypesAndObjects.ts, 11, 1))
+>E1 : Symbol(E1, Decl(mappedTypesAndObjects.ts, 23, 1))
+>T : Symbol(T, Decl(mappedTypesAndObjects.ts, 25, 13))
+>Base : Symbol(Base, Decl(mappedTypesAndObjects.ts, 15, 1))
 
-  foo: T;
->foo : Symbol(E1.foo, Decl(mappedTypesAndObjects.ts, 21, 30))
->T : Symbol(T, Decl(mappedTypesAndObjects.ts, 21, 13))
+    foo: T;
+>foo : Symbol(E1.foo, Decl(mappedTypesAndObjects.ts, 25, 30))
+>T : Symbol(T, Decl(mappedTypesAndObjects.ts, 25, 13))
 }
 
 interface Something { name: string, value: string };
->Something : Symbol(Something, Decl(mappedTypesAndObjects.ts, 23, 1))
->name : Symbol(Something.name, Decl(mappedTypesAndObjects.ts, 25, 21))
->value : Symbol(Something.value, Decl(mappedTypesAndObjects.ts, 25, 35))
+>Something : Symbol(Something, Decl(mappedTypesAndObjects.ts, 27, 1))
+>name : Symbol(Something.name, Decl(mappedTypesAndObjects.ts, 29, 21))
+>value : Symbol(Something.value, Decl(mappedTypesAndObjects.ts, 29, 35))
 
 interface E2 extends Base {
->E2 : Symbol(E2, Decl(mappedTypesAndObjects.ts, 25, 52))
->Base : Symbol(Base, Decl(mappedTypesAndObjects.ts, 11, 1))
+>E2 : Symbol(E2, Decl(mappedTypesAndObjects.ts, 29, 52))
+>Base : Symbol(Base, Decl(mappedTypesAndObjects.ts, 15, 1))
 
-  foo: Partial<Something>;  // or other mapped type
->foo : Symbol(E2.foo, Decl(mappedTypesAndObjects.ts, 26, 27))
+    foo: Partial<Something>;  // or other mapped type
+>foo : Symbol(E2.foo, Decl(mappedTypesAndObjects.ts, 30, 27))
 >Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
->Something : Symbol(Something, Decl(mappedTypesAndObjects.ts, 23, 1))
+>Something : Symbol(Something, Decl(mappedTypesAndObjects.ts, 27, 1))
 }
 
 interface E3<T> extends Base {
->E3 : Symbol(E3, Decl(mappedTypesAndObjects.ts, 28, 1))
->T : Symbol(T, Decl(mappedTypesAndObjects.ts, 30, 13))
->Base : Symbol(Base, Decl(mappedTypesAndObjects.ts, 11, 1))
+>E3 : Symbol(E3, Decl(mappedTypesAndObjects.ts, 32, 1))
+>T : Symbol(T, Decl(mappedTypesAndObjects.ts, 34, 13))
+>Base : Symbol(Base, Decl(mappedTypesAndObjects.ts, 15, 1))
 
-  foo: Partial<T>; // or other mapped type
->foo : Symbol(E3.foo, Decl(mappedTypesAndObjects.ts, 30, 30))
+    foo: Partial<T>; // or other mapped type
+>foo : Symbol(E3.foo, Decl(mappedTypesAndObjects.ts, 34, 30))
 >Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
->T : Symbol(T, Decl(mappedTypesAndObjects.ts, 30, 13))
+>T : Symbol(T, Decl(mappedTypesAndObjects.ts, 34, 13))
 }
+
+// Repro from #13747
+
+class Form<T> {
+>Form : Symbol(Form, Decl(mappedTypesAndObjects.ts, 36, 1))
+>T : Symbol(T, Decl(mappedTypesAndObjects.ts, 40, 11))
+
+    private values: {[P in keyof T]?: T[P]} = {}
+>values : Symbol(Form.values, Decl(mappedTypesAndObjects.ts, 40, 15))
+>P : Symbol(P, Decl(mappedTypesAndObjects.ts, 41, 22))
+>T : Symbol(T, Decl(mappedTypesAndObjects.ts, 40, 11))
+>T : Symbol(T, Decl(mappedTypesAndObjects.ts, 40, 11))
+>P : Symbol(P, Decl(mappedTypesAndObjects.ts, 41, 22))
+}
+
diff --git a/tests/baselines/reference/mappedTypesAndObjects.types b/tests/baselines/reference/mappedTypesAndObjects.types
index e6f8e53f558..75f71082f31 100644
--- a/tests/baselines/reference/mappedTypesAndObjects.types
+++ b/tests/baselines/reference/mappedTypesAndObjects.types
@@ -49,19 +49,32 @@ function f2<T>(x: Partial<T>, y: Readonly<T>) {
 >y : Readonly<T>
 }
 
+function f3<T>(x: Partial<T>) {
+>f3 : <T>(x: Partial<T>) => void
+>T : T
+>x : Partial<T>
+>Partial : Partial<T>
+>T : T
+
+    x = {};
+>x = {} : {}
+>x : Partial<T>
+>{} : {}
+}
+
 // Repro from #12900
 
 interface Base {
 >Base : Base
 
-   foo: { [key: string]: any };
+    foo: { [key: string]: any };
 >foo : { [key: string]: any; }
 >key : string
 
-   bar: any;
+    bar: any;
 >bar : any
 
-   baz: any;
+    baz: any;
 >baz : any
 }
 
@@ -70,7 +83,7 @@ interface E1<T> extends Base {
 >T : T
 >Base : Base
 
-  foo: T;
+    foo: T;
 >foo : T
 >T : T
 }
@@ -84,7 +97,7 @@ interface E2 extends Base {
 >E2 : E2
 >Base : Base
 
-  foo: Partial<Something>;  // or other mapped type
+    foo: Partial<Something>;  // or other mapped type
 >foo : Partial<Something>
 >Partial : Partial<T>
 >Something : Something
@@ -95,8 +108,24 @@ interface E3<T> extends Base {
 >T : T
 >Base : Base
 
-  foo: Partial<T>; // or other mapped type
+    foo: Partial<T>; // or other mapped type
 >foo : Partial<T>
 >Partial : Partial<T>
 >T : T
 }
+
+// Repro from #13747
+
+class Form<T> {
+>Form : Form<T>
+>T : T
+
+    private values: {[P in keyof T]?: T[P]} = {}
+>values : { [P in keyof T]?: T[P] | undefined; }
+>P : P
+>T : T
+>T : T
+>P : P
+>{} : {}
+}
+

From 58cb9a7f08f73b19efb4db5e7bc07ac126a0759a Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 30 Jan 2017 07:49:17 -0800
Subject: [PATCH 049/127] Use "ts2.2" (or "ts2.3", etc.) NPM tag in
 typingsInstaller

---
 src/harness/unittests/typingsInstaller.ts      | 18 ++++++++++--------
 .../typingsInstaller/typingsInstaller.ts       | 10 ++++++++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts
index d4956a387ee..2b79141c3e3 100644
--- a/src/harness/unittests/typingsInstaller.ts
+++ b/src/harness/unittests/typingsInstaller.ts
@@ -44,6 +44,8 @@ namespace ts.projectSystem {
         });
     }
 
+    import typingsName = server.typingsInstaller.typingsName;
+
     describe("typingsInstaller", () => {
         it("configured projects (typings installed) 1", () => {
             const file1 = {
@@ -519,32 +521,32 @@ namespace ts.projectSystem {
             const commander = {
                 path: "/a/data/node_modules/@types/commander/index.d.ts",
                 content: "declare const commander: { x: number }",
-                typings: "@types/commander"
+                typings: typingsName("commander")
             };
             const jquery = {
                 path: "/a/data/node_modules/@types/jquery/index.d.ts",
                 content: "declare const jquery: { x: number }",
-                typings: "@types/jquery"
+                typings: typingsName("jquery")
             };
             const lodash = {
                 path: "/a/data/node_modules/@types/lodash/index.d.ts",
                 content: "declare const lodash: { x: number }",
-                typings: "@types/lodash"
+                typings: typingsName("lodash")
             };
             const cordova = {
                 path: "/a/data/node_modules/@types/cordova/index.d.ts",
                 content: "declare const cordova: { x: number }",
-                typings: "@types/cordova"
+                typings: typingsName("cordova")
             };
             const grunt = {
                 path: "/a/data/node_modules/@types/grunt/index.d.ts",
                 content: "declare const grunt: { x: number }",
-                typings: "@types/grunt"
+                typings: typingsName("grunt")
             };
             const gulp = {
                 path: "/a/data/node_modules/@types/gulp/index.d.ts",
                 content: "declare const gulp: { x: number }",
-                typings: "@types/gulp"
+                typings: typingsName("gulp")
             };
 
             const host = createServerHost([lodashJs, commanderJs, file3]);
@@ -554,7 +556,7 @@ namespace ts.projectSystem {
                 }
                 installWorker(_requestId: number, args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
                     let typingFiles: (FileOrFolder & { typings: string })[] = [];
-                    if (args.indexOf("@types/commander") >= 0) {
+                    if (args.indexOf(typingsName("commander")) >= 0) {
                         typingFiles = [commander, jquery, lodash, cordova];
                     }
                     else {
@@ -982,7 +984,7 @@ namespace ts.projectSystem {
                         return;
                     }
                     if (response.kind === server.EventEndInstallTypes) {
-                        assert.deepEqual(response.packagesToInstall, ["@types/commander"]);
+                        assert.deepEqual(response.packagesToInstall, [typingsName("commander")]);
                         seenTelemetryEvent = true;
                         return;
                     }
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index 1869c542a6e..e889f98789a 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -295,8 +295,7 @@ namespace ts.server.typingsInstaller {
                 this.log.writeLine(`Installing typings ${JSON.stringify(typingsToInstall)}`);
             }
             const filteredTypings = this.filterTypings(typingsToInstall);
-            const scopedTypings = filteredTypings.map(x => `@types/${x}`);
-            if (scopedTypings.length === 0) {
+            if (filteredTypings.length === 0) {
                 if (this.log.isEnabled()) {
                     this.log.writeLine(`All typings are known to be missing or invalid - no need to go any further`);
                 }
@@ -316,6 +315,7 @@ namespace ts.server.typingsInstaller {
                 projectName: req.projectName
             });
 
+            const scopedTypings = filteredTypings.map(typingsName);
             this.installTypingsAsync(requestId, scopedTypings, cachePath, ok => {
                 try {
                     if (!ok) {
@@ -429,4 +429,10 @@ namespace ts.server.typingsInstaller {
         protected abstract installWorker(requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void;
         protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes): void;
     }
+
+    /* @internal */
+    export function typingsName(packageName: string): string {
+        return `@types/${packageName}@ts${versionMajorMinor}`;
+    }
+    const versionMajorMinor = version.split(".").slice(0, 2).join(".");
 }
\ No newline at end of file

From 8515f7e2b56c39cbaee699125dc7363d5a819dc9 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 27 Jan 2017 08:59:33 -0800
Subject: [PATCH 050/127] Change find-all-references tests to test for groups

* Also always test for isWriteAccess and isDefinition
---
 src/harness/fourslash.ts                      | 121 +++++++++++++-----
 src/services/findAllReferences.ts             |  19 +--
 src/services/services.ts                      |   7 +-
 .../fourslash/ambientShorthandFindAllRefs.ts  |  15 ++-
 ...cellationWhenfindingAllRefsOnDefinition.ts |  18 ++-
 .../findAllReferencesOfConstructor.ts         |   6 +-
 ...dAllReferencesOfConstructor_badOverload.ts |   2 +-
 .../findAllRefsForComputedProperties.ts       |  20 ++-
 .../findAllRefsForComputedProperties2.ts      |  18 ++-
 .../fourslash/findAllRefsForDefaultExport.ts  |   6 +-
 .../findAllRefsForDefaultExport01.ts          |   7 +-
 .../findAllRefsForDefaultExport02.ts          |  17 ++-
 .../findAllRefsForDefaultExport03.ts          |   9 +-
 .../findAllRefsForDefaultExport04.ts          |  23 ----
 .../findAllRefsForDefaultExport05.ts          |  23 ----
 .../findAllRefsForDefaultExport06.ts          |  23 ----
 .../findAllRefsForDefaultExport07.ts          |  16 ---
 .../findAllRefsForDefaultExport08.ts          |   5 +-
 .../findAllRefsForFunctionExpression01.ts     |   4 +-
 .../fourslash/findAllRefsForMappedType.ts     |  18 ++-
 .../findAllRefsForObjectLiteralProperties.ts  |  10 +-
 .../fourslash/findAllRefsForObjectSpread.ts   |  17 ++-
 tests/cases/fourslash/findAllRefsForRest.ts   |   4 +-
 .../findAllRefsForStringLiteralTypes.ts       |   2 +-
 .../findAllRefsForUMDModuleAlias1.ts          |   4 +-
 ...findAllRefsForVariableInExtendsClause01.ts |   4 +-
 ...findAllRefsForVariableInExtendsClause02.ts |   4 +-
 ...dAllRefsForVariableInImplementsClause01.ts |   3 +-
 .../fourslash/findAllRefsInClassExpression.ts |  12 +-
 .../findAllRefsInheritedProperties1.ts        |  14 +-
 .../findAllRefsInheritedProperties2.ts        |  10 +-
 .../findAllRefsInheritedProperties3.ts        |  46 ++++---
 .../findAllRefsInheritedProperties4.ts        |  17 +--
 .../findAllRefsInheritedProperties5.ts        |  15 +--
 .../fourslash/findAllRefsInsideTemplates1.ts  |   4 +-
 .../fourslash/findAllRefsInsideTemplates2.ts  |   4 +-
 .../fourslash/findAllRefsInsideWithBlock.ts   |   6 +-
 ...lRefsObjectBindingElementPropertyName01.ts |   4 +-
 ...lRefsObjectBindingElementPropertyName02.ts |   4 +-
 ...lRefsObjectBindingElementPropertyName03.ts |  12 +-
 ...lRefsObjectBindingElementPropertyName04.ts |  13 +-
 ...lRefsObjectBindingElementPropertyName05.ts |   2 +-
 ...lRefsObjectBindingElementPropertyName06.ts |  21 ++-
 ...lRefsObjectBindingElementPropertyName07.ts |  10 +-
 ...lRefsObjectBindingElementPropertyName09.ts |  15 ---
 ...lRefsObjectBindingElementPropertyName10.ts |   4 +-
 .../findAllRefsOfConstructor_withModifier.ts  |   3 +-
 .../fourslash/findAllRefsOnDecorators.ts      |   4 +-
 .../fourslash/findAllRefsOnDefinition.ts      |  10 +-
 .../fourslash/findAllRefsOnDefinition2.ts     |   8 +-
 .../fourslash/findAllRefsOnImportAliases.ts   |  11 +-
 .../fourslash/findAllRefsOnImportAliases2.ts  |  16 ++-
 .../findAllRefsOnPrivateParameterProperty1.ts |   4 +-
 ...indAllRefsParameterPropertyDeclaration1.ts |   9 +-
 ...indAllRefsParameterPropertyDeclaration2.ts |   9 +-
 ...indAllRefsParameterPropertyDeclaration3.ts |   9 +-
 tests/cases/fourslash/findAllRefsPrimitive.ts |   2 +-
 ...sPropertyContextuallyTypedByTypeParam01.ts |  18 ++-
 .../cases/fourslash/findAllRefsThisKeyword.ts |  22 ++--
 .../findAllRefsWithLeadingUnderscoreNames1.ts |  10 +-
 .../findAllRefsWithLeadingUnderscoreNames2.ts |  10 +-
 .../findAllRefsWithLeadingUnderscoreNames3.ts |  10 +-
 .../findAllRefsWithLeadingUnderscoreNames4.ts |  10 +-
 .../findAllRefsWithLeadingUnderscoreNames5.ts |   4 +-
 .../findAllRefsWithLeadingUnderscoreNames6.ts |   4 +-
 .../findAllRefsWithLeadingUnderscoreNames7.ts |   4 +-
 .../findAllRefsWithLeadingUnderscoreNames8.ts |   4 +-
 .../findAllRefsWithLeadingUnderscoreNames9.ts |   4 +-
 ...dAllRefsWithShorthandPropertyAssignment.ts |  21 +--
 ...AllRefsWithShorthandPropertyAssignment2.ts |  20 ++-
 .../findReferencesAcrossMultipleProjects.ts   |   8 +-
 .../fourslash/findReferencesAfterEdit.ts      |   6 +-
 .../fourslash/findReferencesJSXTagName.ts     |   8 +-
 .../fourslash/findReferencesJSXTagName2.ts    |   6 +-
 tests/cases/fourslash/fourslash.ts            |  16 +--
 ...tOccurrencesIsDefinitionOfArrowFunction.ts |   6 +-
 ...OccurrencesIsDefinitionOfBindingPattern.ts |   4 +-
 .../getOccurrencesIsDefinitionOfClass.ts      |   9 +-
 ...currencesIsDefinitionOfComputedProperty.ts |  12 +-
 .../getOccurrencesIsDefinitionOfEnum.ts       |   6 +-
 .../getOccurrencesIsDefinitionOfExport.ts     |   8 +-
 .../getOccurrencesIsDefinitionOfFunction.ts   |   6 +-
 .../getOccurrencesIsDefinitionOfInterface.ts  |   6 +-
 ...rencesIsDefinitionOfInterfaceClassMerge.ts |  13 +-
 .../getOccurrencesIsDefinitionOfNamespace.ts  |   6 +-
 ...rencesIsDefinitionOfNumberNamedProperty.ts |  10 +-
 .../getOccurrencesIsDefinitionOfParameter.ts  |   6 +-
 ...rencesIsDefinitionOfStringNamedProperty.ts |  10 +-
 .../getOccurrencesIsDefinitionOfTypeAlias.ts  |   6 +-
 .../getOccurrencesIsDefinitionOfVariable.ts   |  28 ++--
 tests/cases/fourslash/hoverOverComment.ts     |   2 +-
 tests/cases/fourslash/localGetReferences.ts   |  66 ++++++----
 tests/cases/fourslash/quickInfoForRequire.ts  |   5 +-
 ...referenceInParameterPropertyDeclaration.ts |  21 ++-
 tests/cases/fourslash/referenceToClass.ts     |   7 +-
 .../cases/fourslash/referencesBloomFilters.ts |  16 ++-
 .../fourslash/referencesBloomFilters2.ts      |  16 ++-
 .../fourslash/referencesBloomFilters3.ts      |   4 +-
 .../cases/fourslash/referencesForAmbients.ts  |  16 +--
 .../fourslash/referencesForClassLocal.ts      |   4 +-
 .../fourslash/referencesForClassMembers.ts    |  30 ++++-
 ...esForClassMembersExtendingAbstractClass.ts |  30 ++++-
 ...cesForClassMembersExtendingGenericClass.ts |  30 ++++-
 .../fourslash/referencesForClassParameter.ts  |  10 +-
 ...ontextuallyTypedObjectLiteralProperties.ts |  28 ++--
 ...ncesForContextuallyTypedUnionProperties.ts |  36 +++---
 ...cesForContextuallyTypedUnionProperties2.ts |  26 ++--
 tests/cases/fourslash/referencesForEnums.ts   |  11 +-
 .../fourslash/referencesForExportedValues.ts  |   4 +-
 .../referencesForExternalModuleNames.ts       |   7 +-
 .../referencesForFunctionOverloads.ts         |   6 +-
 .../referencesForFunctionParameter.ts         |   6 +-
 tests/cases/fourslash/referencesForGlobals.ts |   4 +-
 .../cases/fourslash/referencesForGlobals2.ts  |   4 +-
 .../cases/fourslash/referencesForGlobals3.ts  |   4 +-
 .../cases/fourslash/referencesForGlobals4.ts  |   4 +-
 .../cases/fourslash/referencesForGlobals5.ts  |   4 +-
 .../referencesForGlobalsInExternalModule.ts   |  18 ++-
 .../referencesForIllegalAssignment.ts         |  10 +-
 tests/cases/fourslash/referencesForImports.ts |   8 +-
 .../fourslash/referencesForIndexProperty.ts   |   8 +-
 .../fourslash/referencesForIndexProperty2.ts  |   2 +-
 .../fourslash/referencesForIndexProperty3.ts  |   4 +-
 .../referencesForInheritedProperties.ts       |  25 +++-
 .../referencesForInheritedProperties2.ts      |  25 +++-
 .../referencesForInheritedProperties3.ts      |   8 +-
 .../referencesForInheritedProperties4.ts      |  15 ++-
 .../referencesForInheritedProperties5.ts      |  22 +++-
 .../referencesForInheritedProperties6.ts      |  21 ++-
 .../referencesForInheritedProperties7.ts      |  44 ++++---
 .../referencesForInheritedProperties8.ts      |  13 +-
 .../referencesForInheritedProperties9.ts      |  12 +-
 tests/cases/fourslash/referencesForLabel.ts   |   4 +-
 tests/cases/fourslash/referencesForLabel2.ts  |   3 +-
 tests/cases/fourslash/referencesForLabel3.ts  |   3 +-
 tests/cases/fourslash/referencesForLabel4.ts  |   2 +-
 tests/cases/fourslash/referencesForLabel5.ts  |   4 +-
 tests/cases/fourslash/referencesForLabel6.ts  |   6 +-
 .../referencesForMergedDeclarations.ts        |  13 +-
 .../referencesForMergedDeclarations2.ts       |   4 +-
 .../referencesForMergedDeclarations3.ts       |  12 +-
 .../referencesForMergedDeclarations4.ts       |  10 +-
 .../referencesForMergedDeclarations5.ts       |  14 +-
 .../referencesForMergedDeclarations6.ts       |   4 +-
 .../referencesForMergedDeclarations7.ts       |  14 +-
 .../referencesForMergedDeclarations8.ts       |   4 +-
 .../cases/fourslash/referencesForNoContext.ts |  12 +-
 ...eferencesForNumericLiteralPropertyNames.ts |  19 ++-
 .../referencesForObjectLiteralProperties.ts   |  10 +-
 .../cases/fourslash/referencesForOverrides.ts |  93 +++++++++++---
 .../referencesForPropertiesOfGenericType.ts   |  14 +-
 tests/cases/fourslash/referencesForStatic.ts  |   4 +-
 ...rencesForStaticsAndMembersWithSameNames.ts |  19 +--
 ...referencesForStringLiteralPropertyNames.ts |  18 ++-
 ...eferencesForStringLiteralPropertyNames2.ts |  11 +-
 ...eferencesForStringLiteralPropertyNames3.ts |  12 +-
 ...eferencesForStringLiteralPropertyNames4.ts |  12 +-
 .../fourslash/referencesForUnionProperties.ts |  22 +++-
 tests/cases/fourslash/referencesInComment.ts  |   2 +-
 tests/cases/fourslash/remoteGetReferences.ts  |  42 ++++--
 tests/cases/fourslash/renameDefaultImport.ts  |  10 +-
 .../renameDefaultImportDifferentName.ts       |  10 +-
 .../renameImportAndExportInDiffFiles.ts       |   8 +-
 .../shims-pp/getReferencesAtPosition.ts       |  12 +-
 .../shims/getReferencesAtPosition.ts          |  12 +-
 tests/cases/fourslash/untypedModuleImport.ts  |   6 +-
 166 files changed, 1349 insertions(+), 776 deletions(-)
 delete mode 100644 tests/cases/fourslash/findAllRefsForDefaultExport04.ts
 delete mode 100644 tests/cases/fourslash/findAllRefsForDefaultExport05.ts
 delete mode 100644 tests/cases/fourslash/findAllRefsForDefaultExport06.ts
 delete mode 100644 tests/cases/fourslash/findAllRefsForDefaultExport07.ts
 delete mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 721647df0cd..3deddf1f2cc 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -452,7 +452,8 @@ namespace FourSlash {
         }
 
         private messageAtLastKnownMarker(message: string) {
-            return "Marker: " + this.lastKnownMarker + "\n" + message;
+            const locationDescription = this.lastKnownMarker ? this.lastKnownMarker : this.getLineColStringAtPosition(this.currentCaretPosition);
+            return `At ${locationDescription}: ${message}`;
         }
 
         private assertionMessageAtLastKnownMarker(msg: string) {
@@ -562,7 +563,7 @@ namespace FourSlash {
         }
 
         public verifyGoToDefinitionIs(endMarker: string | string[]) {
-            this.verifyGoToXWorker(endMarker instanceof Array ? endMarker : [endMarker], () => this.getGoToDefinition());
+            this.verifyGoToXWorker(toArray(endMarker), () => this.getGoToDefinition());
         }
 
         public verifyGoToDefinition(arg0: any, endMarkerNames?: string | string[]) {
@@ -582,7 +583,7 @@ namespace FourSlash {
             if (endMarkerNames) {
                 this.verifyGoToXPlain(arg0, endMarkerNames, getDefs);
             }
-            else if (arg0 instanceof Array) {
+            else if (ts.isArray(arg0)) {
                 const pairs: [string | string[], string | string[]][] = arg0;
                 for (const [start, end] of pairs) {
                     this.verifyGoToXPlain(start, end, getDefs);
@@ -599,13 +600,8 @@ namespace FourSlash {
         }
 
         private verifyGoToXPlain(startMarkerNames: string | string[], endMarkerNames: string | string[], getDefs: () => ts.DefinitionInfo[] | undefined) {
-            if (startMarkerNames instanceof Array) {
-                for (const start of startMarkerNames) {
-                    this.verifyGoToXSingle(start, endMarkerNames, getDefs);
-                }
-            }
-            else {
-                this.verifyGoToXSingle(startMarkerNames, endMarkerNames, getDefs);
+            for (const start of toArray(startMarkerNames)) {
+                this.verifyGoToXSingle(start, endMarkerNames, getDefs);
             }
         }
 
@@ -617,7 +613,7 @@ namespace FourSlash {
 
         private verifyGoToXSingle(startMarkerName: string, endMarkerNames: string | string[], getDefs: () => ts.DefinitionInfo[] | undefined) {
             this.goToMarker(startMarkerName);
-            this.verifyGoToXWorker(endMarkerNames instanceof Array ? endMarkerNames : [endMarkerNames], getDefs);
+            this.verifyGoToXWorker(toArray(endMarkerNames), getDefs);
         }
 
         private verifyGoToXWorker(endMarkers: string[], getDefs: () => ts.DefinitionInfo[] | undefined) {
@@ -899,8 +895,74 @@ namespace FourSlash {
             }
         }
 
-        public verifyRangesWithSameTextReferenceEachOther() {
-            this.rangesByText().forEach(ranges => this.verifyRangesReferenceEachOther(ranges));
+        public verifyReferenceGroups(startRanges: Range | Range[], parts: Array<{ definition: string, ranges: Range[] }>): void {
+            interface ReferenceJson { definition: string; ranges: ts.ReferenceEntry[]; }
+            type ReferencesJson = ReferenceJson[];
+            const fullExpected = parts.map<ReferenceJson>(({ definition, ranges }) => ({ definition, ranges: ranges.map(rangeToReferenceEntry) }));
+
+            for (const startRange of toArray(startRanges)) {
+                this.goToRangeStart(startRange);
+                const fullActual = this.findReferencesAtCaret().map<ReferenceJson>(({ definition, references }) => ({
+                    definition: definition.displayParts.map(d => d.text).join(""),
+                    ranges: references
+                }));
+                this.assertObjectsEqual<ReferencesJson>(fullActual, fullExpected);
+            }
+
+            function rangeToReferenceEntry(r: Range) {
+                let { isWriteAccess, isDefinition } = (r.marker && r.marker.data) || { isWriteAccess: false, isDefinition: false };
+                isWriteAccess = isWriteAccess || false; isDefinition = isDefinition || false;
+                return { fileName: r.fileName, textSpan: { start: r.start, length: r.end - r.start }, isWriteAccess, isDefinition }
+            }
+        }
+
+        public verifyNoReferences(markerNameOrRange?: string | Range) {
+            if (markerNameOrRange) {
+                if (typeof markerNameOrRange === "string") {
+                    this.goToMarker(markerNameOrRange);
+                }
+                else {
+                    this.goToRangeStart(markerNameOrRange);
+                }
+            }
+
+            const refs = this.getReferencesAtCaret();
+            if (refs && refs.length) {
+                console.log(refs);
+                this.raiseError("Expected getReferences to fail");
+            }
+        }
+
+        public verifySingleReferenceGroup(definition: string, ranges?: Range[]) {
+            ranges = ranges || this.getRanges();
+            this.verifyReferenceGroups(ranges, [{ definition, ranges }]);
+        }
+
+        private assertObjectsEqual<T>(fullActual: T, fullExpected: T, msgPrefix = ""): void {
+            const recur = <U>(actual: U, expected: U, path: string) => {
+                const fail = (msg: string) => {
+                    console.log("Expected:", stringify(fullExpected));
+                    console.log("Actual: ", stringify(fullActual));
+                    this.raiseError(`${msgPrefix}At ${path}: ${msg}`);
+                };
+
+                for (const key in actual) if (ts.hasProperty(actual as any, key)) {
+                    const ak = actual[key], ek = expected[key];
+                    if (typeof ak === "object" && typeof ek === "object") {
+                        recur(ak, ek, path ? path + "." + key : key);
+                    }
+                    else if (ak !== ek) {
+                        fail(`Expected '${key}' to be '${ek}', got '${ak}'`);
+                    }
+                }
+                for (const key in expected) if (ts.hasProperty(expected as any, key)) {
+                    if (!ts.hasProperty(actual as any, key)) {
+                        fail(`${msgPrefix}Missing property '${key}'`);
+                    }
+                }
+            };
+            recur(fullActual, fullExpected, "");
+
         }
 
         public verifyDisplayPartsOfReferencedSymbol(expected: ts.SymbolDisplayPart[]) {
@@ -974,7 +1036,7 @@ namespace FourSlash {
         public verifyQuickInfos(namesAndTexts: { [name: string]: string | [string, string] }) {
             for (const name in namesAndTexts) if (ts.hasProperty(namesAndTexts, name)) {
                 const text = namesAndTexts[name];
-                if (text instanceof Array) {
+                if (ts.isArray(text)) {
                     assert(text.length === 2);
                     const [expectedText, expectedDocumentation] = text;
                     this.verifyQuickInfoAt(name, expectedText, expectedDocumentation);
@@ -1411,13 +1473,6 @@ namespace FourSlash {
             Harness.IO.log(membersString);
         }
 
-        public printReferences() {
-            const references = this.getReferencesAtCaret();
-            ts.forEach(references, entry => {
-                Harness.IO.log(stringify(entry));
-            });
-        }
-
         public printContext() {
             ts.forEach(this.languageServiceAdapterHost.getFilenames(), Harness.IO.log);
         }
@@ -3082,6 +3137,10 @@ ${code}
         }
         return ts.arrayFrom(set.keys());
     }
+
+    function toArray<T>(x: T | T[]): T[] {
+        return ts.isArray(x) ? x : [x];
+    }
 }
 
 namespace FourSlashInterface {
@@ -3346,6 +3405,18 @@ namespace FourSlashInterface {
             this.state.verifyReferencesOf(start, references);
         }
 
+        public referenceGroups(startRanges: FourSlash.Range[], parts: Array<{ definition: string, ranges: FourSlash.Range[] }>) {
+            this.state.verifyReferenceGroups(startRanges, parts);
+        }
+
+        public noReferences(markerNameOrRange?: string | FourSlash.Range) {
+            this.state.verifyNoReferences(markerNameOrRange);
+        }
+
+        public singleReferenceGroup(definition: string, ranges?: FourSlash.Range[]) {
+            this.state.verifySingleReferenceGroup(definition, ranges);
+        }
+
         public rangesReferenceEachOther(ranges?: FourSlash.Range[]) {
             this.state.verifyRangesReferenceEachOther(ranges);
         }
@@ -3354,10 +3425,6 @@ namespace FourSlashInterface {
             this.state.verifyDisplayPartsOfReferencedSymbol(expected);
         }
 
-        public rangesWithSameTextReferenceEachOther() {
-            this.state.verifyRangesWithSameTextReferenceEachOther();
-        }
-
         public currentParameterHelpArgumentNameIs(name: string) {
             this.state.verifyCurrentParameterHelpName(name);
         }
@@ -3660,10 +3727,6 @@ namespace FourSlashInterface {
             this.state.printNavigationBar();
         }
 
-        public printReferences() {
-            this.state.printReferences();
-        }
-
         public printContext() {
             this.state.printContext();
         }
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index 28474839cf3..cd1477c4448 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -5,6 +5,10 @@ namespace ts.FindAllReferences {
         return getReferencedSymbolsForNode(typeChecker, cancellationToken, node, sourceFiles, findInStrings, findInComments, isForRename);
     }
 
+    export function convertReferences(referenceSymbols: ReferencedSymbol[]): ReferenceEntry[] {
+        return referenceSymbols && flatMap(referenceSymbols, r => r.references);
+    }
+
     export function getReferencedSymbolsForNode(typeChecker: TypeChecker, cancellationToken: CancellationToken, node: Node, sourceFiles: SourceFile[], findInStrings?: boolean, findInComments?: boolean, isForRename?: boolean, implementations?: boolean): ReferencedSymbol[] | undefined {
         if (!implementations) {
             const special = getReferencedSymbolsSpecial(node, sourceFiles, typeChecker, cancellationToken);
@@ -411,7 +415,6 @@ namespace ts.FindAllReferences {
             textSpan: createTextSpan(0, 1),
             displayParts: [{ text: name, kind: ScriptElementKind.keyword }]
         }
-
         const references: ReferenceEntry[] = [];
         for (const sourceFile of sourceFiles) {
             cancellationToken.throwIfCancellationRequested();
@@ -1316,20 +1319,6 @@ namespace ts.FindAllReferences {
         return meaning;
     }
 
-    export function convertReferences(referenceSymbols: ReferencedSymbol[]): ReferenceEntry[] {
-        if (!referenceSymbols) {
-            return undefined;
-        }
-
-        const referenceEntries: ReferenceEntry[] = [];
-
-        for (const referenceSymbol of referenceSymbols) {
-            addRange(referenceEntries, referenceSymbol.references);
-        }
-
-        return referenceEntries;
-    }
-
     function isImplementation(node: Node): boolean {
         if (!node) {
             return false;
diff --git a/src/services/services.ts b/src/services/services.ts
index b3e3093cddb..b83995e31ed 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1415,7 +1415,6 @@ namespace ts {
 
         function findReferences(fileName: string, position: number): ReferencedSymbol[] {
             const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false, /*isForRename*/false);
-
             // Only include referenced symbols that have a valid definition.
             return filter(referencedSymbols, rs => !!rs.definition);
         }
@@ -2015,9 +2014,5 @@ namespace ts {
         throw new Error("getDefaultLibFilePath is only supported when consumed as a node module. ");
     }
 
-    function initializeServices() {
-        objectAllocator = getServicesObjectAllocator();
-    }
-
-    initializeServices();
+    objectAllocator = getServicesObjectAllocator();
 }
diff --git a/tests/cases/fourslash/ambientShorthandFindAllRefs.ts b/tests/cases/fourslash/ambientShorthandFindAllRefs.ts
index 2f0dbf914e7..06bc6e94782 100644
--- a/tests/cases/fourslash/ambientShorthandFindAllRefs.ts
+++ b/tests/cases/fourslash/ambientShorthandFindAllRefs.ts
@@ -4,9 +4,18 @@
 ////declare module "jquery";
 
 // @Filename: user.ts
-////import {[|x|]} from "jquery";
+////import {[|{| "isWriteAccess": true, "isDefinition": true |}x|]} from "jquery";
 
 // @Filename: user2.ts
-////import {[|x|]} from "jquery";
+////import {[|{| "isWriteAccess": true, "isDefinition": true |}x|]} from "jquery";
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [
+    { definition: "import x", ranges: [r0] },
+    { definition: 'module "jquery"', ranges: [r1] }
+]);
+verify.referenceGroups(r1, [
+    { definition: 'module "jquery"', ranges: [r0] },
+    { definition: "import x", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts b/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts
index d3d18b2dabb..8f80c871eb3 100644
--- a/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts
+++ b/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts
@@ -7,7 +7,7 @@
 ////
 ////    }
 ////
-////    public /**/[|start|](){
+////    public /**/[|{| "isWriteAccess": true, "isDefinition": true |}start|](){
 ////        return this;
 ////    }
 ////
@@ -23,11 +23,21 @@
 ////second.[|start|]();
 ////second.stop();
 
-verify.rangesReferenceEachOther();
+checkRefs();
 
 cancellation.setCancelled();
-verifyOperationIsCancelled(() => verify.rangesReferenceEachOther());
+verifyOperationIsCancelled(checkRefs);
 
 // verify that internal state is still correct
 cancellation.resetCancelled();
-verify.rangesReferenceEachOther();
+checkRefs();
+
+function checkRefs() {
+    const ranges = test.ranges();
+    const [r0, r1] = ranges;
+    verify.referenceGroups(r0, [{ definition: "(method) Test.start(): this", ranges }]);
+    verify.referenceGroups(r1, [
+        { definition: "(method) Second.Test.start(): Second.Test", ranges: [r0] },
+        { definition: "(method) Second.Test.start(): Second.Test", ranges: [r1] }
+    ]);
+}
diff --git a/tests/cases/fourslash/findAllReferencesOfConstructor.ts b/tests/cases/fourslash/findAllReferencesOfConstructor.ts
index b25508a60db..dcdc23bdc7f 100644
--- a/tests/cases/fourslash/findAllReferencesOfConstructor.ts
+++ b/tests/cases/fourslash/findAllReferencesOfConstructor.ts
@@ -41,6 +41,6 @@
 ////class d extends a.C { constructor() { [|super|](); }
 
 const ranges = test.ranges();
-for (const ctr of ranges.slice(0, 3)) {
-    verify.referencesOf(ctr, ranges);
-}
+const [r0, r1, r2] = ranges;
+verify.referenceGroups([r0, r2], [{ definition: "constructor C(n: number): C (+1 overload)", ranges }]);
+verify.referenceGroups(r1, [{ definition: "constructor C(): C (+1 overload)", ranges }]);
diff --git a/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts b/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts
index 77479bad113..bb8b62a1462 100644
--- a/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts
+++ b/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts
@@ -5,4 +5,4 @@
 ////    [|constructor|](){}
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("constructor C(n: number): C");
diff --git a/tests/cases/fourslash/findAllRefsForComputedProperties.ts b/tests/cases/fourslash/findAllRefsForComputedProperties.ts
index 065d34c6fc5..72c49104ded 100644
--- a/tests/cases/fourslash/findAllRefsForComputedProperties.ts
+++ b/tests/cases/fourslash/findAllRefsForComputedProperties.ts
@@ -1,16 +1,26 @@
 /// <reference path='fourslash.ts'/>
 
-
 ////interface I {
-////    ["[|prop1|]"]: () => void;
+////    ["[|{| "isDefinition": true |}prop1|]"]: () => void;
 ////}
 ////
 ////class C implements I {
-////    ["[|prop1|]"]: any;
+////    ["[|{| "isDefinition": true |}prop1|]"]: any;
 ////}
 ////
 ////var x: I = {
-////    ["[|prop1|]"]: function () { },
+////    ["[|{| "isDefinition": true |}prop1|]"]: function () { },
 ////}
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(r0, [{ definition: '(property) I[["prop1"]]: () => void', ranges }]);
+verify.referenceGroups(r1, [
+    { definition: '(property) I[["prop1"]]: () => void', ranges: [r0, r2] },
+    { definition: '(property) C[["prop1"]]: any', ranges: [r1] }
+]);
+verify.referenceGroups(r2, [
+    { definition: '(property) I[["prop1"]]: () => void', ranges: [r0, r1] },
+    { definition: '(property) ["prop1"]: () => void', ranges: [r2] }
+]);
+
diff --git a/tests/cases/fourslash/findAllRefsForComputedProperties2.ts b/tests/cases/fourslash/findAllRefsForComputedProperties2.ts
index 37a9bd8470e..4a7a17047ec 100644
--- a/tests/cases/fourslash/findAllRefsForComputedProperties2.ts
+++ b/tests/cases/fourslash/findAllRefsForComputedProperties2.ts
@@ -1,15 +1,25 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface I {
-////    [[|42|]](): void;
+////    [[|{| "isDefinition": true |}42|]](): void;
 ////}
 ////
 ////class C implements I {
-////    [[|42|]]: any;
+////    [[|{| "isDefinition": true |}42|]]: any;
 ////}
 ////
 ////var x: I = {
-////    ["[|42|]"]: function () { }
+////    ["[|{| "isDefinition": true |}42|]"]: function () { }
 ////}
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) I[[42]](): void", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) I[[42]](): void", ranges: [r0, r2] },
+    { definition:  "(property) C[[42]]: any", ranges: [r1] }
+]);
+verify.referenceGroups(r2, [
+    { definition: "(method) I[[42]](): void", ranges: [r0, r1] },
+    { definition: '(property) ["42"]: () => void', ranges: [r2] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport.ts b/tests/cases/fourslash/findAllRefsForDefaultExport.ts
index a27227b907a..c518bb8f59e 100644
--- a/tests/cases/fourslash/findAllRefsForDefaultExport.ts
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport.ts
@@ -1,11 +1,11 @@
 /// <reference path="fourslash.ts" />
 
 // @Filename: a.ts
-////export default function /*def*/[|f|]() {}
+////export default function /*def*/[|{| "isWriteAccess": true, "isDefinition": true |}f|]() {}
 
 // @Filename: b.ts
-////import [|g|] from "./a";
+////import [|{| "isWriteAccess": true, "isDefinition": true |}g|] from "./a";
 /////*ref*/[|g|]();
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("function f(): void");
 verify.goToDefinition("ref", "def");
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport01.ts b/tests/cases/fourslash/findAllRefsForDefaultExport01.ts
index 39079294a3b..c04550e54f3 100644
--- a/tests/cases/fourslash/findAllRefsForDefaultExport01.ts
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport01.ts
@@ -1,10 +1,13 @@
 /// <reference path='fourslash.ts'/>
 
-////export default class [|DefaultExportedClass|] {
+////export default class [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedClass|] {
 ////}
 ////
 ////var x: [|DefaultExportedClass|];
 ////
 ////var y = new [|DefaultExportedClass|];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups([r0, r1], [{ definition: "class DefaultExportedClass", ranges }]);
+verify.referenceGroups(r2, [{ definition: "constructor DefaultExportedClass(): DefaultExportedClass", ranges }]);
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport02.ts b/tests/cases/fourslash/findAllRefsForDefaultExport02.ts
index 19f31ece9b0..558bbd2de85 100644
--- a/tests/cases/fourslash/findAllRefsForDefaultExport02.ts
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport02.ts
@@ -1,11 +1,22 @@
 /// <reference path='fourslash.ts'/>
 
-////export default function [|DefaultExportedFunction|]() {
-////    return [|DefaultExportedFunction|]
+////export default function [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedFunction|]() {
+////    return [|DefaultExportedFunction|];
 ////}
 ////
 ////var x: typeof [|DefaultExportedFunction|];
 ////
 ////var y = [|DefaultExportedFunction|]();
+////
+////namespace [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedFunction|] {
+////}
 
-verify.rangesReferenceEachOther();
+
+const ranges = test.ranges();
+const [r0, r1, r2, r3, r4] = ranges;
+const fnRanges = [r0, r1, r2, r3];
+verify.singleReferenceGroup("function DefaultExportedFunction(): () => typeof DefaultExportedFunction", fnRanges);
+
+// The namespace and function do not merge,
+// so the namespace should be all alone.
+verify.singleReferenceGroup("namespace DefaultExportedFunction", [r4]);
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport03.ts b/tests/cases/fourslash/findAllRefsForDefaultExport03.ts
index b9bbfa14a64..d94043f4016 100644
--- a/tests/cases/fourslash/findAllRefsForDefaultExport03.ts
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport03.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
-////function [|f|]() {
+////function [|{| "isWriteAccess": true, "isDefinition": true |}f|]() {
 ////    return 100;
 ////}
 ////
@@ -10,8 +10,11 @@
 ////
 ////var y = [|f|]();
 ////
-////namespace [|f|] {
+////namespace [|{| "isWriteAccess": true, "isDefinition": true |}f|] {
 ////    var local = 100;
 ////}
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3, r4] = ranges;
+verify.referenceGroups([r0, r3], [{ definition: "function f(): number\nnamespace f", ranges }]);
+verify.referenceGroups([r1, r2, r4], [{ definition: "namespace f\nfunction f(): number", ranges }]);
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport04.ts b/tests/cases/fourslash/findAllRefsForDefaultExport04.ts
deleted file mode 100644
index 44b7ee0a06f..00000000000
--- a/tests/cases/fourslash/findAllRefsForDefaultExport04.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/// <reference path='fourslash.ts'/>
-
-////function f() {
-////    return 100;
-////}
-////
-////export default [|f|];
-////
-////var x: typeof f;
-////
-////var y = f();
-////
-////namespace /**/[|f|] {
-////}
-
-// The function 'f' and the namespace 'f' don't get merged,
-// but the 'export default' site, includes both meanings.
-
-// Here we are testing whether the 'export default'
-// site is included in the references to the namespace.
-
-goTo.marker();
-verify.referencesAre(test.ranges());
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport05.ts b/tests/cases/fourslash/findAllRefsForDefaultExport05.ts
deleted file mode 100644
index 0f06792458d..00000000000
--- a/tests/cases/fourslash/findAllRefsForDefaultExport05.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/// <reference path='fourslash.ts'/>
-
-////function /**/[|f|]() {
-////    return 100;
-////}
-////
-////export default [|f|];
-////
-////var x: typeof [|f|];
-////
-////var y = [|f|]();
-////
-////namespace f {
-////}
-
-// The function 'f' and the namespace 'f' don't get merged,
-// but the 'export default' site, includes both meanings.
-
-// Here we are testing whether the 'export default' site
-// and all value-uses of 'f' are included in the references to the function.
-
-goTo.marker();
-verify.referencesAre(test.ranges());
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport06.ts b/tests/cases/fourslash/findAllRefsForDefaultExport06.ts
deleted file mode 100644
index cdd9b4f980c..00000000000
--- a/tests/cases/fourslash/findAllRefsForDefaultExport06.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/// <reference path='fourslash.ts'/>
-
-////function [|f|]() {
-////    return 100;
-////}
-////
-////export default /**/[|f|];
-////
-////var x: typeof [|f|];
-////
-////var y = [|f|]();
-////
-////namespace [|f|] {
-////}
-
-// The function 'f' and the namespace 'f' don't get merged,
-// but the 'export default' site, includes both meanings.
-
-// Here we are testing whether the 'export default' site
-// and all value-uses of 'f' are included in the references to the function.
-
-goTo.marker();
-verify.referencesAre(test.ranges());
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport07.ts b/tests/cases/fourslash/findAllRefsForDefaultExport07.ts
deleted file mode 100644
index 88d0a775026..00000000000
--- a/tests/cases/fourslash/findAllRefsForDefaultExport07.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/// <reference path='fourslash.ts'/>
-
-////export default function DefaultExportedFunction() {
-////    return DefaultExportedFunction
-////}
-////
-////var x: typeof DefaultExportedFunction;
-////
-////var y = DefaultExportedFunction();
-////
-////namespace [|DefaultExportedFunction|] {
-////}
-
-// The namespace and function do not merge,
-// so the namespace should be all alone.
-verify.rangesReferenceEachOther();
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport08.ts b/tests/cases/fourslash/findAllRefsForDefaultExport08.ts
index b7ae7f4d534..b29060f6099 100644
--- a/tests/cases/fourslash/findAllRefsForDefaultExport08.ts
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport08.ts
@@ -7,10 +7,9 @@
 ////
 ////var y = new DefaultExportedClass;
 ////
-////namespace [|DefaultExportedClass|] {
+////namespace [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedClass|] {
 ////}
 
 // The namespace and class do not merge,
 // so the namespace should be all alone.
-
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("namespace DefaultExportedClass");
diff --git a/tests/cases/fourslash/findAllRefsForFunctionExpression01.ts b/tests/cases/fourslash/findAllRefsForFunctionExpression01.ts
index 35d5c45e3d9..15ff0aca5cb 100644
--- a/tests/cases/fourslash/findAllRefsForFunctionExpression01.ts
+++ b/tests/cases/fourslash/findAllRefsForFunctionExpression01.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 // @Filename: file1.ts
-////var foo = function [|foo|](a = [|foo|](), b = () => [|foo|]) {
+////var foo = function [|{| "isWriteAccess": true, "isDefinition": true |}foo|](a = [|foo|](), b = () => [|foo|]) {
 ////    [|foo|]([|foo|], [|foo|]);
 ////}
 
@@ -9,4 +9,4 @@
 /////// <reference path="file1.ts" />
 ////foo();
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(local function) foo(a?: void, b?: () => (a?: void, b?: any) => void): void");
diff --git a/tests/cases/fourslash/findAllRefsForMappedType.ts b/tests/cases/fourslash/findAllRefsForMappedType.ts
index 38fb3a226c6..a841c7e6e46 100644
--- a/tests/cases/fourslash/findAllRefsForMappedType.ts
+++ b/tests/cases/fourslash/findAllRefsForMappedType.ts
@@ -1,9 +1,19 @@
 /// <reference path='fourslash.ts'/>
 
-////interface T { [|a|]: number };
+////interface T { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: number };
 ////type U = { [K in keyof T]: string };
 ////type V = { [K in keyof U]: boolean };
-////const u: U = { [|a|]: "" }
-////const v: V = { [|a|]: true }
+////const u: U = { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: "" }
+////const v: V = { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: true }
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(r0, [{ definition: "(property) T.a: number", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(property) T.a: number", ranges: [r0, r2] },
+    { definition: "(property) a: string", ranges: [r1] }
+]);
+verify.referenceGroups(r2, [
+    { definition: "(property) T.a: number", ranges: [r0, r1] },
+    { definition: "(property) a: boolean", ranges: [r2] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsForObjectLiteralProperties.ts b/tests/cases/fourslash/findAllRefsForObjectLiteralProperties.ts
index cea4db81ea1..125a11f19c4 100644
--- a/tests/cases/fourslash/findAllRefsForObjectLiteralProperties.ts
+++ b/tests/cases/fourslash/findAllRefsForObjectLiteralProperties.ts
@@ -1,11 +1,17 @@
 /// <reference path='fourslash.ts'/>
 
 ////var x = {
-////    [|property|]: {}
+////    [|{| "isWriteAccess": true, "isDefinition": true |}property|]: {}
 ////};
 ////
 ////x.[|property|];
 ////
 ////let {[|property|]: pVar} = x;
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(r0, [{ definition: "(property) property: {}", ranges }]);
+verify.referenceGroups([r1, r2], [
+    { definition: "(property) property: {}", ranges: [r0] },
+    { definition: "(property) property: {}", ranges: [r1, r2] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsForObjectSpread.ts b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
index 05c83491f66..a65f18ef57c 100644
--- a/tests/cases/fourslash/findAllRefsForObjectSpread.ts
+++ b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
@@ -1,14 +1,21 @@
 /// <reference path='fourslash.ts'/>
 
-////interface A1 { [|a|]: string };
-////interface A2 { [|a|]?: number };
+////interface A1 { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: string };
+////interface A2 { [|{| "isWriteAccess": true, "isDefinition": true |}a|]?: number };
 ////let a1: A1;
 ////let a2: A2;
 ////let a12 = { ...a1, ...a2 };
 ////a12.[|a|];
 const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+
 // members of spread types only refer to themselves and the resulting property
-verify.referencesOf(ranges[0], [ranges[0], ranges[2]]);
-verify.referencesOf(ranges[1], [ranges[1], ranges[2]]);
+verify.referenceGroups(r0, [{ definition: "(property) A1.a: string", ranges: [r0, r2] }]);
+verify.referenceGroups(r1, [{ definition: "(property) A2.a: number", ranges: [r1, r2] }]);
+
 // but the resulting property refers to everything
-verify.referencesOf(ranges[2], ranges);
+verify.referenceGroups(r2, [
+    { definition: "(property) A1.a: string", ranges: [r0] },
+    { definition: "(property) A2.a: number", ranges: [r1] },
+    { definition: "(property) a: string | number", ranges: [r2] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsForRest.ts b/tests/cases/fourslash/findAllRefsForRest.ts
index 65d6a3c60e3..026451d68b8 100644
--- a/tests/cases/fourslash/findAllRefsForRest.ts
+++ b/tests/cases/fourslash/findAllRefsForRest.ts
@@ -1,11 +1,11 @@
 /// <reference path='fourslash.ts'/>
 ////interface Gen {
 ////    x: number
-////    [|parent|]: Gen;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}parent|]: Gen;
 ////    millenial: string;
 ////}
 ////let t: Gen;
 ////var { x, ...rest } = t;
 ////rest.[|parent|];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) Gen.parent: Gen");
diff --git a/tests/cases/fourslash/findAllRefsForStringLiteralTypes.ts b/tests/cases/fourslash/findAllRefsForStringLiteralTypes.ts
index 45e981d8a84..e450102c127 100644
--- a/tests/cases/fourslash/findAllRefsForStringLiteralTypes.ts
+++ b/tests/cases/fourslash/findAllRefsForStringLiteralTypes.ts
@@ -3,4 +3,4 @@
 ////type Options = "[|option 1|]" | "option 2";
 ////let myOption: Options = "[|option 1|]";
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup('"option 1"');
diff --git a/tests/cases/fourslash/findAllRefsForUMDModuleAlias1.ts b/tests/cases/fourslash/findAllRefsForUMDModuleAlias1.ts
index 4177e154532..99ca347eac4 100644
--- a/tests/cases/fourslash/findAllRefsForUMDModuleAlias1.ts
+++ b/tests/cases/fourslash/findAllRefsForUMDModuleAlias1.ts
@@ -4,10 +4,10 @@
 //// export function doThing(): string;
 //// export function doTheOtherThing(): void;
 
-//// export as namespace [|myLib|];
+//// export as namespace [|{| "isWriteAccess": true, "isDefinition": true |}myLib|];
 
 // @Filename: 1.ts
 //// /// <reference path="0.d.ts" />
 //// [|myLib|].doThing();
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("export namespace myLib");
diff --git a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts
index dd8fb1026c4..d40cb009f1e 100644
--- a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts
+++ b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts
@@ -1,6 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
-////var [|Base|] = class { };
+////var [|{| "isWriteAccess": true, "isDefinition": true |}Base|] = class { };
 ////class C extends [|Base|] { }
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var Base: typeof (Anonymous class)");
diff --git a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts
index 3fc41358dfd..5685df0c4e1 100644
--- a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts
+++ b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts
@@ -1,9 +1,9 @@
 /// <reference path="fourslash.ts"/>
 
-////interface [|Base|] { }
+////interface [|{| "isWriteAccess": true, "isDefinition": true |}Base|] { }
 ////namespace n {
 ////    var Base = class { };
 ////    interface I extends [|Base|] { }
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("interface Base");
diff --git a/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts b/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts
index f8326eade58..419b828d0b3 100644
--- a/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts
+++ b/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts
@@ -3,5 +3,4 @@
 ////var Base = class { };
 ////class C extends Base implements /**/Base { }
 
-goTo.marker();
-verify.referencesAre([]);
+verify.noReferences("");
diff --git a/tests/cases/fourslash/findAllRefsInClassExpression.ts b/tests/cases/fourslash/findAllRefsInClassExpression.ts
index f874bcbcb5c..b83d8992b4f 100644
--- a/tests/cases/fourslash/findAllRefsInClassExpression.ts
+++ b/tests/cases/fourslash/findAllRefsInClassExpression.ts
@@ -1,8 +1,14 @@
 /// <reference path='fourslash.ts'/>
 
-////interface I { [|boom|](): void; }
+////interface I { [|{| "isWriteAccess": true, "isDefinition": true |}boom|](): void; }
 ////new class C implements I {
-////   [|boom|](){}
+////   [|{| "isWriteAccess": true, "isDefinition": true |}boom|](){}
 ////}
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) I.boom(): void", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) I.boom(): void", ranges: [r0] },
+    { definition: "(method) C.boom(): void", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties1.ts b/tests/cases/fourslash/findAllRefsInheritedProperties1.ts
index 358ba3f249d..41acc117f9e 100644
--- a/tests/cases/fourslash/findAllRefsInheritedProperties1.ts
+++ b/tests/cases/fourslash/findAllRefsInheritedProperties1.ts
@@ -1,8 +1,8 @@
 /// <reference path='fourslash.ts'/>
 
 //// class class1 extends class1 {
-////    [|doStuff|]() { }
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 ////
 //// var v: class1;
@@ -10,7 +10,9 @@
 //// v.[|propName|];
 
 const [r0, r1, r2, r3] = test.ranges();
-verify.referencesOf(r0, [r0, r2]);
-verify.referencesOf(r1, [r1, r3]);
-verify.referencesOf(r2, [r0, r2]);
-verify.referencesOf(r3, [r1, r3]);
+verify.referenceGroups(r0, [{ definition: "(method) class1.doStuff(): void", ranges: [r0, r2] }]);
+verify.referenceGroups(r2, [
+    { definition: "(method) class1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) class1.doStuff(): void", ranges: [r2] }
+]);
+verify.singleReferenceGroup("(property) class1.propName: string", [r1, r3]);
diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties2.ts b/tests/cases/fourslash/findAllRefsInheritedProperties2.ts
index 9fe36fbb48e..23badd64d48 100644
--- a/tests/cases/fourslash/findAllRefsInheritedProperties2.ts
+++ b/tests/cases/fourslash/findAllRefsInheritedProperties2.ts
@@ -1,8 +1,8 @@
 /// <reference path='fourslash.ts'/>
 
 //// interface interface1 extends interface1 {
-////    [|doStuff|](): void;   // r0
-////    [|propName|]: string;  // r1
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;   // r0
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;  // r1
 //// }
 ////
 //// var v: interface1;
@@ -10,7 +10,5 @@
 //// v.[|propName|];   // r3
 
 const [r0, r1, r2, r3] = test.ranges();
-verify.referencesOf(r0, [r0, r2]);
-verify.referencesOf(r1, [r1, r3]);
-verify.referencesOf(r2, [r0, r2]);
-verify.referencesOf(r3, [r1, r3]);
+verify.singleReferenceGroup("(method) interface1.doStuff(): void", [r0, r2]);
+verify.singleReferenceGroup("(property) interface1.propName: string", [r1, r3]);
diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties3.ts b/tests/cases/fourslash/findAllRefsInheritedProperties3.ts
index 772fb78a2e8..cc82e4a4e44 100644
--- a/tests/cases/fourslash/findAllRefsInheritedProperties3.ts
+++ b/tests/cases/fourslash/findAllRefsInheritedProperties3.ts
@@ -1,28 +1,40 @@
 /// <reference path='fourslash.ts'/>
 
 //// class class1 extends class1 {
-////     [|doStuff|]() { }     // r0
-////     [|propName|]: string; // r1
+////     [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { }     // r0
+////     [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; // r1
 //// }
 //// interface interface1 extends interface1 {
-////     [|doStuff|](): void;   // r2
-////     [|propName|]: string;  // r3
+////     [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;   // r2
+////     [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;  // r3
 //// }
 //// class class2 extends class1 implements interface1 {
-////     [|doStuff|]() { }      // r4
-////     [|propName|]: string;  // r5
+////     [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { }      // r4
+////     [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;  // r5
 //// }
-//// 
+////
 //// var v: class2;
-//// v.[|propName|];   // r6
-//// v.[|doStuff|]();  // r7
+//// v.[|doStuff|]();  // r6
+//// v.[|propName|];   // r7
 
 const [r0, r1, r2, r3, r4, r5, r6, r7] = test.ranges();
-verify.referencesOf(r0, [r0, r4, r7]);
-verify.referencesOf(r1, [r1, r5, r6]);
-verify.referencesOf(r2, [r2, r4, r7]);
-verify.referencesOf(r3, [r3, r5, r6]);
-verify.referencesOf(r4, [r0, r2, r4, r7]);
-verify.referencesOf(r5, [r1, r3, r5, r6]);
-verify.referencesOf(r6, [r1, r3, r5, r6]);
-verify.referencesOf(r7, [r0, r2, r4, r7]);
+verify.referenceGroups(r0, [{ definition: "(method) class1.doStuff(): void", ranges: [r0, r4, r6] }]);
+verify.referenceGroups(r1, [{ definition: "(property) class1.propName: string", ranges: [r1, r5, r7] }]);
+verify.referenceGroups(r2, [{ definition: "(method) interface1.doStuff(): void", ranges: [r2, r4, r6] }]);
+verify.referenceGroups(r3, [{ definition: "(property) interface1.propName: string", ranges: [r3, r5, r7] }]);
+verify.referenceGroups(r4, [
+    { definition: "(method) class1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface1.doStuff(): void", ranges: [r2] },
+    { definition: "(method) class2.doStuff(): void", ranges: [r4, r6] }
+]);
+verify.referenceGroups([r5, r7], [
+    { definition: "(property) class1.propName: string", ranges: [r1] },
+    { definition: "(property) interface1.propName: string", ranges: [r3] },
+    { definition: "(property) class2.propName: string", ranges: [r5, r7] }
+]);
+verify.referenceGroups(r6, [
+    { definition: "(method) class1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface1.doStuff(): void", ranges: [r2] },
+    { definition: "(method) class2.doStuff(): void", ranges: [r4] },
+    { definition: "(method) class2.doStuff(): void", ranges: [r6] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties4.ts b/tests/cases/fourslash/findAllRefsInheritedProperties4.ts
index 1ecb85bfae1..e2d8887bbe8 100644
--- a/tests/cases/fourslash/findAllRefsInheritedProperties4.ts
+++ b/tests/cases/fourslash/findAllRefsInheritedProperties4.ts
@@ -1,12 +1,12 @@
 /// <reference path='fourslash.ts'/>
 
 //// interface C extends D {
-////     [|prop0|]: string;  // r0
-////     [|prop1|]: number;  // r1
+////     [|{| "isWriteAccess": true, "isDefinition": true |}prop0|]: string;  // r0
+////     [|{| "isWriteAccess": true, "isDefinition": true |}prop1|]: number;  // r1
 //// }
 ////
 //// interface D extends C {
-////     [|prop0|]: string;  // r2
+////     [|{| "isWriteAccess": true, "isDefinition": true |}prop0|]: string;  // r2
 //// }
 ////
 //// var d: D;
@@ -14,8 +14,9 @@
 //// d.[|prop1|];  // r4
 
 const [r0, r1, r2, r3, r4] = test.ranges();
-verify.referencesOf(r0, [r0, r2, r3]);
-verify.referencesOf(r1, [r1]);
-verify.referencesOf(r2, [r0, r2, r3]);
-verify.referencesOf(r3, [r0, r2, r3]);
-verify.referencesOf(r4, []);
+verify.referenceGroups([r0, r2, r3], [
+    { definition: "(property) C.prop0: string", ranges: [r0] },
+    { definition: "(property) D.prop0: string", ranges: [r2, r3] }
+]);
+verify.singleReferenceGroup("(property) C.prop1: number", [r1]);
+verify.noReferences(r4);
diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties5.ts b/tests/cases/fourslash/findAllRefsInheritedProperties5.ts
index 6d6dbb392bf..c534a9d6aab 100644
--- a/tests/cases/fourslash/findAllRefsInheritedProperties5.ts
+++ b/tests/cases/fourslash/findAllRefsInheritedProperties5.ts
@@ -1,12 +1,12 @@
 /// <reference path='fourslash.ts'/>
 
 //// class C extends D {
-////     [|prop0|]: string;  // r0
-////     [|prop1|]: number;  // r1
+////     [|{| "isWriteAccess": true, "isDefinition": true |}prop0|]: string;  // r0
+////     [|{| "isWriteAccess": true, "isDefinition": true |}prop1|]: number;  // r1
 //// }
 ////
 //// class D extends C {
-////     [|prop0|]: string;  // r2
+////     [|{| "isWriteAccess": true, "isDefinition": true |}prop0|]: string;  // r2
 //// }
 ////
 //// var d: D;
@@ -14,8 +14,7 @@
 //// d.[|prop1|];  // r4
 
 const [r0, r1, r2, r3, r4] = test.ranges();
-verify.referencesOf(r0, [r0]);
-verify.referencesOf(r1, [r1]);
-verify.referencesOf(r2, [r2, r3]);
-verify.referencesOf(r3, [r2, r3]);
-verify.referencesOf(r4, []);
+verify.singleReferenceGroup("(property) C.prop0: string", [r0]);
+verify.singleReferenceGroup("(property) C.prop1: number", [r1]);
+verify.singleReferenceGroup("(property) D.prop0: string", [r2, r3]);
+verify.noReferences(r4);
diff --git a/tests/cases/fourslash/findAllRefsInsideTemplates1.ts b/tests/cases/fourslash/findAllRefsInsideTemplates1.ts
index 9ab4c624230..8d41961c6fd 100644
--- a/tests/cases/fourslash/findAllRefsInsideTemplates1.ts
+++ b/tests/cases/fourslash/findAllRefsInsideTemplates1.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
-////var [|x|] = 10;
+////var [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 10;
 ////var y = `${ [|x|] } ${ [|x|] }`
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var x: number");
diff --git a/tests/cases/fourslash/findAllRefsInsideTemplates2.ts b/tests/cases/fourslash/findAllRefsInsideTemplates2.ts
index 63265eb944b..24a4a7c131b 100644
--- a/tests/cases/fourslash/findAllRefsInsideTemplates2.ts
+++ b/tests/cases/fourslash/findAllRefsInsideTemplates2.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
-////function [|f|](...rest: any[]) { }
+////function [|{| "isWriteAccess": true, "isDefinition": true |}f|](...rest: any[]) { }
 ////[|f|] `${ [|f|] } ${ [|f|] }`
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("function f(...rest: any[]): void");
diff --git a/tests/cases/fourslash/findAllRefsInsideWithBlock.ts b/tests/cases/fourslash/findAllRefsInsideWithBlock.ts
index c95925ff863..52936248095 100644
--- a/tests/cases/fourslash/findAllRefsInsideWithBlock.ts
+++ b/tests/cases/fourslash/findAllRefsInsideWithBlock.ts
@@ -1,12 +1,12 @@
 /// <reference path='fourslash.ts'/>
 
-////var [|x|] = 0;
+////var [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 0;
 ////
 ////with ({}) {
 ////    var y = x;  // Reference of x here should not be picked
 ////    /*2*/y++;        // also reference for y should be ignored
 ////}
 ////
-////[|x|] = [|x|] + 1;
+////[|{| "isWriteAccess": true |}x|] = [|x|] + 1;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var x: number");
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts
index 895b2168b23..d11bcee506f 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts
@@ -1,11 +1,11 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface I {
-////    [|property1|]: number;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number;
 ////    property2: string;
 ////}
 ////
 ////var foo: I;
 ////var { [|property1|]: prop1 } = foo;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) I.property1: number");
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts
index 67a31f33d1e..6ad98df9cd8 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts
@@ -1,11 +1,11 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface I {
-////    [|property1|]: number;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number;
 ////    property2: string;
 ////}
 ////
 ////var foo: I;
 ////var { [|property1|]: {} } = foo;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) I.property1: number");
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts
index 40ecf0139a7..520dbc8e1e4 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts
@@ -1,11 +1,17 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface I {
-////    [|property1|]: number;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number;
 ////    property2: string;
 ////}
 ////
 ////var foo: I;
-////var [{ [|property1|]: prop1 }, { [|property1|], property2 } ] = [foo, foo];
+////var [{ [|property1|]: prop1 }, { [|{| "isWriteAccess": true, "isDefinition": true |}property1|], property2 } ] = [foo, foo];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups([r0, r1], [{ definition: "(property) I.property1: number", ranges }]);
+verify.referenceGroups(r2, [
+    { definition: "(property) I.property1: number", ranges: [r0, r1] },
+    { definition: "var property1: number", ranges: [r2] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
index 5696d242fed..f25fff9da23 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
@@ -1,15 +1,22 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface I {
-////    [|property1|]: number;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number;
 ////    property2: string;
 ////}
 ////
 ////function f({ [|property1|]: p1 }: I,
-////           { [|property1|] }: I,
+////           { [|{| "isWriteAccess": true, "isDefinition": true |}property1|] }: I,
 ////           { property1: p2 }) {
 ////
 ////    return [|property1|] + 1;
 ////}
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups([r0, r1], [{ definition: "(property) I.property1: number", ranges }]);
+verify.referenceGroups([r2, r3], [
+    { definition: "(property) I.property1: number", ranges: [r0, r1] },
+    { definition: "var property1: number", ranges: [r2, r3] }
+]);
+
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
index e33c73ff838..f4e7bd70f7a 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
@@ -10,4 +10,4 @@
 ////}
 
 goTo.marker();
-verify.referencesAre([]);
\ No newline at end of file
+verify.noReferences("");
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
index 8be45ac87e6..c589dccacbc 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
@@ -1,22 +1,29 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface I {
-////    [|property1|]: number;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number;
 ////    property2: string;
 ////}
 ////
 ////var elems: I[];
 ////for (let { [|property1|]: p } of elems) {
 ////}
-////for (let { [|property1|] } of elems) {
+////for (let { [|{| "isWriteAccess": true, "isDefinition": true |}property1|] } of elems) {
 ////}
 ////for (var { [|property1|]: p1 } of elems) {
 ////}
 ////var p2;
-////for ({ [|property1|] : p2 } of elems) {
+////for ({ [|{| "isWriteAccess": true, "isDefinition": true |}property1|] : p2 } of elems) {
 ////}
 
-// Note: if this test ever changes, consider updating
-//       'quickInfoForObjectBindingElementPropertyName05.ts'
-
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3, r4] = ranges;
+verify.referenceGroups([r0, r1, r3], [{ definition: "(property) I.property1: number", ranges }]);
+verify.referenceGroups(r2, [
+    { definition: "(property) I.property1: number", ranges: [r0, r1, r3, r4] },
+    { definition: "let property1: number", ranges: [r2] }
+]);
+verify.referenceGroups(r4, [
+    { definition: "(property) I.property1: number", ranges: [r0, r1, r2, r3] },
+    { definition: "(property) property1: I", ranges: [r4] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts
index 96f414dc060..f9415ab6a81 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts
@@ -2,6 +2,12 @@
 
 ////let p, b;
 ////
-////p, [{ [|a|]: p, b }] = [{ [|a|]: 10, b: true }];
+////p, [{ [|{| "isWriteAccess": true, "isDefinition": true |}a|]: p, b }] = [{ [|{| "isWriteAccess": true, "isDefinition": true |}a|]: 10, b: true }];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(property) a: any", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(property) a: any", ranges: [r0] },
+    { definition: "(property) a: number", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
deleted file mode 100644
index 5696d242fed..00000000000
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/// <reference path='fourslash.ts'/>
-
-////interface I {
-////    [|property1|]: number;
-////    property2: string;
-////}
-////
-////function f({ [|property1|]: p1 }: I,
-////           { [|property1|] }: I,
-////           { property1: p2 }) {
-////
-////    return [|property1|] + 1;
-////}
-
-verify.rangesReferenceEachOther();
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
index 6ffa4b03b68..1c79d326dbc 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
@@ -1,11 +1,11 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface Recursive {
-////    [|next|]?: Recursive;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}next|]?: Recursive;
 ////    value: any;
 ////}
 ////
 ////function f ({ [|next|]: { [|next|]: x} }: Recursive) {
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) Recursive.next: Recursive");
diff --git a/tests/cases/fourslash/findAllRefsOfConstructor_withModifier.ts b/tests/cases/fourslash/findAllRefsOfConstructor_withModifier.ts
index 0954945a546..061903e703d 100644
--- a/tests/cases/fourslash/findAllRefsOfConstructor_withModifier.ts
+++ b/tests/cases/fourslash/findAllRefsOfConstructor_withModifier.ts
@@ -6,5 +6,4 @@
 ////var x = new [|X|]();
 
 const ranges = test.ranges();
-const ctr = ranges[0];
-verify.referencesOf(ctr, ranges);
+verify.referenceGroups(ranges[0], [{ definition: "constructor X(): X", ranges }]);
diff --git a/tests/cases/fourslash/findAllRefsOnDecorators.ts b/tests/cases/fourslash/findAllRefsOnDecorators.ts
index b58e15b9571..95bf1072014 100644
--- a/tests/cases/fourslash/findAllRefsOnDecorators.ts
+++ b/tests/cases/fourslash/findAllRefsOnDecorators.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @Filename: a.ts
-////function [|decorator|](target) {
+////function [|{| "isWriteAccess": true, "isDefinition": true |}decorator|](target) {
 ////    return target;
 ////}
 ////[|decorator|]();
@@ -13,4 +13,4 @@
 ////    method() {}
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("function decorator(target: any): any");
diff --git a/tests/cases/fourslash/findAllRefsOnDefinition.ts b/tests/cases/fourslash/findAllRefsOnDefinition.ts
index cb829807602..7d136efc42a 100644
--- a/tests/cases/fourslash/findAllRefsOnDefinition.ts
+++ b/tests/cases/fourslash/findAllRefsOnDefinition.ts
@@ -7,7 +7,7 @@
 ////
 ////    }
 ////
-////    public [|start|](){
+////    public [|{| "isWriteAccess": true, "isDefinition": true |}start|](){
 ////        return this;
 ////    }
 ////
@@ -23,4 +23,10 @@
 ////second.[|start|]();
 ////second.stop();
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) Test.start(): this", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) Second.Test.start(): Second.Test", ranges: [r0] },
+    { definition: "(method) Second.Test.start(): Second.Test", ranges: [r1] },
+]);
diff --git a/tests/cases/fourslash/findAllRefsOnDefinition2.ts b/tests/cases/fourslash/findAllRefsOnDefinition2.ts
index 8edfd7f8cd7..6d2438a124c 100644
--- a/tests/cases/fourslash/findAllRefsOnDefinition2.ts
+++ b/tests/cases/fourslash/findAllRefsOnDefinition2.ts
@@ -3,7 +3,7 @@
 //@Filename: findAllRefsOnDefinition2-import.ts
 ////export module Test{
 ////
-////    export interface [|start|] { }
+////    export interface [|{| "isWriteAccess": true, "isDefinition": true |}start|] { }
 ////
 ////    export interface stop { }
 ////}
@@ -14,4 +14,8 @@
 ////var start: Second.Test.[|start|];
 ////var stop: Second.Test.stop;
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "interface Test.start", ranges }]);
+verify.referenceGroups(r1, [{ definition: "interface Second.Test.start", ranges }]);
+
diff --git a/tests/cases/fourslash/findAllRefsOnImportAliases.ts b/tests/cases/fourslash/findAllRefsOnImportAliases.ts
index cd258e80316..7574e11625f 100644
--- a/tests/cases/fourslash/findAllRefsOnImportAliases.ts
+++ b/tests/cases/fourslash/findAllRefsOnImportAliases.ts
@@ -1,15 +1,18 @@
 /// <reference path="fourslash.ts" />
 
 //@Filename: a.ts
-////export class [|Class|] {
+////export class [|{| "isWriteAccess": true, "isDefinition": true |}Class|] {
 ////}
 
 //@Filename: b.ts
-////import { [|Class|] } from "./a";
+////import { [|{| "isWriteAccess": true, "isDefinition": true |}Class|] } from "./a";
 ////
 ////var c = new [|Class|]();
 
 //@Filename: c.ts
-////export { [|Class|] } from "./a";
+////export { [|{| "isWriteAccess": true, "isDefinition": true |}Class|] } from "./a";
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups([r0, r1, r3], [{ definition: "class Class", ranges }]);
+verify.referenceGroups(r2, [{ definition: "constructor Class(): Class", ranges }]);
diff --git a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
index 67c4d14b5d9..a21d2da4c03 100644
--- a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
+++ b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
@@ -1,15 +1,23 @@
 /// <reference path="fourslash.ts" />
 
 //@Filename: a.ts
-////export class [|Class|] {
+////export class [|{| "isWriteAccess": true, "isDefinition": true |}Class|] {
 ////}
 
 //@Filename: b.ts
-////import { [|Class|] as [|C2|] } from "./a";
+////import { [|{| "isWriteAccess": true, "isDefinition": true |}Class|] as [|{| "isWriteAccess": true, "isDefinition": true |}C2|] } from "./a";
 ////
 ////var c = new [|C2|]();
 
 //@Filename: c.ts
-////export { [|Class|] as [|C3|] } from "./a";
+////export { [|{| "isWriteAccess": true, "isDefinition": true |}Class|] as [|{| "isWriteAccess": true, "isDefinition": true |}C3|] } from "./a";
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+verify.singleReferenceGroup("class Class", ranges.get("Class"));
+
+const c2s = ranges.get("C2");
+const [c2_0, c2_1] = c2s;
+verify.referenceGroups(c2_0, [{ definition: "import C2", ranges: c2s }]);
+verify.referenceGroups(c2_1, [{ definition: "(alias) new C2(): C2\nimport C2", ranges: c2s }]);
+
+verify.singleReferenceGroup("import C3", ranges.get("C3"));
diff --git a/tests/cases/fourslash/findAllRefsOnPrivateParameterProperty1.ts b/tests/cases/fourslash/findAllRefsOnPrivateParameterProperty1.ts
index 3b8b5084a6b..df33f2888e6 100644
--- a/tests/cases/fourslash/findAllRefsOnPrivateParameterProperty1.ts
+++ b/tests/cases/fourslash/findAllRefsOnPrivateParameterProperty1.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 ////class ABCD {
-////    constructor(private x: number, public y: number, private [|z|]: number) {
+////    constructor(private x: number, public y: number, private [|{| "isWriteAccess": true, "isDefinition": true |}z|]: number) {
 ////    }
 ////
 ////    func() {
@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) ABCD.z: number");
diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts
index 8f30e3cc853..fa1254118a1 100644
--- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts
+++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts
@@ -1,10 +1,15 @@
 /// <reference path='fourslash.ts'/>
 
 //// class Foo {
-////     constructor(private [|privateParam|]: number) {
+////     constructor(private [|{| "isWriteAccess": true, "isDefinition": true |}privateParam|]: number) {
 ////         let localPrivate = [|privateParam|];
 ////         this.[|privateParam|] += 10;
 ////     }
 //// }
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(ranges, [
+    { definition: "(property) Foo.privateParam: number", ranges: [r0, r2] },
+    { definition: "(parameter) privateParam: number", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts
index d9656e8b5cf..45d814f909e 100644
--- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts
+++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts
@@ -1,10 +1,15 @@
 /// <reference path='fourslash.ts'/>
 
 //// class Foo {
-////     constructor(public [|publicParam|]: number) {
+////     constructor(public [|{| "isWriteAccess": true, "isDefinition": true |}publicParam|]: number) {
 ////         let localPublic = [|publicParam|];
 ////         this.[|publicParam|] += 10;
 ////     }
 //// }
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(ranges, [
+    { definition: "(property) Foo.publicParam: number", ranges: [r0, r2] },
+    { definition: "(parameter) publicParam: number", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts
index dc48ffedb21..3520fecb8ad 100644
--- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts
+++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts
@@ -1,10 +1,15 @@
 /// <reference path='fourslash.ts'/>
 
 //// class Foo {
-////     constructor(protected [|protectedParam|]: number) {
+////     constructor(protected [|{| "isWriteAccess": true, "isDefinition": true |}protectedParam|]: number) {
 ////         let localProtected = [|protectedParam|];
 ////         this.[|protectedParam|] += 10;
 ////     }
 //// }
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(ranges, [
+    { definition: "(property) Foo.protectedParam: number", ranges: [r0, r2] },
+    { definition: "(parameter) protectedParam: number", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsPrimitive.ts b/tests/cases/fourslash/findAllRefsPrimitive.ts
index 51c463843e1..bf704c6ae71 100644
--- a/tests/cases/fourslash/findAllRefsPrimitive.ts
+++ b/tests/cases/fourslash/findAllRefsPrimitive.ts
@@ -24,7 +24,7 @@
 // @Filename: b.ts
 // const z: [|any|] = 0;
 
-verify.rangesWithSameTextReferenceEachOther();
+test.rangesByText().forEach((ranges, text) => verify.singleReferenceGroup(text, ranges));
 verify.rangesWithSameTextAreDocumentHighlights();
 
 goTo.rangeStart(test.ranges()[0]);
diff --git a/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts b/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts
index f5b0143ac4b..dec6575ebc4 100644
--- a/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts
+++ b/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts
@@ -1,12 +1,12 @@
 /// <reference path="./fourslash.ts" />
 
 ////interface IFoo {
-////    [|a|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}a|]: string;
 ////}
 ////class C<T extends IFoo> {
 ////    method() {
 ////        var x: T = {
-////            [|a|]: ""
+////            [|{| "isWriteAccess": true, "isDefinition": true |}a|]: ""
 ////        };
 ////        x.[|a|];
 ////    }
@@ -14,7 +14,17 @@
 ////
 ////
 ////var x: IFoo = {
-////    [|a|]: "ss"
+////    [|{| "isWriteAccess": true, "isDefinition": true |}a|]: "ss"
 ////};
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups([r0, r2], [{ definition: "(property) IFoo.a: string", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(property) IFoo.a: string", ranges: [r0, r2, r3] },
+    { definition: "(property) a: string", ranges: [r1] }
+]);
+verify.referenceGroups(r3, [
+    { definition: "(property) IFoo.a: string", ranges: [r0, r1, r2] },
+    { definition: "(property) a: string", ranges: [r3] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsThisKeyword.ts b/tests/cases/fourslash/findAllRefsThisKeyword.ts
index f08a70ccf65..6f5374f902a 100644
--- a/tests/cases/fourslash/findAllRefsThisKeyword.ts
+++ b/tests/cases/fourslash/findAllRefsThisKeyword.ts
@@ -2,9 +2,9 @@
 // @noLib: true
 
 ////[|this|];
-////function f([|this|]) {
+////function f([|{| "isWriteAccess": true, "isDefinition": true |}this|]) {
 ////    return [|this|];
-////    function g([|this|]) { return [|this|]; }
+////    function g([|{| "isWriteAccess": true, "isDefinition": true |}this|]) { return [|this|]; }
 ////}
 ////class C {
 ////    static x() {
@@ -21,13 +21,19 @@
 ////    }
 ////}
 ////// These are *not* real uses of the 'this' keyword, they are identifiers.
-////const x = { [|this|]: 0 }
+////const x = { [|{| "isWriteAccess": true, "isDefinition": true |}this|]: 0 }
 ////x.[|this|];
 
 const [global, f0, f1, g0, g1, x, y, constructor, method, propDef, propUse] = test.ranges();
 verify.referencesOf(global, [global]);
-verify.rangesReferenceEachOther([f0, f1]);
-verify.rangesReferenceEachOther([g0, g1]);
-verify.rangesReferenceEachOther([x, y]);
-verify.rangesReferenceEachOther([constructor, method]);
-verify.rangesReferenceEachOther([propDef, propUse]);
+verify.referenceGroups(f0, [{ definition: "(parameter) this: any", ranges: [f0, f1] }]);
+verify.referenceGroups(f1, [{ definition: "this: any", ranges: [f0, f1] }]);
+verify.referenceGroups(g0, [{ definition: "(parameter) this: any", ranges: [g0, g1] }]);
+verify.referenceGroups(g1, [{ definition: "this: any", ranges: [g0, g1] }]);
+verify.singleReferenceGroup("this: typeof C", [x, y]);
+verify.singleReferenceGroup("this: this", [constructor, method]);
+verify.referenceGroups(propDef, [{ definition: "(property) this: number", ranges: [propDef, propUse] }]);
+verify.referenceGroups(propUse, [
+    { definition: "(property) this: number", ranges: [propDef] },
+    { definition: "(property) this: number", ranges: [propUse] },
+]);
diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames1.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames1.ts
index 7cc47ee34ea..d2baf7c96b3 100644
--- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames1.ts
+++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames1.ts
@@ -1,10 +1,16 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Foo {
-////    public [|_bar|]() { return 0; }
+////    public [|{| "isWriteAccess": true, "isDefinition": true |}_bar|]() { return 0; }
 ////}
 ////
 ////var x: Foo;
 ////x.[|_bar|];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) Foo._bar(): number", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) Foo._bar(): number", ranges: [r0] },
+    { definition: "(method) Foo._bar(): number", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames2.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames2.ts
index d1449016b59..3f5cd9ddbed 100644
--- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames2.ts
+++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames2.ts
@@ -1,10 +1,16 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Foo {
-////    public [|__bar|]() { return 0; }
+////    public [|{| "isWriteAccess": true, "isDefinition": true |}__bar|]() { return 0; }
 ////}
 ////
 ////var x: Foo;
 ////x.[|__bar|];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) Foo.__bar(): number", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) Foo.__bar(): number", ranges: [r0] },
+    { definition: "(method) Foo.__bar(): number", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames3.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames3.ts
index e0d6f7f3456..e1870065325 100644
--- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames3.ts
+++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames3.ts
@@ -1,10 +1,16 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Foo {
-////    public [|___bar|]() { return 0; }
+////    public [|{| "isWriteAccess": true, "isDefinition": true |}___bar|]() { return 0; }
 ////}
 ////
 ////var x: Foo;
 ////x.[|___bar|];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) Foo.___bar(): number", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) Foo.___bar(): number", ranges: [r0] },
+    { definition: "(method) Foo.___bar(): number", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames4.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames4.ts
index 5a8de54db4d..74eef0ae989 100644
--- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames4.ts
+++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames4.ts
@@ -1,10 +1,16 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Foo {
-////    public [|____bar|]() { return 0; }
+////    public [|{| "isWriteAccess": true, "isDefinition": true |}____bar|]() { return 0; }
 ////}
 ////
 ////var x: Foo;
 ////x.[|____bar|];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) Foo.____bar(): number", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) Foo.____bar(): number", ranges: [r0] },
+    { definition: "(method) Foo.____bar(): number", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames5.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames5.ts
index 4ab28f164fe..d54b48bf662 100644
--- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames5.ts
+++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames5.ts
@@ -3,7 +3,7 @@
 ////class Foo {
 ////    public _bar;
 ////    public __bar;
-////    public [|___bar|];
+////    public [|{| "isWriteAccess": true, "isDefinition": true |}___bar|];
 ////    public ____bar;
 ////}
 ////
@@ -13,4 +13,4 @@
 ////x.[|___bar|];
 ////x.____bar;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) Foo.___bar: any");
diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames6.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames6.ts
index 191b0bdbc14..39bc1d73ca3 100644
--- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames6.ts
+++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames6.ts
@@ -2,7 +2,7 @@
 
 ////class Foo {
 ////    public _bar;
-////    public [|__bar|];
+////    public [|{| "isWriteAccess": true, "isDefinition": true |}__bar|];
 ////    public ___bar;
 ////    public ____bar;
 ////}
@@ -13,4 +13,4 @@
 ////x.___bar;
 ////x.____bar;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) Foo.__bar: any");
diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames7.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames7.ts
index f3578193096..dac42f4fc7c 100644
--- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames7.ts
+++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames7.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
-////function [|__foo|]() {
+////function [|{| "isWriteAccess": true, "isDefinition": true |}__foo|]() {
 ////    [|__foo|]();
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("function __foo(): void");
diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames8.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames8.ts
index 15c66f4e7c6..8c92275e27f 100644
--- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames8.ts
+++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames8.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
-////(function [|__foo|]() {
+////(function [|{| "isWriteAccess": true, "isDefinition": true |}__foo|]() {
 ////    [|__foo|]();
 ////})
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(local function) __foo(): void");
diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames9.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames9.ts
index cc33b618c41..bc5799e61cf 100644
--- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames9.ts
+++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames9.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
-////(function [|___foo|]() {
+////(function [|{| "isWriteAccess": true, "isDefinition": true |}___foo|]() {
 ////    [|___foo|]();
 ////})
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(local function) ___foo(): void");
diff --git a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts
index 0dc050602c5..544a3238e3b 100644
--- a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts
+++ b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts
@@ -1,14 +1,19 @@
 /// <reference path='fourslash.ts'/>
 
-//// var [|name|] = "Foo";
+//// var [|{| "isWriteAccess": true, "isDefinition": true |}name|] = "Foo";
 ////
-//// var obj = { [|name|] };
-//// var obj1 = { [|name|]:[|name|] };
+//// var obj = { [|{| "isWriteAccess": true, "isDefinition": true |}name|] };
+//// var obj1 = { [|{| "isWriteAccess": true, "isDefinition": true |}name|]:[|name|] };
 //// obj.[|name|];
 
 const [r0, r1, r2, r3, r4] = test.ranges();
-verify.referencesOf(r0, [r0, r1, r3]);
-verify.referencesOf(r1, [r0, r1, r3, r4]);
-verify.referencesOf(r2, [r2]);
-verify.referencesOf(r3, [r0, r1, r3]);
-verify.referencesOf(r4, [r1, r4]);
+verify.referenceGroups([r0, r3], [{ definition: "var name: string", ranges: [r0, r1, r3] }]);
+verify.referenceGroups(r1, [
+    { definition: "var name: string", ranges: [r0, r3] },
+    { definition: "(property) name: string", ranges: [r1, r4] }
+]);
+verify.singleReferenceGroup("(property) name: string", [r2]);
+verify.referenceGroups(r4, [
+    { definition: "(property) name: string", ranges: [r1] },
+    { definition: "(property) name: string", ranges: [r4] },
+]);
diff --git a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment2.ts b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment2.ts
index 59ba87fabb6..d4f758696fe 100644
--- a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment2.ts
+++ b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment2.ts
@@ -1,16 +1,22 @@
 /// <reference path='fourslash.ts'/>
 
-//// var [|dx|] = "Foo";
+//// var [|{| "isWriteAccess": true, "isDefinition": true |}dx|] = "Foo";
 ////
-//// module M { export var [|dx|]; }
+//// module M { export var [|{| "isWriteAccess": true, "isDefinition": true |}dx|]; }
 //// module M {
 ////    var z = 100;
-////    export var y = { [|dx|], z };
+////    export var y = { [|{| "isWriteAccess": true, "isDefinition": true |}dx|], z };
 //// }
 //// M.y.[|dx|];
 
 const [r0, r1, r2, r3] = test.ranges();
-verify.referencesOf(r0, [r0]);
-verify.referencesOf(r1, [r1, r2]);
-verify.referencesOf(r2, [r1, r2, r3]);
-verify.referencesOf(r3, [r2, r3]);
+verify.singleReferenceGroup("var dx: string", [r0]);
+verify.referenceGroups(r1, [{ definition: "var M.dx: any", ranges: [r1, r2] }]);
+verify.referenceGroups(r2, [
+    { definition: "var M.dx: any", ranges: [r1] },
+    { definition: "(property) dx: any", ranges: [r2, r3] }
+]);
+verify.referenceGroups(r3, [
+    { definition: "(property) dx: any", ranges: [r2] },
+    { definition: "(property) dx: any", ranges: [r3] }
+]);
diff --git a/tests/cases/fourslash/findReferencesAcrossMultipleProjects.ts b/tests/cases/fourslash/findReferencesAcrossMultipleProjects.ts
index a9915fc4b3d..f9feb5ddb62 100644
--- a/tests/cases/fourslash/findReferencesAcrossMultipleProjects.ts
+++ b/tests/cases/fourslash/findReferencesAcrossMultipleProjects.ts
@@ -1,14 +1,14 @@
 /// <reference path="fourslash.ts" />
 
 //@Filename: a.ts
-////var [|x|]: number;
+////var [|{| "isWriteAccess": true, "isDefinition": true |}x|]: number;
 
 //@Filename: b.ts
 /////// <reference path="a.ts" />
-////[|x|]++;
+////[|{| "isWriteAccess": true |}x|]++;
 
 //@Filename: c.ts
 /////// <reference path="a.ts" />
-////[|x|]++;
+////[|{| "isWriteAccess": true |}x|]++;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var x: number");
diff --git a/tests/cases/fourslash/findReferencesAfterEdit.ts b/tests/cases/fourslash/findReferencesAfterEdit.ts
index 6140ca9a767..2d57e78c637 100644
--- a/tests/cases/fourslash/findReferencesAfterEdit.ts
+++ b/tests/cases/fourslash/findReferencesAfterEdit.ts
@@ -2,7 +2,7 @@
 
 // @Filename: a.ts
 ////interface A {
-////    [|foo|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}foo|]: string;
 ////}
 
 // @Filename: b.ts
@@ -12,9 +12,9 @@
 ////    x.[|foo|]
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) A.foo: string");
 
 goTo.marker("");
 edit.insert("\r\n");
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) A.foo: string");
diff --git a/tests/cases/fourslash/findReferencesJSXTagName.ts b/tests/cases/fourslash/findReferencesJSXTagName.ts
index 24760046eb2..5f8bc3a475f 100644
--- a/tests/cases/fourslash/findReferencesJSXTagName.ts
+++ b/tests/cases/fourslash/findReferencesJSXTagName.ts
@@ -1,14 +1,16 @@
 /// <reference path='fourslash.ts'/>
 
 // @Filename: index.tsx
-////import { [|SubmissionComp|] } from "./RedditSubmission"
+////import { [|{| "isWriteAccess": true, "isDefinition": true |}SubmissionComp|] } from "./RedditSubmission"
 ////function displaySubreddit(subreddit: string) {
 ////    let components = submissions
 ////        .map((value, index) => <[|SubmissionComp|] key={ index } elementPosition= { index } {...value.data} />);
 ////}
 
 // @Filename: RedditSubmission.ts
-////export const [|SubmissionComp|] = (submission: SubmissionProps) =>
+////export const [|{| "isWriteAccess": true, "isDefinition": true |}SubmissionComp|] = (submission: SubmissionProps) =>
 ////    <div style={{ fontFamily: "sans-serif" }}></div>;
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(ranges, [{ definition: "const SubmissionComp: (submission: any) => any", ranges: [r2, r0, r1] }]);
diff --git a/tests/cases/fourslash/findReferencesJSXTagName2.ts b/tests/cases/fourslash/findReferencesJSXTagName2.ts
index 4ce08647c52..a8882b60088 100644
--- a/tests/cases/fourslash/findReferencesJSXTagName2.ts
+++ b/tests/cases/fourslash/findReferencesJSXTagName2.ts
@@ -1,7 +1,9 @@
 /// <reference path='fourslash.ts'/>
 
 // @Filename: index.tsx
-////const [|obj|] = {Component: () => <div/>};
+////const [|{| "isWriteAccess": true, "isDefinition": true |}obj|] = {Component: () => <div/>};
 ////const element = <[|obj|].Component/>;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup(`const obj: {
+    Component: () => any;
+}`);
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 6685bbc19c0..c613204f539 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -182,18 +182,19 @@ declare namespace FourSlashInterface {
         goToType(startMarkerNames: string | string[], endMarkerNames: string | string[]): void;
         verifyGetEmitOutputForCurrentFile(expected: string): void;
         verifyGetEmitOutputContentsForCurrentFile(expected: ts.OutputFile[]): void;
+        noReferences(markerNameOrRange?: string | Range): void;
         /**
-         * Asserts that the given ranges are the references from the current position.
-         * If ranges have markers, those markers may have "isDefinition" and "isWriteAccess" data
-         * (otherwise these properties pf the reference are not tested).
-         * Order of ranges does not matter.
-         */
-        referencesAre(ranges: Range[]): void;
-        /**
+         * @deprecated, prefer 'referenceGroups'
          * Like `referencesAre`, but goes to `start` first.
          * `start` should be included in `references`.
          */
         referencesOf(start: Range, references: Range[]): void;
+        /**
+         * For each of startRanges, asserts the ranges that are referenced from there.
+         * This uses the 'findReferences' command instead of 'getReferencesAtPosition', so references are grouped by their definition.
+         */
+        referenceGroups(startRanges: Range | Range[], parts: Array<{ definition: string, ranges: Range[] }>): void;
+        singleReferenceGroup(definition: string, ranges?: Range[]): void;
         rangesAreOccurrences(isWriteAccess?: boolean): void;
         rangesAreRenameLocations(findInStrings?: boolean, findInComments?: boolean): void;
         /**
@@ -202,7 +203,6 @@ declare namespace FourSlashInterface {
          */
         rangesReferenceEachOther(ranges?: Range[]): void;
         findReferencesDefinitionDisplayPartsAtCaretAre(expected: ts.SymbolDisplayPart[]): void;
-        rangesWithSameTextReferenceEachOther(): void;
         currentParameterHelpArgumentNameIs(name: string): void;
         currentParameterSpanIs(parameter: string): void;
         currentParameterHelpArgumentDocCommentIs(docComment: string): void;
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts
index 57b4c14ffba..b1acb76ad2c 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-////var [|{| "isDefinition": true |}f|] = x => x + 1;
-////[|{| "isDefinition": false |}f|](12);
+////var [|{| "isWriteAccess": true, "isDefinition": true |}f|] = x => x + 1;
+////[|f|](12);
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var f: (x: any) => any");
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts
index e60921ec3b8..7725b2e94f8 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-////const { [|{| "isDefinition": true |}x|], y } = { x: 1, y: 2 };
+////const { [|{| "isWriteAccess": true, "isDefinition": true |}x|], y } = { x: 1, y: 2 };
 ////const z = [|{| "isDefinition": false |}x|];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("const x: number");
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts
index 0a3c2e4231c..b39c11dfe6b 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts
@@ -1,10 +1,13 @@
 /// <reference path='fourslash.ts' />
-////class [|{| "isDefinition": true |}C|] {
+////class [|{| "isWriteAccess": true, "isDefinition": true |}C|] {
 ////    n: number;
 ////    constructor() {
 ////        this.n = 12;
 ////    }
 ////}
-////let c = new [|{| "isDefinition": false |}C|]();
+////let c = new [|C|]();
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "class C", ranges }]);
+verify.referenceGroups(r1, [{ definition: "constructor C(): C", ranges }]);
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts
index 81df97eff2d..27c34e56600 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts
@@ -1,7 +1,9 @@
 /// <reference path='fourslash.ts' />
-////let o = { ["/**/[|{| "isDefinition": true |}foo|]"]: 12 };
-////let y = o.[|{| "isDefinition": false |}foo|];
-////let z = o['[|{| "isDefinition": false |}foo|]'];
+////let o = { ["[|{| "isDefinition": true |}foo|]"]: 12 };
+////let y = o.[|foo|];
+////let z = o['[|foo|]'];
 
-goTo.marker();
-verify.referencesAre(test.ranges());
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(r0, [{ definition: '(property) ["foo"]: number', ranges }]);
+verify.referenceGroups([r1, r2], []); // TODO: fix
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts
index 5b77bf6158a..325674d8ee7 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts
@@ -1,8 +1,8 @@
 /// <reference path='fourslash.ts' />
-////enum [|{| "isDefinition": true |}E|] {
+////enum [|{| "isWriteAccess": true, "isDefinition": true |}E|] {
 ////    First,
 ////    Second
 ////}
-////let first = [|{| "isDefinition": false |}E|].First;
+////let first = [|E|].First;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("enum E");
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts
index 759df4fa383..9cdfb0aa0f7 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts
@@ -1,8 +1,8 @@
 /// <reference path='fourslash.ts' />
 // @Filename: m.ts
-////export var [|{| "isDefinition": true |}x|] = 12;
+////export var [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 12;
 // @Filename: main.ts
-////import { [|{| "isDefinition": true |}x|] } from "./m";
-////const y = [|{| "isDefinition": false |}x|];
+////import { [|{| "isWriteAccess": true, "isDefinition": true |}x|] } from "./m";
+////const y = [|x|];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var x: number");
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts
index 357ef088d61..4c91bc08ef8 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
-////function [|{| "isDefinition": true |}func|](x: number) {
+////function [|{| "isWriteAccess": true, "isDefinition": true |}func|](x: number) {
 ////}
-////[|{| "isDefinition": false |}func|](x)
+////[|func|](x)
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("function func(x: number): void");
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts
index b7117995d84..826890c4da9 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
-////interface [|{| "isDefinition": true |}I|] {
+////interface [|{| "isWriteAccess": true, "isDefinition": true |}I|] {
 ////    p: number;
 ////}
-////let i: [|{| "isDefinition": false |}I|] = { p: 12 };
+////let i: [|I|] = { p: 12 };
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("interface I");
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts
index b0506490c70..0e949ca6496 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts
@@ -1,16 +1,19 @@
 /// <reference path='fourslash.ts' />
-////interface [|{| "isDefinition": true |}Numbers|] {
+////interface [|{| "isWriteAccess": true, "isDefinition": true |}Numbers|] {
 ////    p: number;
 ////}
-////interface [|{| "isDefinition": true |}Numbers|] {
+////interface [|{| "isWriteAccess": true, "isDefinition": true |}Numbers|] {
 ////    m: number;
 ////}
-////class [|{| "isDefinition": true |}Numbers|] {
+////class [|{| "isWriteAccess": true, "isDefinition": true |}Numbers|] {
 ////    f(n: number) {
 ////        return this.p + this.m + n;
 ////    }
 ////}
-////let i: [|{| "isDefinition": false |}Numbers|] = new [|{| "isDefinition": false |}Numbers|]();
+////let i: [|Numbers|] = new [|Numbers|]();
 ////let x = i.f(i.p + i.m);
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3, r4] = ranges;
+verify.referenceGroups([r0, r1, r2, r3], [{ definition: "class Numbers\ninterface Numbers", ranges }]);
+verify.referenceGroups(r4, [{ definition: "constructor Numbers(): Numbers", ranges }]);
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts
index ff1cf00fa9b..04d00e6c19f 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
-////namespace [|{| "isDefinition": true |}Numbers|] {
+////namespace [|{| "isWriteAccess": true, "isDefinition": true |}Numbers|] {
 ////    export var n = 12;
 ////}
-////let x = [|{| "isDefinition": false |}Numbers|].n + 1;
+////let x = [|Numbers|].n + 1;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("namespace Numbers");
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts
index a041dab435a..c603f398e5e 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts
@@ -1,5 +1,11 @@
 /// <reference path='fourslash.ts' />
 ////let o = { [|{| "isDefinition": true |}1|]: 12 };
-////let y = o[[|{| "isDefinition": false |}1|]];
+////let y = o[[|1|]];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(property) 1: number", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(property) 1: number", ranges: [r0] },
+    { definition: "(property) 1: number", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts
index cdcc47014fd..8afa67bfe64 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
-////function f([|{| "isDefinition": true |}x|]: number) {
-////  return [|{| "isDefinition": false |}x|] + 1
+////function f([|{| "isWriteAccess": true, "isDefinition": true |}x|]: number) {
+////  return [|x|] + 1
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(parameter) x: number");
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts
index 383cf49a2e3..43fe0c571fc 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts
@@ -1,5 +1,11 @@
 /// <reference path='fourslash.ts' />
 ////let o = { "[|{| "isDefinition": true |}x|]": 12 };
-////let y = o.[|{| "isDefinition": false |}x|];
+////let y = o.[|x|];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: '(property) "x": number', ranges }]);
+verify.referenceGroups(r1, [
+    { definition: '(property) "x": number', ranges: [r0] },
+    { definition: '(property) "x": number', ranges: [r1] },
+]);
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts
index 2bd66830c69..18a4ec0396c 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts
@@ -1,5 +1,5 @@
 /// <reference path='fourslash.ts' />
-////type [|{| "isDefinition": true |}Alias|]= number;
-////let n: [|{| "isDefinition": false |}Alias|] = 12;
+////type [|{| "isWriteAccess": true, "isDefinition": true |}Alias|]= number;
+////let n: [|Alias|] = 12;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("type Alias = number");
diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts
index 78529186ad3..2faf5b53e1b 100644
--- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts
+++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts
@@ -1,20 +1,20 @@
 /// <reference path='fourslash.ts' />
-////var [|{| "isDefinition": true |}x|] = 0;
-////var assignmentRightHandSide = [|{| "isDefinition": false |}x|];
-////var assignmentRightHandSide2 = 1 + [|{| "isDefinition": false |}x|];
+////var [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 0;
+////var assignmentRightHandSide = [|x|];
+////var assignmentRightHandSide2 = 1 + [|x|];
 ////
-////[|{| "isDefinition": false |}x|] = 1;
-////[|{| "isDefinition": false |}x|] = [|{| "isDefinition": false |}x|] + [|{| "isDefinition": false |}x|];
+////[|{| "isWriteAccess": true |}x|] = 1;
+////[|{| "isWriteAccess": true |}x|] = [|x|] + [|x|];
 ////
-////[|{| "isDefinition": false |}x|] == 1;
-////[|{| "isDefinition": false |}x|] <= 1;
+////[|x|] == 1;
+////[|x|] <= 1;
 ////
-////var preIncrement = ++[|{| "isDefinition": false |}x|];
-////var postIncrement = [|{| "isDefinition": false |}x|]++;
-////var preDecrement = --[|{| "isDefinition": false |}x|];
-////var postDecrement = [|{| "isDefinition": false |}x|]--;
+////var preIncrement = ++[|{| "isWriteAccess": true |}x|];
+////var postIncrement = [|{| "isWriteAccess": true |}x|]++;
+////var preDecrement = --[|{| "isWriteAccess": true |}x|];
+////var postDecrement = [|{| "isWriteAccess": true |}x|]--;
 ////
-////[|{| "isDefinition": false |}x|] += 1;
-////[|{| "isDefinition": false |}x|] <<= 1;
+////[|{| "isWriteAccess": true |}x|] += 1;
+////[|{| "isWriteAccess": true |}x|] <<= 1;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var x: number");
diff --git a/tests/cases/fourslash/hoverOverComment.ts b/tests/cases/fourslash/hoverOverComment.ts
index 653eaedfcb7..fd1a7fcd9de 100644
--- a/tests/cases/fourslash/hoverOverComment.ts
+++ b/tests/cases/fourslash/hoverOverComment.ts
@@ -7,4 +7,4 @@
 goTo.marker();
 verify.quickInfoIs("");
 verify.goToDefinitionIs([]);
-verify.referencesAre([]);
+verify.noReferences();
diff --git a/tests/cases/fourslash/localGetReferences.ts b/tests/cases/fourslash/localGetReferences.ts
index d8e64be1ada..4648471648a 100644
--- a/tests/cases/fourslash/localGetReferences.ts
+++ b/tests/cases/fourslash/localGetReferences.ts
@@ -3,17 +3,17 @@
 // @Filename: localGetReferences_1.ts
 ////// Comment Refence Test: g/*1*/lobalVar
 ////// References to a variable declared in global.
-////var [|globalVar|]: number = 2;
+////var [|{| "isWriteAccess": true, "isDefinition": true |}globalVar|]: number = 2;
 ////
 ////class fooCls {
 ////    // References to static variable declared in a class.
-////    static [|clsSVar|] = 1;
+////    static [|{| "isWriteAccess": true, "isDefinition": true |}clsSVar|] = 1;
 ////    // References to a variable declared in a class.
-////    [|clsVar|] = 1;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}clsVar|] = 1;
 ////
-////    constructor (public [|clsParam|]: number) {
+////    constructor (public [|{| "isWriteAccess": true, "isDefinition": true |}clsParam|]: number) {
 ////        //Increments
-////        [|globalVar|]++;
+////        [|{| "isWriteAccess": true |}globalVar|]++;
 ////        this.[|clsVar|]++;
 ////        fooCls.[|clsSVar|]++;
 ////        // References to a class parameter.
@@ -23,18 +23,18 @@
 ////}
 ////
 ////// References to a function parameter.
-////function [|foo|]([|x|]: number) {
+////function [|{| "isWriteAccess": true, "isDefinition": true |}foo|]([|{| "isWriteAccess": true, "isDefinition": true |}x|]: number) {
 ////    // References to a variable declared in a function.
-////    var [|fnVar|] = 1;
+////    var [|{| "isWriteAccess": true, "isDefinition": true |}fnVar|] = 1;
 ////
 ////    //Increments
 ////    fooCls.[|clsSVar|]++;
-////    [|globalVar|]++;
+////    [|{| "isWriteAccess": true |}globalVar|]++;
 ////    modTest.modVar++;
-////    [|fnVar|]++;
+////    [|{| "isWriteAccess": true |}fnVar|]++;
 ////
 ////    //Return
-////    return [|x|]++;
+////    return [|{| "isWriteAccess": true |}x|]++;
 ////}
 ////
 ////module modTest {
@@ -42,7 +42,7 @@
 ////    export var modVar:number;
 ////
 ////    //Increments
-////    [|globalVar|]++;
+////    [|{| "isWriteAccess": true |}globalVar|]++;
 ////    fooCls.[|clsSVar|]++;
 ////    modVar++;
 ////
@@ -54,7 +54,7 @@
 ////        static boo = [|foo|];
 ////
 ////        //Increments
-////        [|globalVar|]++;
+////        [|{| "isWriteAccess": true |}globalVar|]++;
 ////        fooCls.[|clsSVar|]++;
 ////        modVar++;
 ////    }
@@ -76,18 +76,18 @@
 //////Increments
 ////fooCls.[|clsSVar|]++;
 ////modTest.modVar++;
-////[|globalVar|] = [|globalVar|] + [|globalVar|];
+////[|{| "isWriteAccess": true |}globalVar|] = [|globalVar|] + [|globalVar|];
 ////
 //////ETC - Other cases
-////[|globalVar|] = 3;
+////[|{| "isWriteAccess": true |}globalVar|] = 3;
 ////// References to illegal assignment.
-////[|foo|] = [|foo|] + 1;
+////[|{| "isWriteAccess": true |}foo|] = [|foo|] + 1;
 /////*3*/err = err++;
 /////*4*/
 //////Shadowed fn Parameter
-////function shdw([|{| "shadow": true |}globalVar|]: number) {
+////function shdw([|{| "isWriteAccess": true, "isDefinition": true, "shadow": true |}globalVar|]: number) {
 ////    //Increments
-////    [|{| "shadow": true |}globalVar|]++;
+////    [|{| "isWriteAccess": true, "shadow": true |}globalVar|]++;
 ////    return [|{| "shadow": true |}globalVar|];
 ////}
 ////
@@ -117,7 +117,7 @@
 ////array.forEach(
 ////
 ////
-////function([|str|]) {
+////function([|{| "isWriteAccess": true, "isDefinition": true |}str|]) {
 ////
 ////
 ////
@@ -187,24 +187,36 @@
 
 // References to comment.
 goTo.marker("1");
-verify.referencesAre([]);
+verify.noReferences();
 
 // References to unresolved symbol.
 goTo.marker("3");
-verify.referencesAre([]);
+verify.noReferences();
 
 // References to no context.
 goTo.marker("4");
-verify.referencesAre([]);
+verify.noReferences();
 
-const rangesByText = test.rangesByText();
-rangesByText.forEach((ranges, text) => {
+test.rangesByText().forEach((ranges, text) => {
     if (text === "globalVar") {
-        verify.rangesReferenceEachOther(ranges.filter(isShadow));
-        verify.rangesReferenceEachOther(ranges.filter(r => !isShadow(r)));
-    } else {
-        verify.rangesReferenceEachOther(ranges);
+        verify.singleReferenceGroup("(parameter) globalVar: number", ranges.filter(isShadow));
+        verify.singleReferenceGroup("var globalVar: number", ranges.filter(r => !isShadow(r)));
+        return;
     }
+
+    const definition = (() => {
+        switch (text) {
+            case "fnVar": return "(local var) fnVar: number";
+            case "clsSVar": return "(property) fooCls.clsSVar: number";
+            case "clsVar": return "(property) fooCls.clsVar: number";
+            case "clsParam": return "(property) fooCls.clsParam: number";
+            case "foo": return "function foo(x: number): number";
+            case "x": return "(parameter) x: number";
+            case "str": return "(parameter) str: string";
+            default: throw new Error(text);
+        }
+    })();
+    verify.singleReferenceGroup(definition, ranges);
 });
 
 function isShadow(r) {
diff --git a/tests/cases/fourslash/quickInfoForRequire.ts b/tests/cases/fourslash/quickInfoForRequire.ts
index 26b0371fe0e..e97810401f4 100644
--- a/tests/cases/fourslash/quickInfoForRequire.ts
+++ b/tests/cases/fourslash/quickInfoForRequire.ts
@@ -6,5 +6,6 @@
 //@Filename: quickInfoForRequire_input.ts
 ////import a = require("./AA/B/*1*/B");
 
-verify.quickInfoAt("1", "module a");
-verify.referencesAre([]);
\ No newline at end of file
+goTo.marker("1");
+verify.quickInfoIs("module a");
+verify.noReferences();
diff --git a/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts b/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts
index 68a9f73b1d6..79bf6172863 100644
--- a/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts
+++ b/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts
@@ -2,19 +2,26 @@
 
 // @Filename: file1.ts
 //// class Foo {
-////     constructor(private [|privateParam|]: number,
-////         public [|publicParam|]: string,
-////         protected [|protectedParam|]: boolean) {
-//// 
+////     constructor(private [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}privateParam|]: number,
+////         public [|{| "isWriteAccess": true, "isDefinition": true, "type": "string" |}publicParam|]: string,
+////         protected [|{| "isWriteAccess": true, "isDefinition": true, "type": "boolean" |}protectedParam|]: boolean) {
+////
 ////         let localPrivate = [|privateParam|];
 ////         this.[|privateParam|] += 10;
-//// 
+////
 ////         let localPublic = [|publicParam|];
 ////         this.[|publicParam|] += " Hello!";
-//// 
+////
 ////         let localProtected = [|protectedParam|];
 ////         this.[|protectedParam|] = false;
 ////     }
 //// }
 
-verify.rangesWithSameTextReferenceEachOther();
+test.rangesByText().forEach((ranges, text) => {
+    const [r0, r1, r2] = ranges;
+    const type = r0.marker.data.type;
+    verify.referenceGroups(ranges, [
+        { definition: `(property) Foo.${text}: ${type}`, ranges: [r0, r2] },
+        { definition: `(parameter) ${text}: ${type}`, ranges: [r1] }
+    ]);
+});
diff --git a/tests/cases/fourslash/referenceToClass.ts b/tests/cases/fourslash/referenceToClass.ts
index 3e523487bd1..d6d2171507c 100644
--- a/tests/cases/fourslash/referenceToClass.ts
+++ b/tests/cases/fourslash/referenceToClass.ts
@@ -3,7 +3,7 @@
 // Class references should work across file and not find local variables.
 
 // @Filename: referenceToClass_1.ts
-////class [|foo|] {
+////class [|{| "isWriteAccess": true, "isDefinition": true |}foo|] {
 ////    public n: [|foo|];
 ////    public foo: number;
 ////}
@@ -20,4 +20,7 @@
 // @Filename: referenceToClass_2.ts
 ////var k: [|foo|];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3, r4, r5] = ranges;
+verify.referenceGroups([r0, r1, r2, r4, r5], [{ definition: "class foo", ranges }]);
+verify.referenceGroups(r3, [{ definition: "constructor foo(): foo", ranges }]);
diff --git a/tests/cases/fourslash/referencesBloomFilters.ts b/tests/cases/fourslash/referencesBloomFilters.ts
index 7d99ccdfd3c..c9f290db0db 100644
--- a/tests/cases/fourslash/referencesBloomFilters.ts
+++ b/tests/cases/fourslash/referencesBloomFilters.ts
@@ -3,7 +3,7 @@
 // Ensure BloomFilter building logic is correct, by having one reference per file
 
 // @Filename: declaration.ts
-////var container = { [|searchProp|] : 1 };
+////var container = { [|{| "isWriteAccess": true, "isDefinition": true |}searchProp|] : 1 };
 
 // @Filename: expression.ts
 ////function blah() { return (1 + 2 + container.[|searchProp|]()) === 2;  };
@@ -12,6 +12,16 @@
 ////function blah2() { container["[|searchProp|]"] };
 
 // @Filename: redeclaration.ts
-////container = { "[|searchProp|]" : 18 };
+////container = { "[|{| "isDefinition": true |}searchProp|]" : 18 };
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups(r0, [{ definition: "(property) searchProp: number", ranges }]);
+verify.referenceGroups([r1, r2], [
+    { definition: "(property) searchProp: number", ranges: [r0, r3] },
+    { definition: "(property) searchProp: number", ranges: [r1, r2] }
+]);
+verify.referenceGroups(r3, [
+    { definition: "(property) searchProp: number", ranges: [r0, r1, r2] },
+    { definition: '(property) "searchProp": number', ranges: [r3] }
+]);
diff --git a/tests/cases/fourslash/referencesBloomFilters2.ts b/tests/cases/fourslash/referencesBloomFilters2.ts
index c42e5d4eaf1..daf60d0dd01 100644
--- a/tests/cases/fourslash/referencesBloomFilters2.ts
+++ b/tests/cases/fourslash/referencesBloomFilters2.ts
@@ -3,7 +3,7 @@
 // Ensure BloomFilter building logic is correct, by having one reference per file
 
 // @Filename: declaration.ts
-////var container = { [|42|]: 1 };
+////var container = { [|{| "isDefinition": true |}42|]: 1 };
 
 // @Filename: expression.ts
 ////function blah() { return (container[[|42|]]) === 2;  };
@@ -12,6 +12,16 @@
 ////function blah2() { container["[|42|]"] };
 
 // @Filename: redeclaration.ts
-////container = { "[|42|]" : 18 };
+////container = { "[|{| "isDefinition": true |}42|]" : 18 };
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups(r0, [{ definition: "(property) 42: number", ranges }]);
+verify.referenceGroups([r1, r2], [
+    { definition: "(property) 42: number", ranges: [r0, r3] },
+    { definition: "(property) 42: number", ranges: [r1, r2] }
+]);
+verify.referenceGroups(r3, [
+    { definition: "(property) 42: number", ranges: [r0, r1, r2] },
+    { definition: '(property) "42": number', ranges: [r3] }
+]);
diff --git a/tests/cases/fourslash/referencesBloomFilters3.ts b/tests/cases/fourslash/referencesBloomFilters3.ts
index 9703baceb12..0dd5c645264 100644
--- a/tests/cases/fourslash/referencesBloomFilters3.ts
+++ b/tests/cases/fourslash/referencesBloomFilters3.ts
@@ -4,9 +4,9 @@
 
 
 // @Filename: declaration.ts
-////enum Test { "[|42|]" = 1 };
+////enum Test { "[|{| "isDefinition": true |}42|]" = 1 };
 
 // @Filename: expression.ts
 ////(Test[[|42|]]);
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup('(enum member) Test["42"] = 1');
diff --git a/tests/cases/fourslash/referencesForAmbients.ts b/tests/cases/fourslash/referencesForAmbients.ts
index da3f3f43aae..58e4d6e59a5 100644
--- a/tests/cases/fourslash/referencesForAmbients.ts
+++ b/tests/cases/fourslash/referencesForAmbients.ts
@@ -1,11 +1,11 @@
 /// <reference path='fourslash.ts'/>
 
-////declare module "[|foo|]" {
-////    var [|f|]: number;
+////declare module "[|{| "isDefinition": true |}foo|]" {
+////    var [|{| "isWriteAccess": true, "isDefinition": true |}f|]: number;
 ////}
 ////
-////declare module "[|bar|]" {
-////    export import [|foo|] = require("[|foo|]");
+////declare module "[|{| "isDefinition": true |}bar|]" {
+////    export import [|{| "isWriteAccess": true, "isDefinition": true |}foo|] = require("[|foo|]");
 ////    var f2: typeof [|foo|].[|f|];
 ////}
 ////
@@ -15,7 +15,7 @@
 ////}
 
 const [moduleFoo0, f0, moduleBar0, foo0, moduleFoo1, foo1, f1, moduleBar1, foo2] = test.ranges();
-verify.rangesReferenceEachOther([moduleFoo0, moduleFoo1]);
-verify.rangesReferenceEachOther([moduleBar0, moduleBar1]);
-verify.rangesReferenceEachOther([foo0, foo1, foo2]);
-verify.rangesReferenceEachOther([f0, f1]);
+verify.singleReferenceGroup('module "foo"', [moduleFoo0, moduleFoo1]);
+verify.singleReferenceGroup('module "bar"', [moduleBar0, moduleBar1]);
+verify.singleReferenceGroup('import foo = require("foo")', [foo0, foo1, foo2]);
+verify.singleReferenceGroup("var f: number", [f0, f1]);
diff --git a/tests/cases/fourslash/referencesForClassLocal.ts b/tests/cases/fourslash/referencesForClassLocal.ts
index bdde0e7f126..4108c060a39 100644
--- a/tests/cases/fourslash/referencesForClassLocal.ts
+++ b/tests/cases/fourslash/referencesForClassLocal.ts
@@ -5,7 +5,7 @@
 ////var n = 14;
 ////
 ////class foo {
-////    private [|n|] = 0;
+////    private [|{| "isWriteAccess": true, "isDefinition": true |}n|] = 0;
 ////
 ////    public bar() {
 ////        this.[|n|] = 9;
@@ -20,4 +20,4 @@
 ////    }
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) foo.n: number");
diff --git a/tests/cases/fourslash/referencesForClassMembers.ts b/tests/cases/fourslash/referencesForClassMembers.ts
index 0208b13589d..0db4ebb0873 100644
--- a/tests/cases/fourslash/referencesForClassMembers.ts
+++ b/tests/cases/fourslash/referencesForClassMembers.ts
@@ -1,16 +1,36 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Base {
-////    [|a|]: number;
-////    [|method|](): void { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}a|]: number;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void { }
 ////}
 ////class MyClass extends Base {
-////    [|a|];
-////    [|method|]() { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}a|];
+////    [|{| "isWriteAccess": true, "isDefinition": true |}method|]() { }
 ////}
 ////
 ////var c: MyClass;
 ////c.[|a|];
 ////c.[|method|]();
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+const properties = ranges.get("a");
+const [a0, a1, a2] = properties;
+verify.referenceGroups(a0, [{ definition: "(property) Base.a: number", ranges: properties }]);
+verify.referenceGroups([a1, a2], [
+    { definition: "(property) Base.a: number", ranges: [a0] },
+    { definition: "(property) MyClass.a: any", ranges: [a1, a2] }
+]);
+
+const methods = ranges.get("method");
+const [m0, m1, m2] = methods;
+verify.referenceGroups(m0, [{ definition: "(method) Base.method(): void", ranges: methods }]);
+verify.referenceGroups(m1, [
+    { definition: "(method) Base.method(): void", ranges: [m0] },
+    { definition: "(method) MyClass.method(): void", ranges: [m1, m2] }
+]);
+verify.referenceGroups(m2, [
+    { definition: "(method) Base.method(): void", ranges: [m0] },
+    { definition: "(method) MyClass.method(): void", ranges: [m1] },
+    { definition: "(method) MyClass.method(): void", ranges: [m2] }
+]);
diff --git a/tests/cases/fourslash/referencesForClassMembersExtendingAbstractClass.ts b/tests/cases/fourslash/referencesForClassMembersExtendingAbstractClass.ts
index 46115f9da17..b5be77a73bb 100644
--- a/tests/cases/fourslash/referencesForClassMembersExtendingAbstractClass.ts
+++ b/tests/cases/fourslash/referencesForClassMembersExtendingAbstractClass.ts
@@ -1,16 +1,36 @@
 /// <reference path='fourslash.ts'/>
 
 ////abstract class Base {
-////    abstract [|a|]: number;
-////    abstract [|method|](): void;
+////    abstract [|{| "isWriteAccess": true, "isDefinition": true |}a|]: number;
+////    abstract [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void;
 ////}
 ////class MyClass extends Base {
-////    [|a|];
-////    [|method|]() { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}a|];
+////    [|{| "isWriteAccess": true, "isDefinition": true |}method|]() { }
 ////}
 ////
 ////var c: MyClass;
 ////c.[|a|];
 ////c.[|method|]();
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+const properties = ranges.get("a");
+const [a0, a1, a2] = properties;
+verify.referenceGroups(a0, [{ definition: "(property) Base.a: number", ranges: properties }]);
+verify.referenceGroups([a1, a2], [
+    { definition: "(property) Base.a: number", ranges: [a0] },
+    { definition: "(property) MyClass.a: any", ranges: [a1, a2] }
+]);
+
+const methods = ranges.get("method");
+const [m0, m1, m2] = methods;
+verify.referenceGroups(m0, [{ definition: "(method) Base.method(): void", ranges: methods }]);
+verify.referenceGroups(m1, [
+    { definition: "(method) Base.method(): void", ranges: [m0] },
+    { definition: "(method) MyClass.method(): void", ranges: [m1, m2] }
+]);
+verify.referenceGroups(m2, [
+    { definition: "(method) Base.method(): void", ranges: [m0] },
+    { definition: "(method) MyClass.method(): void", ranges: [m1] },
+    { definition: "(method) MyClass.method(): void", ranges: [m2] }
+]);
diff --git a/tests/cases/fourslash/referencesForClassMembersExtendingGenericClass.ts b/tests/cases/fourslash/referencesForClassMembersExtendingGenericClass.ts
index 2b701f25cc1..3e453663f63 100644
--- a/tests/cases/fourslash/referencesForClassMembersExtendingGenericClass.ts
+++ b/tests/cases/fourslash/referencesForClassMembersExtendingGenericClass.ts
@@ -1,16 +1,36 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Base<T> {
-////    [|a|]: this;
-////    [|method|]<U>(a?:T, b?:U): this { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}a|]: this;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}method|]<U>(a?:T, b?:U): this { }
 ////}
 ////class MyClass extends Base<number> {
-////    [|a|];
-////    [|method|]() { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}a|];
+////    [|{| "isWriteAccess": true, "isDefinition": true |}method|]() { }
 ////}
 ////
 ////var c: MyClass;
 ////c.[|a|];
 ////c.[|method|]();
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+const properties = ranges.get("a");
+const [a0, a1, a2] = properties;
+verify.referenceGroups(a0, [{ definition: "(property) Base<T>.a: this", ranges: properties }]);
+verify.referenceGroups([a1, a2], [
+    { definition: "(property) Base<T>.a: this", ranges: [a0] },
+    { definition: "(property) MyClass.a: any", ranges: [a1, a2] }
+]);
+
+const methods = ranges.get("method");
+const [m0, m1, m2] = methods;
+verify.referenceGroups(m0, [{ definition: "(method) Base<T>.method<U>(a?: T, b?: U): this", ranges: methods }]);
+verify.referenceGroups(m1, [
+    { definition: "(method) Base<T>.method(): void", ranges: [m0] },
+    { definition: "(method) MyClass.method(): void", ranges: [m1, m2] }
+]);
+verify.referenceGroups(m2, [
+    { definition: "(method) Base<T>.method<U>(a?: T, b?: U): this", ranges: [m0] },
+    { definition: "(method) MyClass.method(): void", ranges: [m1] },
+    { definition: "(method) MyClass.method(): void", ranges: [m2] }
+]);
diff --git a/tests/cases/fourslash/referencesForClassParameter.ts b/tests/cases/fourslash/referencesForClassParameter.ts
index ce383b36503..e1a33dc5ac4 100644
--- a/tests/cases/fourslash/referencesForClassParameter.ts
+++ b/tests/cases/fourslash/referencesForClassParameter.ts
@@ -7,7 +7,7 @@
 ////class p { }
 ////
 ////class foo {
-////    constructor (public [|p|]: any) {
+////    constructor (public [|{| "isWriteAccess": true, "isDefinition": true |}p|]: any) {
 ////    }
 ////
 ////    public f(p) {
@@ -19,4 +19,10 @@
 ////var n = new foo(undefined);
 ////n.[|p|] = null;
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups([r0, r1], [{ definition: "(property) foo.p: any", ranges }]);
+verify.referenceGroups(r2, [
+    { definition: "(property) foo.p: any", ranges: [r0, r1] },
+    { definition: "(property) foo.p: any", ranges: [r2] }
+]);
diff --git a/tests/cases/fourslash/referencesForContextuallyTypedObjectLiteralProperties.ts b/tests/cases/fourslash/referencesForContextuallyTypedObjectLiteralProperties.ts
index 65bd7eebfb5..7d6bc05cf30 100644
--- a/tests/cases/fourslash/referencesForContextuallyTypedObjectLiteralProperties.ts
+++ b/tests/cases/fourslash/referencesForContextuallyTypedObjectLiteralProperties.ts
@@ -1,28 +1,36 @@
 /// <reference path='fourslash.ts'/>
 
-////interface IFoo { [|xy|]: number; }
+////interface IFoo { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: number; }
 ////
 ////// Assignment
-////var a1: IFoo = { [|xy|]: 0 };
-////var a2: IFoo = { [|xy|]: 0 };
+////var a1: IFoo = { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 0 };
+////var a2: IFoo = { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 0 };
 ////
 ////// Function call
 ////function consumer(f: IFoo) { }
-////consumer({ [|xy|]: 1 });
+////consumer({ [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 1 });
 ////
-////// Type cast 
-////var c = <IFoo>{ [|xy|]: 0 };
+////// Type cast
+////var c = <IFoo>{ [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 0 };
 ////
 ////// Array literal
-////var ar: IFoo[] = [{ [|xy|]: 1 }, { [|xy|]: 2 }];
+////var ar: IFoo[] = [{ [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 1 }, { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 2 }];
 ////
 ////// Nested object literal
-////var ob: { ifoo: IFoo } = { ifoo: { [|xy|]: 0 } };
+////var ob: { ifoo: IFoo } = { ifoo: { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 0 } };
 ////
 ////// Widened type
-////var w: IFoo = { [|xy|]: undefined };
+////var w: IFoo = { [|{| "isWriteAccess": true, "isDefinition": true, "type": "undefined" |}xy|]: undefined };
 ////
 ////// Untped -- should not be included
 ////var u = { xy: 0 };
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+verify.referenceGroups(ranges[0], [{ definition: "(property) IFoo.xy: number", ranges }]);
+for (const range of ranges.slice(1)) {
+    const type = range.marker.data.type || "number";
+    verify.referenceGroups(range, [
+        { definition: "(property) IFoo.xy: number", ranges: ranges.filter(r => r !== range) },
+        { definition: `(property) xy: ${type}`, ranges: [range] }
+    ]);
+}
diff --git a/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties.ts b/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties.ts
index c0e4a5f90ea..d79d4097ee7 100644
--- a/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties.ts
+++ b/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties.ts
@@ -2,33 +2,33 @@
 
 ////interface A {
 ////    a: number;
-////    [|common|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}common|]: string;
 ////}
 ////
 ////interface B {
 ////    b: number;
-////    [|common|]: number;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}common|]: number;
 ////}
 ////
 ////// Assignment
-////var v1: A | B = { a: 0, [|common|]: "" };
-////var v2: A | B = { b: 0, [|common|]: 3 };
+////var v1: A | B = { a: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "string" |}common|]: "" };
+////var v2: A | B = { b: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 3 };
 ////
 ////// Function call
 ////function consumer(f:  A | B) { }
-////consumer({ a: 0, b: 0, [|common|]: 1 });
+////consumer({ a: 0, b: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 1 });
 ////
-////// Type cast 
-////var c = <A | B> { [|common|]: 0, b: 0 };
+////// Type cast
+////var c = <A | B> { [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 0, b: 0 };
 ////
 ////// Array literal
-////var ar: Array<A|B> = [{ a: 0, [|common|]: "" }, { b: 0, [|common|]: 0 }];
+////var ar: Array<A|B> = [{ a: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "string" |}common|]: "" }, { b: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 0 }];
 ////
 ////// Nested object literal
-////var ob: { aorb: A|B } = { aorb: { b: 0, [|common|]: 0 } };
+////var ob: { aorb: A|B } = { aorb: { b: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 0 } };
 ////
 ////// Widened type
-////var w: A|B = { a:0, [|common|]: undefined };
+////var w: A|B = { a:0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "undefined" |}common|]: undefined };
 ////
 ////// Untped -- should not be included
 ////var u1 = { a: 0, b: 0, common: "" };
@@ -36,8 +36,14 @@
 
 const all = test.ranges();
 const [aCommon, bCommon, ...unionRefs] = all;
-verify.referencesOf(aCommon, [aCommon, ...unionRefs]);
-verify.referencesOf(bCommon, [bCommon, ...unionRefs]);
-for (const ref of unionRefs) {
-    verify.referencesOf(ref, all);
-}
+verify.referenceGroups(aCommon, [{ definition: "(property) A.common: string", ranges: [aCommon, ...unionRefs] }]);
+verify.referenceGroups(bCommon, [{ definition: "(property) B.common: number", ranges: [bCommon, ...unionRefs] }]);
+
+unionRefs.forEach((unionRef, idx) => {
+    const type = unionRef.marker.data.type;
+    verify.referenceGroups(unionRef, [
+        { definition: "(property) A.common: string", ranges: all.filter(x => x !== bCommon && x !== unionRef) },
+        { definition: "(property) B.common: number", ranges: [bCommon] },
+        { definition: `(property) common: ${type}`, ranges: [unionRef] }
+    ]);
+});
diff --git a/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties2.ts b/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties2.ts
index de9ffbfd3be..2c48e353b03 100644
--- a/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties2.ts
+++ b/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties2.ts
@@ -6,32 +6,40 @@
 ////}
 ////
 ////interface B {
-////    [|b|]: number;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}b|]: number;
 ////    common: number;
 ////}
 ////
 ////// Assignment
 ////var v1: A | B = { a: 0, common: "" };
-////var v2: A | B = { [|b|]: 0, common: 3 };
+////var v2: A | B = { [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0, common: 3 };
 ////
 ////// Function call
 ////function consumer(f:  A | B) { }
-////consumer({ a: 0, [|b|]: 0, common: 1 });
+////consumer({ a: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0, common: 1 });
 ////
-////// Type cast 
-////var c = <A | B> { common: 0, [|b|]: 0 };
+////// Type cast
+////var c = <A | B> { common: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0 };
 ////
 ////// Array literal
-////var ar: Array<A|B> = [{ a: 0, common: "" }, { [|b|]: 0, common: 0 }];
+////var ar: Array<A|B> = [{ a: 0, common: "" }, { [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0, common: 0 }];
 ////
 ////// Nested object literal
-////var ob: { aorb: A|B } = { aorb: { [|b|]: 0, common: 0 } };
+////var ob: { aorb: A|B } = { aorb: { [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0, common: 0 } };
 ////
 ////// Widened type
-////var w: A|B = { [|b|]:undefined, common: undefined };
+////var w: A|B = { [|{| "isWriteAccess": true, "isDefinition": true, "type": "undefined" |}b|]:undefined, common: undefined };
 ////
 ////// Untped -- should not be included
 ////var u1 = { a: 0, b: 0, common: "" };
 ////var u2 = { b: 0, common: 0 };
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+verify.referenceGroups(ranges[0], [{ definition: "(property) B.b: number", ranges }]);
+for (const reference of ranges.slice(1)) {
+    const type = reference.marker.data.type;
+    verify.referenceGroups(reference, [
+        { definition: "(property) B.b: number", ranges: ranges.filter(r => r !== reference) },
+        { definition: `(property) b: ${type}`, ranges: [reference] }
+    ]);
+}
diff --git a/tests/cases/fourslash/referencesForEnums.ts b/tests/cases/fourslash/referencesForEnums.ts
index 3b979bc5096..68face36d04 100644
--- a/tests/cases/fourslash/referencesForEnums.ts
+++ b/tests/cases/fourslash/referencesForEnums.ts
@@ -1,9 +1,9 @@
 /// <reference path='fourslash.ts'/>
 
 ////enum E {
-////    [|value1|] = 1,
-////    "[|value2|]" = [|value1|],
-////    [|111|] = 11
+////    [|{| "isWriteAccess": true, "isDefinition": true |}value1|] = 1,
+////    "[|{| "isDefinition": true |}value2|]" = [|value1|],
+////    [|{| "isDefinition": true |}111|] = 11
 ////}
 ////
 ////E.[|value1|];
@@ -11,4 +11,7 @@
 ////E.[|value2|];
 ////E[[|111|]];
 
-verify.rangesWithSameTextReferenceEachOther();
+const r = test.rangesByText();
+verify.singleReferenceGroup("(enum member) E.value1 = 1", r.get("value1"));
+verify.singleReferenceGroup("(enum member) E[\"value2\"] = 1", r.get("value2"));
+verify.singleReferenceGroup("(enum member) E[111] = 11", r.get("111"));
diff --git a/tests/cases/fourslash/referencesForExportedValues.ts b/tests/cases/fourslash/referencesForExportedValues.ts
index 315d0b1b585..ff00f844260 100644
--- a/tests/cases/fourslash/referencesForExportedValues.ts
+++ b/tests/cases/fourslash/referencesForExportedValues.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 ////module M {
-////    export var [|variable|] = 0;
+////    export var [|{| "isWriteAccess": true, "isDefinition": true |}variable|] = 0;
 ////
 ////    // local use
 ////    var x = [|variable|];
@@ -10,4 +10,4 @@
 ////// external use
 ////M.[|variable|]
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var M.variable: number");
diff --git a/tests/cases/fourslash/referencesForExternalModuleNames.ts b/tests/cases/fourslash/referencesForExternalModuleNames.ts
index ee783c8bd7e..5e01eae3530 100644
--- a/tests/cases/fourslash/referencesForExternalModuleNames.ts
+++ b/tests/cases/fourslash/referencesForExternalModuleNames.ts
@@ -3,7 +3,7 @@
 // Global interface reference.
 
 // @Filename: referencesForGlobals_1.ts
-////declare module "[|foo|]" {
+////declare module "[|{| "isDefinition": true |}foo|]" {
 ////    var f: number;
 ////}
 
@@ -11,4 +11,7 @@
 // @Filename: referencesForGlobals_2.ts
 ////import f = require("[|foo|]");
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: 'module "foo"', ranges }]);
+verify.referenceGroups(r1, [{ definition: 'module f', ranges }]);
diff --git a/tests/cases/fourslash/referencesForFunctionOverloads.ts b/tests/cases/fourslash/referencesForFunctionOverloads.ts
index d6873643cd4..7afa5a20133 100644
--- a/tests/cases/fourslash/referencesForFunctionOverloads.ts
+++ b/tests/cases/fourslash/referencesForFunctionOverloads.ts
@@ -2,9 +2,9 @@
 
 // Function overloads should be highlighted together.
 
-////function [|foo|](x: string);
-////function [|foo|](x: string, y: number) {
+////function [|{| "isWriteAccess": true, "isDefinition": true |}foo|](x: string);
+////function [|{| "isWriteAccess": true, "isDefinition": true |}foo|](x: string, y: number) {
 ////    [|foo|]('', 43);
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("function foo(x: string): any");
diff --git a/tests/cases/fourslash/referencesForFunctionParameter.ts b/tests/cases/fourslash/referencesForFunctionParameter.ts
index 64d33ca9a60..24582a68e08 100644
--- a/tests/cases/fourslash/referencesForFunctionParameter.ts
+++ b/tests/cases/fourslash/referencesForFunctionParameter.ts
@@ -3,9 +3,9 @@
 ////var x;
 ////var n;
 ////
-////function n(x: number, [|n|]: number) {
-////    [|n|] = 32;
+////function n(x: number, [|{| "isWriteAccess": true, "isDefinition": true |}n|]: number) {
+////    [|{| "isWriteAccess": true |}n|] = 32;
 ////    x = [|n|];
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(parameter) n: number");
diff --git a/tests/cases/fourslash/referencesForGlobals.ts b/tests/cases/fourslash/referencesForGlobals.ts
index f4d7c479767..dc5bc4deb6f 100644
--- a/tests/cases/fourslash/referencesForGlobals.ts
+++ b/tests/cases/fourslash/referencesForGlobals.ts
@@ -3,7 +3,7 @@
 // Global variable reference.
 
 // @Filename: referencesForGlobals_1.ts
-////var [|global|] = 2;
+////var [|{| "isWriteAccess": true, "isDefinition": true |}global|] = 2;
 ////
 ////class foo {
 ////    constructor (public global) { }
@@ -25,4 +25,4 @@
 // @Filename: referencesForGlobals_2.ts
 ////var m = [|global|];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var global: number");
diff --git a/tests/cases/fourslash/referencesForGlobals2.ts b/tests/cases/fourslash/referencesForGlobals2.ts
index 7c6baf5bf67..e08be585c7a 100644
--- a/tests/cases/fourslash/referencesForGlobals2.ts
+++ b/tests/cases/fourslash/referencesForGlobals2.ts
@@ -3,11 +3,11 @@
 // Global class reference.
 
 // @Filename: referencesForGlobals_1.ts
-////class [|globalClass|] {
+////class [|{| "isWriteAccess": true, "isDefinition": true |}globalClass|] {
 ////    public f() { }
 ////}
 
 // @Filename: referencesForGlobals_2.ts
 ////var c = [|globalClass|]();
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("class globalClass");
diff --git a/tests/cases/fourslash/referencesForGlobals3.ts b/tests/cases/fourslash/referencesForGlobals3.ts
index 67e209aaad3..38edddc8255 100644
--- a/tests/cases/fourslash/referencesForGlobals3.ts
+++ b/tests/cases/fourslash/referencesForGlobals3.ts
@@ -3,11 +3,11 @@
 // Global interface reference.
 
 // @Filename: referencesForGlobals_1.ts
-////interface [|globalInterface|] {
+////interface [|{| "isWriteAccess": true, "isDefinition": true |}globalInterface|] {
 ////     f();
 ////}
 
 // @Filename: referencesForGlobals_2.ts
 ////var i: [|globalInterface|];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("interface globalInterface");
diff --git a/tests/cases/fourslash/referencesForGlobals4.ts b/tests/cases/fourslash/referencesForGlobals4.ts
index d7acfbd2df4..b8356461699 100644
--- a/tests/cases/fourslash/referencesForGlobals4.ts
+++ b/tests/cases/fourslash/referencesForGlobals4.ts
@@ -3,11 +3,11 @@
 // Global module reference.
 
 // @Filename: referencesForGlobals_1.ts
-////module [|globalModule|] {
+////module [|{| "isWriteAccess": true, "isDefinition": true |}globalModule|] {
 ////     export f() { };
 ////}
 
 // @Filename: referencesForGlobals_2.ts
 ////var m = [|globalModule|];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("namespace globalModule");
diff --git a/tests/cases/fourslash/referencesForGlobals5.ts b/tests/cases/fourslash/referencesForGlobals5.ts
index 4db2410f638..d7dd9304746 100644
--- a/tests/cases/fourslash/referencesForGlobals5.ts
+++ b/tests/cases/fourslash/referencesForGlobals5.ts
@@ -7,9 +7,9 @@
 ////    export var x;
 ////}
 ////
-////import [|globalAlias|] = globalModule;
+////import [|{| "isWriteAccess": true, "isDefinition": true |}globalAlias|] = globalModule;
 
 // @Filename: referencesForGlobals_2.ts
 ////var m = [|globalAlias|];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("import globalAlias = globalModule");
diff --git a/tests/cases/fourslash/referencesForGlobalsInExternalModule.ts b/tests/cases/fourslash/referencesForGlobalsInExternalModule.ts
index c2f70420402..5047a2f12a4 100644
--- a/tests/cases/fourslash/referencesForGlobalsInExternalModule.ts
+++ b/tests/cases/fourslash/referencesForGlobalsInExternalModule.ts
@@ -2,20 +2,28 @@
 
 // Global variable reference.
 
-////var [|topLevelVar|] = 2;
+////var [|{| "isWriteAccess": true, "isDefinition": true |}topLevelVar|] = 2;
 ////var topLevelVar2 = [|topLevelVar|];
 ////
-////class [|topLevelClass|] { }
+////class [|{| "isWriteAccess": true, "isDefinition": true |}topLevelClass|] { }
 ////var c = new [|topLevelClass|]();
 ////
-////interface [|topLevelInterface|] { }
+////interface [|{| "isWriteAccess": true, "isDefinition": true |}topLevelInterface|] { }
 ////var i: [|topLevelInterface|];
 ////
-////module [|topLevelModule|] {
+////module [|{| "isWriteAccess": true, "isDefinition": true |}topLevelModule|] {
 ////    export var x;
 ////}
 ////var x = [|topLevelModule|].x;
 ////
 ////export = x;
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+verify.singleReferenceGroup("var topLevelVar: number", ranges.get("topLevelVar"));
+
+const topLevelClass = ranges.get("topLevelClass");
+verify.referenceGroups(topLevelClass[0], [{ definition: "class topLevelClass", ranges: topLevelClass }]);
+verify.referenceGroups(topLevelClass[1], [{ definition: "constructor topLevelClass(): topLevelClass", ranges: topLevelClass }]);
+
+verify.singleReferenceGroup("interface topLevelInterface", ranges.get("topLevelInterface"));
+verify.singleReferenceGroup("namespace topLevelModule", ranges.get("topLevelModule"));
diff --git a/tests/cases/fourslash/referencesForIllegalAssignment.ts b/tests/cases/fourslash/referencesForIllegalAssignment.ts
index 59cb6f4f273..f65cd5bf1a6 100644
--- a/tests/cases/fourslash/referencesForIllegalAssignment.ts
+++ b/tests/cases/fourslash/referencesForIllegalAssignment.ts
@@ -2,13 +2,13 @@
 
 ////f/*1*/oo = fo/*2*/o;
 
-////var [|bar|] = function () { };
-////[|bar|] = [|bar|] + 1;
+////var [|{| "isWriteAccess": true, "isDefinition": true |}bar|] = function () { };
+////[|{| "isWriteAccess": true |}bar|] = [|bar|] + 1;
 
 goTo.marker("1");
-verify.referencesAre([]);
+verify.noReferences();
 
 goTo.marker("2");
-verify.referencesAre([]);
+verify.noReferences();
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var bar: () => void");
diff --git a/tests/cases/fourslash/referencesForImports.ts b/tests/cases/fourslash/referencesForImports.ts
index 0203bcee096..54cbb0f1155 100644
--- a/tests/cases/fourslash/referencesForImports.ts
+++ b/tests/cases/fourslash/referencesForImports.ts
@@ -5,11 +5,11 @@
 ////    export = $;
 ////}
 
-////import [|$|] = require("jquery");
+////import [|{| "isWriteAccess": true, "isDefinition": true |}$|] = require("jquery");
 ////[|$|]("a");
 
-////import [|$|] = require("jquery");
+////import [|{| "isWriteAccess": true, "isDefinition": true |}$|] = require("jquery");
 
 const [r0, r1, r2] = test.ranges();
-verify.rangesReferenceEachOther([r0, r1]);
-verify.referencesOf(r2, [r2]);
+verify.singleReferenceGroup('import $ = require("jquery")', [r0, r1]);
+verify.singleReferenceGroup('import $ = require("jquery")', [r2]);
diff --git a/tests/cases/fourslash/referencesForIndexProperty.ts b/tests/cases/fourslash/referencesForIndexProperty.ts
index 49d12c25819..dba2549e414 100644
--- a/tests/cases/fourslash/referencesForIndexProperty.ts
+++ b/tests/cases/fourslash/referencesForIndexProperty.ts
@@ -3,12 +3,14 @@
 // References a class property using string index access
 
 ////class Foo {
-////    [|property|]: number;
-////    [|method|](): void { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}property|]: number;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void { }
 ////}
 ////
 ////var f: Foo;
 ////f["[|property|]"];
 ////f["[|method|]"];
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+verify.singleReferenceGroup("(property) Foo.property: number", ranges.get("property"));
+verify.singleReferenceGroup("(method) Foo.method(): void", ranges.get("method"));
diff --git a/tests/cases/fourslash/referencesForIndexProperty2.ts b/tests/cases/fourslash/referencesForIndexProperty2.ts
index 35c9d7cdd64..a4d5c75a908 100644
--- a/tests/cases/fourslash/referencesForIndexProperty2.ts
+++ b/tests/cases/fourslash/referencesForIndexProperty2.ts
@@ -5,4 +5,4 @@
 ////var a;
 ////a["[|blah|]"];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup('"blah"');
diff --git a/tests/cases/fourslash/referencesForIndexProperty3.ts b/tests/cases/fourslash/referencesForIndexProperty3.ts
index 1fdee9b6602..a2e008c937e 100644
--- a/tests/cases/fourslash/referencesForIndexProperty3.ts
+++ b/tests/cases/fourslash/referencesForIndexProperty3.ts
@@ -3,7 +3,7 @@
 // References to a property of the apparent type using string indexer
 
 ////interface Object {
-////    [|toMyString|]();
+////    [|{| "isWriteAccess": true, "isDefinition": true |}toMyString|]();
 ////}
 ////
 ////var y: Object;
@@ -12,4 +12,4 @@
 ////var x = {};
 ////x["[|toMyString|]"]();
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(method) Object.toMyString(): any");
diff --git a/tests/cases/fourslash/referencesForInheritedProperties.ts b/tests/cases/fourslash/referencesForInheritedProperties.ts
index 19fef4066ee..c2674fe1fe1 100644
--- a/tests/cases/fourslash/referencesForInheritedProperties.ts
+++ b/tests/cases/fourslash/referencesForInheritedProperties.ts
@@ -1,15 +1,15 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface interface1 {
-////    [|doStuff|](): void;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;
 ////}
 ////
 ////interface interface2  extends interface1{
-////    [|doStuff|](): void;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;
 ////}
 ////
 ////class class1 implements interface2 {
-////    [|doStuff|]() {
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() {
 ////
 ////    }
 ////}
@@ -21,4 +21,21 @@
 ////var v: class2;
 ////v.[|doStuff|]();
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) interface1.doStuff(): void", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) interface1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface2.doStuff(): void", ranges: [r1, r2, r3] }
+]);
+verify.referenceGroups(r2, [
+    { definition: "(method) interface1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface2.doStuff(): void", ranges: [r1] },
+    { definition: "(method) class1.doStuff(): void", ranges: [r2, r3] }
+]);
+verify.referenceGroups(r3, [
+    { definition: "(method) interface1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface2.doStuff(): void", ranges: [r1] },
+    { definition: "(method) class1.doStuff(): void", ranges: [r2] },
+    { definition: "(method) class1.doStuff(): void", ranges: [r3] }
+]);
diff --git a/tests/cases/fourslash/referencesForInheritedProperties2.ts b/tests/cases/fourslash/referencesForInheritedProperties2.ts
index 33a7f26aaea..0f89a9aa744 100644
--- a/tests/cases/fourslash/referencesForInheritedProperties2.ts
+++ b/tests/cases/fourslash/referencesForInheritedProperties2.ts
@@ -3,18 +3,18 @@
 // extends statement in a diffrent declaration
 
 ////interface interface1 {
-////    [|doStuff|](): void;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;
 ////}
 ////
 ////interface interface2 {
-////    [|doStuff|](): void;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;
 ////}
 ////
 ////interface interface2 extends interface1 {
 ////}
 ////
 ////class class1 implements interface2 {
-////    [|doStuff|]() {
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() {
 ////
 ////    }
 ////}
@@ -26,4 +26,21 @@
 ////var v: class2;
 ////v.[|doStuff|]();
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) interface1.doStuff(): void", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) interface1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface2.doStuff(): void", ranges: [r1, r2, r3] }
+]);
+verify.referenceGroups(r2, [
+    { definition: "(method) interface1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface2.doStuff(): void", ranges: [r1] },
+    { definition: "(method) class1.doStuff(): void", ranges: [r2, r3] }
+]);
+verify.referenceGroups(r3, [
+    { definition: "(method) interface1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface2.doStuff(): void", ranges: [r1] },
+    { definition: "(method) class1.doStuff(): void", ranges: [r2] },
+    { definition: "(method) class1.doStuff(): void", ranges: [r3] }
+]);
diff --git a/tests/cases/fourslash/referencesForInheritedProperties3.ts b/tests/cases/fourslash/referencesForInheritedProperties3.ts
index 3a2d11da692..c6c870ca350 100644
--- a/tests/cases/fourslash/referencesForInheritedProperties3.ts
+++ b/tests/cases/fourslash/referencesForInheritedProperties3.ts
@@ -1,12 +1,14 @@
 /// <reference path='fourslash.ts'/>
 
 //// interface interface1 extends interface1 {
-////    [|doStuff|](): void;
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 ////
 //// var v: interface1;
 //// v.[|propName|];
 //// v.[|doStuff|]();
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+verify.singleReferenceGroup("(method) interface1.doStuff(): void", ranges.get("doStuff"));
+verify.singleReferenceGroup("(property) interface1.propName: string", ranges.get("propName"));
diff --git a/tests/cases/fourslash/referencesForInheritedProperties4.ts b/tests/cases/fourslash/referencesForInheritedProperties4.ts
index 96010d05086..8a822ec5238 100644
--- a/tests/cases/fourslash/referencesForInheritedProperties4.ts
+++ b/tests/cases/fourslash/referencesForInheritedProperties4.ts
@@ -1,12 +1,21 @@
 /// <reference path='fourslash.ts'/>
 
 //// class class1 extends class1 {
-////    [|doStuff|]() { }
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 ////
 //// var c: class1;
 //// c.[|doStuff|]();
 //// c.[|propName|];
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+const [r0, r1] = ranges.get("doStuff");
+verify.referenceGroups(r0, [
+    { definition: "(method) class1.doStuff(): void", ranges: [r0, r1] },
+]);
+verify.referenceGroups(r1, [
+    { definition: "(method) class1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) class1.doStuff(): void", ranges: [r1] },
+]);
+verify.singleReferenceGroup("(property) class1.propName: string", ranges.get("propName"));
diff --git a/tests/cases/fourslash/referencesForInheritedProperties5.ts b/tests/cases/fourslash/referencesForInheritedProperties5.ts
index bbb86f0defb..7a5cff0ad2b 100644
--- a/tests/cases/fourslash/referencesForInheritedProperties5.ts
+++ b/tests/cases/fourslash/referencesForInheritedProperties5.ts
@@ -1,16 +1,28 @@
 /// <reference path='fourslash.ts'/>
 
 //// interface interface1 extends interface1 {
-////    [|doStuff|](): void;
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 //// interface interface2 extends interface1 {
-////    [|doStuff|](): void;
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 ////
 //// var v: interface1;
 //// v.[|propName|];
 //// v.[|doStuff|]();
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+const [m0, m1, m2] = ranges.get("doStuff");
+const [p0, p1, p2] = ranges.get("propName");
+verify.referenceGroups([m0, m2], [{ definition: "(method) interface1.doStuff(): void", ranges: [m0, m1, m2] }]);
+verify.referenceGroups(m1, [
+    { definition: "(method) interface1.doStuff(): void", ranges: [m0, m2] },
+    { definition: "(method) interface2.doStuff(): void", ranges: [m1] }
+]);
+verify.referenceGroups([p0, p2], [{ definition: "(property) interface1.propName: string", ranges: [p0, p1, p2] }]);
+verify.referenceGroups(p1, [
+    { definition: "(property) interface1.propName: string", ranges: [p0, p2] },
+    { definition: "(property) interface2.propName: string", ranges: [p1] }
+]);
diff --git a/tests/cases/fourslash/referencesForInheritedProperties6.ts b/tests/cases/fourslash/referencesForInheritedProperties6.ts
index ff008cceb43..a39dc085c71 100644
--- a/tests/cases/fourslash/referencesForInheritedProperties6.ts
+++ b/tests/cases/fourslash/referencesForInheritedProperties6.ts
@@ -1,16 +1,27 @@
 /// <reference path='fourslash.ts'/>
 
 //// class class1 extends class1 {
-////    [|doStuff|]() { }
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 //// class class2 extends class1 {
-////    [|doStuff|]() { }
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 ////
 //// var v: class2;
 //// v.[|propName|];
 //// v.[|doStuff|]();
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+const [m0, m1, m2] = ranges.get("doStuff");
+verify.referenceGroups(m0, [{ definition: "(method) class1.doStuff(): void", ranges: [m0, m1, m2] }]);
+verify.referenceGroups(m1, [
+    { definition: "(method) class1.doStuff(): void", ranges: [m0] },
+    { definition: "(method) class2.doStuff(): void", ranges: [m1, m2] }
+]);
+verify.referenceGroups(m2, [
+    { definition: "(method) class1.doStuff(): void", ranges: [m0] },
+    { definition: "(method) class2.doStuff(): void", ranges: [m1] },
+    { definition: "(method) class2.doStuff(): void", ranges: [m2] }
+]);
diff --git a/tests/cases/fourslash/referencesForInheritedProperties7.ts b/tests/cases/fourslash/referencesForInheritedProperties7.ts
index ec92a06f0a3..4911cbefd57 100644
--- a/tests/cases/fourslash/referencesForInheritedProperties7.ts
+++ b/tests/cases/fourslash/referencesForInheritedProperties7.ts
@@ -1,30 +1,40 @@
 /// <reference path='fourslash.ts'/>
 
 //// class class1 extends class1 {
-////    [|doStuff|]() { }
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 //// interface interface1 extends interface1 {
-////    [|doStuff|](): void;
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 //// class class2 extends class1 implements interface1 {
-////    [|doStuff|]() { }
-////    [|propName|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { }
+////    [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string;
 //// }
 ////
 //// var v: class2;
-//// v.[|propName|];
 //// v.[|doStuff|]();
+//// v.[|propName|];
 
 const [r0, r1, r2, r3, r4, r5, r6, r7] = test.ranges();
-verify.referencesOf(r0, [r0, r4, r7]);
-verify.referencesOf(r1, [r1, r5, r6]);
-verify.referencesOf(r2, [r2, r4, r7]);
-verify.referencesOf(r3, [r3, r5, r6]);
-const allDoStuff = [r0, r2, r4, r7];
-verify.referencesOf(r4, allDoStuff);
-const allPropName = [r1, r3, r5, r6];
-verify.referencesOf(r5, allPropName);
-verify.referencesOf(r6, allPropName);
-verify.referencesOf(r7, allDoStuff);
+verify.referenceGroups(r0, [{ definition: "(method) class1.doStuff(): void", ranges: [r0, r4, r6] }]);
+verify.referenceGroups(r1, [{ definition: "(property) class1.propName: string", ranges: [r1, r5, r7] }]);
+verify.referenceGroups(r2, [{ definition: "(method) interface1.doStuff(): void", ranges: [r2, r4, r6] }]);
+verify.referenceGroups(r3, [{ definition: "(property) interface1.propName: string", ranges: [r3, r5, r7] }]);
+verify.referenceGroups(r4, [
+    { definition: "(method) class1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface1.doStuff(): void", ranges: [r2] },
+    { definition: "(method) class2.doStuff(): void", ranges: [r4, r6] }
+]);
+verify.referenceGroups([r5, r7], [
+    { definition: "(property) class1.propName: string", ranges: [r1] },
+    { definition: "(property) interface1.propName: string", ranges: [r3] },
+    { definition: "(property) class2.propName: string", ranges: [r5, r7] }
+]);
+verify.referenceGroups(r6, [
+    { definition: "(method) class1.doStuff(): void", ranges: [r0] },
+    { definition: "(method) interface1.doStuff(): void", ranges: [r2] },
+    { definition: "(method) class2.doStuff(): void", ranges: [r4] },
+    { definition: "(method) class2.doStuff(): void", ranges: [r6] }
+]);
diff --git a/tests/cases/fourslash/referencesForInheritedProperties8.ts b/tests/cases/fourslash/referencesForInheritedProperties8.ts
index 964309fc477..d0d94b49b57 100644
--- a/tests/cases/fourslash/referencesForInheritedProperties8.ts
+++ b/tests/cases/fourslash/referencesForInheritedProperties8.ts
@@ -1,16 +1,19 @@
 /// <reference path='fourslash.ts'/>
 
 //// interface C extends D {
-////     [|propD|]: number;
+////     [|{| "isWriteAccess": true, "isDefinition": true |}propD|]: number;
 //// }
 //// interface D extends C {
-////     [|propD|]: string;
-////     [|propC|]: number;
+////     [|{| "isWriteAccess": true, "isDefinition": true |}propD|]: string;
+////     [|{| "isWriteAccess": true, "isDefinition": true |}propC|]: number;
 //// }
 //// var d: D;
 //// d.[|propD|];
 //// d.[|propC|];
 
 const [d0, d1, c0, d2, c1] = test.ranges();
-verify.rangesReferenceEachOther([d0, d1, d2]);
-verify.rangesReferenceEachOther([c0, c1]);
+verify.referenceGroups([d0, d1, d2], [
+    { definition: "(property) C.propD: number", ranges: [d0] },
+    { definition: "(property) D.propD: string", ranges: [d1, d2] },
+]);
+verify.singleReferenceGroup("(property) D.propC: number", [c0, c1]);
diff --git a/tests/cases/fourslash/referencesForInheritedProperties9.ts b/tests/cases/fourslash/referencesForInheritedProperties9.ts
index 7d4330d0aa6..27bc164a8fc 100644
--- a/tests/cases/fourslash/referencesForInheritedProperties9.ts
+++ b/tests/cases/fourslash/referencesForInheritedProperties9.ts
@@ -1,16 +1,16 @@
 /// <reference path='fourslash.ts'/>
 
 //// class D extends C {
-////     [|prop1|]: string;
+////     [|{| "isWriteAccess": true, "isDefinition": true |}prop1|]: string;
 //// }
-//// 
+////
 //// class C extends D {
-////     [|prop1|]: string;
+////     [|{| "isWriteAccess": true, "isDefinition": true |}prop1|]: string;
 //// }
-//// 
+////
 //// var c: C;
 //// c.[|prop1|];
 
 const [r0, r1, r2] = test.ranges();
-verify.referencesOf(r0, [r0]);
-verify.rangesReferenceEachOther([r1, r2]);
+verify.singleReferenceGroup("(property) D.prop1: string", [r0]);
+verify.singleReferenceGroup("(property) C.prop1: string", [r1, r2]);
diff --git a/tests/cases/fourslash/referencesForLabel.ts b/tests/cases/fourslash/referencesForLabel.ts
index 14b58fd1d92..1abcafda0f2 100644
--- a/tests/cases/fourslash/referencesForLabel.ts
+++ b/tests/cases/fourslash/referencesForLabel.ts
@@ -11,5 +11,5 @@
 ////var label = "label";
 
 const [r0, r1, r2, r3] = test.ranges();
-verify.rangesReferenceEachOther([r0, r1, r2]);
-verify.referencesOf(r3, [r3]);
+verify.singleReferenceGroup("label", [r0, r1, r2]);
+verify.singleReferenceGroup("label", [r3]);
diff --git a/tests/cases/fourslash/referencesForLabel2.ts b/tests/cases/fourslash/referencesForLabel2.ts
index 841e35ad700..6f3721431e0 100644
--- a/tests/cases/fourslash/referencesForLabel2.ts
+++ b/tests/cases/fourslash/referencesForLabel2.ts
@@ -8,5 +8,4 @@
 ////    if (true) continue label;
 ////}
 
-goTo.marker();
-verify.referencesAre([]);
+verify.noReferences("");
diff --git a/tests/cases/fourslash/referencesForLabel3.ts b/tests/cases/fourslash/referencesForLabel3.ts
index fb7a51f858e..13622eb90c3 100644
--- a/tests/cases/fourslash/referencesForLabel3.ts
+++ b/tests/cases/fourslash/referencesForLabel3.ts
@@ -6,5 +6,4 @@
 ////    var label = "label";
 ////}
 
-const [label] = test.ranges();
-verify.referencesOf(label, [label]);
+verify.singleReferenceGroup("label");
diff --git a/tests/cases/fourslash/referencesForLabel4.ts b/tests/cases/fourslash/referencesForLabel4.ts
index 5462500f53c..2ff159bc755 100644
--- a/tests/cases/fourslash/referencesForLabel4.ts
+++ b/tests/cases/fourslash/referencesForLabel4.ts
@@ -8,4 +8,4 @@
 ////    }
 ////}
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("label");
diff --git a/tests/cases/fourslash/referencesForLabel5.ts b/tests/cases/fourslash/referencesForLabel5.ts
index 48d5aab04c2..bc986e3350d 100644
--- a/tests/cases/fourslash/referencesForLabel5.ts
+++ b/tests/cases/fourslash/referencesForLabel5.ts
@@ -13,5 +13,5 @@
 ////        }
 
 const [outer1, outer2, inner1, inner2, outer3] = test.ranges();
-verify.rangesReferenceEachOther([outer1, outer2, outer3]);
-verify.rangesReferenceEachOther([inner1, inner2]);
+verify.singleReferenceGroup("label", [outer1, outer2, outer3]);
+verify.singleReferenceGroup("label", [inner1, inner2]);
diff --git a/tests/cases/fourslash/referencesForLabel6.ts b/tests/cases/fourslash/referencesForLabel6.ts
index aea45805756..0255c07943c 100644
--- a/tests/cases/fourslash/referencesForLabel6.ts
+++ b/tests/cases/fourslash/referencesForLabel6.ts
@@ -7,6 +7,6 @@
 ////            break labelc;
 ////}
 
-const [a, b, useB] = test.ranges();
-verify.referencesOf(a, [a]);
-verify.rangesReferenceEachOther([b, useB]);
+const ranges = test.rangesByText();
+verify.singleReferenceGroup("labela", ranges.get("labela"));
+verify.singleReferenceGroup("labelb", ranges.get("labelb"));
diff --git a/tests/cases/fourslash/referencesForMergedDeclarations.ts b/tests/cases/fourslash/referencesForMergedDeclarations.ts
index 8a0a5d4c680..3e2fe8e4b2c 100644
--- a/tests/cases/fourslash/referencesForMergedDeclarations.ts
+++ b/tests/cases/fourslash/referencesForMergedDeclarations.ts
@@ -1,13 +1,13 @@
 /// <reference path='fourslash.ts'/>
 
-////interface [|Foo|] {
+////interface [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] {
 ////}
 ////
-////module [|Foo|] {
+////module [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] {
 ////    export interface Bar { }
 ////}
 ////
-////function [|Foo|](): void {
+////function [|{| "isWriteAccess": true, "isDefinition": true |}Foo|](): void {
 ////}
 ////
 ////var f1: [|Foo|].Bar;
@@ -15,6 +15,7 @@
 ////[|Foo|].bind(this);
 
 const [type1, namespace1, value1, namespace2, type2, value2] = test.ranges();
-verify.rangesReferenceEachOther([type1, type2]);
-verify.rangesReferenceEachOther([namespace1, namespace2]);
-verify.rangesReferenceEachOther([value1, value2]);
+verify.singleReferenceGroup("interface Foo\nnamespace Foo\nfunction Foo(): void", [type1, type2]);
+verify.singleReferenceGroup("namespace Foo\nfunction Foo(): void", [namespace1, namespace2]);
+verify.referenceGroups(value1, [{ definition: "function Foo(): void\nnamespace Foo", ranges: [value1, value2] }]);
+verify.referenceGroups(value2, [{ definition: "namespace Foo\nfunction Foo(): void", ranges: [value1, value2] }]);
diff --git a/tests/cases/fourslash/referencesForMergedDeclarations2.ts b/tests/cases/fourslash/referencesForMergedDeclarations2.ts
index 75d485002a4..5cf9234511a 100644
--- a/tests/cases/fourslash/referencesForMergedDeclarations2.ts
+++ b/tests/cases/fourslash/referencesForMergedDeclarations2.ts
@@ -6,9 +6,9 @@
 ////
 ////function ATest() { }
 ////
-////import [|alias|] = ATest; // definition
+////import [|{| "isWriteAccess": true, "isDefinition": true |}alias|] = ATest; // definition
 ////
 ////var a: [|alias|].Bar; // namespace
 ////[|alias|].call(this); // value
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("import alias = ATest");
diff --git a/tests/cases/fourslash/referencesForMergedDeclarations3.ts b/tests/cases/fourslash/referencesForMergedDeclarations3.ts
index 181d68e79b3..5ce024258ed 100644
--- a/tests/cases/fourslash/referencesForMergedDeclarations3.ts
+++ b/tests/cases/fourslash/referencesForMergedDeclarations3.ts
@@ -1,13 +1,13 @@
 /// <reference path='fourslash.ts'/>
 
-// class and uninstanciated module
+// class and uninstantiated module
 
-////class [|testClass|] {
+////class [|{| "isWriteAccess": true, "isDefinition": true |}testClass|] {
 ////    static staticMethod() { }
 ////    method() { }
 ////}
 ////
-////module [|testClass|] {
+////module [|{| "isWriteAccess": true, "isDefinition": true |}testClass|] {
 ////    export interface Bar {
 ////
 ////    }
@@ -21,5 +21,7 @@
 ////new [|testClass|]();
 
 const [class0, module0, class1, module1, class2, class3, class4, class5] = test.ranges();
-verify.rangesReferenceEachOther([module0, module1]);
-verify.rangesReferenceEachOther([class0, class1, class2, class3, class4, class5]);
+verify.singleReferenceGroup("class testClass\nnamespace testClass", [module0, module1]);
+const classes = [class0, class1, class2, class3, class4, class5];
+verify.referenceGroups(classes.slice(0, 5), [{ definition: "class testClass\nnamespace testClass", ranges: classes }]);
+verify.referenceGroups(class5, [{ definition: "constructor testClass(): testClass\nnamespace testClass", ranges: classes }]);
diff --git a/tests/cases/fourslash/referencesForMergedDeclarations4.ts b/tests/cases/fourslash/referencesForMergedDeclarations4.ts
index d35cbea745d..55eb331dd90 100644
--- a/tests/cases/fourslash/referencesForMergedDeclarations4.ts
+++ b/tests/cases/fourslash/referencesForMergedDeclarations4.ts
@@ -1,13 +1,13 @@
 /// <reference path='fourslash.ts'/>
 
-// class and instanciated module
+// class and instantiated module
 
-////class [|testClass|] {
+////class [|{| "isWriteAccess": true, "isDefinition": true |}testClass|] {
 ////    static staticMethod() { }
 ////    method() { }
 ////}
 ////
-////module [|testClass|] {
+////module [|{| "isWriteAccess": true, "isDefinition": true |}testClass|] {
 ////    export interface Bar {
 ////
 ////    }
@@ -22,4 +22,6 @@
 ////[|testClass|].s;
 ////new [|testClass|]();
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+verify.referenceGroups(ranges.slice(0, 8), [{ definition: "class testClass\nnamespace testClass", ranges }]);
+verify.referenceGroups(ranges[8], [{ definition: "constructor testClass(): testClass\nnamespace testClass", ranges }]);
diff --git a/tests/cases/fourslash/referencesForMergedDeclarations5.ts b/tests/cases/fourslash/referencesForMergedDeclarations5.ts
index 8fe33ca31e4..8cf597333b0 100644
--- a/tests/cases/fourslash/referencesForMergedDeclarations5.ts
+++ b/tests/cases/fourslash/referencesForMergedDeclarations5.ts
@@ -1,10 +1,14 @@
 /// <reference path='fourslash.ts'/>
 
-////interface [|Foo|] { }
-////module [|Foo|] { export interface Bar { } }
-////function [|Foo|]() { }
+////interface [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] { }
+////module [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] { export interface Bar { } }
+////function [|{| "isWriteAccess": true, "isDefinition": true |}Foo|]() { }
 ////
 ////export = [|Foo|];
 
-const [r0, r1, r2, r3] = test.ranges();
-verify.referencesOf(r3, [r0, r1, r2, r3]);
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups(r0, [{ definition: "interface Foo\nnamespace Foo\nfunction Foo(): void", ranges: [r0, r3] }]);
+verify.referenceGroups(r1, [{ definition: "namespace Foo\nfunction Foo(): void", ranges: [r1, r3] }]);
+verify.referenceGroups(r2, [{ definition: "function Foo(): void\nnamespace Foo", ranges: [r2, r3] }]);
+verify.referenceGroups(r3, [{ definition: "interface Foo\nnamespace Foo\nfunction Foo(): void", ranges }]);
diff --git a/tests/cases/fourslash/referencesForMergedDeclarations6.ts b/tests/cases/fourslash/referencesForMergedDeclarations6.ts
index e4b5b9111c6..79ee0128ab6 100644
--- a/tests/cases/fourslash/referencesForMergedDeclarations6.ts
+++ b/tests/cases/fourslash/referencesForMergedDeclarations6.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface Foo { }
-////module [|Foo|] {
+////module [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] {
 ////    export interface Bar { }
 ////    export module Bar { export interface Baz { } }
 ////    export function Bar() { }
@@ -10,4 +10,4 @@
 ////// module
 ////import a1 = [|Foo|];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("namespace Foo");
diff --git a/tests/cases/fourslash/referencesForMergedDeclarations7.ts b/tests/cases/fourslash/referencesForMergedDeclarations7.ts
index bc56b5d6f9d..66acffde980 100644
--- a/tests/cases/fourslash/referencesForMergedDeclarations7.ts
+++ b/tests/cases/fourslash/referencesForMergedDeclarations7.ts
@@ -2,13 +2,17 @@
 
 ////interface Foo { }
 ////module Foo {
-////    export interface [|Bar|] { }
-////    export module [|Bar|] { export interface Baz { } }
-////    export function [|Bar|]() { }
+////    export interface [|{| "isWriteAccess": true, "isDefinition": true |}Bar|] { }
+////    export module [|{| "isWriteAccess": true, "isDefinition": true |}Bar|] { export interface Baz { } }
+////    export function [|{| "isWriteAccess": true, "isDefinition": true |}Bar|]() { }
 ////}
 ////
 ////// module, value and type
 ////import a2 = Foo.[|Bar|];
 
-const [r0, r1, r2, r3] = test.ranges();
-verify.referencesOf(r3, [r0, r1, r2, r3]);
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups(r0, [{ definition: "interface Foo.Bar\nnamespace Foo.Bar\nfunction Foo.Bar(): void", ranges: [r0, r3] }]);
+verify.referenceGroups(r1, [{ definition: "namespace Foo.Bar\nfunction Foo.Bar(): void", ranges: [r1, r3] }]);
+verify.referenceGroups(r2, [{ definition: "function Foo.Bar(): void\nnamespace Foo.Bar", ranges: [r2, r3] }]);
+verify.referenceGroups(r3, [{ definition: "interface Foo.Bar\nnamespace Foo.Bar\nfunction Foo.Bar(): void", ranges }]);
diff --git a/tests/cases/fourslash/referencesForMergedDeclarations8.ts b/tests/cases/fourslash/referencesForMergedDeclarations8.ts
index b5b1428b7c9..742561e21c5 100644
--- a/tests/cases/fourslash/referencesForMergedDeclarations8.ts
+++ b/tests/cases/fourslash/referencesForMergedDeclarations8.ts
@@ -3,11 +3,11 @@
 ////interface Foo { }
 ////module Foo {
 ////    export interface Bar { }
-////    export module [|Bar|] { export interface Baz { } }
+////    export module [|{| "isWriteAccess": true, "isDefinition": true |}Bar|] { export interface Baz { } }
 ////    export function Bar() { }
 ////}
 ////
 ////// module
 ////import a3 = Foo.[|Bar|].Baz;
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("namespace Foo.Bar\nfunction Foo.Bar(): void");
diff --git a/tests/cases/fourslash/referencesForNoContext.ts b/tests/cases/fourslash/referencesForNoContext.ts
index 4631ce50c16..2ea57656167 100644
--- a/tests/cases/fourslash/referencesForNoContext.ts
+++ b/tests/cases/fourslash/referencesForNoContext.ts
@@ -21,14 +21,4 @@
 ////    }
 ////}
 
-goTo.marker("1");
-verify.referencesAre([]);
-
-goTo.marker("2");
-verify.referencesAre([]);
-
-goTo.marker("3");
-verify.referencesAre([]);
-
-goTo.marker("4");
-verify.referencesAre([]);
+goTo.eachMarker(() => verify.noReferences());
diff --git a/tests/cases/fourslash/referencesForNumericLiteralPropertyNames.ts b/tests/cases/fourslash/referencesForNumericLiteralPropertyNames.ts
index 5e6e8172092..effa4abc164 100644
--- a/tests/cases/fourslash/referencesForNumericLiteralPropertyNames.ts
+++ b/tests/cases/fourslash/referencesForNumericLiteralPropertyNames.ts
@@ -1,12 +1,23 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Foo {
-////    public [|12|]: any;
+////    public [|{| "isDefinition": true |}12|]: any;
 ////}
 ////
 ////var x: Foo;
 ////x[[|12|]];
-////x = { "[|12|]": 0 };
-////x = { [|12|]: 0 };
+////x = { "[|{| "isDefinition": true |}12|]": 0 };
+////x = { [|{| "isDefinition": true |}12|]: 0 };
 
-verify.rangesReferenceEachOther();
+//verify.singleReferenceGroup("(property) Foo[12]: any");
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups([r0, r1], [{ definition: "(property) Foo[12]: any", ranges }]);
+verify.referenceGroups(r2, [
+    { definition: "(property) Foo[12]: any", ranges: [r0, r1, r3] },
+    { definition: "(property) \"12\": number", ranges: [r2] }
+]);
+verify.referenceGroups(r3, [
+    { definition: "(property) Foo[12]: any", ranges: [r0, r1, r2] },
+    { definition: "(property) 12: number", ranges: [r3] }
+]);
diff --git a/tests/cases/fourslash/referencesForObjectLiteralProperties.ts b/tests/cases/fourslash/referencesForObjectLiteralProperties.ts
index f2a815e845b..ea7c20829ae 100644
--- a/tests/cases/fourslash/referencesForObjectLiteralProperties.ts
+++ b/tests/cases/fourslash/referencesForObjectLiteralProperties.ts
@@ -2,10 +2,16 @@
 
 // References to an object literal property
 
-////var x = { [|add|]: 0, b: "string" };
+////var x = { [|{| "isWriteAccess": true, "isDefinition": true |}add|]: 0, b: "string" };
 ////x["[|add|]"];
 ////x.[|add|];
 ////var y = x;
 ////y.[|add|];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3] = ranges;
+verify.referenceGroups(r0, [{ definition: "(property) add: number", ranges }]);
+verify.referenceGroups([r1, r2, r3], [
+    { definition: "(property) add: number", ranges: [r0] },
+    { definition: "(property) add: number", ranges: [r1, r2, r3] }
+]);
diff --git a/tests/cases/fourslash/referencesForOverrides.ts b/tests/cases/fourslash/referencesForOverrides.ts
index 4896bd1cd39..5ce6bc5ed04 100644
--- a/tests/cases/fourslash/referencesForOverrides.ts
+++ b/tests/cases/fourslash/referencesForOverrides.ts
@@ -3,59 +3,59 @@
 ////module FindRef3 {
 ////	module SimpleClassTest {
 ////		export class Foo {
-////			public [|foo|](): void {
+////			public [|{| "isWriteAccess": true, "isDefinition": true |}foo|](): void {
 ////			}
 ////		}
 ////		export class Bar extends Foo {
-////			public [|foo|](): void {
+////			public [|{| "isWriteAccess": true, "isDefinition": true |}foo|](): void {
 ////			}
 ////		}
 ////	}
 ////
 ////	module SimpleInterfaceTest {
 ////		export interface IFoo {
-////			[|ifoo|](): void;
+////			[|{| "isWriteAccess": true, "isDefinition": true |}ifoo|](): void;
 ////		}
 ////		export interface IBar extends IFoo {
-////			[|ifoo|](): void;
+////			[|{| "isWriteAccess": true, "isDefinition": true |}ifoo|](): void;
 ////		}
 ////	}
 ////
 ////	module SimpleClassInterfaceTest {
 ////		export interface IFoo {
-////			[|icfoo|](): void;
+////			[|{| "isWriteAccess": true, "isDefinition": true |}icfoo|](): void;
 ////		}
 ////		export class Bar implements IFoo {
-////			public [|icfoo|](): void {
+////			public [|{| "isWriteAccess": true, "isDefinition": true |}icfoo|](): void {
 ////			}
 ////		}
 ////	}
 ////
 ////	module Test {
 ////		export interface IBase {
-////			[|field|]: string;
-////			[|method|](): void;
+////			[|{| "isWriteAccess": true, "isDefinition": true |}field|]: string;
+////			[|{| "isWriteAccess": true, "isDefinition": true |}method|](): void;
 ////		}
 ////
 ////		export interface IBlah extends IBase {
-////			[|field|]: string;
+////			[|{| "isWriteAccess": true, "isDefinition": true |}field|]: string;
 ////		}
 ////
 ////		export interface IBlah2 extends IBlah {
-////			[|field|]: string;
+////			[|{| "isWriteAccess": true, "isDefinition": true |}field|]: string;
 ////		}
 ////
 ////		export interface IDerived extends IBlah2 {
-////			[|method|](): void;
+////			[|{| "isWriteAccess": true, "isDefinition": true |}method|](): void;
 ////		}
 ////
 ////		export class Bar implements IDerived {
-////			public [|field|]: string;
-////			public [|method|](): void { }
+////			public [|{| "isWriteAccess": true, "isDefinition": true |}field|]: string;
+////			public [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void { }
 ////		}
 ////
 ////		export class BarBlah extends Bar {
-////			public [|field|]: string;
+////			public [|{| "isWriteAccess": true, "isDefinition": true |}field|]: string;
 ////		}
 ////	}
 ////
@@ -75,4 +75,67 @@
 ////	}
 ////}
 
-verify.rangesWithSameTextReferenceEachOther();
+const ranges = test.rangesByText();
+
+const fooRanges = ranges.get("foo");
+const [foo0, foo1, foo2] = fooRanges;
+verify.referenceGroups(foo0, [{ definition: "(method) SimpleClassTest.Foo.foo(): void", ranges: fooRanges }]);
+verify.referenceGroups([foo1, foo2], [
+    { definition: "(method) SimpleClassTest.Foo.foo(): void", ranges: [foo0] },
+    { definition: "(method) SimpleClassTest.Bar.foo(): void", ranges: [foo1, foo2] }
+]);
+
+const ifooRanges = ranges.get("ifoo");
+const [ifoo0, ifoo1, ifoo2] = ifooRanges;
+verify.referenceGroups(ifoo0, [{ definition: "(method) SimpleInterfaceTest.IFoo.ifoo(): void", ranges: ifooRanges }]);
+verify.referenceGroups([ifoo1, ifoo2], [
+    { definition: "(method) SimpleInterfaceTest.IFoo.ifoo(): void", ranges: [ifoo0] },
+    { definition: "(method) SimpleInterfaceTest.IBar.ifoo(): void", ranges: [ifoo1, ifoo2] }
+]);
+
+const icfooRanges = ranges.get("icfoo");
+const [icfoo0, icfoo1, icfoo2] = icfooRanges;
+verify.referenceGroups(icfoo0, [{ definition: "(method) SimpleClassInterfaceTest.IFoo.icfoo(): void", ranges: icfooRanges }]);
+verify.referenceGroups([icfoo1, icfoo2], [
+    { definition: "(method) SimpleClassInterfaceTest.IFoo.icfoo(): void", ranges: [icfoo0] },
+    { definition: "(method) SimpleClassInterfaceTest.Bar.icfoo(): void", ranges: [icfoo1, icfoo2] }
+]);
+
+const fieldRanges = ranges.get("field");
+const [field0, field1, field2, field3, field4, field5] = fieldRanges;
+verify.referenceGroups(field0, [{ definition: "(property) Test.IBase.field: string", ranges: fieldRanges }]);
+verify.referenceGroups(field1, [
+    { definition: "(property) Test.IBase.field: string", ranges: [field0] },
+    { definition: "(property) Test.IBlah.field: string", ranges: fieldRanges.slice(1) }
+]);
+verify.referenceGroups(field2, [
+    { definition: "(property) Test.IBase.field: string", ranges: [field0] },
+    { definition: "(property) Test.IBlah.field: string", ranges: [field1] },
+    { definition: "(property) Test.IBlah2.field: string", ranges: fieldRanges.slice(2) }
+]);
+verify.referenceGroups(field3, [
+    { definition: "(property) Test.IBase.field: string", ranges: [field0] },
+    { definition: "(property) Test.IBlah.field: string", ranges: [field1] },
+    { definition: "(property) Test.IBlah2.field: string", ranges: [field2] },
+    { definition: "(property) Test.Bar.field: string", ranges: fieldRanges.slice(3) }
+]);
+verify.referenceGroups([field4, field5], [
+    { definition: "(property) Test.IBase.field: string", ranges: [field0] },
+    { definition: "(property) Test.IBlah.field: string", ranges: [field1] },
+    { definition: "(property) Test.IBlah2.field: string", ranges: [field2] },
+    { definition: "(property) Test.Bar.field: string", ranges: [field3] },
+    { definition: "(property) Test.BarBlah.field: string", ranges: fieldRanges.slice(4) }
+]);
+
+const methodRanges = ranges.get("method");
+const [method0, method1, method2, method3] = methodRanges;
+verify.referenceGroups(method0, [{ definition: "(method) Test.IBase.method(): void", ranges: methodRanges }]);
+verify.referenceGroups(method1, [
+    { definition: "(method) Test.IBase.method(): void", ranges: [method0] },
+    { definition: "(method) Test.IDerived.method(): void", ranges: methodRanges.slice(1) }
+]);
+verify.referenceGroups([method2, method3], [
+    { definition: "(method) Test.IBase.method(): void", ranges: [method0] },
+    { definition: "(method) Test.IDerived.method(): void", ranges: [method1] },
+    { definition: "(method) Test.Bar.method(): void", ranges: methodRanges.slice(2) }
+]);
diff --git a/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts b/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts
index a8b08eae506..a92ac909782 100644
--- a/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts
+++ b/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface IFoo<T> {
-////    [|doSomething|](v: T): T;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}doSomething|](v: T): T;
 ////}
 ////
 ////var x: IFoo<string>;
@@ -10,4 +10,14 @@
 ////var y: IFoo<number>;
 ////y.[|doSomething|](12);
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) IFoo<T>.doSomething(v: T): T", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) IFoo<T>.doSomething(v: string): string", ranges: [r0, r2] },
+    { definition: "(method) IFoo<string>.doSomething(v: string): string", ranges: [r1] }
+]);
+verify.referenceGroups(r2, [
+    { definition: "(method) IFoo<T>.doSomething(v: number): number", ranges: [r0, r1] },
+    { definition: "(method) IFoo<number>.doSomething(v: number): number", ranges: [r2] }
+]);
diff --git a/tests/cases/fourslash/referencesForStatic.ts b/tests/cases/fourslash/referencesForStatic.ts
index c6594006708..17c33daac32 100644
--- a/tests/cases/fourslash/referencesForStatic.ts
+++ b/tests/cases/fourslash/referencesForStatic.ts
@@ -6,7 +6,7 @@
 ////var n = 43;
 ////
 ////class foo {
-////    static [|n|] = '';
+////    static [|{| "isWriteAccess": true, "isDefinition": true |}n|] = '';
 ////
 ////    public bar() {
 ////        foo.[|n|] = "'";
@@ -30,4 +30,4 @@
 // @Filename: referencesOnStatic_2.ts
 ////var q = foo.[|n|];
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("(property) foo.n: string");
diff --git a/tests/cases/fourslash/referencesForStaticsAndMembersWithSameNames.ts b/tests/cases/fourslash/referencesForStaticsAndMembersWithSameNames.ts
index cada3e0fcf4..1e393ef6761 100644
--- a/tests/cases/fourslash/referencesForStaticsAndMembersWithSameNames.ts
+++ b/tests/cases/fourslash/referencesForStaticsAndMembersWithSameNames.ts
@@ -3,12 +3,12 @@
 ////module FindRef4 {
 ////	module MixedStaticsClassTest {
 ////		export class Foo {
-////			[|bar|]: Foo;
-////			static [|bar|]: Foo;
+////			[|{| "isWriteAccess": true, "isDefinition": true |}bar|]: Foo;
+////			static [|{| "isWriteAccess": true, "isDefinition": true |}bar|]: Foo;
 ////
-////			public [|foo|](): void {
+////			public [|{| "isWriteAccess": true, "isDefinition": true |}foo|](): void {
 ////			}
-////			public static [|foo|](): void {
+////			public static [|{| "isWriteAccess": true, "isDefinition": true |}foo|](): void {
 ////			}
 ////		}
 ////	}
@@ -28,13 +28,16 @@
 const [fooBar, fooStaticBar, fooFoo, fooStaticFoo, xFoo, xBar, staticFoo, staticBar] = test.ranges();
 
 // References to a member method with the same name as a static.
-verify.referencesOf(fooFoo, [fooFoo, xFoo]);
+verify.singleReferenceGroup("(method) MixedStaticsClassTest.Foo.foo(): void", [fooFoo, xFoo]);
 
 // References to a static method with the same name as a member.
-verify.referencesOf(fooStaticFoo, [fooStaticFoo, staticFoo]);
+verify.singleReferenceGroup("(method) MixedStaticsClassTest.Foo.foo(): void", [fooStaticFoo, staticFoo]);
 
 // References to a member property with the same name as a static.
-verify.referencesOf(fooBar, [fooBar, xBar]);
+//verify.singleReferenceGroup("(property) MixedStaticsClassTest.Foo.bar: Foo", [fooBar, xBar]);
+verify.referenceGroups(fooBar, [{ definition: "(property) MixedStaticsClassTest.Foo.bar: Foo", ranges: [fooBar, xBar] }]);
+verify.referenceGroups(xBar, [{ definition: "(property) MixedStaticsClassTest.Foo.bar: MixedStaticsClassTest.Foo", ranges: [fooBar, xBar] }]);
 
 // References to a static property with the same name as a member.
-verify.referencesOf(fooStaticBar, [fooStaticBar, staticBar]);
+verify.referenceGroups(fooStaticBar, [{ definition: "(property) MixedStaticsClassTest.Foo.bar: Foo", ranges: [fooStaticBar, staticBar] }]);
+verify.referenceGroups(staticBar, [{ definition: "(property) MixedStaticsClassTest.Foo.bar: MixedStaticsClassTest.Foo", ranges: [fooStaticBar, staticBar] }]);
diff --git a/tests/cases/fourslash/referencesForStringLiteralPropertyNames.ts b/tests/cases/fourslash/referencesForStringLiteralPropertyNames.ts
index 2db0325d324..e9be352f819 100644
--- a/tests/cases/fourslash/referencesForStringLiteralPropertyNames.ts
+++ b/tests/cases/fourslash/referencesForStringLiteralPropertyNames.ts
@@ -1,13 +1,23 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Foo {
-////    public "[|ss|]": any;
+////    public "[|{| "isDefinition": true |}ss|]": any;
 ////}
 ////
 ////var x: Foo;
 ////x.[|ss|];
 ////x["[|ss|]"];
-////x = { "[|ss|]": 0 };
-////x = { [|ss|]: 0 };
+////x = { "[|{| "isDefinition": true |}ss|]": 0 };
+////x = { [|{| "isWriteAccess": true, "isDefinition": true |}ss|]: 0 };
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2, r3, r4] = ranges;
+verify.referenceGroups([r0, r1, r2], [{ definition: '(property) Foo["ss"]: any', ranges }]);
+verify.referenceGroups(r3, [
+    { definition: '(property) Foo["ss"]: any', ranges: [r0, r1, r2, r4] },
+    { definition: '(property) "ss": number', ranges: [r3] }
+]);
+verify.referenceGroups(r4, [
+    { definition: '(property) Foo["ss"]: any', ranges: [r0, r1, r2, r3] },
+    { definition: '(property) ss: number', ranges: [r4] }
+]);
diff --git a/tests/cases/fourslash/referencesForStringLiteralPropertyNames2.ts b/tests/cases/fourslash/referencesForStringLiteralPropertyNames2.ts
index 275a2b2756c..6fbb0b85072 100644
--- a/tests/cases/fourslash/referencesForStringLiteralPropertyNames2.ts
+++ b/tests/cases/fourslash/referencesForStringLiteralPropertyNames2.ts
@@ -1,10 +1,17 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Foo {
-////    "[|blah|]"() { return 0; }
+////    "[|{| "isDefinition": true |}blah|]"() { return 0; }
 ////}
 ////
 ////var x: Foo;
 ////x.[|blah|];
 
-verify.rangesReferenceEachOther();
+//verify.singleReferenceGroup('(method) Foo["blah"](): number');
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: '(method) Foo["blah"](): number', ranges }]);
+verify.referenceGroups(r1, [
+    { definition: '(method) Foo["blah"](): number', ranges: [r0] },
+    { definition: '(method) Foo["blah"](): number', ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/referencesForStringLiteralPropertyNames3.ts b/tests/cases/fourslash/referencesForStringLiteralPropertyNames3.ts
index 55a067ae8c3..d4e12a67afc 100644
--- a/tests/cases/fourslash/referencesForStringLiteralPropertyNames3.ts
+++ b/tests/cases/fourslash/referencesForStringLiteralPropertyNames3.ts
@@ -1,11 +1,17 @@
 /// <reference path='fourslash.ts'/>
 
 ////class Foo2 {
-////    get "[|42|]"() { return 0; }
-////    set [|42|](n) { }
+////    get "[|{| "isDefinition": true |}42|]"() { return 0; }
+////    set [|{| "isDefinition": true |}42|](n) { }
 ////}
 ////
 ////var y: Foo2;
 ////y[[|42|]];
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups([r0, r1], [{ definition: '(property) Foo2["42"]: number', ranges }]);
+verify.referenceGroups(r2, [
+    { definition: '(property) Foo2["42"]: number', ranges: [r0, r1] },
+    { definition: '(property) Foo2["42"]: number', ranges: [r2] },
+]);
diff --git a/tests/cases/fourslash/referencesForStringLiteralPropertyNames4.ts b/tests/cases/fourslash/referencesForStringLiteralPropertyNames4.ts
index 34cad8f11e8..efe8972f2c7 100644
--- a/tests/cases/fourslash/referencesForStringLiteralPropertyNames4.ts
+++ b/tests/cases/fourslash/referencesForStringLiteralPropertyNames4.ts
@@ -1,7 +1,13 @@
 /// <reference path='fourslash.ts'/>
 
-////var x = { "[|someProperty|]": 0 }
+////var x = { "[|{| "isDefinition": true |}someProperty|]": 0 }
 ////x["[|someProperty|]"] = 3;
-////x./*1*/[|someProperty|] = 5;
+////x.[|someProperty|] = 5;
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1, r2] = ranges;
+verify.referenceGroups(r0, [{ definition: '(property) "someProperty": number', ranges }]);
+verify.referenceGroups([r1, r2], [
+    { definition: '(property) "someProperty": number', ranges: [r0] },
+    { definition: '(property) "someProperty": number', ranges: [r1, r2] },
+]);
diff --git a/tests/cases/fourslash/referencesForUnionProperties.ts b/tests/cases/fourslash/referencesForUnionProperties.ts
index 07eebeb5f74..97570077346 100644
--- a/tests/cases/fourslash/referencesForUnionProperties.ts
+++ b/tests/cases/fourslash/referencesForUnionProperties.ts
@@ -1,16 +1,16 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface One {
-////    common: { [|a|]: number; };
+////    common: { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: number; };
 ////}
 ////
 ////interface Base {
-////    [|a|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}a|]: string;
 ////    b: string;
 ////}
 ////
 ////interface HasAOrB extends Base {
-////    [|a|]: string;
+////    [|{| "isWriteAccess": true, "isDefinition": true |}a|]: string;
 ////    b: string;
 ////}
 ////
@@ -23,7 +23,15 @@
 ////x.common.[|a|];
 
 const [one, base, hasAOrB, x] = test.ranges();
-verify.referencesOf(one, [one, x]);
-verify.referencesOf(base, [base, hasAOrB, x]);
-verify.referencesOf(hasAOrB, [base, hasAOrB, x]);
-verify.referencesOf(x, [one, base, hasAOrB, x]);
+verify.referenceGroups(one, [{ definition: "(property) a: number", ranges: [one, x] }]);
+verify.referenceGroups(base, [{ definition: "(property) Base.a: string", ranges: [base, hasAOrB, x] }]);
+verify.referenceGroups(hasAOrB, [
+    { definition: "(property) Base.a: string", ranges: [base] },
+    { definition: "(property) HasAOrB.a: string", ranges: [hasAOrB, x] }
+]);
+verify.referenceGroups(x, [
+    { definition: "(property) a: number", ranges: [one] },
+    { definition: "(property) Base.a: string", ranges: [base] },
+    { definition: "(property) HasAOrB.a: string", ranges: [hasAOrB] },
+    { definition: "(property) a: string | number", ranges: [x] }
+]);
diff --git a/tests/cases/fourslash/referencesInComment.ts b/tests/cases/fourslash/referencesInComment.ts
index eabf74d2f23..674ee41a8d2 100644
--- a/tests/cases/fourslash/referencesInComment.ts
+++ b/tests/cases/fourslash/referencesInComment.ts
@@ -5,4 +5,4 @@
 ////class foo { }
 ////var bar = 0;
 
-goTo.eachMarker(() => verify.referencesAre([]));
+goTo.eachMarker(() => verify.noReferences());
diff --git a/tests/cases/fourslash/remoteGetReferences.ts b/tests/cases/fourslash/remoteGetReferences.ts
index d9b6c6e852c..292864f9ed4 100644
--- a/tests/cases/fourslash/remoteGetReferences.ts
+++ b/tests/cases/fourslash/remoteGetReferences.ts
@@ -95,10 +95,10 @@
 //////Increments
 ////[|remotefooCls|].[|remoteclsSVar|]++;
 ////remotemodTest.remotemodVar++;
-////[|remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|];
+////[|{| "isWriteAccess": true |}remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|];
 ////
 //////ETC - Other cases
-////[|remoteglobalVar|] = 3;
+////[|{| "isWriteAccess": true |}remoteglobalVar|] = 3;
 ////
 //////Find References misses method param
 ////var
@@ -119,16 +119,16 @@
 ////});
 
 // @Filename: remoteGetReferences_2.ts
-////var [|remoteglobalVar|]: number = 2;
+////var [|{| "isWriteAccess": true, "isDefinition": true |}remoteglobalVar|]: number = 2;
 ////
-////class [|remotefooCls|] {
+////class [|{| "isWriteAccess": true, "isDefinition": true |}remotefooCls|] {
 ////	//Declare
-////	[|remoteclsVar|] = 1;
-////	static [|remoteclsSVar|] = 1;
+////	[|{| "isWriteAccess": true, "isDefinition": true |}remoteclsVar|] = 1;
+////	static [|{| "isWriteAccess": true, "isDefinition": true |}remoteclsSVar|] = 1;
 ////
 ////	constructor(public remoteclsParam: number) {
 ////		//Increments
-////		[|remoteglobalVar|]++;
+////		[|{| "isWriteAccess": true |}remoteglobalVar|]++;
 ////		this.[|remoteclsVar|]++;
 ////		[|remotefooCls|].[|remoteclsSVar|]++;
 ////		this.remoteclsParam++;
@@ -142,7 +142,7 @@
 ////
 ////	//Increments
 ////	[|remotefooCls|].[|remoteclsSVar|]++;
-////	[|remoteglobalVar|]++;
+////	[|{| "isWriteAccess": true |}remoteglobalVar|]++;
 ////	remotemodTest.remotemodVar++;
 ////	remotefnVar++;
 ////
@@ -155,7 +155,7 @@
 ////	export var remotemodVar: number;
 ////
 ////	//Increments
-////	[|remoteglobalVar|]++;
+////	[|{| "isWriteAccess": true |}remoteglobalVar|]++;
 ////	[|remotefooCls|].[|remoteclsSVar|]++;
 ////	remotemodVar++;
 ////
@@ -167,7 +167,7 @@
 ////        static remoteboo = remotefoo;
 ////
 ////		//Increments
-////		[|remoteglobalVar|]++;
+////		[|{| "isWriteAccess": true |}remoteglobalVar|]++;
 ////		[|remotefooCls|].[|remoteclsSVar|]++;
 ////		remotemodVar++;
 ////    }
@@ -177,4 +177,24 @@
 ////	}
 ////}
 
-verify.rangesWithSameTextReferenceEachOther();
+test.rangesByText().forEach((ranges, text) => {
+    const definition = (() => {
+        switch (text) {
+            case "remotefooCls": return "class remotefooCls";
+            case "remoteglobalVar": return "var remoteglobalVar: number";
+            case "remoteclsSVar": return "(property) remotefooCls.remoteclsSVar: number";
+            case "remoteclsVar": return "(property) remotefooCls.remoteclsVar: number";
+            default: throw new Error(text);
+        }
+    })();
+
+    if (text === "remotefooCls") {
+        verify.referenceGroups([ranges[0], ...ranges.slice(2)], [{ definition, ranges }]);
+        verify.referenceGroups(ranges[1], [
+            { definition: "constructor remotefooCls(remoteclsParam: number): remotefooCls", ranges}
+        ]);
+    }
+    else {
+        verify.singleReferenceGroup(definition, ranges);
+    }
+});
diff --git a/tests/cases/fourslash/renameDefaultImport.ts b/tests/cases/fourslash/renameDefaultImport.ts
index ff297ffa147..bcac46d7a63 100644
--- a/tests/cases/fourslash/renameDefaultImport.ts
+++ b/tests/cases/fourslash/renameDefaultImport.ts
@@ -1,21 +1,23 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: B.ts
-////export default class /*1*/[|B|] {
+////export default class /*1*/[|{| "isWriteAccess": true, "isDefinition": true |}B|] {
 ////    test() {
 ////    }
 ////}
 
 // @Filename: A.ts
-////import [|B|] from "./B";
+////import [|{| "isWriteAccess": true, "isDefinition": true |}B|] from "./B";
 ////let b = new [|B|]();
 ////b.test();
 
 goTo.marker("1");
 verify.occurrencesAtPositionCount(1);
 
-const [C, B0, B1] = test.ranges();
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [C, B0, B1] = ranges;
+verify.referenceGroups([C, B0], [{ definition: "class B", ranges }]);
+verify.referenceGroups(B1, [{ definition: "constructor B(): B", ranges }]);
 
 goTo.rangeStart(C);
 verify.renameLocations(false, false, [C, B0, B1]);
diff --git a/tests/cases/fourslash/renameDefaultImportDifferentName.ts b/tests/cases/fourslash/renameDefaultImportDifferentName.ts
index be968c9b883..590c81c650c 100644
--- a/tests/cases/fourslash/renameDefaultImportDifferentName.ts
+++ b/tests/cases/fourslash/renameDefaultImportDifferentName.ts
@@ -1,21 +1,23 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: B.ts
-////export default class /*1*/[|C|] {
+////export default class /*1*/[|{| "isWriteAccess": true, "isDefinition": true |}C|] {
 ////    test() {
 ////    }
 ////}
 
 // @Filename: A.ts
-////import [|B|] from "./B";
+////import [|{| "isWriteAccess": true, "isDefinition": true |}B|] from "./B";
 ////let b = new [|B|]();
 ////b.test();
 
 goTo.marker("1");
 verify.occurrencesAtPositionCount(1);
 
-const [C, B0, B1] = test.ranges();
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [C, B0, B1] = ranges;
+verify.referenceGroups([C, B0], [{ definition: "class C", ranges }]);
+verify.referenceGroups(B1, [{ definition: "constructor C(): B", ranges }]);
 
 goTo.rangeStart(C);
 verify.renameLocations(false, false, [C, B0, B1]);
diff --git a/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts b/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts
index e982d6a4c7b..656a48f24dd 100644
--- a/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts
+++ b/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts
@@ -1,10 +1,10 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: a.ts
-////export var [|a|];
+////export var [|{| "isWriteAccess": true, "isDefinition": true |}a|];
 
 // @Filename: b.ts
-////import { [|a|] } from './a';
-////export { [|a|] };
+////import { [|{| "isWriteAccess": true, "isDefinition": true |}a|] } from './a';
+////export { [|{| "isWriteAccess": true, "isDefinition": true |}a|] };
 
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("var a: any");
diff --git a/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts b/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts
index cb829807602..fa9a510d5ac 100644
--- a/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts
+++ b/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts
@@ -1,4 +1,4 @@
-/// <reference path="fourslash.ts" />
+/// <reference path="../fourslash.ts" />
 
 //@Filename: findAllRefsOnDefinition-import.ts
 ////export class Test{
@@ -7,7 +7,7 @@
 ////
 ////    }
 ////
-////    public [|start|](){
+////    public [|{| "isWriteAccess": true, "isDefinition": true |}start|](){
 ////        return this;
 ////    }
 ////
@@ -23,4 +23,10 @@
 ////second.[|start|]();
 ////second.stop();
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) Test.start(): this", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) Second.Test.start(): Second.Test", ranges: [r0] },
+    { definition: "(method) Second.Test.start(): Second.Test", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/shims/getReferencesAtPosition.ts b/tests/cases/fourslash/shims/getReferencesAtPosition.ts
index cb829807602..fa9a510d5ac 100644
--- a/tests/cases/fourslash/shims/getReferencesAtPosition.ts
+++ b/tests/cases/fourslash/shims/getReferencesAtPosition.ts
@@ -1,4 +1,4 @@
-/// <reference path="fourslash.ts" />
+/// <reference path="../fourslash.ts" />
 
 //@Filename: findAllRefsOnDefinition-import.ts
 ////export class Test{
@@ -7,7 +7,7 @@
 ////
 ////    }
 ////
-////    public [|start|](){
+////    public [|{| "isWriteAccess": true, "isDefinition": true |}start|](){
 ////        return this;
 ////    }
 ////
@@ -23,4 +23,10 @@
 ////second.[|start|]();
 ////second.stop();
 
-verify.rangesReferenceEachOther();
+const ranges = test.ranges();
+const [r0, r1] = ranges;
+verify.referenceGroups(r0, [{ definition: "(method) Test.start(): this", ranges }]);
+verify.referenceGroups(r1, [
+    { definition: "(method) Second.Test.start(): Second.Test", ranges: [r0] },
+    { definition: "(method) Second.Test.start(): Second.Test", ranges: [r1] }
+]);
diff --git a/tests/cases/fourslash/untypedModuleImport.ts b/tests/cases/fourslash/untypedModuleImport.ts
index da6473cf992..1854010d5b6 100644
--- a/tests/cases/fourslash/untypedModuleImport.ts
+++ b/tests/cases/fourslash/untypedModuleImport.ts
@@ -4,7 +4,7 @@
 ////{}
 
 // @Filename: a.ts
-////import /*foo*/[|foo|] from /*fooModule*/"foo";
+////import /*foo*/[|{| "isWriteAccess": true, "isDefinition": true |}foo|] from /*fooModule*/"foo";
 ////[|foo|]();
 
 goTo.file("a.ts");
@@ -13,9 +13,9 @@ verify.numberOfErrorsInCurrentFile(0);
 goTo.marker("fooModule");
 verify.goToDefinitionIs([]);
 verify.quickInfoIs("");
-verify.referencesAre([])
+verify.noReferences();
 
 goTo.marker("foo");
 verify.goToDefinitionIs([]);
 verify.quickInfoIs("import foo");
-verify.rangesReferenceEachOther();
+verify.singleReferenceGroup("import foo");

From d77945fe1f426ef5b7e1d110125a628013a83d16 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 31 Jan 2017 10:28:02 -0800
Subject: [PATCH 051/127] typeof now has string literal union type

Previously, it was just a string
---
 src/compiler/checker.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 26c27cb3be2..47811d6ccaf 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14609,7 +14609,9 @@ namespace ts {
 
         function checkTypeOfExpression(node: TypeOfExpression): Type {
             checkExpression(node.expression);
-            return stringType;
+            const types: Type[] = [];
+            typeofEQFacts.forEach((_, s) => types.push(getLiteralTypeForText(TypeFlags.StringLiteral, s)));
+            return getUnionType(types);
         }
 
         function checkVoidExpression(node: VoidExpression): Type {

From 69e9bfef356ed904d35ec601ff0d00f4c842a7d3 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 31 Jan 2017 10:28:32 -0800
Subject: [PATCH 052/127] Add typeof test case and update baselines

Test that `typeof x === 'random' as string`:

1. Does not issue an error.
2. Does not narrow.
---
 .../reference/TypeGuardWithEnumUnion.types    |   8 +-
 .../reference/anonymousClassExpression1.types |   2 +-
 ...WithoutReturnTypeAnnotationInference.types |  10 +-
 .../reference/castExpressionParentheses.types |   2 +-
 tests/baselines/reference/castOfAwait.types   |   4 +-
 .../classDoesNotDependOnBaseTypes.types       |   2 +-
 ...tionalOperatorConditionIsBooleanType.types |   6 +-
 ...itionalOperatorConditoinIsStringType.types |   6 +-
 .../constLocalsInFunctionExpressions.types    |  10 +-
 .../reference/controlFlowCommaOperator.types  |   4 +-
 .../controlFlowDoWhileStatement.types         |   2 +-
 .../reference/controlFlowForStatement.types   |   8 +-
 .../baselines/reference/controlFlowIIFE.types |   6 +-
 .../reference/controlFlowIfStatement.types    |   4 +-
 .../reference/controlFlowWhileStatement.types |   2 +-
 .../controlFlowWithIncompleteTypes.types      |   4 +-
 ...eclarationEmitIdentifierPredicates01.types |   2 +-
 .../discriminantsAndPrimitives.types          |   8 +-
 ...onentiationOperatorInTempalteString4.types |   8 +-
 ...ntiationOperatorInTempalteString4ES6.types |   8 +-
 ...onentiationOperatorInTemplateString1.types |  12 +-
 ...ntiationOperatorInTemplateString1ES6.types |  12 +-
 ...onentiationOperatorInTemplateString2.types |  12 +-
 ...ntiationOperatorInTemplateString2ES6.types |  12 +-
 ...onentiationOperatorInTemplateString3.types |  12 +-
 ...ntiationOperatorInTemplateString3ES6.types |  12 +-
 .../interfaceDoesNotDependOnBaseTypes.types   |   2 +-
 tests/baselines/reference/mappedTypes4.types  |   2 +-
 .../narrowingConstrainedTypeParameter.types   |   2 +-
 .../reference/nestedLoopTypeGuards.types      |   8 +-
 tests/baselines/reference/neverType.types     |   4 +-
 .../overloadResolutionOverNonCTLambdas.types  |   2 +-
 .../reference/overloadReturnTypes.types       |   2 +-
 ...fixUnaryOperatorsOnExportedVariables.types |   2 +-
 tests/baselines/reference/symbolType17.types  |   2 +-
 tests/baselines/reference/symbolType18.types  |   2 +-
 tests/baselines/reference/symbolType19.types  |   2 +-
 .../reference/templateStringInTypeOf.types    |   4 +-
 .../reference/templateStringInTypeOfES6.types |   4 +-
 ...lateStringWithEmbeddedTypeOfOperator.types |   2 +-
 ...eStringWithEmbeddedTypeOfOperatorES6.types |   2 +-
 .../baselines/reference/throwStatements.types |   2 +-
 .../baselines/reference/typeGuardEnums.types  |   4 +-
 .../typeGuardIntersectionTypes.types          |   2 +-
 .../reference/typeGuardNesting.types          |  24 +--
 .../typeGuardOfFormExpr1AndExpr2.types        |  18 +-
 .../typeGuardOfFormExpr1OrExpr2.types         |  18 +-
 .../reference/typeGuardOfFormNotExpr.types    |  20 +-
 .../typeGuardOfFormTypeOfBoolean.types        |  20 +-
 ...FormTypeOfEqualEqualHasNoEffect.errors.txt |   5 +-
 ...eGuardOfFormTypeOfIsOrderIndependent.types |   8 +-
 ...OfFormTypeOfNotEqualHasNoEffect.errors.txt |   5 +-
 .../typeGuardOfFormTypeOfNumber.types         |  20 +-
 .../typeGuardOfFormTypeOfOther.errors.txt     | 118 +++++++++++
 .../reference/typeGuardOfFormTypeOfOther.js   |  12 ++
 .../typeGuardOfFormTypeOfOther.symbols        | 153 ---------------
 .../typeGuardOfFormTypeOfOther.types          | 183 ------------------
 ...ypeGuardOfFormTypeOfPrimitiveSubtype.types |  12 +-
 .../typeGuardOfFormTypeOfString.types         |  20 +-
 .../reference/typeGuardRedundancy.types       |  16 +-
 .../typeGuardTautologicalConsistiency.types   |   8 +-
 .../reference/typeGuardTypeOfUndefined.types  |  64 +++---
 .../reference/typeGuardsAsAssertions.types    |  12 +-
 .../typeGuardsInClassAccessors.types          |  40 ++--
 .../reference/typeGuardsInClassMethods.types  |  30 +--
 .../typeGuardsInConditionalExpression.types   |  34 ++--
 .../reference/typeGuardsInDoStatement.types   |   6 +-
 .../typeGuardsInExternalModule.types          |   4 +-
 .../reference/typeGuardsInForStatement.types  |   6 +-
 .../reference/typeGuardsInFunction.types      |  38 ++--
 .../typeGuardsInFunctionAndModuleBlock.types  |  26 +--
 .../reference/typeGuardsInGlobal.types        |   2 +-
 .../reference/typeGuardsInModule.types        |  22 +--
 .../reference/typeGuardsInProperties.types    |  12 +-
 ...GuardsInRightOperandOfAndAndOperator.types |  22 +--
 ...peGuardsInRightOperandOfOrOrOperator.types |  22 +--
 .../typeGuardsInWhileStatement.types          |   6 +-
 .../typeGuardsNestedAssignments.types         |   2 +-
 .../reference/typeGuardsObjectMethods.types   |  20 +-
 .../reference/typeGuardsOnClassProperty.types |   8 +-
 .../reference/typeOfOperator1.errors.txt      |   6 +-
 .../typeGuards/typeGuardOfFormTypeOfOther.ts  |   6 +
 82 files changed, 542 insertions(+), 734 deletions(-)
 create mode 100644 tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt
 delete mode 100644 tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
 delete mode 100644 tests/baselines/reference/typeGuardOfFormTypeOfOther.types

diff --git a/tests/baselines/reference/TypeGuardWithEnumUnion.types b/tests/baselines/reference/TypeGuardWithEnumUnion.types
index d33411c4c7c..8ee4aaca363 100644
--- a/tests/baselines/reference/TypeGuardWithEnumUnion.types
+++ b/tests/baselines/reference/TypeGuardWithEnumUnion.types
@@ -12,7 +12,7 @@ function f1(x: Color | string) {
 
     if (typeof x === "number") {
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | Color
 >"number" : "number"
 
@@ -41,7 +41,7 @@ function f2(x: Color | string | string[]) {
 
     if (typeof x === "object") {
 >typeof x === "object" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | Color | string[]
 >"object" : "object"
 
@@ -54,7 +54,7 @@ function f2(x: Color | string | string[]) {
     }
     if (typeof x === "number") {
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | Color | string[]
 >"number" : "number"
 
@@ -76,7 +76,7 @@ function f2(x: Color | string | string[]) {
     }
     if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | Color | string[]
 >"string" : "string"
 
diff --git a/tests/baselines/reference/anonymousClassExpression1.types b/tests/baselines/reference/anonymousClassExpression1.types
index 0fbffffdf4b..3bc01960492 100644
--- a/tests/baselines/reference/anonymousClassExpression1.types
+++ b/tests/baselines/reference/anonymousClassExpression1.types
@@ -4,7 +4,7 @@ function f() {
 
     return typeof class {} === "function";
 >typeof class {} === "function" : boolean
->typeof class {} : string
+>typeof class {} : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >class {} : typeof (Anonymous class)
 >"function" : "function"
 }
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
index 0b515750aec..658eff38bbb 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
@@ -103,17 +103,17 @@ var r6 = foo6(1);
 >1 : 1
 
 function foo7(x) {
->foo7 : (x: any) => string
+>foo7 : (x: any) => "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : any
 
     return typeof x;
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : any
 }
 var r7 = foo7(1);
->r7 : string
->foo7(1) : string
->foo7 : (x: any) => string
+>r7 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
+>foo7(1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
+>foo7 : (x: any) => "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >1 : 1
 
 // object types
diff --git a/tests/baselines/reference/castExpressionParentheses.types b/tests/baselines/reference/castExpressionParentheses.types
index dafe3377aea..aa633825eec 100644
--- a/tests/baselines/reference/castExpressionParentheses.types
+++ b/tests/baselines/reference/castExpressionParentheses.types
@@ -182,7 +182,7 @@ declare var A;
 >(<any>typeof A).x : any
 >(<any>typeof A) : any
 ><any>typeof A : any
->typeof A : string
+>typeof A : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >A : any
 >x : any
 
diff --git a/tests/baselines/reference/castOfAwait.types b/tests/baselines/reference/castOfAwait.types
index 30220ca2ab6..805affe49db 100644
--- a/tests/baselines/reference/castOfAwait.types
+++ b/tests/baselines/reference/castOfAwait.types
@@ -8,7 +8,7 @@ async function f() {
 >0 : 0
 
     typeof await 0;
->typeof await 0 : string
+>typeof await 0 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >await 0 : 0
 >0 : 0
 
@@ -21,7 +21,7 @@ async function f() {
 >await void <string> typeof <number> void await 0 : any
 >void <string> typeof <number> void await 0 : undefined
 ><string> typeof <number> void await 0 : string
->typeof <number> void await 0 : string
+>typeof <number> void await 0 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 ><number> void await 0 : number
 >void await 0 : undefined
 >await 0 : 0
diff --git a/tests/baselines/reference/classDoesNotDependOnBaseTypes.types b/tests/baselines/reference/classDoesNotDependOnBaseTypes.types
index 5ac20c6e0fa..54b67dfd6a7 100644
--- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.types
+++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.types
@@ -5,7 +5,7 @@ var x: StringTree;
 
 if (typeof x !== "string") {
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : StringTree
 >"string" : "string"
 
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types
index f19769b1c58..610b80ef612 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types
@@ -120,7 +120,7 @@ true ? exprString1 : exprBoolean1; // union
 typeof "123" == "string" ? exprBoolean1 : exprBoolean2;
 >typeof "123" == "string" ? exprBoolean1 : exprBoolean2 : boolean
 >typeof "123" == "string" : boolean
->typeof "123" : string
+>typeof "123" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >"123" : "123"
 >"string" : "string"
 >exprBoolean1 : boolean
@@ -262,7 +262,7 @@ var resultIsBoolean3 = typeof "123" == "string" ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean3 : boolean
 >typeof "123" == "string" ? exprBoolean1 : exprBoolean2 : boolean
 >typeof "123" == "string" : boolean
->typeof "123" : string
+>typeof "123" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >"123" : "123"
 >"string" : "string"
 >exprBoolean1 : boolean
@@ -299,7 +299,7 @@ var resultIsStringOrBoolean4 = typeof "123" === "string" ? exprString1 : exprBoo
 >resultIsStringOrBoolean4 : string | boolean
 >typeof "123" === "string" ? exprString1 : exprBoolean1 : string | boolean
 >typeof "123" === "string" : boolean
->typeof "123" : string
+>typeof "123" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >"123" : "123"
 >"string" : "string"
 >exprString1 : string
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
index a6906d7024a..33e34bea635 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
@@ -123,7 +123,7 @@ var array = ["1", "2", "3"];
 
 typeof condString ? exprAny1 : exprAny2;
 >typeof condString ? exprAny1 : exprAny2 : any
->typeof condString : string
+>typeof condString : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >condString : string
 >exprAny1 : any
 >exprAny2 : any
@@ -254,7 +254,7 @@ var resultIsStringOrBoolean2 = "hello" ? exprString1 : exprBoolean1; // union
 var resultIsAny3 = typeof condString ? exprAny1 : exprAny2;
 >resultIsAny3 : any
 >typeof condString ? exprAny1 : exprAny2 : any
->typeof condString : string
+>typeof condString : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >condString : string
 >exprAny1 : any
 >exprAny2 : any
@@ -297,7 +297,7 @@ var resultIsObject3 = array[1] ? exprIsObject1 : exprIsObject2;
 var resultIsStringOrBoolean3 = typeof condString ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean3 : string | boolean
 >typeof condString ? exprString1 : exprBoolean1 : string | boolean
->typeof condString : string
+>typeof condString : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >condString : string
 >exprString1 : string
 >exprBoolean1 : boolean
diff --git a/tests/baselines/reference/constLocalsInFunctionExpressions.types b/tests/baselines/reference/constLocalsInFunctionExpressions.types
index db1da04e0ca..07d3392045c 100644
--- a/tests/baselines/reference/constLocalsInFunctionExpressions.types
+++ b/tests/baselines/reference/constLocalsInFunctionExpressions.types
@@ -12,7 +12,7 @@ function f1() {
 
     if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -35,7 +35,7 @@ function f2() {
 
     if (typeof x !== "string") {
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -59,7 +59,7 @@ function f3() {
 
     if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -82,7 +82,7 @@ function f4() {
 
     if (typeof x !== "string") {
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -106,7 +106,7 @@ function f5() {
 
     if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
diff --git a/tests/baselines/reference/controlFlowCommaOperator.types b/tests/baselines/reference/controlFlowCommaOperator.types
index 52fd3d7b87d..d4e073295d7 100644
--- a/tests/baselines/reference/controlFlowCommaOperator.types
+++ b/tests/baselines/reference/controlFlowCommaOperator.types
@@ -17,7 +17,7 @@ function f(x: string | number | boolean) {
 >y : string | number | boolean
 >"" : ""
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -36,7 +36,7 @@ function f(x: string | number | boolean) {
 >z : string | number | boolean
 >1 : 1
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
diff --git a/tests/baselines/reference/controlFlowDoWhileStatement.types b/tests/baselines/reference/controlFlowDoWhileStatement.types
index 24f3e92b144..baa585bc14d 100644
--- a/tests/baselines/reference/controlFlowDoWhileStatement.types
+++ b/tests/baselines/reference/controlFlowDoWhileStatement.types
@@ -66,7 +66,7 @@ function c() {
 
         if (typeof x === "string") continue;
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
diff --git a/tests/baselines/reference/controlFlowForStatement.types b/tests/baselines/reference/controlFlowForStatement.types
index d227e87ea1d..f82a018573b 100644
--- a/tests/baselines/reference/controlFlowForStatement.types
+++ b/tests/baselines/reference/controlFlowForStatement.types
@@ -82,7 +82,7 @@ function d() {
 >x : string | number | boolean
 >"" : ""
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >x = 5 : 5
@@ -107,7 +107,7 @@ function e() {
 >"" : ""
 >0 : 0
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | true
 >"string" : "string"
 >x = "" || true : true
@@ -128,7 +128,7 @@ function f() {
 
     for (; typeof x !== "string";) {
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -137,7 +137,7 @@ function f() {
 
         if (typeof x === "number") break;
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
diff --git a/tests/baselines/reference/controlFlowIIFE.types b/tests/baselines/reference/controlFlowIIFE.types
index 7cf4337b53b..1c2e8290394 100644
--- a/tests/baselines/reference/controlFlowIIFE.types
+++ b/tests/baselines/reference/controlFlowIIFE.types
@@ -13,7 +13,7 @@ function f1() {
 
     if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -41,7 +41,7 @@ function f2() {
 
     if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -73,7 +73,7 @@ function f3() {
 
     if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
diff --git a/tests/baselines/reference/controlFlowIfStatement.types b/tests/baselines/reference/controlFlowIfStatement.types
index fd8f25b9ee3..e0ce68db7b1 100644
--- a/tests/baselines/reference/controlFlowIfStatement.types
+++ b/tests/baselines/reference/controlFlowIfStatement.types
@@ -100,7 +100,7 @@ function c<T>(data: string | T): T {
 
     if (typeof data === 'string') {
 >typeof data === 'string' : boolean
->typeof data : string
+>typeof data : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >data : string | T
 >'string' : "string"
 
@@ -124,7 +124,7 @@ function d<T extends string>(data: string | T): never {
 
     if (typeof data === 'string') {
 >typeof data === 'string' : boolean
->typeof data : string
+>typeof data : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >data : string | T
 >'string' : "string"
 
diff --git a/tests/baselines/reference/controlFlowWhileStatement.types b/tests/baselines/reference/controlFlowWhileStatement.types
index 19f7fc49d02..4576e1a4f62 100644
--- a/tests/baselines/reference/controlFlowWhileStatement.types
+++ b/tests/baselines/reference/controlFlowWhileStatement.types
@@ -69,7 +69,7 @@ function c() {
 
         if (typeof x === "string") continue;
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
diff --git a/tests/baselines/reference/controlFlowWithIncompleteTypes.types b/tests/baselines/reference/controlFlowWithIncompleteTypes.types
index 784f22a3966..f5e8f2bcf24 100644
--- a/tests/baselines/reference/controlFlowWithIncompleteTypes.types
+++ b/tests/baselines/reference/controlFlowWithIncompleteTypes.types
@@ -16,7 +16,7 @@ function foo1() {
 
         if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -49,7 +49,7 @@ function foo2() {
 
         if (typeof x === "number") {
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"number" : "number"
 
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.types b/tests/baselines/reference/declarationEmitIdentifierPredicates01.types
index 1129012a80a..1aeb3ea824d 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.types
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.types
@@ -7,7 +7,7 @@ export function f(x: any): x is number {
 
     return typeof x === "number";
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : any
 >"number" : "number"
 }
diff --git a/tests/baselines/reference/discriminantsAndPrimitives.types b/tests/baselines/reference/discriminantsAndPrimitives.types
index d3e1b70e599..0870d17948f 100644
--- a/tests/baselines/reference/discriminantsAndPrimitives.types
+++ b/tests/baselines/reference/discriminantsAndPrimitives.types
@@ -30,7 +30,7 @@ function f1(x: Foo | Bar | string) {
 
     if (typeof x !== 'string') {
 >typeof x !== 'string' : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | Foo | Bar
 >'string' : "string"
 
@@ -58,7 +58,7 @@ function f2(x: Foo | Bar | string | undefined) {
 
     if (typeof x === "object") {
 >typeof x === "object" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | Foo | Bar | undefined
 >"object" : "object"
 
@@ -89,7 +89,7 @@ function f3(x: Foo | Bar | string | null) {
 >x && typeof x !== "string" : boolean | "" | null
 >x : string | Foo | Bar | null
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | Foo | Bar
 >"string" : "string"
 
@@ -120,7 +120,7 @@ function f4(x: Foo | Bar | string | number | null) {
 >x && typeof x === "object" : boolean | "" | 0 | null
 >x : string | number | Foo | Bar | null
 >typeof x === "object" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | Foo | Bar
 >"object" : "object"
 
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.types b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.types
index 7991ef224f0..d11846227f2 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.types
+++ b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.types
@@ -64,7 +64,7 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) } world`;
 >`${typeof (t1 ** t2 ** t1) } world` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -162,14 +162,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1)} hello world ${typeof (t1 ** t2 ** t1)}`;
 >`${typeof (t1 ** t2 ** t1)} hello world ${typeof (t1 ** t2 ** t1)}` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -223,7 +223,7 @@ var s;
 
 `hello ${typeof (t1 ** t2 ** t1)}`;
 >`hello ${typeof (t1 ** t2 ** t1)}` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4ES6.types b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4ES6.types
index 981829dd42b..610c3a64a6e 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4ES6.types
+++ b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4ES6.types
@@ -64,7 +64,7 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) } world`;
 >`${typeof (t1 ** t2 ** t1) } world` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -162,14 +162,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1)} hello world ${typeof (t1 ** t2 ** t1)}`;
 >`${typeof (t1 ** t2 ** t1)} hello world ${typeof (t1 ** t2 ** t1)}` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -223,7 +223,7 @@ var s;
 
 `hello ${typeof (t1 ** t2 ** t1)}`;
 >`hello ${typeof (t1 ** t2 ** t1)}` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.types
index bbfb5b88e04..4f78cd61fcc 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.types
+++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.types
@@ -54,7 +54,7 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) }`;
 >`${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -66,7 +66,7 @@ var s;
 >`${1 + typeof (t1 ** t2 ** t1) }` : string
 >1 + typeof (t1 ** t2 ** t1) : string
 >1 : 1
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -141,14 +141,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1)}${typeof (t1 ** t2 ** t1)}`;
 >`${typeof (t1 ** t2 ** t1)}${typeof (t1 ** t2 ** t1)}` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -223,14 +223,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }`;
 >`${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1ES6.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1ES6.types
index a005dd07463..0bc65c31b12 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1ES6.types
+++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1ES6.types
@@ -54,7 +54,7 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) }`;
 >`${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -66,7 +66,7 @@ var s;
 >`${1 + typeof (t1 ** t2 ** t1) }` : string
 >1 + typeof (t1 ** t2 ** t1) : string
 >1 : 1
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -141,14 +141,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1)}${typeof (t1 ** t2 ** t1)}`;
 >`${typeof (t1 ** t2 ** t1)}${typeof (t1 ** t2 ** t1)}` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -223,14 +223,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }`;
 >`${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.types
index 156851b60b9..9b77f4bc3fc 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.types
+++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.types
@@ -54,7 +54,7 @@ var s;
 
 `hello ${typeof (t1 ** t2 ** t1) }`;
 >`hello ${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -66,7 +66,7 @@ var s;
 >`hello ${1 + typeof (t1 ** t2 ** t1) }` : string
 >1 + typeof (t1 ** t2 ** t1) : string
 >1 : 1
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -141,14 +141,14 @@ var s;
 
 `hello ${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) }`;
 >`hello ${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -223,14 +223,14 @@ var s;
 
 `hello ${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }`;
 >`hello ${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2ES6.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2ES6.types
index dbeee05554e..ed0be973e5b 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2ES6.types
+++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2ES6.types
@@ -54,7 +54,7 @@ var s;
 
 `hello ${typeof (t1 ** t2 ** t1) }`;
 >`hello ${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -66,7 +66,7 @@ var s;
 >`hello ${1 + typeof (t1 ** t2 ** t1) }` : string
 >1 + typeof (t1 ** t2 ** t1) : string
 >1 : 1
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -141,14 +141,14 @@ var s;
 
 `hello ${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) }`;
 >`hello ${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -223,14 +223,14 @@ var s;
 
 `hello ${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }`;
 >`hello ${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.types
index d3472beac12..16fe31dde5e 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.types
+++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.types
@@ -54,7 +54,7 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) } world`;
 >`${typeof (t1 ** t2 ** t1) } world` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -66,7 +66,7 @@ var s;
 >`${1 + typeof (t1 ** t2 ** t1) } world` : string
 >1 + typeof (t1 ** t2 ** t1) : string
 >1 : 1
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -141,14 +141,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) } world`;
 >`${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) } world` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -223,14 +223,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1)} !!`;
 >`${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1)} !!` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3ES6.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3ES6.types
index 239ef02a529..86eb42efc05 100644
--- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3ES6.types
+++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3ES6.types
@@ -54,7 +54,7 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) } world`;
 >`${typeof (t1 ** t2 ** t1) } world` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -66,7 +66,7 @@ var s;
 >`${1 + typeof (t1 ** t2 ** t1) } world` : string
 >1 + typeof (t1 ** t2 ** t1) : string
 >1 : 1
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -141,14 +141,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) } world`;
 >`${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) } world` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
@@ -223,14 +223,14 @@ var s;
 
 `${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1)} !!`;
 >`${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1)} !!` : string
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
 >t2 ** t1 : number
 >t2 : number
 >t1 : number
->typeof (t1 ** t2 ** t1) : string
+>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(t1 ** t2 ** t1) : number
 >t1 ** t2 ** t1 : number
 >t1 : number
diff --git a/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types b/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types
index 4f60c5d36cc..eae55bc09d1 100644
--- a/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types
+++ b/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types
@@ -5,7 +5,7 @@ var x: StringTree;
 
 if (typeof x !== "string") {
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : StringTree
 >"string" : "string"
 
diff --git a/tests/baselines/reference/mappedTypes4.types b/tests/baselines/reference/mappedTypes4.types
index a2fec06ccec..1d0c4c16b89 100644
--- a/tests/baselines/reference/mappedTypes4.types
+++ b/tests/baselines/reference/mappedTypes4.types
@@ -29,7 +29,7 @@ function boxify<T>(obj: T): Boxified<T> {
 
     if (typeof obj === "object") {
 >typeof obj === "object" : boolean
->typeof obj : string
+>typeof obj : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >obj : T
 >"object" : "object"
 
diff --git a/tests/baselines/reference/narrowingConstrainedTypeParameter.types b/tests/baselines/reference/narrowingConstrainedTypeParameter.types
index 942b9f7055d..348716ab3c4 100644
--- a/tests/baselines/reference/narrowingConstrainedTypeParameter.types
+++ b/tests/baselines/reference/narrowingConstrainedTypeParameter.types
@@ -17,7 +17,7 @@ function isPet(pet: any): pet is Pet {
 
     return typeof pet.name === "string";
 >typeof pet.name === "string" : boolean
->typeof pet.name : string
+>typeof pet.name : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >pet.name : any
 >pet : any
 >name : any
diff --git a/tests/baselines/reference/nestedLoopTypeGuards.types b/tests/baselines/reference/nestedLoopTypeGuards.types
index 9d7b793badf..e0279325012 100644
--- a/tests/baselines/reference/nestedLoopTypeGuards.types
+++ b/tests/baselines/reference/nestedLoopTypeGuards.types
@@ -9,7 +9,7 @@ function f1() {
 
     if (typeof a !== 'boolean') {
 >typeof a !== 'boolean' : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : string | number | boolean
 >'boolean' : "boolean"
 
@@ -34,7 +34,7 @@ function f1() {
 
             if (typeof a === 'string') {
 >typeof a === 'string' : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : string | number
 >'string' : "string"
 
@@ -66,7 +66,7 @@ function f2() {
 
     if (typeof a === 'string') {
 >typeof a === 'string' : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : string | number
 >'string' : "string"
 
@@ -78,7 +78,7 @@ function f2() {
 
             if (typeof a === 'string') {
 >typeof a === 'string' : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : string
 >'string' : "string"
 
diff --git a/tests/baselines/reference/neverType.types b/tests/baselines/reference/neverType.types
index bdb1ff56c3e..9555285e4be 100644
--- a/tests/baselines/reference/neverType.types
+++ b/tests/baselines/reference/neverType.types
@@ -164,7 +164,7 @@ function f1(x: string | number) {
 
     if (typeof x === "boolean") {
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"boolean" : "boolean"
 
@@ -182,7 +182,7 @@ function f2(x: string | number) {
 
         if (typeof x === "boolean") {
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"boolean" : "boolean"
 
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
index ee5c336ba9c..a4de1666d0b 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
@@ -32,7 +32,7 @@ module Bugs {
       return typeof args[index] !== 'undefined'
 >typeof args[index] !== 'undefined'        ? args[index]        : match : any
 >typeof args[index] !== 'undefined' : boolean
->typeof args[index] : string
+>typeof args[index] : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >args[index] : any
 >args : any[]
 >index : any
diff --git a/tests/baselines/reference/overloadReturnTypes.types b/tests/baselines/reference/overloadReturnTypes.types
index c0f573fb980..daf790b9a92 100644
--- a/tests/baselines/reference/overloadReturnTypes.types
+++ b/tests/baselines/reference/overloadReturnTypes.types
@@ -26,7 +26,7 @@ function attr(nameOrMap: any, value?: string): any {
 >nameOrMap && typeof nameOrMap === "object" : boolean
 >nameOrMap : any
 >typeof nameOrMap === "object" : boolean
->typeof nameOrMap : string
+>typeof nameOrMap : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >nameOrMap : any
 >"object" : "object"
 
diff --git a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types
index 4e4dbe93372..41df41af51b 100644
--- a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types
+++ b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types
@@ -39,7 +39,7 @@ if (void x) {
 }
 
 if (typeof x) {
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : false
     
 }
diff --git a/tests/baselines/reference/symbolType17.types b/tests/baselines/reference/symbolType17.types
index c186f915cd0..6ba36d335a7 100644
--- a/tests/baselines/reference/symbolType17.types
+++ b/tests/baselines/reference/symbolType17.types
@@ -12,7 +12,7 @@ x;
 
 if (typeof x === "symbol") {
 >typeof x === "symbol" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : symbol | Foo
 >"symbol" : "symbol"
 
diff --git a/tests/baselines/reference/symbolType18.types b/tests/baselines/reference/symbolType18.types
index 8f0012f4f11..9c58320ed3b 100644
--- a/tests/baselines/reference/symbolType18.types
+++ b/tests/baselines/reference/symbolType18.types
@@ -12,7 +12,7 @@ x;
 
 if (typeof x === "object") {
 >typeof x === "object" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : symbol | Foo
 >"object" : "object"
 
diff --git a/tests/baselines/reference/symbolType19.types b/tests/baselines/reference/symbolType19.types
index 18daa27fd00..66bd80b33d8 100644
--- a/tests/baselines/reference/symbolType19.types
+++ b/tests/baselines/reference/symbolType19.types
@@ -11,7 +11,7 @@ x;
 
 if (typeof x === "number") {
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : symbol | E
 >"number" : "number"
 
diff --git a/tests/baselines/reference/templateStringInTypeOf.types b/tests/baselines/reference/templateStringInTypeOf.types
index 0d7d26a82b2..5de62164a70 100644
--- a/tests/baselines/reference/templateStringInTypeOf.types
+++ b/tests/baselines/reference/templateStringInTypeOf.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/templates/templateStringInTypeOf.ts ===
 var x = typeof `abc${ 123 }def`;
->x : string
->typeof `abc${ 123 }def` : string
+>x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
+>typeof `abc${ 123 }def` : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >`abc${ 123 }def` : string
 >123 : 123
 
diff --git a/tests/baselines/reference/templateStringInTypeOfES6.types b/tests/baselines/reference/templateStringInTypeOfES6.types
index ad142d13fe5..cc035a25501 100644
--- a/tests/baselines/reference/templateStringInTypeOfES6.types
+++ b/tests/baselines/reference/templateStringInTypeOfES6.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/templates/templateStringInTypeOfES6.ts ===
 var x = typeof `abc${ 123 }def`;
->x : string
->typeof `abc${ 123 }def` : string
+>x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
+>typeof `abc${ 123 }def` : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >`abc${ 123 }def` : string
 >123 : 123
 
diff --git a/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperator.types b/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperator.types
index 48330140ad3..a7811bd03bd 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperator.types
+++ b/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperator.types
@@ -2,6 +2,6 @@
 var x = `abc${ typeof "hi" }def`;
 >x : string
 >`abc${ typeof "hi" }def` : string
->typeof "hi" : string
+>typeof "hi" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >"hi" : "hi"
 
diff --git a/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperatorES6.types b/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperatorES6.types
index 3d7eba45c19..27e593bf4b3 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperatorES6.types
+++ b/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperatorES6.types
@@ -2,6 +2,6 @@
 var x = `abc${ typeof "hi" }def`;
 >x : string
 >`abc${ typeof "hi" }def` : string
->typeof "hi" : string
+>typeof "hi" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >"hi" : "hi"
 
diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types
index 19b8988ed47..3c8fd64ee39 100644
--- a/tests/baselines/reference/throwStatements.types
+++ b/tests/baselines/reference/throwStatements.types
@@ -174,7 +174,7 @@ throw aModule;
 >aModule : typeof M
 
 throw typeof M;
->typeof M : string
+>typeof M : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >M : typeof M
 
 var aClassInModule = new M.A();
diff --git a/tests/baselines/reference/typeGuardEnums.types b/tests/baselines/reference/typeGuardEnums.types
index f9d5cb1754e..cf62bccebd3 100644
--- a/tests/baselines/reference/typeGuardEnums.types
+++ b/tests/baselines/reference/typeGuardEnums.types
@@ -12,7 +12,7 @@ let x: number|string|E|V;
 
 if (typeof x === "number") {
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | E | V
 >"number" : "number"
 
@@ -26,7 +26,7 @@ else {
 
 if (typeof x !== "number") {
 >typeof x !== "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | E | V
 >"number" : "number"
 
diff --git a/tests/baselines/reference/typeGuardIntersectionTypes.types b/tests/baselines/reference/typeGuardIntersectionTypes.types
index 6b6dbae8ca2..b6206ed2007 100644
--- a/tests/baselines/reference/typeGuardIntersectionTypes.types
+++ b/tests/baselines/reference/typeGuardIntersectionTypes.types
@@ -163,7 +163,7 @@ function hasLegs(x: Beast): x is Legged { return x && typeof x.legs === 'number'
 >x && typeof x.legs === 'number' : boolean
 >x : Beast
 >typeof x.legs === 'number' : boolean
->typeof x.legs : string
+>typeof x.legs : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x.legs : number | undefined
 >x : Beast
 >legs : number | undefined
diff --git a/tests/baselines/reference/typeGuardNesting.types b/tests/baselines/reference/typeGuardNesting.types
index 29f6cba10db..c1396130c05 100644
--- a/tests/baselines/reference/typeGuardNesting.types
+++ b/tests/baselines/reference/typeGuardNesting.types
@@ -7,13 +7,13 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri
 >(typeof strOrBool === 'boolean' && !strOrBool) : boolean
 >typeof strOrBool === 'boolean' && !strOrBool : boolean
 >typeof strOrBool === 'boolean' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'boolean' : "boolean"
 >!strOrBool : boolean
 >strOrBool : boolean
 >typeof strOrBool === 'string' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | true
 >'string' : "string"
 
@@ -22,7 +22,7 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri
 >(typeof strOrBool === 'string') ? strOrBool : "string" : string
 >(typeof strOrBool === 'string') : boolean
 >typeof strOrBool === 'string' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'string' : "string"
 >strOrBool : string
@@ -33,7 +33,7 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri
 >(typeof strOrBool === 'boolean') ? strOrBool : false : boolean
 >(typeof strOrBool === 'boolean') : boolean
 >typeof strOrBool === 'boolean' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'boolean' : "boolean"
 >strOrBool : boolean
@@ -44,7 +44,7 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri
 >(typeof strOrBool !== 'boolean') ? strOrBool : "string" : string
 >(typeof strOrBool !== 'boolean') : boolean
 >typeof strOrBool !== 'boolean' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'boolean' : "boolean"
 >strOrBool : string
@@ -55,7 +55,7 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri
 >(typeof strOrBool !== 'string') ? strOrBool : false : boolean
 >(typeof strOrBool !== 'string') : boolean
 >typeof strOrBool !== 'string' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'string' : "string"
 >strOrBool : boolean
@@ -67,13 +67,13 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole
 >(typeof strOrBool !== 'string' && !strOrBool) : boolean
 >typeof strOrBool !== 'string' && !strOrBool : boolean
 >typeof strOrBool !== 'string' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'string' : "string"
 >!strOrBool : boolean
 >strOrBool : boolean
 >typeof strOrBool !== 'boolean' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | true
 >'boolean' : "boolean"
 
@@ -82,7 +82,7 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole
 >(typeof strOrBool === 'string') ? strOrBool : "string" : string
 >(typeof strOrBool === 'string') : boolean
 >typeof strOrBool === 'string' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'string' : "string"
 >strOrBool : string
@@ -93,7 +93,7 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole
 >(typeof strOrBool === 'boolean') ? strOrBool : false : boolean
 >(typeof strOrBool === 'boolean') : boolean
 >typeof strOrBool === 'boolean' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'boolean' : "boolean"
 >strOrBool : boolean
@@ -104,7 +104,7 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole
 >(typeof strOrBool !== 'boolean') ? strOrBool : "string" : string
 >(typeof strOrBool !== 'boolean') : boolean
 >typeof strOrBool !== 'boolean' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'boolean' : "boolean"
 >strOrBool : string
@@ -115,7 +115,7 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole
 >(typeof strOrBool !== 'string') ? strOrBool : false : boolean
 >(typeof strOrBool !== 'string') : boolean
 >typeof strOrBool !== 'string' : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >'string' : "string"
 >strOrBool : boolean
diff --git a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types
index b24b63f61dc..78d419d7dcd 100644
--- a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types
+++ b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types
@@ -42,11 +42,11 @@ var strOrNumOrBoolOrC: string | number | boolean | C;
 if (typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number") {
 >typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number" : boolean
 >typeof strOrNumOrBool !== "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 >typeof strOrNumOrBool !== "number" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : number | boolean
 >"number" : "number"
 
@@ -66,15 +66,15 @@ if (typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "numbe
 >typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "number" && typeof strOrNumOrBoolOrC !== "boolean" : boolean
 >typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "number" : boolean
 >typeof strOrNumOrBoolOrC !== "string" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : string | number | boolean | C
 >"string" : "string"
 >typeof strOrNumOrBoolOrC !== "number" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : number | boolean | C
 >"number" : "number"
 >typeof strOrNumOrBoolOrC !== "boolean" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : boolean | C
 >"boolean" : "boolean"
 
@@ -94,15 +94,15 @@ if (typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "numbe
 >typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "number" && typeof strOrNumOrBool === "boolean" : boolean
 >typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "number" : boolean
 >typeof strOrNumOrBoolOrC !== "string" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : string | number | boolean | C
 >"string" : "string"
 >typeof strOrNumOrBoolOrC !== "number" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : number | boolean | C
 >"number" : "number"
 >typeof strOrNumOrBool === "boolean" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"boolean" : "boolean"
 
@@ -130,7 +130,7 @@ else {
 if (typeof strOrNumOrBool !== "string" && numOrBool !== strOrNumOrBool) {
 >typeof strOrNumOrBool !== "string" && numOrBool !== strOrNumOrBool : boolean
 >typeof strOrNumOrBool !== "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 >numOrBool !== strOrNumOrBool : boolean
diff --git a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types
index eb428bcb679..e2a06a817af 100644
--- a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types
+++ b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types
@@ -42,11 +42,11 @@ var strOrNumOrBoolOrC: string | number | boolean | C;
 if (typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number") {
 >typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number" : boolean
 >typeof strOrNumOrBool === "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 >typeof strOrNumOrBool === "number" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : number | boolean
 >"number" : "number"
 
@@ -66,15 +66,15 @@ if (typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "numbe
 >typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "number" || typeof strOrNumOrBoolOrC === "boolean" : boolean
 >typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "number" : boolean
 >typeof strOrNumOrBoolOrC === "string" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : string | number | boolean | C
 >"string" : "string"
 >typeof strOrNumOrBoolOrC === "number" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : number | boolean | C
 >"number" : "number"
 >typeof strOrNumOrBoolOrC === "boolean" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : boolean | C
 >"boolean" : "boolean"
 
@@ -94,15 +94,15 @@ if (typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "numbe
 >typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "number" || typeof strOrNumOrBool !== "boolean" : boolean
 >typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "number" : boolean
 >typeof strOrNumOrBoolOrC === "string" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : string | number | boolean | C
 >"string" : "string"
 >typeof strOrNumOrBoolOrC === "number" : boolean
->typeof strOrNumOrBoolOrC : string
+>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBoolOrC : number | boolean | C
 >"number" : "number"
 >typeof strOrNumOrBool !== "boolean" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"boolean" : "boolean"
 
@@ -130,7 +130,7 @@ else {
 if (typeof strOrNumOrBool === "string" || numOrBool !== strOrNumOrBool) {
 >typeof strOrNumOrBool === "string" || numOrBool !== strOrNumOrBool : boolean
 >typeof strOrNumOrBool === "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 >numOrBool !== strOrNumOrBool : boolean
diff --git a/tests/baselines/reference/typeGuardOfFormNotExpr.types b/tests/baselines/reference/typeGuardOfFormNotExpr.types
index e4490d42dae..624bd7c71fc 100644
--- a/tests/baselines/reference/typeGuardOfFormNotExpr.types
+++ b/tests/baselines/reference/typeGuardOfFormNotExpr.types
@@ -26,7 +26,7 @@ if (!(typeof strOrNum === "string")) {
 >!(typeof strOrNum === "string") : boolean
 >(typeof strOrNum === "string") : boolean
 >typeof strOrNum === "string" : boolean
->typeof strOrNum : string
+>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNum : string | number
 >"string" : "string"
 
@@ -47,11 +47,11 @@ if (!(typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number"))
 >(typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number") : boolean
 >typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number" : boolean
 >typeof strOrNumOrBool === "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 >typeof strOrNumOrBool === "number" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : number | boolean
 >"number" : "number"
 
@@ -72,13 +72,13 @@ if (!(typeof strOrNumOrBool !== "string") || !(typeof strOrNumOrBool !== "number
 >!(typeof strOrNumOrBool !== "string") : boolean
 >(typeof strOrNumOrBool !== "string") : boolean
 >typeof strOrNumOrBool !== "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 >!(typeof strOrNumOrBool !== "number") : boolean
 >(typeof strOrNumOrBool !== "number") : boolean
 >typeof strOrNumOrBool !== "number" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : number | boolean
 >"number" : "number"
 
@@ -99,11 +99,11 @@ if (!(typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number"))
 >(typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number") : boolean
 >typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number" : boolean
 >typeof strOrNumOrBool !== "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 >typeof strOrNumOrBool !== "number" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : number | boolean
 >"number" : "number"
 
@@ -124,13 +124,13 @@ if (!(typeof strOrNumOrBool === "string") && !(typeof strOrNumOrBool === "number
 >!(typeof strOrNumOrBool === "string") : boolean
 >(typeof strOrNumOrBool === "string") : boolean
 >typeof strOrNumOrBool === "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 >!(typeof strOrNumOrBool === "number") : boolean
 >(typeof strOrNumOrBool === "number") : boolean
 >typeof strOrNumOrBool === "number" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : number | boolean
 >"number" : "number"
 
@@ -151,7 +151,7 @@ if (!(typeof strOrNumOrBool === "string") && numOrBool !== strOrNumOrBool) {
 >!(typeof strOrNumOrBool === "string") : boolean
 >(typeof strOrNumOrBool === "string") : boolean
 >typeof strOrNumOrBool === "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 >numOrBool !== strOrNumOrBool : boolean
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types
index c06c16e331d..a2cfdf64ea8 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types
@@ -46,7 +46,7 @@ var c: C;
 //  - when false, removes the primitive type from the type of x.
 if (typeof strOrBool === "boolean") {
 >typeof strOrBool === "boolean" : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >"boolean" : "boolean"
 
@@ -63,7 +63,7 @@ else {
 }
 if (typeof numOrBool === "boolean") {
 >typeof numOrBool === "boolean" : boolean
->typeof numOrBool : string
+>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >numOrBool : number | boolean
 >"boolean" : "boolean"
 
@@ -80,7 +80,7 @@ else {
 }
 if (typeof strOrNumOrBool === "boolean") {
 >typeof strOrNumOrBool === "boolean" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"boolean" : "boolean"
 
@@ -97,7 +97,7 @@ else {
 }
 if (typeof boolOrC === "boolean") {
 >typeof boolOrC === "boolean" : boolean
->typeof boolOrC : string
+>typeof boolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >boolOrC : boolean | C
 >"boolean" : "boolean"
 
@@ -115,7 +115,7 @@ else {
 
 if (typeof strOrNum === "boolean") {
 >typeof strOrNum === "boolean" : boolean
->typeof strOrNum : string
+>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNum : string | number
 >"boolean" : "boolean"
 
@@ -135,7 +135,7 @@ else {
 //  - when false, narrows the type of x by typeof x === s when true.
 if (typeof strOrBool !== "boolean") {
 >typeof strOrBool !== "boolean" : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >"boolean" : "boolean"
 
@@ -152,7 +152,7 @@ else {
 }
 if (typeof numOrBool !== "boolean") {
 >typeof numOrBool !== "boolean" : boolean
->typeof numOrBool : string
+>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >numOrBool : number | boolean
 >"boolean" : "boolean"
 
@@ -169,7 +169,7 @@ else {
 }
 if (typeof strOrNumOrBool !== "boolean") {
 >typeof strOrNumOrBool !== "boolean" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"boolean" : "boolean"
 
@@ -186,7 +186,7 @@ else {
 }
 if (typeof boolOrC !== "boolean") {
 >typeof boolOrC !== "boolean" : boolean
->typeof boolOrC : string
+>typeof boolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >boolOrC : boolean | C
 >"boolean" : "boolean"
 
@@ -204,7 +204,7 @@ else {
 
 if (typeof strOrNum !== "boolean") {
 >typeof strOrNum !== "boolean" : boolean
->typeof strOrNum : string
+>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNum : string | number
 >"boolean" : "boolean"
 
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
index c76c6e819df..1845d2e9775 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
@@ -1,10 +1,11 @@
 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(13,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'string', but here has type 'number'.
 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(20,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'boolean', but here has type 'string'.
 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(27,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'number', but here has type 'boolean'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(30,5): error TS2365: Operator '==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(34,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'C', but here has type 'string'.
 
 
-==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts (4 errors) ====
+==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts (5 errors) ====
     class C { private p: string };
     
     var strOrNum: string | number;
@@ -41,6 +42,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHa
     }
     
     if (typeof strOrC == "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
         var r4 = strOrC; // string | C
     }
     else {
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfIsOrderIndependent.types b/tests/baselines/reference/typeGuardOfFormTypeOfIsOrderIndependent.types
index 43cc37f98e8..be594983779 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfIsOrderIndependent.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfIsOrderIndependent.types
@@ -26,7 +26,7 @@ var func: () => void;
 if ("string" === typeof strOrNum) {
 >"string" === typeof strOrNum : boolean
 >"string" : "string"
->typeof strOrNum : string
+>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNum : string | number
 
     str = strOrNum;
@@ -43,7 +43,7 @@ else {
 if ("function" === typeof strOrFunc) {
 >"function" === typeof strOrFunc : boolean
 >"function" : "function"
->typeof strOrFunc : string
+>typeof strOrFunc : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrFunc : string | (() => void)
 
     func = strOrFunc;
@@ -60,7 +60,7 @@ else {
 if ("number" === typeof numOrBool) {
 >"number" === typeof numOrBool : boolean
 >"number" : "number"
->typeof numOrBool : string
+>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >numOrBool : number | boolean
 
     num = numOrBool;
@@ -77,7 +77,7 @@ else {
 if ("boolean" === typeof strOrBool) {
 >"boolean" === typeof strOrBool : boolean
 >"boolean" : "boolean"
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 
     bool = strOrBool;
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
index 3b29f3ecba8..1814abec823 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
@@ -1,10 +1,11 @@
 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(13,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'number', but here has type 'string'.
 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(20,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'string', but here has type 'boolean'.
 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(27,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'boolean', but here has type 'number'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(30,5): error TS2365: Operator '!=' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
 tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(34,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'string', but here has type 'C'.
 
 
-==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts (4 errors) ====
+==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts (5 errors) ====
     class C { private p: string };
     
     var strOrNum: string | number;
@@ -41,6 +42,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasN
     }
     
     if (typeof strOrC != "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '!=' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
         var r4 = strOrC; // string | C
     }
     else {
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types
index 17787d06486..ec0854f6bc2 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types
@@ -46,7 +46,7 @@ var c: C;
 //  - when false, removes the primitive type from the type of x.
 if (typeof strOrNum === "number") {
 >typeof strOrNum === "number" : boolean
->typeof strOrNum : string
+>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNum : string | number
 >"number" : "number"
 
@@ -63,7 +63,7 @@ else {
 }
 if (typeof numOrBool === "number") {
 >typeof numOrBool === "number" : boolean
->typeof numOrBool : string
+>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >numOrBool : number | boolean
 >"number" : "number"
 
@@ -79,7 +79,7 @@ else {
 }
 if (typeof strOrNumOrBool === "number") {
 >typeof strOrNumOrBool === "number" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"number" : "number"
 
@@ -96,7 +96,7 @@ else {
 }
 if (typeof numOrC === "number") {
 >typeof numOrC === "number" : boolean
->typeof numOrC : string
+>typeof numOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >numOrC : number | C
 >"number" : "number"
 
@@ -114,7 +114,7 @@ else {
 
 if (typeof strOrBool === "number") {
 >typeof strOrBool === "number" : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >"number" : "number"
 
@@ -133,7 +133,7 @@ else {
 //  - when false, narrows the type of x by typeof x === s when true.
 if (typeof strOrNum !== "number") {
 >typeof strOrNum !== "number" : boolean
->typeof strOrNum : string
+>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNum : string | number
 >"number" : "number"
 
@@ -150,7 +150,7 @@ else {
 }
 if (typeof numOrBool !== "number") {
 >typeof numOrBool !== "number" : boolean
->typeof numOrBool : string
+>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >numOrBool : number | boolean
 >"number" : "number"
 
@@ -166,7 +166,7 @@ else {
 }
 if (typeof strOrNumOrBool !== "number") {
 >typeof strOrNumOrBool !== "number" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"number" : "number"
 
@@ -183,7 +183,7 @@ else {
 }
 if (typeof numOrC !== "number") {
 >typeof numOrC !== "number" : boolean
->typeof numOrC : string
+>typeof numOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >numOrC : number | C
 >"number" : "number"
 
@@ -201,7 +201,7 @@ else {
 
 if (typeof strOrBool !== "number") {
 >typeof strOrBool !== "number" : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >"number" : "number"
 
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt
new file mode 100644
index 00000000000..c9cb9fdd456
--- /dev/null
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt
@@ -0,0 +1,118 @@
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(21,5): error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(27,5): error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(33,5): error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(40,5): error TS2322: Type 'string | C' is not assignable to type 'C'.
+  Type 'string' is not assignable to type 'C'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(43,9): error TS2322: Type 'string | C' is not assignable to type 'string'.
+  Type 'C' is not assignable to type 'string'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(46,5): error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(56,5): error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(62,5): error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(68,5): error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(75,5): error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts (10 errors) ====
+    class C { private p: string };
+    
+    var str: string;
+    var bool: boolean;
+    var num: number;
+    var strOrNum: string | number;
+    var strOrBool: string | boolean;
+    var numOrBool: number | boolean
+    var strOrNumOrBool: string | number | boolean;
+    var strOrC: string | C;
+    var numOrC: number | C;
+    var boolOrC: boolean | C;
+    var emptyObj: {};
+    var c: C;
+    
+    // A type guard of the form typeof x === s, 
+    // where s is a string literal with any value but 'string', 'number' or 'boolean',
+    //  - when true, removes the primitive types string, number, and boolean from the type of x, or
+    //  - when false, has no effect on the type of x.
+    
+    if (typeof strOrC === "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+        c = strOrC; // C
+    }
+    else {
+        var r2: string = strOrC; // string
+    }
+    if (typeof numOrC === "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+        c = numOrC; // C
+    }
+    else {
+        var r3: number  = numOrC; // number
+    }
+    if (typeof boolOrC === "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+        c = boolOrC; // C
+    }
+    else {
+        var r4: boolean = boolOrC; // boolean
+    }
+    if (typeof strOrC === "Object" as string) { // comparison is OK with cast
+        c = strOrC; // error: but no narrowing to C
+        ~
+!!! error TS2322: Type 'string | C' is not assignable to type 'C'.
+!!! error TS2322:   Type 'string' is not assignable to type 'C'.
+    }
+    else {
+        var r5: string = strOrC; // error: no narrowing to string
+            ~~
+!!! error TS2322: Type 'string | C' is not assignable to type 'string'.
+!!! error TS2322:   Type 'C' is not assignable to type 'string'.
+    }
+    
+    if (typeof strOrNumOrBool === "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+        let q1: {} = strOrNumOrBool; // {}
+    }
+    else {
+        let q2: string | number | boolean = strOrNumOrBool; // string | number | boolean
+    }
+    
+    // A type guard of the form typeof x !== s, where s is a string literal,
+    //  - when true, narrows the type of x by typeof x === s when false, or
+    //  - when false, narrows the type of x by typeof x === s when true.
+    if (typeof strOrC !== "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+        var r2: string = strOrC; // string
+    }
+    else {
+        c = strOrC; // C
+    }
+    if (typeof numOrC !== "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+        var r3: number = numOrC; // number
+    }
+    else {
+        c = numOrC; // C
+    }
+    if (typeof boolOrC !== "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+        var r4: boolean = boolOrC; // boolean
+    }
+    else {
+        c = boolOrC; // C
+    }
+    
+    if (typeof strOrNumOrBool !== "Object") {
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'.
+        let q1: string | number | boolean = strOrNumOrBool; // string | number | boolean
+    }
+    else {
+        let q2: {} = strOrNumOrBool; // {}
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
index ee0b6f66332..571edc7e5a2 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
@@ -37,6 +37,12 @@ if (typeof boolOrC === "Object") {
 else {
     var r4: boolean = boolOrC; // boolean
 }
+if (typeof strOrC === "Object" as string) { // comparison is OK with cast
+    c = strOrC; // error: but no narrowing to C
+}
+else {
+    var r5: string = strOrC; // error: no narrowing to string
+}
 
 if (typeof strOrNumOrBool === "Object") {
     let q1: {} = strOrNumOrBool; // {}
@@ -116,6 +122,12 @@ if (typeof boolOrC === "Object") {
 else {
     var r4 = boolOrC; // boolean
 }
+if (typeof strOrC === "Object") {
+    c = strOrC; // error: but no narrowing to C
+}
+else {
+    var r5 = strOrC; // error: no narrowing to string
+}
 if (typeof strOrNumOrBool === "Object") {
     var q1 = strOrNumOrBool; // {}
 }
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
deleted file mode 100644
index a8760feda45..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
+++ /dev/null
@@ -1,153 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts ===
-class C { private p: string };
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
->p : Symbol(C.p, Decl(typeGuardOfFormTypeOfOther.ts, 0, 9))
-
-var str: string;
->str : Symbol(str, Decl(typeGuardOfFormTypeOfOther.ts, 2, 3))
-
-var bool: boolean;
->bool : Symbol(bool, Decl(typeGuardOfFormTypeOfOther.ts, 3, 3))
-
-var num: number;
->num : Symbol(num, Decl(typeGuardOfFormTypeOfOther.ts, 4, 3))
-
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfOther.ts, 5, 3))
-
-var strOrBool: string | boolean;
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 6, 3))
-
-var numOrBool: number | boolean
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 7, 3))
-
-var strOrNumOrBool: string | number | boolean;
->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3))
-
-var strOrC: string | C;
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
-
-var numOrC: number | C;
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
-
-var boolOrC: boolean | C;
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
-
-var emptyObj: {};
->emptyObj : Symbol(emptyObj, Decl(typeGuardOfFormTypeOfOther.ts, 12, 3))
-
-var c: C;
->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
-
-// A type guard of the form typeof x === s, 
-// where s is a string literal with any value but 'string', 'number' or 'boolean',
-//  - when true, removes the primitive types string, number, and boolean from the type of x, or
-//  - when false, has no effect on the type of x.
-
-if (typeof strOrC === "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
-
-    c = strOrC; // C
->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
-}
-else {
-    var r2: string = strOrC; // string
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 50, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
-}
-if (typeof numOrC === "Object") {
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
-
-    c = numOrC; // C
->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
-}
-else {
-    var r3: number  = numOrC; // number
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 56, 7))
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
-}
-if (typeof boolOrC === "Object") {
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
-
-    c = boolOrC; // C
->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
-}
-else {
-    var r4: boolean = boolOrC; // boolean
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 62, 7))
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
-}
-
-if (typeof strOrNumOrBool === "Object") {
->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3))
-
-    let q1: {} = strOrNumOrBool; // {}
->q1 : Symbol(q1, Decl(typeGuardOfFormTypeOfOther.ts, 40, 7))
->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3))
-}
-else {
-    let q2: string | number | boolean = strOrNumOrBool; // string | number | boolean
->q2 : Symbol(q2, Decl(typeGuardOfFormTypeOfOther.ts, 43, 7))
->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3))
-}
-
-// A type guard of the form typeof x !== s, where s is a string literal,
-//  - when true, narrows the type of x by typeof x === s when false, or
-//  - when false, narrows the type of x by typeof x === s when true.
-if (typeof strOrC !== "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
-
-    var r2: string = strOrC; // string
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 50, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
-}
-else {
-    c = strOrC; // C
->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3))
-}
-if (typeof numOrC !== "Object") {
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
-
-    var r3: number = numOrC; // number
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 56, 7))
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
-}
-else {
-    c = numOrC; // C
->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3))
-}
-if (typeof boolOrC !== "Object") {
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
-
-    var r4: boolean = boolOrC; // boolean
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 62, 7))
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
-}
-else {
-    c = boolOrC; // C
->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3))
->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3))
-}
-
-if (typeof strOrNumOrBool !== "Object") {
->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3))
-
-    let q1: string | number | boolean = strOrNumOrBool; // string | number | boolean
->q1 : Symbol(q1, Decl(typeGuardOfFormTypeOfOther.ts, 69, 7))
->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3))
-}
-else {
-    let q2: {} = strOrNumOrBool; // {}
->q2 : Symbol(q2, Decl(typeGuardOfFormTypeOfOther.ts, 72, 7))
->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3))
-}
-
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
deleted file mode 100644
index b87f6a2a004..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
+++ /dev/null
@@ -1,183 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts ===
-class C { private p: string };
->C : C
->p : string
-
-var str: string;
->str : string
-
-var bool: boolean;
->bool : boolean
-
-var num: number;
->num : number
-
-var strOrNum: string | number;
->strOrNum : string | number
-
-var strOrBool: string | boolean;
->strOrBool : string | boolean
-
-var numOrBool: number | boolean
->numOrBool : number | boolean
-
-var strOrNumOrBool: string | number | boolean;
->strOrNumOrBool : string | number | boolean
-
-var strOrC: string | C;
->strOrC : string | C
->C : C
-
-var numOrC: number | C;
->numOrC : number | C
->C : C
-
-var boolOrC: boolean | C;
->boolOrC : boolean | C
->C : C
-
-var emptyObj: {};
->emptyObj : {}
-
-var c: C;
->c : C
->C : C
-
-// A type guard of the form typeof x === s, 
-// where s is a string literal with any value but 'string', 'number' or 'boolean',
-//  - when true, removes the primitive types string, number, and boolean from the type of x, or
-//  - when false, has no effect on the type of x.
-
-if (typeof strOrC === "Object") {
->typeof strOrC === "Object" : boolean
->typeof strOrC : string
->strOrC : string | C
->"Object" : "Object"
-
-    c = strOrC; // C
->c = strOrC : C
->c : C
->strOrC : C
-}
-else {
-    var r2: string = strOrC; // string
->r2 : string
->strOrC : string
-}
-if (typeof numOrC === "Object") {
->typeof numOrC === "Object" : boolean
->typeof numOrC : string
->numOrC : number | C
->"Object" : "Object"
-
-    c = numOrC; // C
->c = numOrC : C
->c : C
->numOrC : C
-}
-else {
-    var r3: number  = numOrC; // number
->r3 : number
->numOrC : number
-}
-if (typeof boolOrC === "Object") {
->typeof boolOrC === "Object" : boolean
->typeof boolOrC : string
->boolOrC : boolean | C
->"Object" : "Object"
-
-    c = boolOrC; // C
->c = boolOrC : C
->c : C
->boolOrC : C
-}
-else {
-    var r4: boolean = boolOrC; // boolean
->r4 : boolean
->boolOrC : boolean
-}
-
-if (typeof strOrNumOrBool === "Object") {
->typeof strOrNumOrBool === "Object" : boolean
->typeof strOrNumOrBool : string
->strOrNumOrBool : string | number | boolean
->"Object" : "Object"
-
-    let q1: {} = strOrNumOrBool; // {}
->q1 : {}
->strOrNumOrBool : never
-}
-else {
-    let q2: string | number | boolean = strOrNumOrBool; // string | number | boolean
->q2 : string | number | boolean
->strOrNumOrBool : string | number | boolean
-}
-
-// A type guard of the form typeof x !== s, where s is a string literal,
-//  - when true, narrows the type of x by typeof x === s when false, or
-//  - when false, narrows the type of x by typeof x === s when true.
-if (typeof strOrC !== "Object") {
->typeof strOrC !== "Object" : boolean
->typeof strOrC : string
->strOrC : string | C
->"Object" : "Object"
-
-    var r2: string = strOrC; // string
->r2 : string
->strOrC : string
-}
-else {
-    c = strOrC; // C
->c = strOrC : C
->c : C
->strOrC : C
-}
-if (typeof numOrC !== "Object") {
->typeof numOrC !== "Object" : boolean
->typeof numOrC : string
->numOrC : number | C
->"Object" : "Object"
-
-    var r3: number = numOrC; // number
->r3 : number
->numOrC : number
-}
-else {
-    c = numOrC; // C
->c = numOrC : C
->c : C
->numOrC : C
-}
-if (typeof boolOrC !== "Object") {
->typeof boolOrC !== "Object" : boolean
->typeof boolOrC : string
->boolOrC : boolean | C
->"Object" : "Object"
-
-    var r4: boolean = boolOrC; // boolean
->r4 : boolean
->boolOrC : boolean
-}
-else {
-    c = boolOrC; // C
->c = boolOrC : C
->c : C
->boolOrC : C
-}
-
-if (typeof strOrNumOrBool !== "Object") {
->typeof strOrNumOrBool !== "Object" : boolean
->typeof strOrNumOrBool : string
->strOrNumOrBool : string | number | boolean
->"Object" : "Object"
-
-    let q1: string | number | boolean = strOrNumOrBool; // string | number | boolean
->q1 : string | number | boolean
->strOrNumOrBool : string | number | boolean
-}
-else {
-    let q2: {} = strOrNumOrBool; // {}
->q2 : {}
->strOrNumOrBool : never
-}
-
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfPrimitiveSubtype.types b/tests/baselines/reference/typeGuardOfFormTypeOfPrimitiveSubtype.types
index 6302ef58005..4787c07d758 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfPrimitiveSubtype.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfPrimitiveSubtype.types
@@ -8,7 +8,7 @@ let b: {toString(): string};
 
 if (typeof a === "number") {
 >typeof a === "number" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : {}
 >"number" : "number"
 
@@ -18,7 +18,7 @@ if (typeof a === "number") {
 }
 if (typeof a === "string") {
 >typeof a === "string" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : {}
 >"string" : "string"
 
@@ -28,7 +28,7 @@ if (typeof a === "string") {
 }
 if (typeof a === "boolean") {
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : {}
 >"boolean" : "boolean"
 
@@ -39,7 +39,7 @@ if (typeof a === "boolean") {
 
 if (typeof b === "number") {
 >typeof b === "number" : boolean
->typeof b : string
+>typeof b : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >b : { toString(): string; }
 >"number" : "number"
 
@@ -49,7 +49,7 @@ if (typeof b === "number") {
 }
 if (typeof b === "string") {
 >typeof b === "string" : boolean
->typeof b : string
+>typeof b : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >b : { toString(): string; }
 >"string" : "string"
 
@@ -59,7 +59,7 @@ if (typeof b === "string") {
 }
 if (typeof b === "boolean") {
 >typeof b === "boolean" : boolean
->typeof b : string
+>typeof b : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >b : { toString(): string; }
 >"boolean" : "boolean"
 
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfString.types b/tests/baselines/reference/typeGuardOfFormTypeOfString.types
index e9960ac3019..6b3e048212a 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfString.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfString.types
@@ -46,7 +46,7 @@ var c: C;
 //  - when false, removes the primitive type from the type of x.
 if (typeof strOrNum === "string") {
 >typeof strOrNum === "string" : boolean
->typeof strOrNum : string
+>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNum : string | number
 >"string" : "string"
 
@@ -63,7 +63,7 @@ else {
 }
 if (typeof strOrBool === "string") {
 >typeof strOrBool === "string" : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >"string" : "string"
 
@@ -80,7 +80,7 @@ else {
 }
 if (typeof strOrNumOrBool === "string") {
 >typeof strOrNumOrBool === "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 
@@ -97,7 +97,7 @@ else {
 }
 if (typeof strOrC === "string") {
 >typeof strOrC === "string" : boolean
->typeof strOrC : string
+>typeof strOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrC : string | C
 >"string" : "string"
 
@@ -115,7 +115,7 @@ else {
 
 if (typeof numOrBool === "string") {
 >typeof numOrBool === "string" : boolean
->typeof numOrBool : string
+>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >numOrBool : number | boolean
 >"string" : "string"
 
@@ -134,7 +134,7 @@ else {
 //  - when false, narrows the type of x by typeof x === s when true.
 if (typeof strOrNum !== "string") {
 >typeof strOrNum !== "string" : boolean
->typeof strOrNum : string
+>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNum : string | number
 >"string" : "string"
 
@@ -151,7 +151,7 @@ else {
 }
 if (typeof strOrBool !== "string") {
 >typeof strOrBool !== "string" : boolean
->typeof strOrBool : string
+>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrBool : string | boolean
 >"string" : "string"
 
@@ -168,7 +168,7 @@ else {
 }
 if (typeof strOrNumOrBool !== "string") {
 >typeof strOrNumOrBool !== "string" : boolean
->typeof strOrNumOrBool : string
+>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrNumOrBool : string | number | boolean
 >"string" : "string"
 
@@ -185,7 +185,7 @@ else {
 }
 if (typeof strOrC !== "string") {
 >typeof strOrC !== "string" : boolean
->typeof strOrC : string
+>typeof strOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >strOrC : string | C
 >"string" : "string"
 
@@ -203,7 +203,7 @@ else {
 
 if (typeof numOrBool !== "string") {
 >typeof numOrBool !== "string" : boolean
->typeof numOrBool : string
+>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >numOrBool : number | boolean
 >"string" : "string"
 
diff --git a/tests/baselines/reference/typeGuardRedundancy.types b/tests/baselines/reference/typeGuardRedundancy.types
index 80de5f54ace..2023defbb43 100644
--- a/tests/baselines/reference/typeGuardRedundancy.types
+++ b/tests/baselines/reference/typeGuardRedundancy.types
@@ -7,11 +7,11 @@ var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed;
 >typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string
 >typeof x === "string" && typeof x === "string" : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string
 >"string" : "string"
 >x.substr : (from: number, length?: number) => string
@@ -28,11 +28,11 @@ var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.subst
 >(typeof x === "string" && typeof x === "string") : boolean
 >typeof x === "string" && typeof x === "string" : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string
 >"string" : "string"
 >x.toFixed : (fractionDigits?: number) => string
@@ -47,11 +47,11 @@ var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed;
 >typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string
 >typeof x === "string" || typeof x === "string" : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number
 >"string" : "string"
 >x.substr : (from: number, length?: number) => string
@@ -68,11 +68,11 @@ var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.subst
 >(typeof x === "string" || typeof x === "string") : boolean
 >typeof x === "string" || typeof x === "string" : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number
 >"string" : "string"
 >x.toFixed : (fractionDigits?: number) => string
diff --git a/tests/baselines/reference/typeGuardTautologicalConsistiency.types b/tests/baselines/reference/typeGuardTautologicalConsistiency.types
index 0a6524dd26f..136b09674d8 100644
--- a/tests/baselines/reference/typeGuardTautologicalConsistiency.types
+++ b/tests/baselines/reference/typeGuardTautologicalConsistiency.types
@@ -4,13 +4,13 @@ let stringOrNumber: string | number;
 
 if (typeof stringOrNumber === "number") {
 >typeof stringOrNumber === "number" : boolean
->typeof stringOrNumber : string
+>typeof stringOrNumber : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >stringOrNumber : string | number
 >"number" : "number"
 
     if (typeof stringOrNumber !== "number") {
 >typeof stringOrNumber !== "number" : boolean
->typeof stringOrNumber : string
+>typeof stringOrNumber : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >stringOrNumber : number
 >"number" : "number"
 
@@ -22,11 +22,11 @@ if (typeof stringOrNumber === "number") {
 if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") {
 >typeof stringOrNumber === "number" && typeof stringOrNumber !== "number" : boolean
 >typeof stringOrNumber === "number" : boolean
->typeof stringOrNumber : string
+>typeof stringOrNumber : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >stringOrNumber : string | number
 >"number" : "number"
 >typeof stringOrNumber !== "number" : boolean
->typeof stringOrNumber : string
+>typeof stringOrNumber : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >stringOrNumber : number
 >"number" : "number"
 
diff --git a/tests/baselines/reference/typeGuardTypeOfUndefined.types b/tests/baselines/reference/typeGuardTypeOfUndefined.types
index 520d045d9e0..a28dab04490 100644
--- a/tests/baselines/reference/typeGuardTypeOfUndefined.types
+++ b/tests/baselines/reference/typeGuardTypeOfUndefined.types
@@ -6,13 +6,13 @@ function test1(a: any) {
 
     if (typeof a !== "undefined") {
 >typeof a !== "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : any
 >"undefined" : "undefined"
 
         if (typeof a === "boolean") {
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : any
 >"boolean" : "boolean"
 
@@ -36,13 +36,13 @@ function test2(a: any) {
 
     if (typeof a === "undefined") {
 >typeof a === "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : any
 >"undefined" : "undefined"
 
         if (typeof a === "boolean") {
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : undefined
 >"boolean" : "boolean"
 
@@ -67,11 +67,11 @@ function test3(a: any) {
     if (typeof a === "undefined" || typeof a === "boolean") {
 >typeof a === "undefined" || typeof a === "boolean" : boolean
 >typeof a === "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : any
 >"undefined" : "undefined"
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : any
 >"boolean" : "boolean"
 
@@ -91,11 +91,11 @@ function test4(a: any) {
     if (typeof a !== "undefined" && typeof a === "boolean") {
 >typeof a !== "undefined" && typeof a === "boolean" : boolean
 >typeof a !== "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : any
 >"undefined" : "undefined"
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : any
 >"boolean" : "boolean"
 
@@ -114,13 +114,13 @@ function test5(a: boolean | void) {
 
     if (typeof a !== "undefined") {
 >typeof a !== "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : boolean | void
 >"undefined" : "undefined"
 
         if (typeof a === "boolean") {
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : boolean
 >"boolean" : "boolean"
 
@@ -144,13 +144,13 @@ function test6(a: boolean | void) {
 
     if (typeof a === "undefined") {
 >typeof a === "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : boolean | void
 >"undefined" : "undefined"
 
         if (typeof a === "boolean") {
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : boolean | void
 >"boolean" : "boolean"
 
@@ -175,11 +175,11 @@ function test7(a: boolean | void) {
     if (typeof a === "undefined" || typeof a === "boolean") {
 >typeof a === "undefined" || typeof a === "boolean" : boolean
 >typeof a === "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : boolean | void
 >"undefined" : "undefined"
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : boolean
 >"boolean" : "boolean"
 
@@ -199,11 +199,11 @@ function test8(a: boolean | void) {
     if (typeof a !== "undefined" && typeof a === "boolean") {
 >typeof a !== "undefined" && typeof a === "boolean" : boolean
 >typeof a !== "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : boolean | void
 >"undefined" : "undefined"
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : boolean
 >"boolean" : "boolean"
 
@@ -222,13 +222,13 @@ function test9(a: boolean | number) {
 
     if (typeof a !== "undefined") {
 >typeof a !== "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"undefined" : "undefined"
 
         if (typeof a === "boolean") {
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"boolean" : "boolean"
 
@@ -252,13 +252,13 @@ function test10(a: boolean | number) {
 
     if (typeof a === "undefined") {
 >typeof a === "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"undefined" : "undefined"
 
         if (typeof a === "boolean") {
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"boolean" : "boolean"
 
@@ -283,11 +283,11 @@ function test11(a: boolean | number) {
     if (typeof a === "undefined" || typeof a === "boolean") {
 >typeof a === "undefined" || typeof a === "boolean" : boolean
 >typeof a === "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"undefined" : "undefined"
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"boolean" : "boolean"
 
@@ -307,11 +307,11 @@ function test12(a: boolean | number) {
     if (typeof a !== "undefined" && typeof a === "boolean") {
 >typeof a !== "undefined" && typeof a === "boolean" : boolean
 >typeof a !== "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"undefined" : "undefined"
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"boolean" : "boolean"
 
@@ -330,13 +330,13 @@ function test13(a: boolean | number | void) {
 
     if (typeof a !== "undefined") {
 >typeof a !== "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean | void
 >"undefined" : "undefined"
 
         if (typeof a === "boolean") {
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"boolean" : "boolean"
 
@@ -360,13 +360,13 @@ function test14(a: boolean | number | void) {
 
     if (typeof a === "undefined") {
 >typeof a === "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean | void
 >"undefined" : "undefined"
 
         if (typeof a === "boolean") {
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean | void
 >"boolean" : "boolean"
 
@@ -391,11 +391,11 @@ function test15(a: boolean | number | void) {
     if (typeof a === "undefined" || typeof a === "boolean") {
 >typeof a === "undefined" || typeof a === "boolean" : boolean
 >typeof a === "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean | void
 >"undefined" : "undefined"
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"boolean" : "boolean"
 
@@ -415,11 +415,11 @@ function test16(a: boolean | number | void) {
     if (typeof a !== "undefined" && typeof a === "boolean") {
 >typeof a !== "undefined" && typeof a === "boolean" : boolean
 >typeof a !== "undefined" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean | void
 >"undefined" : "undefined"
 >typeof a === "boolean" : boolean
->typeof a : string
+>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >a : number | boolean
 >"boolean" : "boolean"
 
diff --git a/tests/baselines/reference/typeGuardsAsAssertions.types b/tests/baselines/reference/typeGuardsAsAssertions.types
index bdda2eafefd..06dda2691be 100644
--- a/tests/baselines/reference/typeGuardsAsAssertions.types
+++ b/tests/baselines/reference/typeGuardsAsAssertions.types
@@ -118,7 +118,7 @@ function foo1() {
 >x : string | number | boolean
 >typeof x === "string" ? x.slice() : "abc" : string
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >x.slice() : string
@@ -152,7 +152,7 @@ function foo2() {
 
         if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -211,7 +211,7 @@ function f2() {
 
     if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : undefined
 >"string" : "string"
 
@@ -254,7 +254,7 @@ function f4() {
 
     if (typeof x === "boolean") {
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : undefined
 >"boolean" : "boolean"
 
@@ -272,11 +272,11 @@ function f5(x: string | number) {
     if (typeof x === "string" && typeof x === "number") {
 >typeof x === "string" && typeof x === "number" : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string
 >"number" : "number"
 
diff --git a/tests/baselines/reference/typeGuardsInClassAccessors.types b/tests/baselines/reference/typeGuardsInClassAccessors.types
index 2250657e453..71e427124c4 100644
--- a/tests/baselines/reference/typeGuardsInClassAccessors.types
+++ b/tests/baselines/reference/typeGuardsInClassAccessors.types
@@ -26,7 +26,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -42,7 +42,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -63,7 +63,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -76,7 +76,7 @@ class ClassWithAccessors {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -92,7 +92,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -109,7 +109,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -125,7 +125,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -146,7 +146,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -159,7 +159,7 @@ class ClassWithAccessors {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -175,7 +175,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -192,7 +192,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -208,7 +208,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -229,7 +229,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -242,7 +242,7 @@ class ClassWithAccessors {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -258,7 +258,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -275,7 +275,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -291,7 +291,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -312,7 +312,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -325,7 +325,7 @@ class ClassWithAccessors {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -341,7 +341,7 @@ class ClassWithAccessors {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
diff --git a/tests/baselines/reference/typeGuardsInClassMethods.types b/tests/baselines/reference/typeGuardsInClassMethods.types
index 600e3e36ab0..3a45abcf155 100644
--- a/tests/baselines/reference/typeGuardsInClassMethods.types
+++ b/tests/baselines/reference/typeGuardsInClassMethods.types
@@ -21,7 +21,7 @@ class C1 {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -37,7 +37,7 @@ class C1 {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -50,7 +50,7 @@ class C1 {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -68,7 +68,7 @@ class C1 {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -84,7 +84,7 @@ class C1 {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -97,7 +97,7 @@ class C1 {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -115,7 +115,7 @@ class C1 {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -131,7 +131,7 @@ class C1 {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -144,7 +144,7 @@ class C1 {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -162,7 +162,7 @@ class C1 {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -178,7 +178,7 @@ class C1 {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -191,7 +191,7 @@ class C1 {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -209,7 +209,7 @@ class C1 {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -225,7 +225,7 @@ class C1 {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -238,7 +238,7 @@ class C1 {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
diff --git a/tests/baselines/reference/typeGuardsInConditionalExpression.types b/tests/baselines/reference/typeGuardsInConditionalExpression.types
index 165eecd3514..85d5380675d 100644
--- a/tests/baselines/reference/typeGuardsInConditionalExpression.types
+++ b/tests/baselines/reference/typeGuardsInConditionalExpression.types
@@ -13,7 +13,7 @@ function foo(x: number | string) {
     return typeof x === "string"
 >typeof x === "string"        ? x.length // string        : x++ : number
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -33,7 +33,7 @@ function foo2(x: number | string) {
     return typeof x === "string"
 >typeof x === "string"        ? ((x = "hello") && x) // string        : x : string | number
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -56,7 +56,7 @@ function foo3(x: number | string) {
     return typeof x === "string"
 >typeof x === "string"        ? ((x = 10) && x) // number        : x : number
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -79,7 +79,7 @@ function foo4(x: number | string) {
     return typeof x === "string"
 >typeof x === "string"        ? x // string        : ((x = 10) && x) : string | number
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -102,7 +102,7 @@ function foo5(x: number | string) {
     return typeof x === "string"
 >typeof x === "string"        ? x // string        : ((x = "hello") && x) : string
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -126,7 +126,7 @@ function foo6(x: number | string) {
     return typeof x === "string"
 >typeof x === "string"        ? ((x = 10) && x) // number        : ((x = "hello") && x) : string | number
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -155,7 +155,7 @@ function foo7(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        ? x === "hello" // boolean        : typeof x === "boolean"        ? x // boolean        : x == 10 : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -167,7 +167,7 @@ function foo7(x: number | string | boolean) {
         : typeof x === "boolean"
 >typeof x === "boolean"        ? x // boolean        : x == 10 : boolean
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"boolean" : "boolean"
 
@@ -189,7 +189,7 @@ function foo8(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        ? x === "hello"        : ((b = x) && //  number | boolean        (typeof x === "boolean"        ? x // boolean        : x == 10)) : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -210,7 +210,7 @@ function foo8(x: number | string | boolean) {
 >(typeof x === "boolean"        ? x // boolean        : x == 10) : boolean
 >typeof x === "boolean"        ? x // boolean        : x == 10 : boolean
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"boolean" : "boolean"
 
@@ -234,7 +234,7 @@ function foo9(x: number | string) {
     return typeof x === "string"
 >typeof x === "string"        ? ((y = x.length) && x === "hello") // boolean        : x === 10 : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -267,7 +267,7 @@ function foo10(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        ? x // string        : ((b = x) // x is number | boolean        && typeof x === "number"        && x.toString()) : string
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -285,7 +285,7 @@ function foo10(x: number | string | boolean) {
 
         && typeof x === "number"
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
@@ -306,7 +306,7 @@ function foo11(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        ? x // string        : ((b = x) // x is number | boolean        && typeof x === "number"        && (x = 10) // assignment to x        && x) : string | number
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -325,7 +325,7 @@ function foo11(x: number | string | boolean) {
 
         && typeof x === "number"
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
@@ -349,7 +349,7 @@ function foo12(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        ? ((x = 10) && x.toString().length) // number        : ((b = x) // x is number | boolean        && typeof x === "number"        && x) : number
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -378,7 +378,7 @@ function foo12(x: number | string | boolean) {
 
         && typeof x === "number"
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
diff --git a/tests/baselines/reference/typeGuardsInDoStatement.types b/tests/baselines/reference/typeGuardsInDoStatement.types
index fe14cff375f..c663ebbea54 100644
--- a/tests/baselines/reference/typeGuardsInDoStatement.types
+++ b/tests/baselines/reference/typeGuardsInDoStatement.types
@@ -22,7 +22,7 @@ function a(x: string | number | boolean) {
 
     } while (typeof x === "string")
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -52,7 +52,7 @@ function b(x: string | number | boolean) {
 
     } while (typeof x === "string")
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -82,7 +82,7 @@ function c(x: string | number) {
 
     } while (typeof x === "string")
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
diff --git a/tests/baselines/reference/typeGuardsInExternalModule.types b/tests/baselines/reference/typeGuardsInExternalModule.types
index a0c33af4557..86b47f9b5c6 100644
--- a/tests/baselines/reference/typeGuardsInExternalModule.types
+++ b/tests/baselines/reference/typeGuardsInExternalModule.types
@@ -11,7 +11,7 @@ var var1: string | number;
 
 if (typeof var1 === "string") {
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 
@@ -38,7 +38,7 @@ export var var2: string | number;
 
 if (typeof var2 === "string") {
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 
diff --git a/tests/baselines/reference/typeGuardsInForStatement.types b/tests/baselines/reference/typeGuardsInForStatement.types
index 1d600d52d13..4ad1a283d40 100644
--- a/tests/baselines/reference/typeGuardsInForStatement.types
+++ b/tests/baselines/reference/typeGuardsInForStatement.types
@@ -11,7 +11,7 @@ function a(x: string | number) {
 >x : string | number
 >undefined : undefined
 >typeof x !== "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"number" : "number"
 >x = undefined : undefined
@@ -33,7 +33,7 @@ function b(x: string | number) {
 >x : string | number
 >undefined : undefined
 >typeof x !== "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"number" : "number"
 >x = undefined : undefined
@@ -58,7 +58,7 @@ function c(x: string | number) {
 >x : string | number
 >undefined : undefined
 >typeof x !== "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"number" : "number"
 >x = undefined : undefined
diff --git a/tests/baselines/reference/typeGuardsInFunction.types b/tests/baselines/reference/typeGuardsInFunction.types
index 6a007dd7c95..a7dca0f709b 100644
--- a/tests/baselines/reference/typeGuardsInFunction.types
+++ b/tests/baselines/reference/typeGuardsInFunction.types
@@ -20,7 +20,7 @@ function f(param: string | number) {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -36,7 +36,7 @@ function f(param: string | number) {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -49,7 +49,7 @@ function f(param: string | number) {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -74,7 +74,7 @@ function f1(param: string | number) {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -87,7 +87,7 @@ function f1(param: string | number) {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -100,7 +100,7 @@ function f1(param: string | number) {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -116,7 +116,7 @@ function f1(param: string | number) {
 >num : number
 >typeof var3 === "string" && var3.length : number
 >typeof var3 === "string" : boolean
->typeof var3 : string
+>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var3 : string | number
 >"string" : "string"
 >var3.length : number
@@ -128,7 +128,7 @@ function f1(param: string | number) {
 >num : number
 >typeof param1 === "string" && param1.length : number
 >typeof param1 === "string" : boolean
->typeof param1 : string
+>typeof param1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param1 : string | number
 >"string" : "string"
 >param1.length : number
@@ -158,7 +158,7 @@ function f2(param: string | number) {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -171,7 +171,7 @@ function f2(param: string | number) {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -184,7 +184,7 @@ function f2(param: string | number) {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -200,7 +200,7 @@ function f2(param: string | number) {
 >num : number
 >typeof var3 === "string" && var3.length : number
 >typeof var3 === "string" : boolean
->typeof var3 : string
+>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var3 : string | number
 >"string" : "string"
 >var3.length : number
@@ -212,7 +212,7 @@ function f2(param: string | number) {
 >num : number
 >typeof param1 === "string" && param1.length : number
 >typeof param1 === "string" : boolean
->typeof param1 : string
+>typeof param1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param1 : string | number
 >"string" : "string"
 >param1.length : number
@@ -245,7 +245,7 @@ function f3(param: string | number) {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -258,7 +258,7 @@ function f3(param: string | number) {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -271,7 +271,7 @@ function f3(param: string | number) {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -287,7 +287,7 @@ function f3(param: string | number) {
 >num : number
 >typeof var3 === "string" && var3.length : number
 >typeof var3 === "string" : boolean
->typeof var3 : string
+>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var3 : string | number
 >"string" : "string"
 >var3.length : number
@@ -299,7 +299,7 @@ function f3(param: string | number) {
 >num : number
 >typeof param1 === "string" && param1.length : number
 >typeof param1 === "string" : boolean
->typeof param1 : string
+>typeof param1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param1 : string | number
 >"string" : "string"
 >param1.length : number
@@ -329,7 +329,7 @@ strOrNum = typeof f4() === "string" && f4(); // string | number
 >strOrNum : string | number
 >typeof f4() === "string" && f4() : string | number
 >typeof f4() === "string" : boolean
->typeof f4() : string
+>typeof f4() : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >f4() : string | number
 >f4 : () => string | number
 >"string" : "string"
diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types
index 0cb312ffb1a..a425e4d632e 100644
--- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types
+++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types
@@ -8,7 +8,7 @@ function foo(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        ? x        : function f() {            var b = x; // number | boolean            return typeof x === "boolean"                ? x.toString() // boolean                : x.toString(); // number        } () : string
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -27,7 +27,7 @@ function foo(x: number | string | boolean) {
             return typeof x === "boolean"
 >typeof x === "boolean"                ? x.toString() // boolean                : x.toString() : string
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"boolean" : "boolean"
 
@@ -52,7 +52,7 @@ function foo2(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        ? x        : function f(a: number | boolean) {            var b = x; // new scope - number | boolean            return typeof x === "boolean"                ? x.toString() // boolean                : x.toString(); // number        } (x) : string
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -72,7 +72,7 @@ function foo2(x: number | string | boolean) {
             return typeof x === "boolean"
 >typeof x === "boolean"                ? x.toString() // boolean                : x.toString() : string
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"boolean" : "boolean"
 
@@ -98,7 +98,7 @@ function foo3(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        ? x        : (() => {            var b = x; // new scope - number | boolean            return typeof x === "boolean"                ? x.toString() // boolean                : x.toString(); // number        })() : string
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -117,7 +117,7 @@ function foo3(x: number | string | boolean) {
             return typeof x === "boolean"
 >typeof x === "boolean"                ? x.toString() // boolean                : x.toString() : string
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"boolean" : "boolean"
 
@@ -142,7 +142,7 @@ function foo4(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        ? x        : ((a: number | boolean) => {            var b = x; // new scope - number | boolean            return typeof x === "boolean"                ? x.toString() // boolean                : x.toString(); // number        })(x) : string
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -162,7 +162,7 @@ function foo4(x: number | string | boolean) {
             return typeof x === "boolean"
 >typeof x === "boolean"                ? x.toString() // boolean                : x.toString() : string
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"boolean" : "boolean"
 
@@ -188,7 +188,7 @@ function foo5(x: number | string | boolean) {
 
     if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -223,7 +223,7 @@ module m {
 
         if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -238,7 +238,7 @@ module m {
 >y : string
 >typeof x === "boolean"            ? x.toString() // boolean            : x.toString() : string
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"boolean" : "boolean"
 
@@ -275,7 +275,7 @@ module m1 {
 
         if (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -290,7 +290,7 @@ module m1 {
 >y : string
 >typeof x === "boolean"            ? x.toString() // boolean            : x.toString() : string
 >typeof x === "boolean" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"boolean" : "boolean"
 
diff --git a/tests/baselines/reference/typeGuardsInGlobal.types b/tests/baselines/reference/typeGuardsInGlobal.types
index 7935c05411e..7ccc2defe27 100644
--- a/tests/baselines/reference/typeGuardsInGlobal.types
+++ b/tests/baselines/reference/typeGuardsInGlobal.types
@@ -11,7 +11,7 @@ var var1: string | number;
 
 if (typeof var1 === "string") {
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 
diff --git a/tests/baselines/reference/typeGuardsInModule.types b/tests/baselines/reference/typeGuardsInModule.types
index f1efc45a248..a14c47e3cca 100644
--- a/tests/baselines/reference/typeGuardsInModule.types
+++ b/tests/baselines/reference/typeGuardsInModule.types
@@ -22,7 +22,7 @@ module m1 {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -35,7 +35,7 @@ module m1 {
 
     if (typeof var2 === "string") {
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 
@@ -59,7 +59,7 @@ module m1 {
 
     if (typeof var3 === "string") {
 >typeof var3 === "string" : boolean
->typeof var3 : string
+>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var3 : string | number
 >"string" : "string"
 
@@ -94,7 +94,7 @@ module m2 {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -107,7 +107,7 @@ module m2 {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -120,7 +120,7 @@ module m2 {
 >strOrNum : string | number
 >typeof var3 === "string" && var3 : string
 >typeof var3 === "string" : boolean
->typeof var3 : string
+>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var3 : string | number
 >"string" : "string"
 >var3 : string
@@ -131,7 +131,7 @@ module m2 {
 
         if (typeof var4 === "string") {
 >typeof var4 === "string" : boolean
->typeof var4 : string
+>typeof var4 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var4 : string | number
 >"string" : "string"
 
@@ -155,7 +155,7 @@ module m2 {
 
         if (typeof var5 === "string") {
 >typeof var5 === "string" : boolean
->typeof var5 : string
+>typeof var5 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var5 : string | number
 >"string" : "string"
 
@@ -183,7 +183,7 @@ module m3.m4 {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -196,7 +196,7 @@ module m3.m4 {
 
     if (typeof var2 === "string") {
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 
@@ -220,7 +220,7 @@ module m3.m4 {
 
     if (typeof var3 === "string") {
 >typeof var3 === "string" : boolean
->typeof var3 : string
+>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var3 : string | number
 >"string" : "string"
 
diff --git a/tests/baselines/reference/typeGuardsInProperties.types b/tests/baselines/reference/typeGuardsInProperties.types
index 1f8151dff71..d40de30bd97 100644
--- a/tests/baselines/reference/typeGuardsInProperties.types
+++ b/tests/baselines/reference/typeGuardsInProperties.types
@@ -33,7 +33,7 @@ class C1 {
 >strOrNum : string | number
 >typeof this.pp1 === "string" && this.pp1 : string
 >typeof this.pp1 === "string" : boolean
->typeof this.pp1 : string
+>typeof this.pp1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >this.pp1 : string | number
 >this : this
 >pp1 : string | number
@@ -47,7 +47,7 @@ class C1 {
 >strOrNum : string | number
 >typeof this.pp2 === "string" && this.pp2 : string
 >typeof this.pp2 === "string" : boolean
->typeof this.pp2 : string
+>typeof this.pp2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >this.pp2 : string | number
 >this : this
 >pp2 : string | number
@@ -61,7 +61,7 @@ class C1 {
 >strOrNum : string | number
 >typeof this.pp3 === "string" && this.pp3 : string
 >typeof this.pp3 === "string" : boolean
->typeof this.pp3 : string
+>typeof this.pp3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >this.pp3 : string | number
 >this : this
 >pp3 : string | number
@@ -80,7 +80,7 @@ strOrNum = typeof c1.pp2 === "string" && c1.pp2; // string | number
 >strOrNum : string | number
 >typeof c1.pp2 === "string" && c1.pp2 : string
 >typeof c1.pp2 === "string" : boolean
->typeof c1.pp2 : string
+>typeof c1.pp2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >c1.pp2 : string | number
 >c1 : C1
 >pp2 : string | number
@@ -94,7 +94,7 @@ strOrNum = typeof c1.pp3 === "string" && c1.pp3; // string | number
 >strOrNum : string | number
 >typeof c1.pp3 === "string" && c1.pp3 : string
 >typeof c1.pp3 === "string" : boolean
->typeof c1.pp3 : string
+>typeof c1.pp3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >c1.pp3 : string | number
 >c1 : C1
 >pp3 : string | number
@@ -115,7 +115,7 @@ strOrNum = typeof obj1.x === "string" && obj1.x;  // string | number
 >strOrNum : string | number
 >typeof obj1.x === "string" && obj1.x : string
 >typeof obj1.x === "string" : boolean
->typeof obj1.x : string
+>typeof obj1.x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >obj1.x : string | number
 >obj1 : { x: string | number; }
 >x : string | number
diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types
index 54c1d0270b5..7235a1d80c2 100644
--- a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types
+++ b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types
@@ -8,7 +8,7 @@ function foo(x: number | string) {
     return typeof x === "string" && x.length === 10; // string
 >typeof x === "string" && x.length === 10 : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >x.length === 10 : boolean
@@ -25,7 +25,7 @@ function foo2(x: number | string) {
     return typeof x === "string" && ((x = 10) && x); // string | number
 >typeof x === "string" && ((x = 10) && x) : number
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >((x = 10) && x) : number
@@ -44,7 +44,7 @@ function foo3(x: number | string) {
     return typeof x === "string" && ((x = "hello") && x); // string | number
 >typeof x === "string" && ((x = "hello") && x) : string
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >((x = "hello") && x) : string
@@ -63,13 +63,13 @@ function foo4(x: number | string | boolean) {
 >typeof x !== "string" // string | number | boolean        && typeof x !== "number"  // number | boolean        && x : boolean
 >typeof x !== "string" // string | number | boolean        && typeof x !== "number" : boolean
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
         && typeof x !== "number"  // number | boolean
 >typeof x !== "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
@@ -87,7 +87,7 @@ function foo5(x: number | string | boolean) {
     return typeof x !== "string" // string | number | boolean
 >typeof x !== "string" // string | number | boolean        && ((b = x) && (typeof x !== "number"  // number | boolean        && x)) : boolean
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -101,7 +101,7 @@ function foo5(x: number | string | boolean) {
 >(typeof x !== "number"  // number | boolean        && x) : boolean
 >typeof x !== "number"  // number | boolean        && x : boolean
 >typeof x !== "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
@@ -116,7 +116,7 @@ function foo6(x: number | string | boolean) {
     return typeof x !== "string" // string | number | boolean
 >typeof x !== "string" // string | number | boolean        && (typeof x !== "number" // number | boolean        ? x // boolean        : x === 10) : boolean
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -124,7 +124,7 @@ function foo6(x: number | string | boolean) {
 >(typeof x !== "number" // number | boolean        ? x // boolean        : x === 10) : boolean
 >typeof x !== "number" // number | boolean        ? x // boolean        : x === 10 : boolean
 >typeof x !== "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
@@ -150,7 +150,7 @@ function foo7(x: number | string | boolean) {
     return typeof x !== "string"
 >typeof x !== "string"        && ((z = x) // number | boolean        && (typeof x === "number"        // change value of x        ? ((x = 10) && x.toString()) // x is number        // do not change value        : ((y = x) && x.toString()))) : string
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -166,7 +166,7 @@ function foo7(x: number | string | boolean) {
 >(typeof x === "number"        // change value of x        ? ((x = 10) && x.toString()) // x is number        // do not change value        : ((y = x) && x.toString())) : string
 >typeof x === "number"        // change value of x        ? ((x = 10) && x.toString()) // x is number        // do not change value        : ((y = x) && x.toString()) : string
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types
index e8548ab1ef6..d8d807bad70 100644
--- a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types
+++ b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types
@@ -9,7 +9,7 @@ function foo(x: number | string) {
     return typeof x !== "string" || x.length === 10; // string
 >typeof x !== "string" || x.length === 10 : boolean
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >x.length === 10 : boolean
@@ -26,7 +26,7 @@ function foo2(x: number | string) {
     return typeof x !== "string" || ((x = 10) || x); // string | number
 >typeof x !== "string" || ((x = 10) || x) : number | true
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >((x = 10) || x) : number
@@ -45,7 +45,7 @@ function foo3(x: number | string) {
     return typeof x !== "string" || ((x = "hello") || x); // string | number
 >typeof x !== "string" || ((x = "hello") || x) : string | true
 >typeof x !== "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 >((x = "hello") || x) : string
@@ -64,13 +64,13 @@ function foo4(x: number | string | boolean) {
 >typeof x === "string" // string | number | boolean        || typeof x === "number"  // number | boolean        || x : boolean
 >typeof x === "string" // string | number | boolean        || typeof x === "number" : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
         || typeof x === "number"  // number | boolean
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
@@ -88,7 +88,7 @@ function foo5(x: number | string | boolean) {
     return typeof x === "string" // string | number | boolean
 >typeof x === "string" // string | number | boolean        || ((b = x) || (typeof x === "number"  // number | boolean        || x)) : number | boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -102,7 +102,7 @@ function foo5(x: number | string | boolean) {
 >(typeof x === "number"  // number | boolean        || x) : boolean
 >typeof x === "number"  // number | boolean        || x : boolean
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
@@ -117,7 +117,7 @@ function foo6(x: number | string | boolean) {
     return typeof x === "string" // string | number | boolean
 >typeof x === "string" // string | number | boolean        || (typeof x !== "number" // number | boolean        ? x // boolean        : x === 10) : boolean
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -125,7 +125,7 @@ function foo6(x: number | string | boolean) {
 >(typeof x !== "number" // number | boolean        ? x // boolean        : x === 10) : boolean
 >typeof x !== "number" // number | boolean        ? x // boolean        : x === 10 : boolean
 >typeof x !== "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
@@ -151,7 +151,7 @@ function foo7(x: number | string | boolean) {
     return typeof x === "string"
 >typeof x === "string"        || ((z = x) // number | boolean        || (typeof x === "number"        // change value of x        ? ((x = 10) && x.toString()) // number | boolean | string        // do not change value        : ((y = x) && x.toString()))) : string | number | true
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number | boolean
 >"string" : "string"
 
@@ -167,7 +167,7 @@ function foo7(x: number | string | boolean) {
 >(typeof x === "number"        // change value of x        ? ((x = 10) && x.toString()) // number | boolean | string        // do not change value        : ((y = x) && x.toString())) : string
 >typeof x === "number"        // change value of x        ? ((x = 10) && x.toString()) // number | boolean | string        // do not change value        : ((y = x) && x.toString()) : string
 >typeof x === "number" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : number | boolean
 >"number" : "number"
 
diff --git a/tests/baselines/reference/typeGuardsInWhileStatement.types b/tests/baselines/reference/typeGuardsInWhileStatement.types
index b0ea7959ec5..cdcff209c08 100644
--- a/tests/baselines/reference/typeGuardsInWhileStatement.types
+++ b/tests/baselines/reference/typeGuardsInWhileStatement.types
@@ -8,7 +8,7 @@ function a(x: string | number) {
 
     while (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -29,7 +29,7 @@ function b(x: string | number) {
 
     while (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
@@ -53,7 +53,7 @@ function c(x: string | number) {
 
     while (typeof x === "string") {
 >typeof x === "string" : boolean
->typeof x : string
+>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >x : string | number
 >"string" : "string"
 
diff --git a/tests/baselines/reference/typeGuardsNestedAssignments.types b/tests/baselines/reference/typeGuardsNestedAssignments.types
index 32ac85e270b..ba26f6c07aa 100644
--- a/tests/baselines/reference/typeGuardsNestedAssignments.types
+++ b/tests/baselines/reference/typeGuardsNestedAssignments.types
@@ -103,7 +103,7 @@ function f4() {
 
     if (typeof (x = getStringOrNumberOrNull()) === "number") {
 >typeof (x = getStringOrNumberOrNull()) === "number" : boolean
->typeof (x = getStringOrNumberOrNull()) : string
+>typeof (x = getStringOrNumberOrNull()) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >(x = getStringOrNumberOrNull()) : string | number | null
 >x = getStringOrNumberOrNull() : string | number | null
 >x : string | number | null
diff --git a/tests/baselines/reference/typeGuardsObjectMethods.types b/tests/baselines/reference/typeGuardsObjectMethods.types
index 5a795c336e2..4f3e888d76e 100644
--- a/tests/baselines/reference/typeGuardsObjectMethods.types
+++ b/tests/baselines/reference/typeGuardsObjectMethods.types
@@ -28,7 +28,7 @@ var obj1 = {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -44,7 +44,7 @@ var obj1 = {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -57,7 +57,7 @@ var obj1 = {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -77,7 +77,7 @@ var obj1 = {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -93,7 +93,7 @@ var obj1 = {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -114,7 +114,7 @@ var obj1 = {
 >num : number
 >typeof var1 === "string" && var1.length : number
 >typeof var1 === "string" : boolean
->typeof var1 : string
+>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var1 : string | number
 >"string" : "string"
 >var1.length : number
@@ -130,7 +130,7 @@ var obj1 = {
 >num : number
 >typeof var2 === "string" && var2.length : number
 >typeof var2 === "string" : boolean
->typeof var2 : string
+>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >var2 : string | number
 >"string" : "string"
 >var2.length : number
@@ -143,7 +143,7 @@ var obj1 = {
 >num : number
 >typeof param === "string" && param.length : number
 >typeof param === "string" : boolean
->typeof param : string
+>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >param : string | number
 >"string" : "string"
 >param.length : number
@@ -157,7 +157,7 @@ strOrNum = typeof obj1.method(strOrNum) === "string" && obj1.method(strOrNum);
 >strOrNum : string | number
 >typeof obj1.method(strOrNum) === "string" && obj1.method(strOrNum) : string | number
 >typeof obj1.method(strOrNum) === "string" : boolean
->typeof obj1.method(strOrNum) : string
+>typeof obj1.method(strOrNum) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >obj1.method(strOrNum) : string | number
 >obj1.method : (param: string | number) => string | number
 >obj1 : { method(param: string | number): string | number; prop: string | number; }
@@ -176,7 +176,7 @@ strOrNum = typeof obj1.prop === "string" && obj1.prop;
 >strOrNum : string | number
 >typeof obj1.prop === "string" && obj1.prop : string
 >typeof obj1.prop === "string" : boolean
->typeof obj1.prop : string
+>typeof obj1.prop : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >obj1.prop : string | number
 >obj1 : { method(param: string | number): string | number; prop: string | number; }
 >prop : string | number
diff --git a/tests/baselines/reference/typeGuardsOnClassProperty.types b/tests/baselines/reference/typeGuardsOnClassProperty.types
index 1b663ef209f..f4c3542344f 100644
--- a/tests/baselines/reference/typeGuardsOnClassProperty.types
+++ b/tests/baselines/reference/typeGuardsOnClassProperty.types
@@ -22,7 +22,7 @@ class D {
         return typeof data === "string" ? data : data.join(" ");
 >typeof data === "string" ? data : data.join(" ") : string
 >typeof data === "string" : boolean
->typeof data : string
+>typeof data : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >data : string | string[]
 >"string" : "string"
 >data : string
@@ -39,7 +39,7 @@ class D {
         return typeof this.data === "string" ? this.data : this.data.join(" ");
 >typeof this.data === "string" ? this.data : this.data.join(" ") : string
 >typeof this.data === "string" : boolean
->typeof this.data : string
+>typeof this.data : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >this.data : string | string[]
 >this : this
 >data : string | string[]
@@ -81,7 +81,7 @@ var o: {
 if (typeof o.prop1 === "string" && o.prop1.toLowerCase()) {}
 >typeof o.prop1 === "string" && o.prop1.toLowerCase() : string
 >typeof o.prop1 === "string" : boolean
->typeof o.prop1 : string
+>typeof o.prop1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >o.prop1 : string | number
 >o : { prop1: string | number; prop2: string | boolean; }
 >prop1 : string | number
@@ -102,7 +102,7 @@ var prop1 = o.prop1;
 if (typeof prop1 === "string" && prop1.toLocaleLowerCase()) { }
 >typeof prop1 === "string" && prop1.toLocaleLowerCase() : string
 >typeof prop1 === "string" : boolean
->typeof prop1 : string
+>typeof prop1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >prop1 : string | number
 >"string" : "string"
 >prop1.toLocaleLowerCase() : string
diff --git a/tests/baselines/reference/typeOfOperator1.errors.txt b/tests/baselines/reference/typeOfOperator1.errors.txt
index 764463a3087..75fc25d243c 100644
--- a/tests/baselines/reference/typeOfOperator1.errors.txt
+++ b/tests/baselines/reference/typeOfOperator1.errors.txt
@@ -1,4 +1,5 @@
-tests/cases/compiler/typeOfOperator1.ts(3,5): error TS2322: Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/typeOfOperator1.ts(3,5): error TS2322: Type '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' is not assignable to type 'number'.
+  Type '"string"' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/typeOfOperator1.ts (1 errors) ====
@@ -6,4 +7,5 @@ tests/cases/compiler/typeOfOperator1.ts(3,5): error TS2322: Type 'string' is not
     var y: string = typeof x;
     var z: number = typeof x;
         ~
-!!! error TS2322: Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+!!! error TS2322: Type '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' is not assignable to type 'number'.
+!!! error TS2322:   Type '"string"' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts
index 44b064c3219..92b3103723e 100644
--- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts
@@ -36,6 +36,12 @@ if (typeof boolOrC === "Object") {
 else {
     var r4: boolean = boolOrC; // boolean
 }
+if (typeof strOrC === "Object" as string) { // comparison is OK with cast
+    c = strOrC; // error: but no narrowing to C
+}
+else {
+    var r5: string = strOrC; // error: no narrowing to string
+}
 
 if (typeof strOrNumOrBool === "Object") {
     let q1: {} = strOrNumOrBool; // {}

From 01bc4efc82105043cb98e1aa9105354a78ea5424 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 31 Jan 2017 10:34:44 -0800
Subject: [PATCH 053/127] Add arrayFromMap utility function

---
 src/compiler/checker.ts | 4 +---
 src/compiler/core.ts    | 8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 47811d6ccaf..ba4e8c6993d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14609,9 +14609,7 @@ namespace ts {
 
         function checkTypeOfExpression(node: TypeOfExpression): Type {
             checkExpression(node.expression);
-            const types: Type[] = [];
-            typeofEQFacts.forEach((_, s) => types.push(getLiteralTypeForText(TypeFlags.StringLiteral, s)));
-            return getUnionType(types);
+            return getUnionType(arrayFromMap(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s)));
         }
 
         function checkVoidExpression(node: VoidExpression): Type {
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index de3472afd88..486dd5b42c8 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -895,6 +895,14 @@ namespace ts {
         return result;
     }
 
+    export function arrayFromMap<T, U>(iterator: Iterator<T>, f: (value: T) => U) {
+        const result: U[] = [];
+        for (let { value, done } = iterator.next(); !done; { value, done } = iterator.next()) {
+            result.push(f(value));
+        }
+        return result;
+    }
+
     /**
      * Calls `callback` for each entry in the map, returning the first truthy result.
      * Use `map.forEach` instead for normal iteration.

From 2ce64f2bad67b3422423dddc8ad4e3d05030c64f Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 31 Jan 2017 14:39:10 -0800
Subject: [PATCH 054/127] Create typeof's string literal union type once

This changes the print order of string literal unions slightly. I think
this is because 'string', 'symbol', etc are added to a union very early
on in the creation of the checker.
---
 src/compiler/checker.ts                                  | 9 ++++++---
 .../reference/intersectionTypeNormalization.types        | 4 ++--
 .../reference/modularizeLibrary_Dom.iterable.types       | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index ba4e8c6993d..8a5e51dd110 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -326,7 +326,6 @@ namespace ts {
             "object": TypeFacts.TypeofEQObject,
             "function": TypeFacts.TypeofEQFunction
         });
-
         const typeofNEFacts = createMapFromTemplate({
             "string": TypeFacts.TypeofNEString,
             "number": TypeFacts.TypeofNENumber,
@@ -336,7 +335,6 @@ namespace ts {
             "object": TypeFacts.TypeofNEObject,
             "function": TypeFacts.TypeofNEFunction
         });
-
         const typeofTypesByName = createMapFromTemplate<Type>({
             "string": stringType,
             "number": numberType,
@@ -344,6 +342,7 @@ namespace ts {
             "symbol": esSymbolType,
             "undefined": undefinedType
         });
+        const typeofType = createTypeofType();
 
         let jsxElementType: Type;
         let _jsxNamespace: string;
@@ -1725,6 +1724,10 @@ namespace ts {
             return type;
         }
 
+        function createTypeofType() {
+            return getUnionType(arrayFromMap(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s)));
+        }
+
         // A reserved member name starts with two underscores, but the third character cannot be an underscore
         // or the @ symbol. A third underscore indicates an escaped form of an identifer that started
         // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
@@ -14609,7 +14612,7 @@ namespace ts {
 
         function checkTypeOfExpression(node: TypeOfExpression): Type {
             checkExpression(node.expression);
-            return getUnionType(arrayFromMap(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s)));
+            return typeofType;
         }
 
         function checkVoidExpression(node: VoidExpression): Type {
diff --git a/tests/baselines/reference/intersectionTypeNormalization.types b/tests/baselines/reference/intersectionTypeNormalization.types
index 3ffe7484afe..7d8ba117eec 100644
--- a/tests/baselines/reference/intersectionTypeNormalization.types
+++ b/tests/baselines/reference/intersectionTypeNormalization.types
@@ -227,9 +227,9 @@ function getValueAsString(value: IntersectionFail): string {
 
     if (value.kind === 'int') {
 >value.kind === 'int' : boolean
->value.kind : "int" | "string"
+>value.kind : "string" | "int"
 >value : IntersectionFail
->kind : "int" | "string"
+>kind : "string" | "int"
 >'int' : "int"
 
         return '' + value.num;
diff --git a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
index 054923fb5ee..d681322e2a7 100644
--- a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
+++ b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
@@ -3,9 +3,9 @@
 for (const element of document.getElementsByTagName("a")) {
 >element : HTMLAnchorElement
 >document.getElementsByTagName("a") : NodeListOf<HTMLAnchorElement>
->document.getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
+>document.getElementsByTagName : { <K extends "symbol" | "object" | "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
 >document : Document
->getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
+>getElementsByTagName : { <K extends "symbol" | "object" | "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
 >"a" : "a"
 
     element.href;

From 3b1b5e241f69bfcf49309094359e2620ada6cd06 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 31 Jan 2017 16:35:30 -0800
Subject: [PATCH 055/127] Add string literal completion for equality expression

---
 src/services/completions.ts                   | 24 +++++++++++++++++++
 .../fourslash/completionForStringLiteral10.ts | 12 ++++++++++
 .../fourslash/completionForStringLiteral8.ts  | 12 ++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 tests/cases/fourslash/completionForStringLiteral10.ts
 create mode 100644 tests/cases/fourslash/completionForStringLiteral8.ts

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 5a08dbcb9c8..5d70b357625 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -173,6 +173,11 @@ namespace ts.Completions {
             //      var y = require("/*completion position*/");
             return getStringLiteralCompletionEntriesFromModuleNames(<StringLiteral>node, compilerOptions, host, typeChecker);
         }
+        else if (isEqualityExpression(node.parent)) {
+            // Get all known external module names or complete a path to a module
+            // i.e. x === '/*completion position'
+            return getStringLiteralCompletionEntriesFromBinaryExpression(<StringLiteral>node, node.parent, typeChecker);
+        }
         else {
             const argumentInfo = SignatureHelp.getImmediatelyContainingArgumentInfo(node, position, sourceFile);
             if (argumentInfo) {
@@ -240,6 +245,18 @@ namespace ts.Completions {
         return undefined;
     }
 
+    function getStringLiteralCompletionEntriesFromBinaryExpression(node: StringLiteral, parent: BinaryExpression, typeChecker: TypeChecker): CompletionInfo | undefined {
+        const type = typeChecker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+        if (type) {
+            const entries: CompletionEntry[] = [];
+            addStringLiteralCompletionsFromType(type, entries, typeChecker);
+            if (entries.length) {
+                return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries };
+            }
+        }
+        return undefined;
+    }
+
     function addStringLiteralCompletionsFromType(type: Type, result: Push<CompletionEntry>, typeChecker: TypeChecker): void {
         if (type && type.flags & TypeFlags.TypeParameter) {
             type = typeChecker.getApparentType(type);
@@ -1756,4 +1773,11 @@ namespace ts.Completions {
         catch (e) {}
         return undefined;
     }
+
+    function isEqualityExpression(node: Node): node is BinaryExpression {
+        return isBinaryExpression(node) && (node.operatorToken.kind == SyntaxKind.EqualsEqualsToken ||
+            node.operatorToken.kind === SyntaxKind.ExclamationEqualsToken ||
+            node.operatorToken.kind === SyntaxKind.EqualsEqualsEqualsToken ||
+            node.operatorToken.kind === SyntaxKind.ExclamationEqualsEqualsToken);
+    }
 }
diff --git a/tests/cases/fourslash/completionForStringLiteral10.ts b/tests/cases/fourslash/completionForStringLiteral10.ts
new file mode 100644
index 00000000000..76a98eb732f
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteral10.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+////type As = 'arf' | 'abacus' | 'abaddon';
+////let a: As;
+////if ('/**/' != a
+
+goTo.marker();
+verify.completionListContains("arf");
+verify.completionListContains("abacus");
+verify.completionListContains("abaddon");
+verify.completionListCount(3);
+
diff --git a/tests/cases/fourslash/completionForStringLiteral8.ts b/tests/cases/fourslash/completionForStringLiteral8.ts
new file mode 100644
index 00000000000..727bdf6e6a4
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteral8.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+////type As = 'arf' | 'abacus' | 'abaddon';
+////let a: As;
+////if (a === '/**/
+
+goTo.marker();
+verify.completionListContains("arf");
+verify.completionListContains("abacus");
+verify.completionListContains("abaddon");
+verify.completionListCount(3);
+

From 52841924dad0909e1284352d1ab9b14c00437fda Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 31 Jan 2017 16:35:30 -0800
Subject: [PATCH 056/127] Support string literal completion in case labels

---
 src/services/completions.ts                   | 28 ++++++++-----------
 .../fourslash/completionForStringLiteral11.ts | 14 ++++++++++
 2 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 tests/cases/fourslash/completionForStringLiteral11.ts

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 5d70b357625..4c882c9b6b6 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -174,9 +174,16 @@ namespace ts.Completions {
             return getStringLiteralCompletionEntriesFromModuleNames(<StringLiteral>node, compilerOptions, host, typeChecker);
         }
         else if (isEqualityExpression(node.parent)) {
-            // Get all known external module names or complete a path to a module
+            // Get completions from the type of the other operand
+            // i.e. switch (a) {
+            //         case '/*completion position*/'
+            //      }
+            return getStringLiteralCompletionEntriesFromType(typeChecker.getTypeAtLocation(node.parent.left === node ? node.parent.right : node.parent.left), typeChecker);
+        }
+        else if (isCaseOrDefaultClause(node.parent)) {
+            // Get completions from the type of the switch expression
             // i.e. x === '/*completion position'
-            return getStringLiteralCompletionEntriesFromBinaryExpression(<StringLiteral>node, node.parent, typeChecker);
+            return getStringLiteralCompletionEntriesFromType(typeChecker.getTypeAtLocation((<SwitchStatement>node.parent.parent.parent).expression), typeChecker);
         }
         else {
             const argumentInfo = SignatureHelp.getImmediatelyContainingArgumentInfo(node, position, sourceFile);
@@ -189,7 +196,7 @@ namespace ts.Completions {
 
             // Get completion for string literal from string literal type
             // i.e. var x: "hi" | "hello" = "/*completion position*/"
-            return getStringLiteralCompletionEntriesFromContextualType(<StringLiteral>node, typeChecker);
+            return getStringLiteralCompletionEntriesFromType(typeChecker.getContextualType(<StringLiteral>node), typeChecker);
         }
     }
 
@@ -233,20 +240,7 @@ namespace ts.Completions {
         return undefined;
     }
 
-    function getStringLiteralCompletionEntriesFromContextualType(node: StringLiteral, typeChecker: TypeChecker): CompletionInfo | undefined {
-        const type = typeChecker.getContextualType(node);
-        if (type) {
-            const entries: CompletionEntry[] = [];
-            addStringLiteralCompletionsFromType(type, entries, typeChecker);
-            if (entries.length) {
-                return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries };
-            }
-        }
-        return undefined;
-    }
-
-    function getStringLiteralCompletionEntriesFromBinaryExpression(node: StringLiteral, parent: BinaryExpression, typeChecker: TypeChecker): CompletionInfo | undefined {
-        const type = typeChecker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+    function getStringLiteralCompletionEntriesFromType(type: Type, typeChecker: TypeChecker): CompletionInfo | undefined {
         if (type) {
             const entries: CompletionEntry[] = [];
             addStringLiteralCompletionsFromType(type, entries, typeChecker);
diff --git a/tests/cases/fourslash/completionForStringLiteral11.ts b/tests/cases/fourslash/completionForStringLiteral11.ts
new file mode 100644
index 00000000000..f6acac28a65
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteral11.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////type As = 'arf' | 'abacus' | 'abaddon';
+////let a: As;
+////switch (a) {
+////    case '/**/
+////}
+
+goTo.marker();
+verify.completionListContains("arf");
+verify.completionListContains("abacus");
+verify.completionListContains("abaddon");
+verify.completionListCount(3);
+

From a39c14ec2e85bd61cd9c1820232e6840a5ffe07d Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 31 Jan 2017 21:34:25 -0800
Subject: [PATCH 057/127] Factor kind check to a separate function

---
 src/services/completions.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 4c882c9b6b6..df78ab931d1 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -1769,9 +1769,13 @@ namespace ts.Completions {
     }
 
     function isEqualityExpression(node: Node): node is BinaryExpression {
-        return isBinaryExpression(node) && (node.operatorToken.kind == SyntaxKind.EqualsEqualsToken ||
-            node.operatorToken.kind === SyntaxKind.ExclamationEqualsToken ||
-            node.operatorToken.kind === SyntaxKind.EqualsEqualsEqualsToken ||
-            node.operatorToken.kind === SyntaxKind.ExclamationEqualsEqualsToken);
+        return isBinaryExpression(node) && isEqualityOperatorKind(node.operatorToken.kind);
+    }
+
+    function isEqualityOperatorKind(kind: SyntaxKind) {
+        return kind == SyntaxKind.EqualsEqualsToken ||
+            kind === SyntaxKind.ExclamationEqualsToken ||
+            kind === SyntaxKind.EqualsEqualsEqualsToken ||
+            kind === SyntaxKind.ExclamationEqualsEqualsToken;
     }
 }

From 15c6022e40eae1549e3aa669f1819016cd90fcdb Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 1 Feb 2017 09:32:33 -0800
Subject: [PATCH 058/127] Fix typo causing bug

---
 src/compiler/checker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 26c27cb3be2..de7e9a9387f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4929,7 +4929,7 @@ namespace ts {
         }
 
         function getApparentTypeOfIntersectionType(type: IntersectionType) {
-            return type.resolvedIndexType || (type.resolvedApparentType = getTypeWithThisArgument(type, type));
+            return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(type, type));
         }
 
         /**

From 34ec8956421bdedbc53277e2d4c7fcb35ccf9e4d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 1 Feb 2017 09:47:30 -0800
Subject: [PATCH 059/127] Add regression test

---
 .../types/keyof/keyofAndIndexedAccess.ts      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index a8a5acd450f..70b70dff6ea 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -527,3 +527,30 @@ class Form<T> {
         this.childFormFactories[prop](value)
     }
 }
+
+// Repro from #13787
+
+class SampleClass<P> {
+    public props: Readonly<P>;
+    constructor(props: P) {
+        this.props = Object.freeze(props);
+    }
+}
+
+interface Foo {
+    foo: string;
+}
+
+declare function merge<T, U>(obj1: T, obj2: U): T & U;
+
+class AnotherSampleClass<T> extends SampleClass<T & Foo> {
+    constructor(props: T) {
+        const foo: Foo = { foo: "bar" };
+        super(merge(props, foo));
+    }
+
+    public brokenMethod() {
+        this.props.foo.concat;
+    }
+}
+new AnotherSampleClass({});

From 97828b4b9c79efa087c857b3492cf2373ae8699b Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 1 Feb 2017 09:47:37 -0800
Subject: [PATCH 060/127] Accept new baselines

---
 .../reference/keyofAndIndexedAccess.js        | 60 ++++++++++++
 .../reference/keyofAndIndexedAccess.symbols   | 83 +++++++++++++++++
 .../reference/keyofAndIndexedAccess.types     | 91 +++++++++++++++++++
 3 files changed, 234 insertions(+)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index 62b848e97df..2b1b22d3595 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -526,6 +526,33 @@ class Form<T> {
         this.childFormFactories[prop](value)
     }
 }
+
+// Repro from #13787
+
+class SampleClass<P> {
+    public props: Readonly<P>;
+    constructor(props: P) {
+        this.props = Object.freeze(props);
+    }
+}
+
+interface Foo {
+    foo: string;
+}
+
+declare function merge<T, U>(obj1: T, obj2: U): T & U;
+
+class AnotherSampleClass<T> extends SampleClass<T & Foo> {
+    constructor(props: T) {
+        const foo: Foo = { foo: "bar" };
+        super(merge(props, foo));
+    }
+
+    public brokenMethod() {
+        this.props.foo.concat;
+    }
+}
+new AnotherSampleClass({});
 
 
 //// [keyofAndIndexedAccess.js]
@@ -881,6 +908,27 @@ var Form = (function () {
     };
     return Form;
 }());
+// Repro from #13787
+var SampleClass = (function () {
+    function SampleClass(props) {
+        this.props = Object.freeze(props);
+    }
+    return SampleClass;
+}());
+var AnotherSampleClass = (function (_super) {
+    __extends(AnotherSampleClass, _super);
+    function AnotherSampleClass(props) {
+        var _this = this;
+        var foo = { foo: "bar" };
+        _this = _super.call(this, merge(props, foo)) || this;
+        return _this;
+    }
+    AnotherSampleClass.prototype.brokenMethod = function () {
+        this.props.foo.concat;
+    };
+    return AnotherSampleClass;
+}(SampleClass));
+new AnotherSampleClass({});
 
 
 //// [keyofAndIndexedAccess.d.ts]
@@ -1127,3 +1175,15 @@ declare class Form<T> {
     private childFormFactories;
     set<K extends keyof T>(prop: K, value: T[K]): void;
 }
+declare class SampleClass<P> {
+    props: Readonly<P>;
+    constructor(props: P);
+}
+interface Foo {
+    foo: string;
+}
+declare function merge<T, U>(obj1: T, obj2: U): T & U;
+declare class AnotherSampleClass<T> extends SampleClass<T & Foo> {
+    constructor(props: T);
+    brokenMethod(): void;
+}
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index 54fff19f428..f6425b5ed0e 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -1880,3 +1880,86 @@ class Form<T> {
     }
 }
 
+// Repro from #13787
+
+class SampleClass<P> {
+>SampleClass : Symbol(SampleClass, Decl(keyofAndIndexedAccess.ts, 526, 1))
+>P : Symbol(P, Decl(keyofAndIndexedAccess.ts, 530, 18))
+
+    public props: Readonly<P>;
+>props : Symbol(SampleClass.props, Decl(keyofAndIndexedAccess.ts, 530, 22))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>P : Symbol(P, Decl(keyofAndIndexedAccess.ts, 530, 18))
+
+    constructor(props: P) {
+>props : Symbol(props, Decl(keyofAndIndexedAccess.ts, 532, 16))
+>P : Symbol(P, Decl(keyofAndIndexedAccess.ts, 530, 18))
+
+        this.props = Object.freeze(props);
+>this.props : Symbol(SampleClass.props, Decl(keyofAndIndexedAccess.ts, 530, 22))
+>this : Symbol(SampleClass, Decl(keyofAndIndexedAccess.ts, 526, 1))
+>props : Symbol(SampleClass.props, Decl(keyofAndIndexedAccess.ts, 530, 22))
+>Object.freeze : Symbol(ObjectConstructor.freeze, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>freeze : Symbol(ObjectConstructor.freeze, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>props : Symbol(props, Decl(keyofAndIndexedAccess.ts, 532, 16))
+    }
+}
+
+interface Foo {
+>Foo : Symbol(Foo, Decl(keyofAndIndexedAccess.ts, 535, 1))
+
+    foo: string;
+>foo : Symbol(Foo.foo, Decl(keyofAndIndexedAccess.ts, 537, 15))
+}
+
+declare function merge<T, U>(obj1: T, obj2: U): T & U;
+>merge : Symbol(merge, Decl(keyofAndIndexedAccess.ts, 539, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 541, 23))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 541, 25))
+>obj1 : Symbol(obj1, Decl(keyofAndIndexedAccess.ts, 541, 29))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 541, 23))
+>obj2 : Symbol(obj2, Decl(keyofAndIndexedAccess.ts, 541, 37))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 541, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 541, 23))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 541, 25))
+
+class AnotherSampleClass<T> extends SampleClass<T & Foo> {
+>AnotherSampleClass : Symbol(AnotherSampleClass, Decl(keyofAndIndexedAccess.ts, 541, 54))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 543, 25))
+>SampleClass : Symbol(SampleClass, Decl(keyofAndIndexedAccess.ts, 526, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 543, 25))
+>Foo : Symbol(Foo, Decl(keyofAndIndexedAccess.ts, 535, 1))
+
+    constructor(props: T) {
+>props : Symbol(props, Decl(keyofAndIndexedAccess.ts, 544, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 543, 25))
+
+        const foo: Foo = { foo: "bar" };
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 545, 13))
+>Foo : Symbol(Foo, Decl(keyofAndIndexedAccess.ts, 535, 1))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 545, 26))
+
+        super(merge(props, foo));
+>super : Symbol(SampleClass, Decl(keyofAndIndexedAccess.ts, 526, 1))
+>merge : Symbol(merge, Decl(keyofAndIndexedAccess.ts, 539, 1))
+>props : Symbol(props, Decl(keyofAndIndexedAccess.ts, 544, 16))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 545, 13))
+    }
+
+    public brokenMethod() {
+>brokenMethod : Symbol(AnotherSampleClass.brokenMethod, Decl(keyofAndIndexedAccess.ts, 547, 5))
+
+        this.props.foo.concat;
+>this.props.foo.concat : Symbol(String.concat, Decl(lib.d.ts, --, --))
+>this.props.foo : Symbol(foo)
+>this.props : Symbol(SampleClass.props, Decl(keyofAndIndexedAccess.ts, 530, 22))
+>this : Symbol(AnotherSampleClass, Decl(keyofAndIndexedAccess.ts, 541, 54))
+>props : Symbol(SampleClass.props, Decl(keyofAndIndexedAccess.ts, 530, 22))
+>foo : Symbol(foo)
+>concat : Symbol(String.concat, Decl(lib.d.ts, --, --))
+    }
+}
+new AnotherSampleClass({});
+>AnotherSampleClass : Symbol(AnotherSampleClass, Decl(keyofAndIndexedAccess.ts, 541, 54))
+
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index e987ee9043b..86469efc284 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -2204,3 +2204,94 @@ class Form<T> {
     }
 }
 
+// Repro from #13787
+
+class SampleClass<P> {
+>SampleClass : SampleClass<P>
+>P : P
+
+    public props: Readonly<P>;
+>props : Readonly<P>
+>Readonly : Readonly<T>
+>P : P
+
+    constructor(props: P) {
+>props : P
+>P : P
+
+        this.props = Object.freeze(props);
+>this.props = Object.freeze(props) : Readonly<P>
+>this.props : Readonly<P>
+>this : this
+>props : Readonly<P>
+>Object.freeze(props) : Readonly<P>
+>Object.freeze : { <T>(a: T[]): ReadonlyArray<T>; <T extends Function>(f: T): T; <T>(o: T): Readonly<T>; }
+>Object : ObjectConstructor
+>freeze : { <T>(a: T[]): ReadonlyArray<T>; <T extends Function>(f: T): T; <T>(o: T): Readonly<T>; }
+>props : P
+    }
+}
+
+interface Foo {
+>Foo : Foo
+
+    foo: string;
+>foo : string
+}
+
+declare function merge<T, U>(obj1: T, obj2: U): T & U;
+>merge : <T, U>(obj1: T, obj2: U) => T & U
+>T : T
+>U : U
+>obj1 : T
+>T : T
+>obj2 : U
+>U : U
+>T : T
+>U : U
+
+class AnotherSampleClass<T> extends SampleClass<T & Foo> {
+>AnotherSampleClass : AnotherSampleClass<T>
+>T : T
+>SampleClass : SampleClass<T & Foo>
+>T : T
+>Foo : Foo
+
+    constructor(props: T) {
+>props : T
+>T : T
+
+        const foo: Foo = { foo: "bar" };
+>foo : Foo
+>Foo : Foo
+>{ foo: "bar" } : { foo: string; }
+>foo : string
+>"bar" : "bar"
+
+        super(merge(props, foo));
+>super(merge(props, foo)) : void
+>super : typeof SampleClass
+>merge(props, foo) : T & Foo
+>merge : <T, U>(obj1: T, obj2: U) => T & U
+>props : T
+>foo : Foo
+    }
+
+    public brokenMethod() {
+>brokenMethod : () => void
+
+        this.props.foo.concat;
+>this.props.foo.concat : (...strings: string[]) => string
+>this.props.foo : (T & Foo)["foo"]
+>this.props : Readonly<T & Foo>
+>this : this
+>props : Readonly<T & Foo>
+>foo : (T & Foo)["foo"]
+>concat : (...strings: string[]) => string
+    }
+}
+new AnotherSampleClass({});
+>new AnotherSampleClass({}) : AnotherSampleClass<{}>
+>AnotherSampleClass : typeof AnotherSampleClass
+>{} : {}
+

From 86b3c14099464ec43aabb961296f9098480766f6 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 1 Feb 2017 11:36:33 -0800
Subject: [PATCH 061/127] Consider 'object' a valid base type + apparent type
 of 'object' is {}

---
 src/compiler/checker.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index de7e9a9387f..b5306771dd7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3991,7 +3991,7 @@ namespace ts {
         // A valid base type is any non-generic object type or intersection of non-generic
         // object types.
         function isValidBaseType(type: Type): boolean {
-            return type.flags & TypeFlags.Object && !isGenericMappedType(type) ||
+            return type.flags & (TypeFlags.Object | TypeFlags.NonPrimitive) && !isGenericMappedType(type) ||
                 type.flags & TypeFlags.Intersection && !forEach((<IntersectionType>type).types, t => !isValidBaseType(t));
         }
 
@@ -4944,7 +4944,7 @@ namespace ts {
                 t.flags & TypeFlags.NumberLike ? globalNumberType :
                 t.flags & TypeFlags.BooleanLike ? globalBooleanType :
                 t.flags & TypeFlags.ESSymbol ? getGlobalESSymbolType() :
-                t.flags & TypeFlags.NonPrimitive ? globalObjectType :
+                t.flags & TypeFlags.NonPrimitive ? emptyObjectType :
                 t;
         }
 

From b6d612980c76f545d75cf669336457a33b85dec6 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 1 Feb 2017 11:37:11 -0800
Subject: [PATCH 062/127] Accept baseline change for apparent type

---
 tests/baselines/reference/nonPrimitiveAssignError.errors.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
index a9bfaaa4a8a..f8c4450f3aa 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveAssignError.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(5,1): error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
-  Property 'foo' is missing in type 'Object'.
+  Property 'foo' is missing in type '{}'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(13,1): error TS2322: Type 'number' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(14,1): error TS2322: Type 'true' is not assignable to type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(15,1): error TS2322: Type 'string' is not assignable to type 'object'.
@@ -16,7 +16,7 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveAssignError.ts(19,1): err
     y = a; // expect error
     ~
 !!! error TS2322: Type 'object' is not assignable to type '{ foo: string; }'.
-!!! error TS2322:   Property 'foo' is missing in type 'Object'.
+!!! error TS2322:   Property 'foo' is missing in type '{}'.
     a = x;
     a = y;
     

From a8de5ce836e54c4d8d3713a6db789b27402c399c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 1 Feb 2017 11:37:24 -0800
Subject: [PATCH 063/127] Add regression test

---
 tests/cases/conformance/classes/mixinClassesAnonymous.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/cases/conformance/classes/mixinClassesAnonymous.ts b/tests/cases/conformance/classes/mixinClassesAnonymous.ts
index 24289b61e3e..0e422888087 100644
--- a/tests/cases/conformance/classes/mixinClassesAnonymous.ts
+++ b/tests/cases/conformance/classes/mixinClassesAnonymous.ts
@@ -54,3 +54,11 @@ class Thing3 extends Thing2 {
         this.print();
     }
 }
+
+// Repro from #13805
+
+const Timestamped = <CT extends Constructor<object>>(Base: CT) => {
+    return class extends Base {
+        timestamp = new Date();
+    };
+}

From 3a0a58d2e2274408788ff98246b001b176710617 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 1 Feb 2017 11:37:33 -0800
Subject: [PATCH 064/127] Accept new baselines

---
 .../reference/mixinClassesAnonymous.js        | 20 +++++++++++++++++
 .../reference/mixinClassesAnonymous.symbols   | 19 ++++++++++++++++
 .../reference/mixinClassesAnonymous.types     | 22 +++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/tests/baselines/reference/mixinClassesAnonymous.js b/tests/baselines/reference/mixinClassesAnonymous.js
index c7b8ab5fd63..aa148c25acf 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.js
+++ b/tests/baselines/reference/mixinClassesAnonymous.js
@@ -55,6 +55,14 @@ class Thing3 extends Thing2 {
         this.print();
     }
 }
+
+// Repro from #13805
+
+const Timestamped = <CT extends Constructor<object>>(Base: CT) => {
+    return class extends Base {
+        timestamp = new Date();
+    };
+}
 
 
 //// [mixinClassesAnonymous.js]
@@ -138,3 +146,15 @@ var Thing3 = (function (_super) {
     };
     return Thing3;
 }(Thing2));
+// Repro from #13805
+var Timestamped = function (Base) {
+    return (function (_super) {
+        __extends(class_2, _super);
+        function class_2() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.timestamp = new Date();
+            return _this;
+        }
+        return class_2;
+    }(Base));
+};
diff --git a/tests/baselines/reference/mixinClassesAnonymous.symbols b/tests/baselines/reference/mixinClassesAnonymous.symbols
index 204d9c589fd..bd709501f31 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.symbols
+++ b/tests/baselines/reference/mixinClassesAnonymous.symbols
@@ -167,3 +167,22 @@ class Thing3 extends Thing2 {
     }
 }
 
+// Repro from #13805
+
+const Timestamped = <CT extends Constructor<object>>(Base: CT) => {
+>Timestamped : Symbol(Timestamped, Decl(mixinClassesAnonymous.ts, 59, 5))
+>CT : Symbol(CT, Decl(mixinClassesAnonymous.ts, 59, 21))
+>Constructor : Symbol(Constructor, Decl(mixinClassesAnonymous.ts, 0, 0))
+>Base : Symbol(Base, Decl(mixinClassesAnonymous.ts, 59, 53))
+>CT : Symbol(CT, Decl(mixinClassesAnonymous.ts, 59, 21))
+
+    return class extends Base {
+>Base : Symbol(Base, Decl(mixinClassesAnonymous.ts, 59, 53))
+
+        timestamp = new Date();
+>timestamp : Symbol((Anonymous class).timestamp, Decl(mixinClassesAnonymous.ts, 60, 31))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+    };
+}
+
diff --git a/tests/baselines/reference/mixinClassesAnonymous.types b/tests/baselines/reference/mixinClassesAnonymous.types
index 54b1c2c3819..516b15af2f3 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.types
+++ b/tests/baselines/reference/mixinClassesAnonymous.types
@@ -198,3 +198,25 @@ class Thing3 extends Thing2 {
     }
 }
 
+// Repro from #13805
+
+const Timestamped = <CT extends Constructor<object>>(Base: CT) => {
+>Timestamped : <CT extends Constructor<object>>(Base: CT) => { new (...args: any[]): (Anonymous class); prototype: <any>.(Anonymous class); } & CT
+><CT extends Constructor<object>>(Base: CT) => {    return class extends Base {        timestamp = new Date();    };} : <CT extends Constructor<object>>(Base: CT) => { new (...args: any[]): (Anonymous class); prototype: <any>.(Anonymous class); } & CT
+>CT : CT
+>Constructor : Constructor<T>
+>Base : CT
+>CT : CT
+
+    return class extends Base {
+>class extends Base {        timestamp = new Date();    } : { new (...args: any[]): (Anonymous class); prototype: <any>.(Anonymous class); } & CT
+>Base : object
+
+        timestamp = new Date();
+>timestamp : Date
+>new Date() : Date
+>Date : DateConstructor
+
+    };
+}
+

From d23f692734a38ee6c5a7764c432f65c4e4cb7564 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 1 Feb 2017 13:11:16 -0800
Subject: [PATCH 065/127] rename arrayFromMap -> convertToArray

---
 src/compiler/checker.ts | 2 +-
 src/compiler/core.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8a5e51dd110..69d019688b1 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1725,7 +1725,7 @@ namespace ts {
         }
 
         function createTypeofType() {
-            return getUnionType(arrayFromMap(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s)));
+            return getUnionType(convertToArray(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s)));
         }
 
         // A reserved member name starts with two underscores, but the third character cannot be an underscore
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 486dd5b42c8..d11f9925c05 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -895,7 +895,7 @@ namespace ts {
         return result;
     }
 
-    export function arrayFromMap<T, U>(iterator: Iterator<T>, f: (value: T) => U) {
+    export function convertToArray<T, U>(iterator: Iterator<T>, f: (value: T) => U) {
         const result: U[] = [];
         for (let { value, done } = iterator.next(); !done; { value, done } = iterator.next()) {
             result.push(f(value));

From f02ce1f6a02661da69aade37d9d167274c23dad4 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Wed, 1 Feb 2017 15:22:35 -0800
Subject: [PATCH 066/127] PR Feedback

---
 src/compiler/comments.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
index f69b4c546a0..200158c2f5c 100644
--- a/src/compiler/comments.ts
+++ b/src/compiler/comments.ts
@@ -11,7 +11,7 @@ namespace ts {
         emitTrailingCommentsOfPosition(pos: number): void;
     }
 
-    export function createCommentWriter(printerOptions: PrinterOptions, emitPos: (pos: number) => void): CommentWriter {
+    export function createCommentWriter(printerOptions: PrinterOptions, emitPos: ((pos: number) => void) | undefined): CommentWriter {
         const extendedDiagnostics = printerOptions.extendedDiagnostics;
         const newLine = getNewLineCharacter(printerOptions);
         let writer: EmitTextWriter;

From 8372a1d1c12556fdf77cb22afd6bd62b2901d7be Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Wed, 1 Feb 2017 16:15:14 -0800
Subject: [PATCH 067/127] Update baselines from a-c

---
 tests/baselines/reference/APISample_compile.js                | 1 +
 tests/baselines/reference/APISample_linter.js                 | 1 +
 tests/baselines/reference/APISample_parseConfig.js            | 1 +
 tests/baselines/reference/aliasAssignments.js                 | 1 +
 tests/baselines/reference/aliasUsageInAccessorsOfClass.js     | 2 ++
 tests/baselines/reference/aliasUsageInArray.js                | 2 ++
 tests/baselines/reference/aliasUsageInFunctionExpression.js   | 2 ++
 tests/baselines/reference/aliasUsageInGenericFunction.js      | 2 ++
 tests/baselines/reference/aliasUsageInIndexerOfClass.js       | 2 ++
 tests/baselines/reference/aliasUsageInObjectLiteral.js        | 2 ++
 tests/baselines/reference/aliasUsageInOrExpression.js         | 2 ++
 .../reference/aliasUsageInTypeArgumentOfExtendsClause.js      | 2 ++
 tests/baselines/reference/aliasUsageInVarAssignment.js        | 2 ++
 tests/baselines/reference/aliasUsedAsNameValue.js             | 2 ++
 tests/baselines/reference/allowSyntheticDefaultImports1.js    | 2 ++
 tests/baselines/reference/allowSyntheticDefaultImports4.js    | 1 +
 tests/baselines/reference/alwaysStrictModule4.js              | 1 +
 tests/baselines/reference/alwaysStrictModule6.js              | 1 +
 tests/baselines/reference/ambientShorthand_reExport.js        | 2 ++
 tests/baselines/reference/amdImportNotAsPrimaryExpression.js  | 1 +
 tests/baselines/reference/anonymousDefaultExportsAmd.js       | 4 ++--
 tests/baselines/reference/anonymousDefaultExportsCommonjs.js  | 4 ++--
 tests/baselines/reference/anonymousDefaultExportsUmd.js       | 4 ++--
 tests/baselines/reference/asOperator4.js                      | 1 +
 tests/baselines/reference/asyncImportedPromise_es5.js         | 1 +
 tests/baselines/reference/asyncImportedPromise_es6.js         | 1 +
 tests/baselines/reference/augmentedTypesExternalModule1.js    | 1 +
 tests/baselines/reference/cacheResolutions.js                 | 3 +++
 tests/baselines/reference/circularReferenceInImport.js        | 1 +
 tests/baselines/reference/classAbstractManyKeywords.js        | 2 +-
 tests/baselines/reference/classExtendsAcrossFiles.js          | 2 ++
 .../reference/classMemberInitializerWithLamdaScoping3.js      | 1 +
 .../reference/classMemberInitializerWithLamdaScoping4.js      | 1 +
 tests/baselines/reference/collisionExportsRequireAndAlias.js  | 3 +++
 .../reference/collisionExportsRequireAndAmbientModule.js      | 1 +
 tests/baselines/reference/collisionExportsRequireAndClass.js  | 1 +
 .../baselines/reference/collisionExportsRequireAndFunction.js | 1 +
 tests/baselines/reference/collisionExportsRequireAndModule.js | 1 +
 .../collisionExportsRequireAndUninstantiatedModule.js         | 1 +
 tests/baselines/reference/collisionExportsRequireAndVar.js    | 1 +
 tests/baselines/reference/commentsExternalModules2.js         | 1 +
 tests/baselines/reference/commentsExternalModules3.js         | 1 +
 tests/baselines/reference/commentsOnRequireStatement.js       | 3 +++
 .../baselines/reference/commonJSImportAsPrimaryExpression.js  | 1 +
 .../reference/commonJSImportNotAsPrimaryExpression.js         | 1 +
 tests/baselines/reference/commonSourceDir5.js                 | 3 +++
 tests/baselines/reference/commonSourceDir6.js                 | 3 +++
 tests/baselines/reference/commonSourceDirectory_dts.js        | 1 +
 tests/baselines/reference/commonjsSafeImport.js               | 1 +
 tests/baselines/reference/complexNarrowingWithAny.js          | 1 +
 tests/baselines/reference/constDeclarations-access5.js        | 1 +
 tests/baselines/reference/controlFlowPropertyDeclarations.js  | 1 +
 tests/baselines/reference/controlFlowSelfReferentialLoop.js   | 2 +-
 .../reference/crashIntypeCheckInvocationExpression.js         | 1 +
 .../reference/crashIntypeCheckObjectCreationExpression.js     | 1 +
 55 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 5f55c04c9f9..37383082983 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -60,3 +60,4 @@ compile(process.argv.slice(2), {
     noEmitOnError: true, noImplicitAny: true,
     target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS
 });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index 1421b53a00c..cc57b184960 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -117,3 +117,4 @@ fileNames.forEach(function (fileName) {
     // delint it
     delint(sourceFile);
 });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js
index 75ab80d3f23..d97acbdc14f 100644
--- a/tests/baselines/reference/APISample_parseConfig.js
+++ b/tests/baselines/reference/APISample_parseConfig.js
@@ -68,3 +68,4 @@ function createProgram(rootFiles, compilerOptionsJson) {
     return ts.createProgram(rootFiles, settings.options);
 }
 exports.createProgram = createProgram;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js
index 7aef6de22e6..7a69de02cfe 100644
--- a/tests/baselines/reference/aliasAssignments.js
+++ b/tests/baselines/reference/aliasAssignments.js
@@ -21,6 +21,7 @@ var someClass = (function () {
     return someClass;
 }());
 exports.someClass = someClass;
+exports.__esModule = true;
 //// [aliasAssignments_1.js]
 "use strict";
 var moduleA = require("./aliasAssignments_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
index 41a2bb06664..0b05a0c3c63 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -35,6 +35,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [aliasUsage1_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -56,6 +57,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [aliasUsage1_main.js]
 "use strict";
 var moduleA = require("./aliasUsage1_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js
index 1f3e1490332..5e864df3d0f 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -29,6 +29,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInArray_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -50,6 +51,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInArray_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInArray_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js
index a6fc0e97f68..d84253f7992 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -28,6 +28,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInFunctionExpression_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -49,6 +50,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInFunctionExpression_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInFunctionExpression_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index a991207971c..53e702ba227 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -32,6 +32,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInGenericFunction_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -53,6 +54,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInGenericFunction_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInGenericFunction_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index d57b2f6379d..0a53d6605dd 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -34,6 +34,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInIndexerOfClass_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -55,6 +56,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInIndexerOfClass_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index 15818c82cb9..f9202b02067 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -29,6 +29,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInObjectLiteral_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -50,6 +51,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInObjectLiteral_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInObjectLiteral_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index 99360ea648d..a40d3679b63 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -32,6 +32,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInOrExpression_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -53,6 +54,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInOrExpression_main.js]
 "use strict";
 var moduleA = require("./aliasUsageInOrExpression_moduleA");
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index 47f0c30d28b..de566b4dd53 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -32,6 +32,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -53,6 +54,7 @@ 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 () {
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index 666e32e1546..dbee5562266 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -28,6 +28,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [aliasUsageInVarAssignment_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -49,6 +50,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [aliasUsageInVarAssignment_main.js]
 "use strict";
 var i;
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js
index 9495f8890b6..5febf4b90e7 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.js
+++ b/tests/baselines/reference/aliasUsedAsNameValue.js
@@ -24,6 +24,7 @@ export var a = function () {
 "use strict";
 function b(a) { return null; }
 exports.b = b;
+exports.__esModule = true;
 //// [aliasUsedAsNameValue_2.js]
 "use strict";
 ///<reference path='aliasUsedAsNameValue_0.ts' />
@@ -34,3 +35,4 @@ exports.a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
 };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js
index 3789410a54b..dceecdd4001 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js
@@ -18,7 +18,9 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
 var b_1 = require("./b");
 exports.x = new b_1["default"].Foo();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js
index 747f59dc904..69bfedadc49 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports4.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js
@@ -15,3 +15,4 @@ export var x = new Foo();
 "use strict";
 var b_1 = require("./b");
 exports.x = new b_1["default"]();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js
index 1444f351bbd..7ca68d85000 100644
--- a/tests/baselines/reference/alwaysStrictModule4.js
+++ b/tests/baselines/reference/alwaysStrictModule4.js
@@ -7,3 +7,4 @@ export const a = 1
 "use strict";
 // Module commonjs
 exports.a = 1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js
index 9a603926169..161e341ba79 100644
--- a/tests/baselines/reference/alwaysStrictModule6.js
+++ b/tests/baselines/reference/alwaysStrictModule6.js
@@ -7,3 +7,4 @@ export const a = 1;
 "use strict";
 // Targeting ES5
 exports.a = 1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
index bdfc0ee0821..0d9a14c0f15 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -20,12 +20,14 @@ x($);
 "use strict";
 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;
 //// [reExportUser.js]
 "use strict";
 var reExportX_1 = require("./reExportX");
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index a0bd7c83d64..781142b4061 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
@@ -48,6 +48,7 @@ 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) {
diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.js b/tests/baselines/reference/anonymousDefaultExportsAmd.js
index bb5cd587a83..a3b8b7cd98a 100644
--- a/tests/baselines/reference/anonymousDefaultExportsAmd.js
+++ b/tests/baselines/reference/anonymousDefaultExportsAmd.js
@@ -11,13 +11,13 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     class default_1 {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     function default_1() { }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
index 754ffdb7c9b..dbfdfd0f420 100644
--- a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
+++ b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
@@ -10,10 +10,10 @@ export default function() {}
 "use strict";
 class default_1 {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 function default_1() { }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js
index 85ed1d30444..a8984434c9c 100644
--- a/tests/baselines/reference/anonymousDefaultExportsUmd.js
+++ b/tests/baselines/reference/anonymousDefaultExportsUmd.js
@@ -19,8 +19,8 @@ export default function() {}
     "use strict";
     class default_1 {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 (function (factory) {
@@ -34,6 +34,6 @@ export default function() {}
 })(function (require, exports) {
     "use strict";
     function default_1() { }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js
index 41edf92416b..672d311a702 100644
--- a/tests/baselines/reference/asOperator4.js
+++ b/tests/baselines/reference/asOperator4.js
@@ -16,6 +16,7 @@ import { foo } from './foo';
 "use strict";
 function foo() { }
 exports.foo = foo;
+exports.__esModule = true;
 //// [bar.js]
 "use strict";
 var foo_1 = require("./foo");
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index 280e8a87916..ceabda58899 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -29,6 +29,7 @@ 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) {
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js
index 6c6e34e7b1d..923af2e55cd 100644
--- a/tests/baselines/reference/asyncImportedPromise_es6.js
+++ b/tests/baselines/reference/asyncImportedPromise_es6.js
@@ -14,6 +14,7 @@ class Test {
 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) {
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js
index 65525e8187e..32111846162 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.js
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.js
@@ -13,4 +13,5 @@ define(["require", "exports"], function (require, exports) {
         c5.prototype.foo = function () { };
         return c5;
     }());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/cacheResolutions.js b/tests/baselines/reference/cacheResolutions.js
index 1d0f918bf98..1c8c6ec0168 100644
--- a/tests/baselines/reference/cacheResolutions.js
+++ b/tests/baselines/reference/cacheResolutions.js
@@ -14,14 +14,17 @@ export let x = 1;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [lib1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [lib2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/circularReferenceInImport.js b/tests/baselines/reference/circularReferenceInImport.js
index a9cf0925c34..28f43fa7985 100644
--- a/tests/baselines/reference/circularReferenceInImport.js
+++ b/tests/baselines/reference/circularReferenceInImport.js
@@ -21,6 +21,7 @@ function foo() {
     return new Object();
 }
 exports.foo = foo;
+exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js
index 8ba50dcee1c..298395a232c 100644
--- a/tests/baselines/reference/classAbstractManyKeywords.js
+++ b/tests/baselines/reference/classAbstractManyKeywords.js
@@ -6,7 +6,6 @@ import abstract class D {}
 
 //// [classAbstractManyKeywords.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = abstract;
 var A = (function () {
     function A() {
@@ -30,3 +29,4 @@ var D = (function () {
     }
     return D;
 }());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js
index 6fcce5c5982..8a648cc62cd 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -49,6 +49,7 @@ exports.b = {
         a_1.a.f();
     }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [a.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -79,3 +80,4 @@ exports.a = {
         b_1.b.f();
     }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
index d310ccd53bc..ce46e75bed8 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
@@ -33,3 +33,4 @@ var Test1 = (function () {
     return Test1;
 }());
 exports.Test1 = Test1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
index 161bceca04d..49f5f916cd3 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
@@ -29,3 +29,4 @@ var Test1 = (function () {
     return Test1;
 }());
 exports.Test1 = Test1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js
index d7785dc73cf..b6d3159b0f9 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js
@@ -23,6 +23,7 @@ define(["require", "exports"], function (require, exports) {
     function bar() {
     }
     exports.bar = bar;
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAlias_file3333.js]
 define(["require", "exports"], function (require, exports) {
@@ -30,6 +31,7 @@ define(["require", "exports"], function (require, exports) {
     function bar2() {
     }
     exports.bar2 = bar2;
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAlias_file2.js]
 define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) {
@@ -42,4 +44,5 @@ define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisio
         exports.bar2();
     }
     exports.foo2 = foo2;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
index 7f0a5c82d9a..045e7dcb796 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
@@ -109,6 +109,7 @@ define(["require", "exports"], function (require, exports) {
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientModule_globalFile.js]
 var m4;
diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js
index 962df0344ed..ca16128e9cd 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndClass.js
@@ -79,6 +79,7 @@ define(["require", "exports"], function (require, exports) {
         }());
         m2.exports = exports;
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndClass_globalFile.js]
 var require = (function () {
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js
index 0fe5405cfb3..7e538d462b2 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.js
+++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js
@@ -53,4 +53,5 @@ define(["require", "exports"], function (require, exports) {
         }
         m2.require = require;
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js
index b29364aebe3..d1ca4d3a75c 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.js
@@ -162,6 +162,7 @@ define(["require", "exports"], function (require, exports) {
             exports.C = C;
         })(exports = m2.exports || (m2.exports = {}));
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndModule_globalFile.js]
 var require;
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
index 6270cf65c02..ba1926dd965 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
@@ -25,4 +25,5 @@ define(["require", "exports"], function (require, exports) {
         return null;
     }
     exports.foo2 = foo2;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js
index 0686b932921..9c7a24b176f 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.js
+++ b/tests/baselines/reference/collisionExportsRequireAndVar.js
@@ -44,6 +44,7 @@ define(["require", "exports"], function (require, exports) {
         m2.exports = 0;
         m2.require = "require";
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndVar_globalFile.js]
 var exports = 0;
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
index 18f3564ec7f..7b403061199 100644
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ b/tests/baselines/reference/commentsExternalModules2.js
@@ -132,6 +132,7 @@ define(["require", "exports", "commentsExternalModules2_0"], function (require,
     exports.newVar = new extMod.m1.m2.c();
     extMod.m4.fooExport();
     exports.newVar2 = new extMod.m4.m2.c();
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index 85fbcfe019f..68ec3be48bd 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/tests/baselines/reference/commentsExternalModules3.js
@@ -131,6 +131,7 @@ 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]
diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js
index 9cfd75c0211..6feff1bd813 100644
--- a/tests/baselines/reference/commentsOnRequireStatement.js
+++ b/tests/baselines/reference/commentsOnRequireStatement.js
@@ -20,9 +20,11 @@ export {subject1} from './1';
 //// [0.js]
 "use strict";
 exports.subject = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [1.js]
 "use strict";
 exports.subject1 = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 /* blah0 */
@@ -34,3 +36,4 @@ exports.subject = _0_1.subject;
 /* blah1 */
 var _1_1 = require("./1");
 exports.subject1 = _1_1.subject1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index b8cf42ea762..212f5869744 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -23,6 +23,7 @@ var C1 = (function () {
 }());
 C1.s1 = true;
 exports.C1 = C1;
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 var foo = require("./foo_0");
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index eb77d1baa3c..76610c2d56d 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
@@ -47,6 +47,7 @@ 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";
 var i;
diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js
index 1e404b26e13..f1ec275cf73 100644
--- a/tests/baselines/reference/commonSourceDir5.js
+++ b/tests/baselines/reference/commonSourceDir5.js
@@ -21,13 +21,16 @@ define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require,
     "use strict";
     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.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;
 });
diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js
index 88f5828a500..d52fde52cf2 100644
--- a/tests/baselines/reference/commonSourceDir6.js
+++ b/tests/baselines/reference/commonSourceDir6.js
@@ -20,13 +20,16 @@ define("baz", ["require", "exports", "a/bar", "a/foo"], function (require, expor
     "use strict";
     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.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;
 });
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js
index 8aa0bd04e11..e49192dbe2f 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js
@@ -14,6 +14,7 @@ export const x = y;
 "use strict";
 /// <reference path="../lib/bar.d.ts" />
 exports.x = y;
+exports.__esModule = true;
 //# sourceMappingURL=/app/myMapRoot/index.js.map
 
 //// [/app/bin/index.d.ts]
diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js
index 93439a418f6..5af2c56b5ef 100644
--- a/tests/baselines/reference/commonjsSafeImport.js
+++ b/tests/baselines/reference/commonjsSafeImport.js
@@ -14,6 +14,7 @@ Foo();
 "use strict";
 function Foo() { }
 exports.Foo = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
 var _10_lib_1 = require("./10_lib");
diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js
index 0a137f5d793..5c665a52cb3 100644
--- a/tests/baselines/reference/complexNarrowingWithAny.js
+++ b/tests/baselines/reference/complexNarrowingWithAny.js
@@ -1025,3 +1025,4 @@ function viewFactory_AppComponent0(viewUtils, parentInjector, declarationEl) {
     return new _View_AppComponent0(viewUtils, parentInjector, declarationEl);
 }
 exports.viewFactory_AppComponent0 = viewFactory_AppComponent0;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 1da0cf40fcd..282581fbdb8 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/tests/baselines/reference/constDeclarations-access5.js
@@ -52,6 +52,7 @@ m.x.toString();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 0;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [constDeclarations_access_2.js]
 define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) {
diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.js b/tests/baselines/reference/controlFlowPropertyDeclarations.js
index 748f63ea858..be61fc2c75a 100644
--- a/tests/baselines/reference/controlFlowPropertyDeclarations.js
+++ b/tests/baselines/reference/controlFlowPropertyDeclarations.js
@@ -289,3 +289,4 @@ var StyleParser = (function () {
     return StyleParser;
 }());
 exports.StyleParser = StyleParser;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
index f7dbc0a2324..d1422112fff 100644
--- a/tests/baselines/reference/controlFlowSelfReferentialLoop.js
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
@@ -203,5 +203,5 @@ function md5(string) {
         b = II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
     }
 }
-exports.__esModule = true;
 exports["default"] = md5;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
index 549d7948fcb..67eba038d46 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
@@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) {
         var folder = path.join(), fileset = nake.fileSetSync(folder);
         return doCompile(fileset, moduleType);
     });
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
index 00f4dbdc377..48fe4dad45f 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
@@ -22,4 +22,5 @@ define(["require", "exports"], function (require, exports) {
         return BuildWorkspaceService;
     }());
     exports.BuildWorkspaceService = BuildWorkspaceService;
+    exports.__esModule = true;
 });

From 984541316ac586bc9fdd385400b8858122a16baf Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Wed, 1 Feb 2017 16:16:04 -0800
Subject: [PATCH 068/127] Added comments and a few Debug assertions

---
 src/compiler/emitter.ts | 15 ++++++++++
 src/compiler/types.ts   | 66 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index f20a7944a0f..8c6868555f2 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -236,6 +236,21 @@ namespace ts {
         };
 
         function printNode(hint: EmitHint, node: Node, sourceFile: SourceFile): string {
+            switch (hint) {
+                case EmitHint.SourceFile:
+                    Debug.assert(isSourceFile(node), "Expected a SourceFile node.");
+                    break;
+                case EmitHint.IdentifierName:
+                    Debug.assert(isIdentifier(node), "Expected an Identifier node.");
+                    break;
+                case EmitHint.Expression:
+                    Debug.assert(isExpression(node), "Expected an Expression node.");
+                    break;
+            }
+            switch (node.kind) {
+                case SyntaxKind.SourceFile: return printFile(<SourceFile>node);
+                case SyntaxKind.Bundle: return printBundle(<Bundle>node);
+            }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 03098fd4129..8660e6138cd 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3912,8 +3912,27 @@
     export type Transformer = (context: TransformationContext) => (node: SourceFile) => SourceFile;
 
     export interface Printer {
+        /**
+         * Print a node and its subtree as-is, without any emit transformations.
+         * @param hint A value indicating the purpose of a node. This is primarily used to
+         * distinguish between an `Identifier` used in an expression position, versus an
+         * `Identifier` used as an `IdentifierName` as part of a declaration. For most nodes you
+         * should just pass `Unspecified`.
+         * @param node The node to print. The node and its subtree are printed as-is, without any
+         * emit transformations.
+         * @param sourceFile A source file that provides context for the node. The source text of
+         * the file is used to emit the original source content for literals and identifiers, while
+         * the identifiers of the source file are used when generating unique names to avoid
+         * collisions.
+         */
         printNode(hint: EmitHint, node: Node, sourceFile: SourceFile): string;
+        /**
+         * Prints a source file as-is, without any emit transformations.
+         */
         printFile(sourceFile: SourceFile): string;
+        /**
+         * Prints a bundle of source files as-is, without any emit transformations.
+         */
         printBundle(bundle: Bundle): string;
         /*@internal*/ writeNode(hint: EmitHint, node: Node, sourceFile: SourceFile, writer: EmitTextWriter): void;
         /*@internal*/ writeFile(sourceFile: SourceFile, writer: EmitTextWriter): void;
@@ -3921,9 +3940,50 @@
     }
 
     export interface PrintHandlers {
-        hasGlobalName?: (name: string) => boolean;
-        onEmitNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
-        onSubstituteNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+        /**
+         * A hook used by the Printer when generating unique names to avoid collisions with
+         * globally defined names that exist outside of the current source file.
+         */
+        hasGlobalName?(name: string): boolean;
+        /**
+         * A hook used by the Printer to provide notifications prior to emitting a node. A
+         * compatible implementation **must** invoke `emitCallback` with the provided `hint` and
+         * `node` values.
+         * @param hint A hint indicating the intended purpose of the node.
+         * @param node The node to emit.
+         * @param emitCallback A callback that, when invoked, will emit the node.
+         * @example
+         * ```ts
+         * var printer = createPrinter(printerOptions, {
+         *   onEmitNode(hint, node, emitCallback) {
+         *     // set up or track state prior to emitting the node...
+         *     emitCallback(hint, node);
+         *     // restore state after emitting the node...
+         *   }
+         * });
+         * ```
+         */
+        onEmitNode?(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
+        /**
+         * A hook used by the Printer to perform just-in-time substitution of a node. This is
+         * primarily used by node transformations that need to substitute one node for another,
+         * such as replacing `myExportedVar` with `exports.myExportedVar`. A compatible
+         * implementation **must** invoke `emitCallback` eith the provided `hint` and either
+         * the provided `node`, or its substitute.
+         * @param hint A hint indicating the intended purpose of the node.
+         * @param node The node to emit.
+         * @param emitCallback A callback that, when invoked, will emit the node.
+         * @example
+         * ```ts
+         * var printer = createPrinter(printerOptions, {
+         *   onSubstituteNode(hint, node, emitCallback) {
+         *     // perform substitution if necessary...
+         *     emitCallback(hint, node);
+         *   }
+         * });
+         * ```
+         */
+        onSubstituteNode?(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
         /*@internal*/ onEmitSourceMapOfNode?: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
         /*@internal*/ onEmitSourceMapOfToken?: (node: Node, token: SyntaxKind, pos: number, emitCallback: (token: SyntaxKind, pos: number) => number) => number;
         /*@internal*/ onEmitSourceMapOfPosition?: (pos: number) => void;

From 2ff2850ffa48d31b3b89b8e439ceceb892034bfd Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Wed, 1 Feb 2017 16:16:53 -0800
Subject: [PATCH 069/127] Emit __esModule when emitting ES6 Module

---
 src/compiler/transformers/module/module.ts | 77 ++++++++++++----------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 0adea4fd540..7318e03b352 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -45,6 +45,7 @@ namespace ts {
         let currentSourceFile: SourceFile; // The current file.
         let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file.
         let noSubstitution: boolean[]; // Set of nodes for which substitution rules should be ignored.
+        let shouldAppendUnderscoreUnderscoreEsModule: boolean;  // A boolean indicating whether "__esModule" should be emitted
 
         return transformSourceFile;
 
@@ -62,6 +63,7 @@ namespace ts {
 
             currentSourceFile = node;
             currentModuleInfo = collectExternalModuleInfo(node, resolver, compilerOptions);
+            shouldAppendUnderscoreUnderscoreEsModule = false;
             moduleInfoMap[getOriginalNodeId(node)] = currentModuleInfo;
 
             // Perform the transformation.
@@ -88,11 +90,14 @@ namespace ts {
             addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
 
+            if (shouldAppendUnderscoreUnderscoreEsModule) {
+                append(statements, createUnderscoreUnderscoreESModule());
+            }
+
             const updated = updateSourceFileNode(node, createNodeArray(statements, node.statements));
             if (currentModuleInfo.hasExportStarsToExportValues) {
                 addEmitHelper(updated, exportStarHelper);
             }
-
             return updated;
         }
 
@@ -378,6 +383,10 @@ namespace ts {
             // Append the 'export =' statement if provided.
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
 
+            if (shouldAppendUnderscoreUnderscoreEsModule) {
+                append(statements, createUnderscoreUnderscoreESModule());
+            }
+
             const body = createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
             if (currentModuleInfo.hasExportStarsToExportValues) {
                 // If we have any `export * from ...` declarations
@@ -657,6 +666,8 @@ namespace ts {
             }
 
             const generatedName = getGeneratedNameForNode(node);
+            shouldAppendUnderscoreUnderscoreEsModule = true;
+
             if (node.exportClause) {
                 const statements: Statement[] = [];
                 // export { x, y } from "mod";
@@ -834,6 +845,7 @@ namespace ts {
                         variables = append(variables, variable);
                     }
                     else if (variable.initializer) {
+                        shouldAppendUnderscoreUnderscoreEsModule = true;
                         expressions = append(expressions, transformInitializedVariable(variable));
                     }
                 }
@@ -1107,43 +1119,40 @@ namespace ts {
          * @param allowComments Whether to allow comments on the export.
          */
         function appendExportStatement(statements: Statement[] | undefined, exportName: Identifier, expression: Expression, location?: TextRange, allowComments?: boolean): Statement[] | undefined {
-            if (exportName.text === "default") {
-                const sourceFile = getOriginalNode(currentSourceFile, isSourceFile);
-                if (sourceFile && !sourceFile.symbol.exports.get("___esModule")) {
-                    if (languageVersion === ScriptTarget.ES3) {
-                        statements = append(statements,
-                            createStatement(
-                                createExportExpression(
-                                    createIdentifier("__esModule"),
-                                    createLiteral(true)
-                                )
-                            )
-                        );
-                    }
-                    else {
-                        statements = append(statements,
-                            createStatement(
-                                createCall(
-                                    createPropertyAccess(createIdentifier("Object"), "defineProperty"),
-                                    /*typeArguments*/ undefined,
-                                    [
-                                        createIdentifier("exports"),
-                                        createLiteral("__esModule"),
-                                        createObjectLiteral([
-                                            createPropertyAssignment("value", createLiteral(true))
-                                        ])
-                                    ]
-                                )
-                            )
-                        );
-                    }
-                }
-            }
-
+            shouldAppendUnderscoreUnderscoreEsModule = true;
             statements = append(statements, createExportStatement(exportName, expression, location, allowComments));
             return statements;
         }
 
+        function createUnderscoreUnderscoreESModule() {
+            let statement: Statement;
+            if (languageVersion === ScriptTarget.ES3) {
+                statement = createStatement(
+                    createExportExpression(
+                        createIdentifier("__esModule"),
+                        createLiteral(true)
+                    )
+                )
+            }
+            else {
+                statement = createStatement(
+                    createCall(
+                        createPropertyAccess(createIdentifier("Object"), "defineProperty"),
+                        /*typeArguments*/ undefined,
+                        [
+                            createIdentifier("exports"),
+                            createLiteral("__esModule"),
+                            createObjectLiteral([
+                                createPropertyAssignment("value", createLiteral(true))
+                            ])
+                        ]
+                    )
+                );
+            }
+            setEmitFlags(statement, EmitFlags.CustomPrologue);
+            return statement;
+        }
+
         /**
          * Creates a call to the current file's export function to export a value.
          *

From ff4c72de00335109af3d31094139b23be840892e Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Wed, 1 Feb 2017 16:36:10 -0800
Subject: [PATCH 070/127] Make most current Node factory functions public

---
 src/compiler/factory.ts                    | 2224 ++++++++++----------
 src/compiler/program.ts                    |    9 +-
 src/compiler/transformers/destructuring.ts |   23 +-
 src/compiler/transformers/es2015.ts        |  363 ++--
 src/compiler/transformers/es2016.ts        |   48 +-
 src/compiler/transformers/es2017.ts        |   41 +-
 src/compiler/transformers/es5.ts           |    4 +-
 src/compiler/transformers/esnext.ts        |   28 +-
 src/compiler/transformers/generators.ts    |  216 +-
 src/compiler/transformers/jsx.ts           |    6 +-
 src/compiler/transformers/module/es2015.ts |    2 +-
 src/compiler/transformers/module/module.ts |  450 ++--
 src/compiler/transformers/module/system.ts |  141 +-
 src/compiler/transformers/ts.ts            |  257 ++-
 src/compiler/types.ts                      |    6 +-
 src/compiler/utilities.ts                  |    8 +
 src/compiler/visitor.ts                    |   28 +-
 17 files changed, 2056 insertions(+), 1798 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index f2a8de3a93b..ec1e0dafb79 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1,28 +1,18 @@
 /// <reference path="core.ts"/>
 /// <reference path="utilities.ts"/>
 
-/* @internal */
 namespace ts {
-    let NodeConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node;
-    let SourceFileConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node;
-
-    function createNode(kind: SyntaxKind, location?: TextRange, flags?: NodeFlags): Node {
-        const ConstructorForKind = kind === SyntaxKind.SourceFile
-            ? (SourceFileConstructor || (SourceFileConstructor = objectAllocator.getSourceFileConstructor()))
-            : (NodeConstructor || (NodeConstructor = objectAllocator.getNodeConstructor()));
-
-        const node = location
-            ? new ConstructorForKind(kind, location.pos, location.end)
-            : new ConstructorForKind(kind, /*pos*/ -1, /*end*/ -1);
-
-        node.flags = flags | NodeFlags.Synthesized;
-
+    function createSynthesizedNode(kind: SyntaxKind): Node {
+        const node = createNode(kind, -1, -1);
+        node.flags |= NodeFlags.Synthesized;
         return node;
     }
 
+    /* @internal */
     export function updateNode<T extends Node>(updated: T, original: T): T {
         if (updated !== original) {
             setOriginalNode(updated, original);
+            setTextRange(updated, original);
             if (original.startsOnNewLine) {
                 updated.startsOnNewLine = true;
             }
@@ -31,7 +21,10 @@ namespace ts {
         return updated;
     }
 
-    export function createNodeArray<T extends Node>(elements?: T[], location?: TextRange, hasTrailingComma?: boolean): NodeArray<T> {
+    /**
+     * Make `elements` into a `NodeArray<T>`. If `elements` is `undefined`, returns an empty `NodeArray<T>`.
+     */
+    export function createNodeArray<T extends Node>(elements?: T[], hasTrailingComma?: boolean): NodeArray<T> {
         if (elements) {
             if (isNodeArray(elements)) {
                 return elements;
@@ -42,40 +35,22 @@ namespace ts {
         }
 
         const array = <NodeArray<T>>elements;
-        if (location) {
-            array.pos = location.pos;
-            array.end = location.end;
-        }
-        else {
-            array.pos = -1;
-            array.end = -1;
-        }
-
-        if (hasTrailingComma) {
-            array.hasTrailingComma = true;
-        }
-
+        array.pos = -1;
+        array.end = -1;
+        array.hasTrailingComma = hasTrailingComma;
         return array;
     }
 
-    export function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node {
-        const node = createNode(kind, /*location*/ undefined);
-        node.startsOnNewLine = startsOnNewLine;
-        return node;
-    }
-
-    export function createSynthesizedNodeArray<T extends Node>(elements?: T[]): NodeArray<T> {
-        return createNodeArray(elements, /*location*/ undefined);
-    }
-
     /**
      * Creates a shallow, memberwise clone of a node with no source map location.
      */
+    /* @internal */
     export function getSynthesizedClone<T extends Node>(node: T): T {
         // We don't use "clone" from core.ts here, as we need to preserve the prototype chain of
         // the original node. We also need to exclude specific properties and only include own-
         // properties (to skip members already defined on the shared prototype).
-        const clone = <T>createNode(node.kind, /*location*/ undefined, node.flags);
+        const clone = <T>createSynthesizedNode(node.kind);
+        clone.flags |= node.flags;
         setOriginalNode(clone, node);
 
         for (const key in node) {
@@ -89,63 +64,62 @@ namespace ts {
         return clone;
     }
 
-    /**
-     * Creates a shallow, memberwise clone of a node for mutation.
-     */
-    export function getMutableClone<T extends Node>(node: T): T {
-        const clone = getSynthesizedClone(node);
-        clone.pos = node.pos;
-        clone.end = node.end;
-        clone.parent = node.parent;
-        return clone;
-    }
-
     // Literals
 
-    export function createLiteral(textSource: StringLiteral | NumericLiteral | Identifier, location?: TextRange): StringLiteral;
-    export function createLiteral(value: string, location?: TextRange): StringLiteral;
-    export function createLiteral(value: number, location?: TextRange): NumericLiteral;
-    export function createLiteral(value: boolean, location?: TextRange): BooleanLiteral;
-    export function createLiteral(value: string | number | boolean, location?: TextRange): PrimaryExpression;
-    export function createLiteral(value: string | number | boolean | StringLiteral | NumericLiteral | Identifier, location?: TextRange): PrimaryExpression {
+    export function createLiteral(value: string): StringLiteral;
+    export function createLiteral(value: number): NumericLiteral;
+    export function createLiteral(value: boolean): BooleanLiteral;
+    /** Create a string literal whose source text is read from a source node during emit. */
+    export function createLiteral(sourceNode: StringLiteral | NumericLiteral | Identifier): StringLiteral;
+    export function createLiteral(value: string | number | boolean): PrimaryExpression;
+    export function createLiteral(value: string | number | boolean | StringLiteral | NumericLiteral | Identifier): PrimaryExpression {
         if (typeof value === "number") {
-            const node = <NumericLiteral>createNode(SyntaxKind.NumericLiteral, location, /*flags*/ undefined);
-            node.text = value.toString();
-            return node;
+            return createNumericLiteral(value + "");
         }
-        else if (typeof value === "boolean") {
-            return <BooleanLiteral>createNode(value ? SyntaxKind.TrueKeyword : SyntaxKind.FalseKeyword, location, /*flags*/ undefined);
+        if (typeof value === "boolean") {
+            return value ? createTrue() : createFalse();
         }
-        else if (typeof value === "string") {
-            const node = <StringLiteral>createNode(SyntaxKind.StringLiteral, location, /*flags*/ undefined);
-            node.text = value;
-            return node;
-        }
-        else if (value) {
-            const node = <StringLiteral>createNode(SyntaxKind.StringLiteral, location, /*flags*/ undefined);
-            node.textSourceNode = value;
-            node.text = value.text;
-            return node;
+        if (typeof value === "string") {
+            return createStringLiteral(value);
         }
+        return createLiteralFromNode(value);
     }
 
+    export function createNumericLiteral(value: string): NumericLiteral {
+        const node = <NumericLiteral>createSynthesizedNode(SyntaxKind.NumericLiteral);
+        node.text = value;
+        return node;
+    }
+
+    function createStringLiteral(text: string): StringLiteral {
+        const node = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
+        node.text = text;
+        return node;
+    }
+
+    function createLiteralFromNode(sourceNode: StringLiteral | NumericLiteral | Identifier): StringLiteral {
+        const node = createStringLiteral(sourceNode.text);
+        node.textSourceNode = sourceNode;
+        return node;
+    }
+
+
     // Identifiers
 
-    let nextAutoGenerateId = 0;
-
-    export function createIdentifier(text: string, location?: TextRange): Identifier {
-        const node = <Identifier>createNode(SyntaxKind.Identifier, location);
-        node.text = escapeIdentifier(text);
-        node.originalKeywordKind = stringToToken(text);
+    export function createIdentifier(text: string): Identifier {
+        const node = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+        node.text = text ? escapeIdentifier(text) : undefined;
+        node.originalKeywordKind = text ? stringToToken(text) : SyntaxKind.Unknown;
         node.autoGenerateKind = GeneratedIdentifierKind.None;
         node.autoGenerateId = 0;
         return node;
     }
 
-    export function createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined, location?: TextRange): Identifier {
-        const name = <Identifier>createNode(SyntaxKind.Identifier, location);
-        name.text = "";
-        name.originalKeywordKind = SyntaxKind.Unknown;
+    let nextAutoGenerateId = 0;
+
+    /** Create a unique temporary variable. */
+    export function createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined): Identifier {
+        const name = createIdentifier("");
         name.autoGenerateKind = GeneratedIdentifierKind.Auto;
         name.autoGenerateId = nextAutoGenerateId;
         nextAutoGenerateId++;
@@ -155,33 +129,31 @@ namespace ts {
         return name;
     }
 
-    export function createLoopVariable(location?: TextRange): Identifier {
-        const name = <Identifier>createNode(SyntaxKind.Identifier, location);
-        name.text = "";
-        name.originalKeywordKind = SyntaxKind.Unknown;
+    /** Create a unique temporary variable for use in a loop. */
+    export function createLoopVariable(): Identifier {
+        const name = createIdentifier("");
         name.autoGenerateKind = GeneratedIdentifierKind.Loop;
         name.autoGenerateId = nextAutoGenerateId;
         nextAutoGenerateId++;
         return name;
     }
 
-    export function createUniqueName(text: string, location?: TextRange): Identifier {
-        const name = <Identifier>createNode(SyntaxKind.Identifier, location);
+    /** Create a unique name based on the supplied text. */
+    export function createUniqueName(text: string): Identifier {
+        const name = createIdentifier("");
         name.text = text;
-        name.originalKeywordKind = SyntaxKind.Unknown;
         name.autoGenerateKind = GeneratedIdentifierKind.Unique;
         name.autoGenerateId = nextAutoGenerateId;
         nextAutoGenerateId++;
         return name;
     }
 
-    export function getGeneratedNameForNode(node: Node, location?: TextRange): Identifier {
-        const name = <Identifier>createNode(SyntaxKind.Identifier, location);
-        name.original = node;
-        name.text = "";
-        name.originalKeywordKind = SyntaxKind.Unknown;
+    /** Create a unique name generated for a node. */
+    export function getGeneratedNameForNode(node: Node): Identifier {
+        const name = createIdentifier("");
         name.autoGenerateKind = GeneratedIdentifierKind.Node;
         name.autoGenerateId = nextAutoGenerateId;
+        name.original = node;
         nextAutoGenerateId++;
         return name;
     }
@@ -189,49 +161,53 @@ namespace ts {
     // Punctuation
 
     export function createToken<TKind extends SyntaxKind>(token: TKind) {
-        return <Token<TKind>>createNode(token);
+        return <Token<TKind>>createSynthesizedNode(token);
     }
 
     // Reserved words
 
     export function createSuper() {
-        const node = <PrimaryExpression>createNode(SyntaxKind.SuperKeyword);
-        return node;
+        return <PrimaryExpression>createSynthesizedNode(SyntaxKind.SuperKeyword);
     }
 
-    export function createThis(location?: TextRange) {
-        const node = <PrimaryExpression>createNode(SyntaxKind.ThisKeyword, location);
-        return node;
+    export function createThis() {
+        return <PrimaryExpression>createSynthesizedNode(SyntaxKind.ThisKeyword);
     }
 
     export function createNull() {
-        const node = <PrimaryExpression>createNode(SyntaxKind.NullKeyword);
-        return node;
+        return <PrimaryExpression>createSynthesizedNode(SyntaxKind.NullKeyword);
+    }
+
+    export function createTrue() {
+        return <BooleanLiteral>createSynthesizedNode(SyntaxKind.TrueKeyword);
+    }
+
+    export function createFalse() {
+        return <BooleanLiteral>createSynthesizedNode(SyntaxKind.FalseKeyword);
     }
 
     // Names
 
-    export function createComputedPropertyName(expression: Expression, location?: TextRange) {
-        const node = <ComputedPropertyName>createNode(SyntaxKind.ComputedPropertyName, location);
+    export function createComputedPropertyName(expression: Expression) {
+        const node = <ComputedPropertyName>createSynthesizedNode(SyntaxKind.ComputedPropertyName);
         node.expression = expression;
         return node;
     }
 
     export function updateComputedPropertyName(node: ComputedPropertyName, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createComputedPropertyName(expression, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createComputedPropertyName(expression), node)
+            : node;
     }
 
     // Signature elements
 
-    export function createParameter(decorators: Decorator[], modifiers: Modifier[], dotDotDotToken: DotDotDotToken, name: string | Identifier | BindingPattern, questionToken?: QuestionToken, type?: TypeNode, initializer?: Expression, location?: TextRange, flags?: NodeFlags) {
-        const node = <ParameterDeclaration>createNode(SyntaxKind.Parameter, location, flags);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+    export function createParameter(decorators: Decorator[], modifiers: Modifier[], dotDotDotToken: DotDotDotToken, name: string | Identifier | BindingPattern, questionToken?: QuestionToken, type?: TypeNode, initializer?: Expression) {
+        const node = <ParameterDeclaration>createSynthesizedNode(SyntaxKind.Parameter);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
         node.dotDotDotToken = dotDotDotToken;
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.name = asName(name);
         node.questionToken = questionToken;
         node.type = type;
         node.initializer = initializer ? parenthesizeExpressionForList(initializer) : undefined;
@@ -239,20 +215,35 @@ namespace ts {
     }
 
     export function updateParameter(node: ParameterDeclaration, decorators: Decorator[], modifiers: Modifier[], dotDotDotToken: DotDotDotToken, name: BindingName, type: TypeNode, initializer: Expression) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.dotDotDotToken !== dotDotDotToken || node.name !== name || node.type !== type || node.initializer !== initializer) {
-            return updateNode(createParameter(decorators, modifiers, dotDotDotToken, name, node.questionToken, type, initializer, /*location*/ node, /*flags*/ node.flags), node);
-        }
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.dotDotDotToken !== dotDotDotToken
+            || node.name !== name
+            || node.type !== type
+            || node.initializer !== initializer
+            ? updateNode(createParameter(decorators, modifiers, dotDotDotToken, name, node.questionToken, type, initializer), node)
+            : node;
+    }
 
+    export function createDecorator(expression: Expression) {
+        const node = <Decorator>createSynthesizedNode(SyntaxKind.Decorator);
+        node.expression = parenthesizeForAccess(expression);
         return node;
     }
 
+    export function updateDecorator(node: Decorator, expression: Expression) {
+        return node.expression !== expression
+            ? updateNode(createDecorator(expression), node)
+            : node;
+    }
+
     // Type members
 
-    export function createProperty(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, questionToken: QuestionToken, type: TypeNode, initializer: Expression, location?: TextRange) {
-        const node = <PropertyDeclaration>createNode(SyntaxKind.PropertyDeclaration, location);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
+    export function createProperty(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, questionToken: QuestionToken, type: TypeNode, initializer: Expression) {
+        const node = <PropertyDeclaration>createSynthesizedNode(SyntaxKind.PropertyDeclaration);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
         node.questionToken = questionToken;
         node.type = type;
         node.initializer = initializer;
@@ -260,19 +251,22 @@ namespace ts {
     }
 
     export function updateProperty(node: PropertyDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, type: TypeNode, initializer: Expression) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) {
-            return updateNode(createProperty(decorators, modifiers, name, node.questionToken, type, initializer, node), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.type !== type
+            || node.initializer !== initializer
+            ? updateNode(createProperty(decorators, modifiers, name, node.questionToken, type, initializer), node)
+            : node;
     }
 
-    export function createMethod(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) {
-        const node = <MethodDeclaration>createNode(SyntaxKind.MethodDeclaration, location, flags);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+    export function createMethod(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
+        const node = <MethodDeclaration>createSynthesizedNode(SyntaxKind.MethodDeclaration);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
-        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
         node.type = type;
         node.body = body;
@@ -280,16 +274,21 @@ namespace ts {
     }
 
     export function updateMethod(node: MethodDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) {
-            return updateNode(createMethod(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.body !== body
+            ? updateNode(createMethod(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body), node)
+            : node;
     }
 
-    export function createConstructor(decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block, location?: TextRange, flags?: NodeFlags) {
-        const node = <ConstructorDeclaration>createNode(SyntaxKind.Constructor, location, flags);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+    export function createConstructor(decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block) {
+        const node = <ConstructorDeclaration>createSynthesizedNode(SyntaxKind.Constructor);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
         node.typeParameters = undefined;
         node.parameters = createNodeArray(parameters);
         node.type = undefined;
@@ -298,17 +297,19 @@ namespace ts {
     }
 
     export function updateConstructor(node: ConstructorDeclaration, decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.parameters !== parameters || node.body !== body) {
-            return updateNode(createConstructor(decorators, modifiers, parameters, body, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.parameters !== parameters
+            || node.body !== body
+            ? updateNode(createConstructor(decorators, modifiers, parameters, body), node)
+            : node;
     }
 
-    export function createGetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) {
-        const node = <GetAccessorDeclaration>createNode(SyntaxKind.GetAccessor, location, flags);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
+    export function createGetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
+        const node = <GetAccessorDeclaration>createSynthesizedNode(SyntaxKind.GetAccessor);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
         node.typeParameters = undefined;
         node.parameters = createNodeArray(parameters);
         node.type = type;
@@ -317,17 +318,21 @@ namespace ts {
     }
 
     export function updateGetAccessor(node: GetAccessorDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.parameters !== parameters || node.type !== type || node.body !== body) {
-            return updateNode(createGetAccessor(decorators, modifiers, name, parameters, type, body, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.body !== body
+            ? updateNode(createGetAccessor(decorators, modifiers, name, parameters, type, body), node)
+            : node;
     }
 
-    export function createSetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], body: Block, location?: TextRange, flags?: NodeFlags) {
-        const node = <SetAccessorDeclaration>createNode(SyntaxKind.SetAccessor, location, flags);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
+    export function createSetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], body: Block) {
+        const node = <SetAccessorDeclaration>createSynthesizedNode(SyntaxKind.SetAccessor);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
         node.typeParameters = undefined;
         node.parameters = createNodeArray(parameters);
         node.body = body;
@@ -335,60 +340,63 @@ namespace ts {
     }
 
     export function updateSetAccessor(node: SetAccessorDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, parameters: ParameterDeclaration[], body: Block) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.parameters !== parameters || node.body !== body) {
-            return updateNode(createSetAccessor(decorators, modifiers, name, parameters, body, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.parameters !== parameters
+            || node.body !== body
+            ? updateNode(createSetAccessor(decorators, modifiers, name, parameters, body), node)
+            : node;
     }
 
     // Binding Patterns
 
-    export function createObjectBindingPattern(elements: BindingElement[], location?: TextRange) {
-        const node = <ObjectBindingPattern>createNode(SyntaxKind.ObjectBindingPattern, location);
+    export function createObjectBindingPattern(elements: BindingElement[]) {
+        const node = <ObjectBindingPattern>createSynthesizedNode(SyntaxKind.ObjectBindingPattern);
         node.elements = createNodeArray(elements);
         return node;
     }
 
     export function updateObjectBindingPattern(node: ObjectBindingPattern, elements: BindingElement[]) {
-        if (node.elements !== elements) {
-            return updateNode(createObjectBindingPattern(elements, node), node);
-        }
-        return node;
+        return node.elements !== elements
+            ? updateNode(createObjectBindingPattern(elements), node)
+            : node;
     }
 
-    export function createArrayBindingPattern(elements: ArrayBindingElement[], location?: TextRange) {
-        const node = <ArrayBindingPattern>createNode(SyntaxKind.ArrayBindingPattern, location);
+    export function createArrayBindingPattern(elements: ArrayBindingElement[]) {
+        const node = <ArrayBindingPattern>createSynthesizedNode(SyntaxKind.ArrayBindingPattern);
         node.elements = createNodeArray(elements);
         return node;
     }
 
     export function updateArrayBindingPattern(node: ArrayBindingPattern, elements: ArrayBindingElement[]) {
-        if (node.elements !== elements) {
-            return updateNode(createArrayBindingPattern(elements, node), node);
-        }
-        return node;
+        return node.elements !== elements
+            ? updateNode(createArrayBindingPattern(elements), node)
+            : node;
     }
 
-    export function createBindingElement(propertyName: string | PropertyName, dotDotDotToken: DotDotDotToken, name: string | BindingName, initializer?: Expression, location?: TextRange) {
-        const node = <BindingElement>createNode(SyntaxKind.BindingElement, location);
-        node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
+    export function createBindingElement(propertyName: string | PropertyName, dotDotDotToken: DotDotDotToken, name: string | BindingName, initializer?: Expression) {
+        const node = <BindingElement>createSynthesizedNode(SyntaxKind.BindingElement);
+        node.propertyName = asName(propertyName);
         node.dotDotDotToken = dotDotDotToken;
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.name = asName(name);
         node.initializer = initializer;
         return node;
     }
 
     export function updateBindingElement(node: BindingElement, dotDotDotToken: DotDotDotToken, propertyName: PropertyName, name: BindingName, initializer: Expression) {
-        if (node.propertyName !== propertyName || node.dotDotDotToken !== dotDotDotToken || node.name !== name || node.initializer !== initializer) {
-            return updateNode(createBindingElement(propertyName, dotDotDotToken, name, initializer, node), node);
-        }
-        return node;
+        return node.propertyName !== propertyName
+            || node.dotDotDotToken !== dotDotDotToken
+            || node.name !== name
+            || node.initializer !== initializer
+            ? updateNode(createBindingElement(propertyName, dotDotDotToken, name, initializer), node)
+            : node;
     }
 
     // Expression
 
-    export function createArrayLiteral(elements?: Expression[], location?: TextRange, multiLine?: boolean) {
-        const node = <ArrayLiteralExpression>createNode(SyntaxKind.ArrayLiteralExpression, location);
+    export function createArrayLiteral(elements?: Expression[], multiLine?: boolean) {
+        const node = <ArrayLiteralExpression>createSynthesizedNode(SyntaxKind.ArrayLiteralExpression);
         node.elements = parenthesizeListElements(createNodeArray(elements));
         if (multiLine) {
             node.multiLine = true;
@@ -398,14 +406,13 @@ namespace ts {
     }
 
     export function updateArrayLiteral(node: ArrayLiteralExpression, elements: Expression[]) {
-        if (node.elements !== elements) {
-            return updateNode(createArrayLiteral(elements, node, node.multiLine), node);
-        }
-        return node;
+        return node.elements !== elements
+            ? updateNode(createArrayLiteral(elements, node.multiLine), node)
+            : node;
     }
 
-    export function createObjectLiteral(properties?: ObjectLiteralElementLike[], location?: TextRange, multiLine?: boolean) {
-        const node = <ObjectLiteralExpression>createNode(SyntaxKind.ObjectLiteralExpression, location);
+    export function createObjectLiteral(properties?: ObjectLiteralElementLike[], multiLine?: boolean) {
+        const node = <ObjectLiteralExpression>createSynthesizedNode(SyntaxKind.ObjectLiteralExpression);
         node.properties = createNodeArray(properties);
         if (multiLine) {
             node.multiLine = true;
@@ -414,110 +421,106 @@ namespace ts {
     }
 
     export function updateObjectLiteral(node: ObjectLiteralExpression, properties: ObjectLiteralElementLike[]) {
-        if (node.properties !== properties) {
-            return updateNode(createObjectLiteral(properties, node, node.multiLine), node);
-        }
-        return node;
+        return node.properties !== properties
+            ? updateNode(createObjectLiteral(properties, node.multiLine), node)
+            : node;
     }
 
-    export function createPropertyAccess(expression: Expression, name: string | Identifier, location?: TextRange, flags?: NodeFlags) {
-        const node = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, location, flags);
+    export function createPropertyAccess(expression: Expression, name: string | Identifier) {
+        const node = <PropertyAccessExpression>createSynthesizedNode(SyntaxKind.PropertyAccessExpression);
         node.expression = parenthesizeForAccess(expression);
-        (node.emitNode || (node.emitNode = {})).flags |= EmitFlags.NoIndentation;
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
+        node.name = asName(name);
+        setEmitFlags(node, EmitFlags.NoIndentation);
         return node;
     }
 
     export function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier) {
-        if (node.expression !== expression || node.name !== name) {
-            const propertyAccess = createPropertyAccess(expression, name, /*location*/ node, node.flags);
-            // Because we are updating existed propertyAccess we want to inherit its emitFlags instead of using default from createPropertyAccess
-            (propertyAccess.emitNode || (propertyAccess.emitNode = {})).flags = getEmitFlags(node);
-            return updateNode(propertyAccess, node);
-        }
-        return node;
+        // Because we are updating existed propertyAccess we want to inherit its emitFlags
+        // instead of using the default from createPropertyAccess
+        return node.expression !== expression
+            || node.name !== name
+            ? updateNode(setEmitFlags(createPropertyAccess(expression, name), getEmitFlags(node)), node)
+            : node;
     }
 
-    export function createElementAccess(expression: Expression, index: number | Expression, location?: TextRange) {
-        const node = <ElementAccessExpression>createNode(SyntaxKind.ElementAccessExpression, location);
+    export function createElementAccess(expression: Expression, index: number | Expression) {
+        const node = <ElementAccessExpression>createSynthesizedNode(SyntaxKind.ElementAccessExpression);
         node.expression = parenthesizeForAccess(expression);
-        node.argumentExpression = typeof index === "number" ? createLiteral(index) : index;
+        node.argumentExpression = asExpression(index);
         return node;
     }
 
     export function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression) {
-        if (node.expression !== expression || node.argumentExpression !== argumentExpression) {
-            return updateNode(createElementAccess(expression, argumentExpression, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            || node.argumentExpression !== argumentExpression
+            ? updateNode(createElementAccess(expression, argumentExpression), node)
+            : node;
     }
 
-    export function createCall(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[], location?: TextRange, flags?: NodeFlags) {
-        const node = <CallExpression>createNode(SyntaxKind.CallExpression, location, flags);
+    export function createCall(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) {
+        const node = <CallExpression>createSynthesizedNode(SyntaxKind.CallExpression);
         node.expression = parenthesizeForAccess(expression);
-        if (typeArguments) {
-            node.typeArguments = createNodeArray(typeArguments);
-        }
-
+        node.typeArguments = asNodeArray(typeArguments);
         node.arguments = parenthesizeListElements(createNodeArray(argumentsArray));
         return node;
     }
 
     export function updateCall(node: CallExpression, expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) {
-        if (expression !== node.expression || typeArguments !== node.typeArguments || argumentsArray !== node.arguments) {
-            return updateNode(createCall(expression, typeArguments, argumentsArray, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return expression !== node.expression
+            || typeArguments !== node.typeArguments
+            || argumentsArray !== node.arguments
+            ? updateNode(createCall(expression, typeArguments, argumentsArray), node)
+            : node;
     }
 
-    export function createNew(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[], location?: TextRange, flags?: NodeFlags) {
-        const node = <NewExpression>createNode(SyntaxKind.NewExpression, location, flags);
+    export function createNew(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) {
+        const node = <NewExpression>createSynthesizedNode(SyntaxKind.NewExpression);
         node.expression = parenthesizeForNew(expression);
-        node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
+        node.typeArguments = asNodeArray(typeArguments);
         node.arguments = argumentsArray ? parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
         return node;
     }
 
     export function updateNew(node: NewExpression, expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) {
-        if (node.expression !== expression || node.typeArguments !== typeArguments || node.arguments !== argumentsArray) {
-            return updateNode(createNew(expression, typeArguments, argumentsArray, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.expression !== expression
+            || node.typeArguments !== typeArguments
+            || node.arguments !== argumentsArray
+            ? updateNode(createNew(expression, typeArguments, argumentsArray), node)
+            : node;
     }
 
-    export function createTaggedTemplate(tag: Expression, template: TemplateLiteral, location?: TextRange) {
-        const node = <TaggedTemplateExpression>createNode(SyntaxKind.TaggedTemplateExpression, location);
+    export function createTaggedTemplate(tag: Expression, template: TemplateLiteral) {
+        const node = <TaggedTemplateExpression>createSynthesizedNode(SyntaxKind.TaggedTemplateExpression);
         node.tag = parenthesizeForAccess(tag);
         node.template = template;
         return node;
     }
 
     export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral) {
-        if (node.tag !== tag || node.template !== template) {
-            return updateNode(createTaggedTemplate(tag, template, node), node);
-        }
-        return node;
+        return node.tag !== tag
+            || node.template !== template
+            ? updateNode(createTaggedTemplate(tag, template), node)
+            : node;
     }
 
-    export function createParen(expression: Expression, location?: TextRange) {
-        const node = <ParenthesizedExpression>createNode(SyntaxKind.ParenthesizedExpression, location);
+    export function createParen(expression: Expression) {
+        const node = <ParenthesizedExpression>createSynthesizedNode(SyntaxKind.ParenthesizedExpression);
         node.expression = expression;
         return node;
     }
 
     export function updateParen(node: ParenthesizedExpression, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createParen(expression, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createParen(expression), node)
+            : node;
     }
 
-    export function createFunctionExpression(modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) {
-        const node = <FunctionExpression>createNode(SyntaxKind.FunctionExpression, location, flags);
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+    export function createFunctionExpression(modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
+        const node = <FunctionExpression>createSynthesizedNode(SyntaxKind.FunctionExpression);
+        node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
-        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
         node.type = type;
         node.body = body;
@@ -525,16 +528,20 @@ namespace ts {
     }
 
     export function updateFunctionExpression(node: FunctionExpression, modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
-        if (node.name !== name || node.modifiers !== modifiers || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) {
-            return updateNode(createFunctionExpression(modifiers, node.asteriskToken, name, typeParameters, parameters, type, body, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.name !== name
+            || node.modifiers !== modifiers
+            || node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.body !== body
+            ? updateNode(createFunctionExpression(modifiers, node.asteriskToken, name, typeParameters, parameters, type, body), node)
+            : node;
     }
 
-    export function createArrowFunction(modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, equalsGreaterThanToken: EqualsGreaterThanToken, body: ConciseBody, location?: TextRange, flags?: NodeFlags) {
-        const node = <ArrowFunction>createNode(SyntaxKind.ArrowFunction, location, flags);
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
-        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+    export function createArrowFunction(modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, equalsGreaterThanToken: EqualsGreaterThanToken, body: ConciseBody) {
+        const node = <ArrowFunction>createSynthesizedNode(SyntaxKind.ArrowFunction);
+        node.modifiers = asNodeArray(modifiers);
+        node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
         node.type = type;
         node.equalsGreaterThanToken = equalsGreaterThanToken || createToken(SyntaxKind.EqualsGreaterThanToken);
@@ -543,96 +550,93 @@ namespace ts {
     }
 
     export function updateArrowFunction(node: ArrowFunction, modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: ConciseBody) {
-        if (node.modifiers !== modifiers || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) {
-            return updateNode(createArrowFunction(modifiers, typeParameters, parameters, type, node.equalsGreaterThanToken, body, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.modifiers !== modifiers
+            || node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.body !== body
+            ? updateNode(createArrowFunction(modifiers, typeParameters, parameters, type, node.equalsGreaterThanToken, body), node)
+            : node;
     }
 
-    export function createDelete(expression: Expression, location?: TextRange) {
-        const node = <DeleteExpression>createNode(SyntaxKind.DeleteExpression, location);
+    export function createDelete(expression: Expression) {
+        const node = <DeleteExpression>createSynthesizedNode(SyntaxKind.DeleteExpression);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
 
     export function updateDelete(node: DeleteExpression, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createDelete(expression, node), expression);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createDelete(expression), node)
+            : node;
     }
 
-    export function createTypeOf(expression: Expression, location?: TextRange) {
-        const node = <TypeOfExpression>createNode(SyntaxKind.TypeOfExpression, location);
+    export function createTypeOf(expression: Expression) {
+        const node = <TypeOfExpression>createSynthesizedNode(SyntaxKind.TypeOfExpression);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
 
     export function updateTypeOf(node: TypeOfExpression, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createTypeOf(expression, node), expression);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createTypeOf(expression), node)
+            : node;
     }
 
-    export function createVoid(expression: Expression, location?: TextRange) {
-        const node = <VoidExpression>createNode(SyntaxKind.VoidExpression, location);
+    export function createVoid(expression: Expression) {
+        const node = <VoidExpression>createSynthesizedNode(SyntaxKind.VoidExpression);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
 
     export function updateVoid(node: VoidExpression, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createVoid(expression, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createVoid(expression), node)
+            : node;
     }
 
-    export function createAwait(expression: Expression, location?: TextRange) {
-        const node = <AwaitExpression>createNode(SyntaxKind.AwaitExpression, location);
+    export function createAwait(expression: Expression) {
+        const node = <AwaitExpression>createSynthesizedNode(SyntaxKind.AwaitExpression);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
 
     export function updateAwait(node: AwaitExpression, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createAwait(expression, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createAwait(expression), node)
+            : node;
     }
 
-    export function createPrefix(operator: PrefixUnaryOperator, operand: Expression, location?: TextRange) {
-        const node = <PrefixUnaryExpression>createNode(SyntaxKind.PrefixUnaryExpression, location);
+    export function createPrefix(operator: PrefixUnaryOperator, operand: Expression) {
+        const node = <PrefixUnaryExpression>createSynthesizedNode(SyntaxKind.PrefixUnaryExpression);
         node.operator = operator;
         node.operand = parenthesizePrefixOperand(operand);
         return node;
     }
 
     export function updatePrefix(node: PrefixUnaryExpression, operand: Expression) {
-        if (node.operand !== operand) {
-            return updateNode(createPrefix(node.operator, operand, node), node);
-        }
-        return node;
+        return node.operand !== operand
+            ? updateNode(createPrefix(node.operator, operand), node)
+            : node;
     }
 
-    export function createPostfix(operand: Expression, operator: PostfixUnaryOperator, location?: TextRange) {
-        const node = <PostfixUnaryExpression>createNode(SyntaxKind.PostfixUnaryExpression, location);
+    export function createPostfix(operand: Expression, operator: PostfixUnaryOperator) {
+        const node = <PostfixUnaryExpression>createSynthesizedNode(SyntaxKind.PostfixUnaryExpression);
         node.operand = parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
     }
 
     export function updatePostfix(node: PostfixUnaryExpression, operand: Expression) {
-        if (node.operand !== operand) {
-            return updateNode(createPostfix(operand, node.operator, node), node);
-        }
-        return node;
+        return node.operand !== operand
+            ? updateNode(createPostfix(operand, node.operator), node)
+            : node;
     }
 
-    export function createBinary(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression, location?: TextRange) {
-        const operatorToken = typeof operator === "number" ? createToken(operator) : operator;
+    export function createBinary(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression) {
+        const node = <BinaryExpression>createSynthesizedNode(SyntaxKind.BinaryExpression);
+        const operatorToken = asToken(operator);
         const operatorKind = operatorToken.kind;
-        const node = <BinaryExpression>createNode(SyntaxKind.BinaryExpression, location);
         node.left = parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
         node.operatorToken = operatorToken;
         node.right = parenthesizeBinaryOperand(operatorKind, right, /*isLeftSideOfBinary*/ false, node.left);
@@ -640,218 +644,205 @@ namespace ts {
     }
 
     export function updateBinary(node: BinaryExpression, left: Expression, right: Expression) {
-        if (node.left !== left || node.right !== right) {
-            return updateNode(createBinary(left, node.operatorToken, right, /*location*/ node), node);
-        }
-        return node;
+        return node.left !== left
+            || node.right !== right
+            ? updateNode(createBinary(left, node.operatorToken, right), node)
+            : node;
     }
 
-    export function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression, location?: TextRange): ConditionalExpression;
-    export function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression, location?: TextRange): ConditionalExpression;
-    export function createConditional(condition: Expression, questionTokenOrWhenTrue: QuestionToken | Expression, whenTrueOrWhenFalse: Expression, colonTokenOrLocation?: ColonToken | TextRange, whenFalse?: Expression, location?: TextRange) {
-        const node = <ConditionalExpression>createNode(SyntaxKind.ConditionalExpression, whenFalse ? location : colonTokenOrLocation);
+    export function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
+    export function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression): ConditionalExpression;
+    export function createConditional(condition: Expression, questionTokenOrWhenTrue: QuestionToken | Expression, whenTrueOrWhenFalse: Expression, colonToken?: ColonToken, whenFalse?: Expression) {
+        const node = <ConditionalExpression>createSynthesizedNode(SyntaxKind.ConditionalExpression);
         node.condition = parenthesizeForConditionalHead(condition);
-        if (whenFalse) {
-            // second overload
-            node.questionToken = <QuestionToken>questionTokenOrWhenTrue;
-            node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(whenTrueOrWhenFalse);
-            node.colonToken = <ColonToken>colonTokenOrLocation;
-            node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenFalse);
-        }
-        else {
-            // first overload
-            node.questionToken = createToken(SyntaxKind.QuestionToken);
-            node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(<Expression>questionTokenOrWhenTrue);
-            node.colonToken = createToken(SyntaxKind.ColonToken);
-            node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenTrueOrWhenFalse);
-        }
+        node.questionToken = whenFalse ? <QuestionToken>questionTokenOrWhenTrue : createToken(SyntaxKind.QuestionToken);
+        node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : <Expression>questionTokenOrWhenTrue);
+        node.colonToken = whenFalse ? colonToken : createToken(SyntaxKind.ColonToken);
+        node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenFalse : whenTrueOrWhenFalse);
         return node;
     }
 
     export function updateConditional(node: ConditionalExpression, condition: Expression, whenTrue: Expression, whenFalse: Expression) {
-        if (node.condition !== condition || node.whenTrue !== whenTrue || node.whenFalse !== whenFalse) {
-            return updateNode(createConditional(condition, node.questionToken, whenTrue, node.colonToken, whenFalse, node), node);
-        }
-        return node;
+        return node.condition !== condition
+            || node.whenTrue !== whenTrue
+            || node.whenFalse !== whenFalse
+            ? updateNode(createConditional(condition, node.questionToken, whenTrue, node.colonToken, whenFalse), node)
+            : node;
     }
 
-    export function createTemplateExpression(head: TemplateHead, templateSpans: TemplateSpan[], location?: TextRange) {
-        const node = <TemplateExpression>createNode(SyntaxKind.TemplateExpression, location);
+    export function createTemplateExpression(head: TemplateHead, templateSpans: TemplateSpan[]) {
+        const node = <TemplateExpression>createSynthesizedNode(SyntaxKind.TemplateExpression);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
     }
 
     export function updateTemplateExpression(node: TemplateExpression, head: TemplateHead, templateSpans: TemplateSpan[]) {
-        if (node.head !== head || node.templateSpans !== templateSpans) {
-            return updateNode(createTemplateExpression(head, templateSpans, node), node);
-        }
-        return node;
+        return node.head !== head
+            || node.templateSpans !== templateSpans
+            ? updateNode(createTemplateExpression(head, templateSpans), node)
+            : node;
     }
 
-    export function createYield(asteriskToken: AsteriskToken, expression: Expression, location?: TextRange) {
-        const node = <YieldExpression>createNode(SyntaxKind.YieldExpression, location);
-        node.asteriskToken = asteriskToken;
-        node.expression = expression;
+    export function createYield(expression?: Expression): YieldExpression;
+    export function createYield(asteriskToken: AsteriskToken, expression: Expression): YieldExpression;
+    export function createYield(asteriskTokenOrExpression?: AsteriskToken | Expression, expression?: Expression) {
+        const node = <YieldExpression>createSynthesizedNode(SyntaxKind.YieldExpression);
+        node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === SyntaxKind.AsteriskToken ? <AsteriskToken>asteriskTokenOrExpression : undefined;
+        node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== SyntaxKind.AsteriskToken ? <Expression>asteriskTokenOrExpression : expression;
         return node;
     }
 
     export function updateYield(node: YieldExpression, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createYield(node.asteriskToken, expression, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createYield(node.asteriskToken, expression), node)
+            : node;
     }
 
-    export function createSpread(expression: Expression, location?: TextRange) {
-        const node = <SpreadElement>createNode(SyntaxKind.SpreadElement, location);
+    export function createSpread(expression: Expression) {
+        const node = <SpreadElement>createSynthesizedNode(SyntaxKind.SpreadElement);
         node.expression = parenthesizeExpressionForList(expression);
         return node;
     }
 
     export function updateSpread(node: SpreadElement, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createSpread(expression, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createSpread(expression), node)
+            : node;
     }
 
-    export function createClassExpression(modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[], location?: TextRange) {
-        const node = <ClassExpression>createNode(SyntaxKind.ClassExpression, location);
+    export function createClassExpression(modifiers: Modifier[], name: string | Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) {
+        const node = <ClassExpression>createSynthesizedNode(SyntaxKind.ClassExpression);
         node.decorators = undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
-        node.name = name;
-        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
-        node.heritageClauses = createNodeArray(heritageClauses);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.heritageClauses = asNodeArray(heritageClauses);
         node.members = createNodeArray(members);
         return node;
     }
 
     export function updateClassExpression(node: ClassExpression, modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) {
-        if (node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.heritageClauses !== heritageClauses || node.members !== members) {
-            return updateNode(createClassExpression(modifiers, name, typeParameters, heritageClauses, members, node), node);
-        }
-        return node;
+        return node.modifiers !== modifiers
+            || node.name !== name
+            || node.typeParameters !== typeParameters
+            || node.heritageClauses !== heritageClauses
+            || node.members !== members
+            ? updateNode(createClassExpression(modifiers, name, typeParameters, heritageClauses, members), node)
+            : node;
     }
 
-    export function createOmittedExpression(location?: TextRange) {
-        const node = <OmittedExpression>createNode(SyntaxKind.OmittedExpression, location);
-        return node;
+    export function createOmittedExpression() {
+        return <OmittedExpression>createSynthesizedNode(SyntaxKind.OmittedExpression);
     }
 
-    export function createExpressionWithTypeArguments(typeArguments: TypeNode[], expression: Expression, location?: TextRange) {
-        const node = <ExpressionWithTypeArguments>createNode(SyntaxKind.ExpressionWithTypeArguments, location);
-        node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
+    export function createExpressionWithTypeArguments(typeArguments: TypeNode[], expression: Expression) {
+        const node = <ExpressionWithTypeArguments>createSynthesizedNode(SyntaxKind.ExpressionWithTypeArguments);
         node.expression = parenthesizeForAccess(expression);
+        node.typeArguments = asNodeArray(typeArguments);
         return node;
     }
 
     export function updateExpressionWithTypeArguments(node: ExpressionWithTypeArguments, typeArguments: TypeNode[], expression: Expression) {
-        if (node.typeArguments !== typeArguments || node.expression !== expression) {
-            return updateNode(createExpressionWithTypeArguments(typeArguments, expression, node), node);
-        }
-        return node;
+        return node.typeArguments !== typeArguments
+            || node.expression !== expression
+            ? updateNode(createExpressionWithTypeArguments(typeArguments, expression), node)
+            : node;
     }
 
-
     // Misc
 
-    export function createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail, location?: TextRange) {
-        const node = <TemplateSpan>createNode(SyntaxKind.TemplateSpan, location);
+    export function createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail) {
+        const node = <TemplateSpan>createSynthesizedNode(SyntaxKind.TemplateSpan);
         node.expression = expression;
         node.literal = literal;
         return node;
     }
 
     export function updateTemplateSpan(node: TemplateSpan, expression: Expression, literal: TemplateMiddle | TemplateTail) {
-        if (node.expression !== expression || node.literal !== literal) {
-            return updateNode(createTemplateSpan(expression, literal, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            || node.literal !== literal
+            ? updateNode(createTemplateSpan(expression, literal), node)
+            : node;
     }
 
     // Element
 
-    export function createBlock(statements: Statement[], location?: TextRange, multiLine?: boolean, flags?: NodeFlags): Block {
-        const block = <Block>createNode(SyntaxKind.Block, location, flags);
+    export function createBlock(statements: Statement[], multiLine?: boolean): Block {
+        const block = <Block>createSynthesizedNode(SyntaxKind.Block);
         block.statements = createNodeArray(statements);
-        if (multiLine) {
-            block.multiLine = true;
-        }
+        if (multiLine) block.multiLine = multiLine;
         return block;
     }
 
     export function updateBlock(node: Block, statements: Statement[]) {
-        if (statements !== node.statements) {
-            return updateNode(createBlock(statements, /*location*/ node, node.multiLine, node.flags), node);
-        }
-
-        return node;
+        return statements !== node.statements
+            ? updateNode(createBlock(statements, node.multiLine), node)
+            : node;
     }
 
-    export function createVariableStatement(modifiers: Modifier[], declarationList: VariableDeclarationList | VariableDeclaration[], location?: TextRange, flags?: NodeFlags): VariableStatement {
-        const node = <VariableStatement>createNode(SyntaxKind.VariableStatement, location, flags);
+    export function createVariableStatement(modifiers: Modifier[], declarationList: VariableDeclarationList | VariableDeclaration[]): VariableStatement {
+        const node = <VariableStatement>createSynthesizedNode(SyntaxKind.VariableStatement);
         node.decorators = undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.modifiers = asNodeArray(modifiers);
         node.declarationList = isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
         return node;
     }
 
     export function updateVariableStatement(node: VariableStatement, modifiers: Modifier[], declarationList: VariableDeclarationList): VariableStatement {
-        if (node.modifiers !== modifiers || node.declarationList !== declarationList) {
-            return updateNode(createVariableStatement(modifiers, declarationList, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.modifiers !== modifiers
+            || node.declarationList !== declarationList
+            ? updateNode(createVariableStatement(modifiers, declarationList), node)
+            : node;
     }
 
-    export function createVariableDeclarationList(declarations: VariableDeclaration[], location?: TextRange, flags?: NodeFlags): VariableDeclarationList {
-        const node = <VariableDeclarationList>createNode(SyntaxKind.VariableDeclarationList, location, flags);
+    export function createVariableDeclarationList(declarations: VariableDeclaration[], flags?: NodeFlags): VariableDeclarationList {
+        const node = <VariableDeclarationList>createSynthesizedNode(SyntaxKind.VariableDeclarationList);
+        node.flags |= flags;
         node.declarations = createNodeArray(declarations);
         return node;
     }
 
     export function updateVariableDeclarationList(node: VariableDeclarationList, declarations: VariableDeclaration[]) {
-        if (node.declarations !== declarations) {
-            return updateNode(createVariableDeclarationList(declarations, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.declarations !== declarations
+            ? updateNode(createVariableDeclarationList(declarations, node.flags), node)
+            : node;
     }
 
-    export function createVariableDeclaration(name: string | BindingPattern | Identifier, type?: TypeNode, initializer?: Expression, location?: TextRange, flags?: NodeFlags): VariableDeclaration {
-        const node = <VariableDeclaration>createNode(SyntaxKind.VariableDeclaration, location, flags);
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
+    export function createVariableDeclaration(name: string | BindingName, type?: TypeNode, initializer?: Expression): VariableDeclaration {
+        const node = <VariableDeclaration>createSynthesizedNode(SyntaxKind.VariableDeclaration);
+        node.name = asName(name);
         node.type = type;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
         return node;
     }
 
     export function updateVariableDeclaration(node: VariableDeclaration, name: BindingName, type: TypeNode, initializer: Expression) {
-        if (node.name !== name || node.type !== type || node.initializer !== initializer) {
-            return updateNode(createVariableDeclaration(name, type, initializer, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.name !== name
+            || node.type !== type
+            || node.initializer !== initializer
+            ? updateNode(createVariableDeclaration(name, type, initializer), node)
+            : node;
     }
 
-    export function createEmptyStatement(location: TextRange) {
-        return <EmptyStatement>createNode(SyntaxKind.EmptyStatement, location);
+    export function createEmptyStatement() {
+        return <EmptyStatement>createSynthesizedNode(SyntaxKind.EmptyStatement);
     }
 
-    export function createStatement(expression: Expression, location?: TextRange, flags?: NodeFlags): ExpressionStatement {
-        const node = <ExpressionStatement>createNode(SyntaxKind.ExpressionStatement, location, flags);
+    export function createStatement(expression: Expression): ExpressionStatement {
+        const node = <ExpressionStatement>createSynthesizedNode(SyntaxKind.ExpressionStatement);
         node.expression = parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
 
     export function updateStatement(node: ExpressionStatement, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createStatement(expression, /*location*/ node, node.flags), node);
-        }
-
-        return node;
+        return node.expression !== expression
+            ? updateNode(createStatement(expression), node)
+            : node;
     }
 
-    export function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement, location?: TextRange) {
-        const node = <IfStatement>createNode(SyntaxKind.IfStatement, location);
+    export function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement) {
+        const node = <IfStatement>createSynthesizedNode(SyntaxKind.IfStatement);
         node.expression = expression;
         node.thenStatement = thenStatement;
         node.elseStatement = elseStatement;
@@ -859,42 +850,43 @@ namespace ts {
     }
 
     export function updateIf(node: IfStatement, expression: Expression, thenStatement: Statement, elseStatement: Statement) {
-        if (node.expression !== expression || node.thenStatement !== thenStatement || node.elseStatement !== elseStatement) {
-            return updateNode(createIf(expression, thenStatement, elseStatement, /*location*/ node), node);
-        }
-        return node;
+        return node.expression !== expression
+            || node.thenStatement !== thenStatement
+            || node.elseStatement !== elseStatement
+            ? updateNode(createIf(expression, thenStatement, elseStatement), node)
+            : node;
     }
 
-    export function createDo(statement: Statement, expression: Expression, location?: TextRange) {
-        const node = <DoStatement>createNode(SyntaxKind.DoStatement, location);
+    export function createDo(statement: Statement, expression: Expression) {
+        const node = <DoStatement>createSynthesizedNode(SyntaxKind.DoStatement);
         node.statement = statement;
         node.expression = expression;
         return node;
     }
 
     export function updateDo(node: DoStatement, statement: Statement, expression: Expression) {
-        if (node.statement !== statement || node.expression !== expression) {
-            return updateNode(createDo(statement, expression, node), node);
-        }
-        return node;
+        return node.statement !== statement
+            || node.expression !== expression
+            ? updateNode(createDo(statement, expression), node)
+            : node;
     }
 
-    export function createWhile(expression: Expression, statement: Statement, location?: TextRange) {
-        const node = <WhileStatement>createNode(SyntaxKind.WhileStatement, location);
+    export function createWhile(expression: Expression, statement: Statement) {
+        const node = <WhileStatement>createSynthesizedNode(SyntaxKind.WhileStatement);
         node.expression = expression;
         node.statement = statement;
         return node;
     }
 
     export function updateWhile(node: WhileStatement, expression: Expression, statement: Statement) {
-        if (node.expression !== expression || node.statement !== statement) {
-            return updateNode(createWhile(expression, statement, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            || node.statement !== statement
+            ? updateNode(createWhile(expression, statement), node)
+            : node;
     }
 
-    export function createFor(initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement, location?: TextRange) {
-        const node = <ForStatement>createNode(SyntaxKind.ForStatement, location, /*flags*/ undefined);
+    export function createFor(initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement) {
+        const node = <ForStatement>createSynthesizedNode(SyntaxKind.ForStatement);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
@@ -903,14 +895,16 @@ namespace ts {
     }
 
     export function updateFor(node: ForStatement, initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement) {
-        if (node.initializer !== initializer || node.condition !== condition || node.incrementor !== incrementor || node.statement !== statement) {
-            return updateNode(createFor(initializer, condition, incrementor, statement, node), node);
-        }
-        return node;
+        return node.initializer !== initializer
+            || node.condition !== condition
+            || node.incrementor !== incrementor
+            || node.statement !== statement
+            ? updateNode(createFor(initializer, condition, incrementor, statement), node)
+            : node;
     }
 
-    export function createForIn(initializer: ForInitializer, expression: Expression, statement: Statement, location?: TextRange) {
-        const node = <ForInStatement>createNode(SyntaxKind.ForInStatement, location);
+    export function createForIn(initializer: ForInitializer, expression: Expression, statement: Statement) {
+        const node = <ForInStatement>createSynthesizedNode(SyntaxKind.ForInStatement);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -918,14 +912,15 @@ namespace ts {
     }
 
     export function updateForIn(node: ForInStatement, initializer: ForInitializer, expression: Expression, statement: Statement) {
-        if (node.initializer !== initializer || node.expression !== expression || node.statement !== statement) {
-            return updateNode(createForIn(initializer, expression, statement, node), node);
-        }
-        return node;
+        return node.initializer !== initializer
+            || node.expression !== expression
+            || node.statement !== statement
+            ? updateNode(createForIn(initializer, expression, statement), node)
+            : node;
     }
 
-    export function createForOf(initializer: ForInitializer, expression: Expression, statement: Statement, location?: TextRange) {
-        const node = <ForOfStatement>createNode(SyntaxKind.ForOfStatement, location);
+    export function createForOf(initializer: ForInitializer, expression: Expression, statement: Statement) {
+        const node = <ForOfStatement>createSynthesizedNode(SyntaxKind.ForOfStatement);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -933,112 +928,105 @@ namespace ts {
     }
 
     export function updateForOf(node: ForOfStatement, initializer: ForInitializer, expression: Expression, statement: Statement) {
-        if (node.initializer !== initializer || node.expression !== expression || node.statement !== statement) {
-            return updateNode(createForOf(initializer, expression, statement, node), node);
-        }
-        return node;
+        return node.initializer !== initializer
+            || node.expression !== expression
+            || node.statement !== statement
+            ? updateNode(createForOf(initializer, expression, statement), node)
+            : node;
     }
 
-    export function createContinue(label?: Identifier, location?: TextRange): ContinueStatement {
-        const node = <ContinueStatement>createNode(SyntaxKind.ContinueStatement, location);
-        if (label) {
-            node.label = label;
-        }
+    export function createContinue(label?: string | Identifier): ContinueStatement {
+        const node = <ContinueStatement>createSynthesizedNode(SyntaxKind.ContinueStatement);
+        node.label = asName(label);
         return node;
     }
 
     export function updateContinue(node: ContinueStatement, label: Identifier) {
-        if (node.label !== label) {
-            return updateNode(createContinue(label, node), node);
-        }
-        return node;
+        return node.label !== label
+            ? updateNode(createContinue(label), node)
+            : node;
     }
 
-    export function createBreak(label?: Identifier, location?: TextRange): BreakStatement {
-        const node = <BreakStatement>createNode(SyntaxKind.BreakStatement, location);
-        if (label) {
-            node.label = label;
-        }
+    export function createBreak(label?: string | Identifier): BreakStatement {
+        const node = <BreakStatement>createSynthesizedNode(SyntaxKind.BreakStatement);
+        node.label = asName(label);
         return node;
     }
 
     export function updateBreak(node: BreakStatement, label: Identifier) {
-        if (node.label !== label) {
-            return updateNode(createBreak(label, node), node);
-        }
-        return node;
+        return node.label !== label
+            ? updateNode(createBreak(label), node)
+            : node;
     }
 
-    export function createReturn(expression?: Expression, location?: TextRange): ReturnStatement {
-        const node = <ReturnStatement>createNode(SyntaxKind.ReturnStatement, location);
+    export function createReturn(expression?: Expression): ReturnStatement {
+        const node = <ReturnStatement>createSynthesizedNode(SyntaxKind.ReturnStatement);
         node.expression = expression;
         return node;
     }
 
     export function updateReturn(node: ReturnStatement, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createReturn(expression, /*location*/ node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createReturn(expression), node)
+            : node;
     }
 
-    export function createWith(expression: Expression, statement: Statement, location?: TextRange) {
-        const node = <WithStatement>createNode(SyntaxKind.WithStatement, location);
+    export function createWith(expression: Expression, statement: Statement) {
+        const node = <WithStatement>createSynthesizedNode(SyntaxKind.WithStatement);
         node.expression = expression;
         node.statement = statement;
         return node;
     }
 
     export function updateWith(node: WithStatement, expression: Expression, statement: Statement) {
-        if (node.expression !== expression || node.statement !== statement) {
-            return updateNode(createWith(expression, statement, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            || node.statement !== statement
+            ? updateNode(createWith(expression, statement), node)
+            : node;
     }
 
-    export function createSwitch(expression: Expression, caseBlock: CaseBlock, location?: TextRange): SwitchStatement {
-        const node = <SwitchStatement>createNode(SyntaxKind.SwitchStatement, location);
+    export function createSwitch(expression: Expression, caseBlock: CaseBlock): SwitchStatement {
+        const node = <SwitchStatement>createSynthesizedNode(SyntaxKind.SwitchStatement);
         node.expression = parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
     }
 
     export function updateSwitch(node: SwitchStatement, expression: Expression, caseBlock: CaseBlock) {
-        if (node.expression !== expression || node.caseBlock !== caseBlock) {
-            return updateNode(createSwitch(expression, caseBlock, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            || node.caseBlock !== caseBlock
+            ? updateNode(createSwitch(expression, caseBlock), node)
+            : node;
     }
 
-    export function createLabel(label: string | Identifier, statement: Statement, location?: TextRange) {
-        const node = <LabeledStatement>createNode(SyntaxKind.LabeledStatement, location);
-        node.label = typeof label === "string" ? createIdentifier(label) : label;
+    export function createLabel(label: string | Identifier, statement: Statement) {
+        const node = <LabeledStatement>createSynthesizedNode(SyntaxKind.LabeledStatement);
+        node.label = asName(label);
         node.statement = statement;
         return node;
     }
 
     export function updateLabel(node: LabeledStatement, label: Identifier, statement: Statement) {
-        if (node.label !== label || node.statement !== statement) {
-            return updateNode(createLabel(label, statement, node), node);
-        }
-        return node;
+        return node.label !== label
+            || node.statement !== statement
+            ? updateNode(createLabel(label, statement), node)
+            : node;
     }
 
-    export function createThrow(expression: Expression, location?: TextRange) {
-        const node = <ThrowStatement>createNode(SyntaxKind.ThrowStatement, location);
+    export function createThrow(expression: Expression) {
+        const node = <ThrowStatement>createSynthesizedNode(SyntaxKind.ThrowStatement);
         node.expression = expression;
         return node;
     }
 
     export function updateThrow(node: ThrowStatement, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createThrow(expression, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createThrow(expression), node)
+            : node;
     }
 
-    export function createTry(tryBlock: Block, catchClause: CatchClause, finallyBlock: Block, location?: TextRange) {
-        const node = <TryStatement>createNode(SyntaxKind.TryStatement, location);
+    export function createTry(tryBlock: Block, catchClause: CatchClause, finallyBlock: Block) {
+        const node = <TryStatement>createSynthesizedNode(SyntaxKind.TryStatement);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -1046,32 +1034,32 @@ namespace ts {
     }
 
     export function updateTry(node: TryStatement, tryBlock: Block, catchClause: CatchClause, finallyBlock: Block) {
-        if (node.tryBlock !== tryBlock || node.catchClause !== catchClause || node.finallyBlock !== finallyBlock) {
-            return updateNode(createTry(tryBlock, catchClause, finallyBlock, node), node);
-        }
-        return node;
+        return node.tryBlock !== tryBlock
+            || node.catchClause !== catchClause
+            || node.finallyBlock !== finallyBlock
+            ? updateNode(createTry(tryBlock, catchClause, finallyBlock), node)
+            : node;
     }
 
-    export function createCaseBlock(clauses: CaseOrDefaultClause[], location?: TextRange): CaseBlock {
-        const node = <CaseBlock>createNode(SyntaxKind.CaseBlock, location);
+    export function createCaseBlock(clauses: CaseOrDefaultClause[]): CaseBlock {
+        const node = <CaseBlock>createSynthesizedNode(SyntaxKind.CaseBlock);
         node.clauses = createNodeArray(clauses);
         return node;
     }
 
     export function updateCaseBlock(node: CaseBlock, clauses: CaseOrDefaultClause[]) {
-        if (node.clauses !== clauses) {
-            return updateNode(createCaseBlock(clauses, node), node);
-        }
-        return node;
+        return node.clauses !== clauses
+            ? updateNode(createCaseBlock(clauses), node)
+            : node;
     }
 
-    export function createFunctionDeclaration(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) {
-        const node = <FunctionDeclaration>createNode(SyntaxKind.FunctionDeclaration, location, flags);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+    export function createFunctionDeclaration(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
+        const node = <FunctionDeclaration>createSynthesizedNode(SyntaxKind.FunctionDeclaration);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
-        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
         node.type = type;
         node.body = body;
@@ -1079,163 +1067,172 @@ namespace ts {
     }
 
     export function updateFunctionDeclaration(node: FunctionDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) {
-            return updateNode(createFunctionDeclaration(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body, /*location*/ node, node.flags), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.body !== body
+            ? updateNode(createFunctionDeclaration(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body), node)
+            : node;
     }
 
-    export function createClassDeclaration(decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[], location?: TextRange) {
-        const node = <ClassDeclaration>createNode(SyntaxKind.ClassDeclaration, location);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
-        node.name = name;
-        node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
-        node.heritageClauses = createNodeArray(heritageClauses);
+    export function createClassDeclaration(decorators: Decorator[], modifiers: Modifier[], name: string | Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) {
+        const node = <ClassDeclaration>createSynthesizedNode(SyntaxKind.ClassDeclaration);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.heritageClauses = asNodeArray(heritageClauses);
         node.members = createNodeArray(members);
         return node;
     }
 
     export function updateClassDeclaration(node: ClassDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.heritageClauses !== heritageClauses || node.members !== members) {
-            return updateNode(createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members, node), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.typeParameters !== typeParameters
+            || node.heritageClauses !== heritageClauses
+            || node.members !== members
+            ? updateNode(createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members), node)
+            : node;
     }
 
-    export function createImportDeclaration(decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier?: Expression, location?: TextRange): ImportDeclaration {
-        const node = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, location);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+    export function createImportDeclaration(decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier?: Expression): ImportDeclaration {
+        const node = <ImportDeclaration>createSynthesizedNode(SyntaxKind.ImportDeclaration);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
         node.importClause = importClause;
         node.moduleSpecifier = moduleSpecifier;
         return node;
     }
 
     export function updateImportDeclaration(node: ImportDeclaration, decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier: Expression) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.importClause !== importClause || node.moduleSpecifier !== moduleSpecifier) {
-            return updateNode(createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier, node), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.importClause !== importClause || node.moduleSpecifier !== moduleSpecifier
+            ? updateNode(createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier), node)
+            : node;
     }
 
-    export function createImportClause(name: Identifier, namedBindings: NamedImportBindings, location?: TextRange): ImportClause {
-        const node = <ImportClause>createNode(SyntaxKind.ImportClause, location);
+    export function createImportClause(name: Identifier, namedBindings: NamedImportBindings): ImportClause {
+        const node = <ImportClause>createSynthesizedNode(SyntaxKind.ImportClause);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
     }
 
     export function updateImportClause(node: ImportClause, name: Identifier, namedBindings: NamedImportBindings) {
-        if (node.name !== name || node.namedBindings !== namedBindings) {
-            return updateNode(createImportClause(name, namedBindings, node), node);
-        }
-        return node;
+        return node.name !== name
+            || node.namedBindings !== namedBindings
+            ? updateNode(createImportClause(name, namedBindings), node)
+            : node;
     }
 
-    export function createNamespaceImport(name: Identifier, location?: TextRange): NamespaceImport {
-        const node = <NamespaceImport>createNode(SyntaxKind.NamespaceImport, location);
+    export function createNamespaceImport(name: Identifier): NamespaceImport {
+        const node = <NamespaceImport>createSynthesizedNode(SyntaxKind.NamespaceImport);
         node.name = name;
         return node;
     }
 
     export function updateNamespaceImport(node: NamespaceImport, name: Identifier) {
-        if (node.name !== name) {
-            return updateNode(createNamespaceImport(name, node), node);
-        }
-        return node;
+        return node.name !== name
+            ? updateNode(createNamespaceImport(name), node)
+            : node;
     }
 
-    export function createNamedImports(elements: ImportSpecifier[], location?: TextRange): NamedImports {
-        const node = <NamedImports>createNode(SyntaxKind.NamedImports, location);
+    export function createNamedImports(elements: ImportSpecifier[]): NamedImports {
+        const node = <NamedImports>createSynthesizedNode(SyntaxKind.NamedImports);
         node.elements = createNodeArray(elements);
         return node;
     }
 
     export function updateNamedImports(node: NamedImports, elements: ImportSpecifier[]) {
-        if (node.elements !== elements) {
-            return updateNode(createNamedImports(elements, node), node);
-        }
-        return node;
+        return node.elements !== elements
+            ? updateNode(createNamedImports(elements), node)
+            : node;
     }
 
-    export function createImportSpecifier(propertyName: Identifier, name: Identifier, location?: TextRange) {
-        const node = <ImportSpecifier>createNode(SyntaxKind.ImportSpecifier, location);
+    export function createImportSpecifier(propertyName: Identifier, name: Identifier) {
+        const node = <ImportSpecifier>createSynthesizedNode(SyntaxKind.ImportSpecifier);
         node.propertyName = propertyName;
         node.name = name;
         return node;
     }
 
     export function updateImportSpecifier(node: ImportSpecifier, propertyName: Identifier, name: Identifier) {
-        if (node.propertyName !== propertyName || node.name !== name) {
-            return updateNode(createImportSpecifier(propertyName, name, node), node);
-        }
-        return node;
+        return node.propertyName !== propertyName
+            || node.name !== name
+            ? updateNode(createImportSpecifier(propertyName, name), node)
+            : node;
     }
 
-    export function createExportAssignment(decorators: Decorator[], modifiers: Modifier[], isExportEquals: boolean, expression: Expression, location?: TextRange) {
-        const node = <ExportAssignment>createNode(SyntaxKind.ExportAssignment, location);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+    export function createExportAssignment(decorators: Decorator[], modifiers: Modifier[], isExportEquals: boolean, expression: Expression) {
+        const node = <ExportAssignment>createSynthesizedNode(SyntaxKind.ExportAssignment);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
         node.isExportEquals = isExportEquals;
         node.expression = expression;
         return node;
     }
 
     export function updateExportAssignment(node: ExportAssignment, decorators: Decorator[], modifiers: Modifier[], expression: Expression) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.expression !== expression) {
-            return updateNode(createExportAssignment(decorators, modifiers, node.isExportEquals, expression, node), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.expression !== expression
+            ? updateNode(createExportAssignment(decorators, modifiers, node.isExportEquals, expression), node)
+            : node;
     }
 
-    export function createExportDeclaration(decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier?: Expression, location?: TextRange) {
-        const node = <ExportDeclaration>createNode(SyntaxKind.ExportDeclaration, location);
-        node.decorators = decorators ? createNodeArray(decorators) : undefined;
-        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+    export function createExportDeclaration(decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier?: Expression) {
+        const node = <ExportDeclaration>createSynthesizedNode(SyntaxKind.ExportDeclaration);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
         node.exportClause = exportClause;
         node.moduleSpecifier = moduleSpecifier;
         return node;
     }
 
     export function updateExportDeclaration(node: ExportDeclaration, decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier: Expression) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.exportClause !== exportClause || node.moduleSpecifier !== moduleSpecifier) {
-            return updateNode(createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, node), node);
-        }
-        return node;
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.exportClause !== exportClause
+            || node.moduleSpecifier !== moduleSpecifier
+            ? updateNode(createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier), node)
+            : node;
     }
 
-    export function createNamedExports(elements: ExportSpecifier[], location?: TextRange) {
-        const node = <NamedExports>createNode(SyntaxKind.NamedExports, location);
+    export function createNamedExports(elements: ExportSpecifier[]) {
+        const node = <NamedExports>createSynthesizedNode(SyntaxKind.NamedExports);
         node.elements = createNodeArray(elements);
         return node;
     }
 
     export function updateNamedExports(node: NamedExports, elements: ExportSpecifier[]) {
-        if (node.elements !== elements) {
-            return updateNode(createNamedExports(elements, node), node);
-        }
-        return node;
+        return node.elements !== elements
+            ? updateNode(createNamedExports(elements), node)
+            : node;
     }
 
-    export function createExportSpecifier(name: string | Identifier, propertyName?: string | Identifier, location?: TextRange) {
-        const node = <ExportSpecifier>createNode(SyntaxKind.ExportSpecifier, location);
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
-        node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
+    export function createExportSpecifier(name: string | Identifier, propertyName?: string | Identifier) {
+        const node = <ExportSpecifier>createSynthesizedNode(SyntaxKind.ExportSpecifier);
+        node.name = asName(name);
+        node.propertyName = asName(propertyName);
         return node;
     }
 
     export function updateExportSpecifier(node: ExportSpecifier, name: Identifier, propertyName: Identifier) {
-        if (node.name !== name || node.propertyName !== propertyName) {
-            return updateNode(createExportSpecifier(name, propertyName, node), node);
-        }
-        return node;
+        return node.name !== name || node.propertyName !== propertyName
+            ? updateNode(createExportSpecifier(name, propertyName), node)
+            : node;
     }
 
     // JSX
 
-    export function createJsxElement(openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement, location?: TextRange) {
-        const node = <JsxElement>createNode(SyntaxKind.JsxElement, location);
+    export function createJsxElement(openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement) {
+        const node = <JsxElement>createSynthesizedNode(SyntaxKind.JsxElement);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -1243,98 +1240,96 @@ namespace ts {
     }
 
     export function updateJsxElement(node: JsxElement, openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement) {
-        if (node.openingElement !== openingElement || node.children !== children || node.closingElement !== closingElement) {
-            return updateNode(createJsxElement(openingElement, children, closingElement, node), node);
-        }
-        return node;
+        return node.openingElement !== openingElement
+            || node.children !== children
+            || node.closingElement !== closingElement
+            ? updateNode(createJsxElement(openingElement, children, closingElement), node)
+            : node;
     }
 
-    export function createJsxSelfClosingElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[], location?: TextRange) {
-        const node = <JsxSelfClosingElement>createNode(SyntaxKind.JsxSelfClosingElement, location);
+    export function createJsxSelfClosingElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) {
+        const node = <JsxSelfClosingElement>createSynthesizedNode(SyntaxKind.JsxSelfClosingElement);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
     }
 
     export function updateJsxSelfClosingElement(node: JsxSelfClosingElement, tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) {
-        if (node.tagName !== tagName || node.attributes !== attributes) {
-            return updateNode(createJsxSelfClosingElement(tagName, attributes, node), node);
-        }
-        return node;
+        return node.tagName !== tagName
+            || node.attributes !== attributes
+            ? updateNode(createJsxSelfClosingElement(tagName, attributes), node)
+            : node;
     }
 
-    export function createJsxOpeningElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[], location?: TextRange) {
-        const node = <JsxOpeningElement>createNode(SyntaxKind.JsxOpeningElement, location);
+    export function createJsxOpeningElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) {
+        const node = <JsxOpeningElement>createSynthesizedNode(SyntaxKind.JsxOpeningElement);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
     }
 
     export function updateJsxOpeningElement(node: JsxOpeningElement, tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) {
-        if (node.tagName !== tagName || node.attributes !== attributes) {
-            return updateNode(createJsxOpeningElement(tagName, attributes, node), node);
-        }
-        return node;
+        return node.tagName !== tagName
+            || node.attributes !== attributes
+            ? updateNode(createJsxOpeningElement(tagName, attributes), node)
+            : node;
     }
 
-    export function createJsxClosingElement(tagName: JsxTagNameExpression, location?: TextRange) {
-        const node = <JsxClosingElement>createNode(SyntaxKind.JsxClosingElement, location);
+    export function createJsxClosingElement(tagName: JsxTagNameExpression) {
+        const node = <JsxClosingElement>createSynthesizedNode(SyntaxKind.JsxClosingElement);
         node.tagName = tagName;
         return node;
     }
 
     export function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression) {
-        if (node.tagName !== tagName) {
-            return updateNode(createJsxClosingElement(tagName, node), node);
-        }
-        return node;
+        return node.tagName !== tagName
+            ? updateNode(createJsxClosingElement(tagName), node)
+            : node;
     }
 
-    export function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression, location?: TextRange) {
-        const node = <JsxAttribute>createNode(SyntaxKind.JsxAttribute, location);
+    export function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression) {
+        const node = <JsxAttribute>createSynthesizedNode(SyntaxKind.JsxAttribute);
         node.name = name;
         node.initializer = initializer;
         return node;
     }
 
     export function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression) {
-        if (node.name !== name || node.initializer !== initializer) {
-            return updateNode(createJsxAttribute(name, initializer, node), node);
-        }
-        return node;
+        return node.name !== name
+            || node.initializer !== initializer
+            ? updateNode(createJsxAttribute(name, initializer), node)
+            : node;
     }
 
-    export function createJsxSpreadAttribute(expression: Expression, location?: TextRange) {
-        const node = <JsxSpreadAttribute>createNode(SyntaxKind.JsxSpreadAttribute, location);
+    export function createJsxSpreadAttribute(expression: Expression) {
+        const node = <JsxSpreadAttribute>createSynthesizedNode(SyntaxKind.JsxSpreadAttribute);
         node.expression = expression;
         return node;
     }
 
     export function updateJsxSpreadAttribute(node: JsxSpreadAttribute, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createJsxSpreadAttribute(expression, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createJsxSpreadAttribute(expression), node)
+            : node;
     }
 
-    export function createJsxExpression(expression: Expression, dotDotDotToken: Token<SyntaxKind.DotDotDotToken>, location?: TextRange) {
-        const node = <JsxExpression>createNode(SyntaxKind.JsxExpression, location);
+    export function createJsxExpression(expression: Expression, dotDotDotToken: DotDotDotToken) {
+        const node = <JsxExpression>createSynthesizedNode(SyntaxKind.JsxExpression);
         node.dotDotDotToken = dotDotDotToken;
         node.expression = expression;
         return node;
     }
 
     export function updateJsxExpression(node: JsxExpression, expression: Expression) {
-        if (node.expression !== expression) {
-            return updateNode(createJsxExpression(expression, node.dotDotDotToken, node), node);
-        }
-        return node;
+        return node.expression !== expression
+            ? updateNode(createJsxExpression(expression, node.dotDotDotToken), node)
+            : node;
     }
 
     // Clauses
 
-    export function createHeritageClause(token: SyntaxKind, types: ExpressionWithTypeArguments[], location?: TextRange) {
-        const node = <HeritageClause>createNode(SyntaxKind.HeritageClause, location);
+    export function createHeritageClause(token: SyntaxKind, types: ExpressionWithTypeArguments[]) {
+        const node = <HeritageClause>createSynthesizedNode(SyntaxKind.HeritageClause);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -1342,13 +1337,13 @@ namespace ts {
 
     export function updateHeritageClause(node: HeritageClause, types: ExpressionWithTypeArguments[]) {
         if (node.types !== types) {
-            return updateNode(createHeritageClause(node.token, types, node), node);
+            return updateNode(createHeritageClause(node.token, types), node);
         }
         return node;
     }
 
-    export function createCaseClause(expression: Expression, statements: Statement[], location?: TextRange) {
-        const node = <CaseClause>createNode(SyntaxKind.CaseClause, location);
+    export function createCaseClause(expression: Expression, statements: Statement[]) {
+        const node = <CaseClause>createSynthesizedNode(SyntaxKind.CaseClause);
         node.expression = parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -1356,26 +1351,26 @@ namespace ts {
 
     export function updateCaseClause(node: CaseClause, expression: Expression, statements: Statement[]) {
         if (node.expression !== expression || node.statements !== statements) {
-            return updateNode(createCaseClause(expression, statements, node), node);
+            return updateNode(createCaseClause(expression, statements), node);
         }
         return node;
     }
 
-    export function createDefaultClause(statements: Statement[], location?: TextRange) {
-        const node = <DefaultClause>createNode(SyntaxKind.DefaultClause, location);
+    export function createDefaultClause(statements: Statement[]) {
+        const node = <DefaultClause>createSynthesizedNode(SyntaxKind.DefaultClause);
         node.statements = createNodeArray(statements);
         return node;
     }
 
     export function updateDefaultClause(node: DefaultClause, statements: Statement[]) {
         if (node.statements !== statements) {
-            return updateNode(createDefaultClause(statements, node), node);
+            return updateNode(createDefaultClause(statements), node);
         }
         return node;
     }
 
-    export function createCatchClause(variableDeclaration: string | VariableDeclaration, block: Block, location?: TextRange) {
-        const node = <CatchClause>createNode(SyntaxKind.CatchClause, location);
+    export function createCatchClause(variableDeclaration: string | VariableDeclaration, block: Block) {
+        const node = <CatchClause>createSynthesizedNode(SyntaxKind.CatchClause);
         node.variableDeclaration = typeof variableDeclaration === "string" ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -1383,16 +1378,16 @@ namespace ts {
 
     export function updateCatchClause(node: CatchClause, variableDeclaration: VariableDeclaration, block: Block) {
         if (node.variableDeclaration !== variableDeclaration || node.block !== block) {
-            return updateNode(createCatchClause(variableDeclaration, block, node), node);
+            return updateNode(createCatchClause(variableDeclaration, block), node);
         }
         return node;
     }
 
     // Property assignments
 
-    export function createPropertyAssignment(name: string | PropertyName, initializer: Expression, location?: TextRange) {
-        const node = <PropertyAssignment>createNode(SyntaxKind.PropertyAssignment, location);
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
+    export function createPropertyAssignment(name: string | PropertyName, initializer: Expression) {
+        const node = <PropertyAssignment>createSynthesizedNode(SyntaxKind.PropertyAssignment);
+        node.name = asName(name);
         node.questionToken = undefined;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
         return node;
@@ -1400,34 +1395,34 @@ namespace ts {
 
     export function updatePropertyAssignment(node: PropertyAssignment, name: PropertyName, initializer: Expression) {
         if (node.name !== name || node.initializer !== initializer) {
-            return updateNode(createPropertyAssignment(name, initializer, node), node);
+            return updateNode(createPropertyAssignment(name, initializer), node);
         }
         return node;
     }
 
-    export function createShorthandPropertyAssignment(name: string | Identifier, objectAssignmentInitializer: Expression, location?: TextRange) {
-        const node = <ShorthandPropertyAssignment>createNode(SyntaxKind.ShorthandPropertyAssignment, location);
-        node.name = typeof name === "string" ? createIdentifier(name) : name;
+    export function createShorthandPropertyAssignment(name: string | Identifier, objectAssignmentInitializer: Expression) {
+        const node = <ShorthandPropertyAssignment>createSynthesizedNode(SyntaxKind.ShorthandPropertyAssignment);
+        node.name = asName(name);
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
     }
 
-    export function createSpreadAssignment(expression: Expression, location?: TextRange) {
-        const node = <SpreadAssignment>createNode(SyntaxKind.SpreadAssignment, location);
+    export function createSpreadAssignment(expression: Expression) {
+        const node = <SpreadAssignment>createSynthesizedNode(SyntaxKind.SpreadAssignment);
         node.expression = expression !== undefined ? parenthesizeExpressionForList(expression) : undefined;
         return node;
     }
 
     export function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression) {
         if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) {
-            return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node);
+            return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer), node);
         }
         return node;
     }
 
     export function updateSpreadAssignment(node: SpreadAssignment, expression: Expression) {
         if (node.expression !== expression) {
-            return updateNode(createSpreadAssignment(expression, node), node);
+            return updateNode(createSpreadAssignment(expression), node);
         }
         return node;
     }
@@ -1436,7 +1431,8 @@ namespace ts {
 
     export function updateSourceFileNode(node: SourceFile, statements: Statement[]) {
         if (node.statements !== statements) {
-            const updated = <SourceFile>createNode(SyntaxKind.SourceFile, /*location*/ node, node.flags);
+            const updated = <SourceFile>createSynthesizedNode(SyntaxKind.SourceFile);
+            updated.flags |= node.flags;
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
             updated.fileName = node.fileName;
@@ -1472,6 +1468,17 @@ namespace ts {
         return node;
     }
 
+    /**
+     * Creates a shallow, memberwise clone of a node for mutation.
+     */
+    export function getMutableClone<T extends Node>(node: T): T {
+        const clone = getSynthesizedClone(node);
+        clone.pos = node.pos;
+        clone.end = node.end;
+        clone.parent = node.parent;
+        return clone;
+    }
+
     // Transformation nodes
 
     /**
@@ -1481,8 +1488,9 @@ namespace ts {
      * @param original The original statement.
      */
     export function createNotEmittedStatement(original: Node) {
-        const node = <NotEmittedStatement>createNode(SyntaxKind.NotEmittedStatement, /*location*/ original);
+        const node = <NotEmittedStatement>createSynthesizedNode(SyntaxKind.NotEmittedStatement);
         node.original = original;
+        setTextRange(node, original);
         return node;
     }
 
@@ -1490,8 +1498,9 @@ namespace ts {
      * Creates a synthetic element to act as a placeholder for the end of an emitted declaration in
      * order to properly emit exports.
      */
+    /* @internal */
     export function createEndOfDeclarationMarker(original: Node) {
-        const node = <EndOfDeclarationMarker>createNode(SyntaxKind.EndOfDeclarationMarker);
+        const node = <EndOfDeclarationMarker>createSynthesizedNode(SyntaxKind.EndOfDeclarationMarker);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -1501,8 +1510,9 @@ namespace ts {
      * Creates a synthetic element to act as a placeholder for the beginning of a merged declaration in
      * order to properly emit exports.
      */
+    /* @internal */
     export function createMergeDeclarationMarker(original: Node) {
-        const node = <MergeDeclarationMarker>createNode(SyntaxKind.MergeDeclarationMarker);
+        const node = <MergeDeclarationMarker>createSynthesizedNode(SyntaxKind.MergeDeclarationMarker);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -1516,16 +1526,17 @@ namespace ts {
      * @param original The original outer expression.
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
-    export function createPartiallyEmittedExpression(expression: Expression, original?: Node, location?: TextRange) {
-        const node = <PartiallyEmittedExpression>createNode(SyntaxKind.PartiallyEmittedExpression, /*location*/ location || original);
+    export function createPartiallyEmittedExpression(expression: Expression, original?: Node) {
+        const node = <PartiallyEmittedExpression>createSynthesizedNode(SyntaxKind.PartiallyEmittedExpression);
         node.expression = expression;
         node.original = original;
+        setTextRange(node, original);
         return node;
     }
 
     export function updatePartiallyEmittedExpression(node: PartiallyEmittedExpression, expression: Expression) {
         if (node.expression !== expression) {
-            return updateNode(createPartiallyEmittedExpression(expression, node.original, node), node);
+            return updateNode(createPartiallyEmittedExpression(expression, node.original), node);
         }
         return node;
     }
@@ -1549,14 +1560,14 @@ namespace ts {
         return <Expression>createBinary(left, SyntaxKind.CommaToken, right);
     }
 
-    export function createLessThan(left: Expression, right: Expression, location?: TextRange) {
-        return <Expression>createBinary(left, SyntaxKind.LessThanToken, right, location);
+    export function createLessThan(left: Expression, right: Expression) {
+        return <Expression>createBinary(left, SyntaxKind.LessThanToken, right);
     }
 
-    export function createAssignment(left: ObjectLiteralExpression | ArrayLiteralExpression, right: Expression, location?: TextRange): DestructuringAssignment;
-    export function createAssignment(left: Expression, right: Expression, location?: TextRange): BinaryExpression;
-    export function createAssignment(left: Expression, right: Expression, location?: TextRange) {
-        return createBinary(left, SyntaxKind.EqualsToken, right, location);
+    export function createAssignment(left: ObjectLiteralExpression | ArrayLiteralExpression, right: Expression): DestructuringAssignment;
+    export function createAssignment(left: Expression, right: Expression): BinaryExpression;
+    export function createAssignment(left: Expression, right: Expression) {
+        return createBinary(left, SyntaxKind.EqualsToken, right);
     }
 
     export function createStrictEquality(left: Expression, right: Expression) {
@@ -1575,8 +1586,8 @@ namespace ts {
         return createBinary(left, SyntaxKind.MinusToken, right);
     }
 
-    export function createPostfixIncrement(operand: Expression, location?: TextRange) {
-        return createPostfix(operand, SyntaxKind.PlusPlusToken, location);
+    export function createPostfixIncrement(operand: Expression) {
+        return createPostfix(operand, SyntaxKind.PlusPlusToken);
     }
 
     export function createLogicalAnd(left: Expression, right: Expression) {
@@ -1595,6 +1606,321 @@ namespace ts {
         return createVoid(createLiteral(0));
     }
 
+    export function createExportDefault(expression: Expression) {
+        return createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportEquals*/ false, expression);
+    }
+
+    export function createExternalModuleExport(exportName: Identifier) {
+        return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([createExportSpecifier(exportName)]));
+    }
+
+    // Utilities
+
+    function asName(name: string): Identifier;
+    function asName(name: Identifier): Identifier;
+    function asName(name: string | Identifier): Identifier;
+    function asName(name: string | BindingName): BindingName;
+    function asName(name: string | PropertyName): PropertyName;
+    function asName(name: string | Identifier | BindingName | PropertyName) {
+        return typeof name === "string" ? createIdentifier(name) : name;
+    }
+
+    function asExpression(value: string | number | Expression) {
+        return typeof value === "string" || typeof value === "number" ? createLiteral(value) : value;
+    }
+
+    function asNodeArray<T extends Node>(array: T[] | undefined): NodeArray<T> | undefined {
+        return array ? createNodeArray(array) : undefined;
+    }
+
+    function asToken<TKind extends SyntaxKind>(value: TKind | Token<TKind>): Token<TKind> {
+        return typeof value === "number" ? createToken(value) : value;
+    }
+
+    /**
+     * Clears any EmitNode entries from parse-tree nodes.
+     * @param sourceFile A source file.
+     */
+    export function disposeEmitNodes(sourceFile: SourceFile) {
+        // During transformation we may need to annotate a parse tree node with transient
+        // transformation properties. As parse tree nodes live longer than transformation
+        // nodes, we need to make sure we reclaim any memory allocated for custom ranges
+        // from these nodes to ensure we do not hold onto entire subtrees just for position
+        // information. We also need to reset these nodes to a pre-transformation state
+        // for incremental parsing scenarios so that we do not impact later emit.
+        sourceFile = getSourceFileOfNode(getParseTreeNode(sourceFile));
+        const emitNode = sourceFile && sourceFile.emitNode;
+        const annotatedNodes = emitNode && emitNode.annotatedNodes;
+        if (annotatedNodes) {
+            for (const node of annotatedNodes) {
+                node.emitNode = undefined;
+            }
+        }
+    }
+
+    /**
+     * Associates a node with the current transformation, initializing
+     * various transient transformation properties.
+     *
+     * @param node The node.
+     */
+    /* @internal */
+    export function getOrCreateEmitNode(node: Node) {
+        if (!node.emitNode) {
+            if (isParseTreeNode(node)) {
+                // To avoid holding onto transformation artifacts, we keep track of any
+                // parse tree node we are annotating. This allows us to clean them up after
+                // all transformations have completed.
+                if (node.kind === SyntaxKind.SourceFile) {
+                    return node.emitNode = { annotatedNodes: [node] };
+                }
+
+                const sourceFile = getSourceFileOfNode(node);
+                getOrCreateEmitNode(sourceFile).annotatedNodes.push(node);
+            }
+
+            node.emitNode = {};
+        }
+
+        return node.emitNode;
+    }
+
+    export function setTextRange<T extends TextRange>(range: T, location: TextRange | undefined): T {
+        if (location) {
+            range.pos = location.pos;
+            range.end = location.end;
+        }
+        return range;
+    }
+
+    /**
+     * Gets flags that control emit behavior of a node.
+     *
+     * @param node The node.
+     */
+    export function getEmitFlags(node: Node) {
+        const emitNode = node.emitNode;
+        return emitNode && emitNode.flags;
+    }
+
+    /**
+     * Sets flags that control emit behavior of a node.
+     *
+     * @param node The node.
+     * @param emitFlags The NodeEmitFlags for the node.
+     */
+    export function setEmitFlags<T extends Node>(node: T, emitFlags: EmitFlags) {
+        getOrCreateEmitNode(node).flags = emitFlags;
+        return node;
+    }
+
+    /**
+     * Gets a custom text range to use when emitting source maps.
+     *
+     * @param node The node.
+     */
+    export function getSourceMapRange(node: Node) {
+        const emitNode = node.emitNode;
+        return (emitNode && emitNode.sourceMapRange) || node;
+    }
+
+    /**
+     * Sets a custom text range to use when emitting source maps.
+     *
+     * @param node The node.
+     * @param range The text range.
+     */
+    export function setSourceMapRange<T extends Node>(node: T, range: TextRange) {
+        getOrCreateEmitNode(node).sourceMapRange = range;
+        return node;
+    }
+
+    /**
+     * Gets the TextRange to use for source maps for a token of a node.
+     *
+     * @param node The node.
+     * @param token The token.
+     */
+    export function getTokenSourceMapRange(node: Node, token: SyntaxKind) {
+        const emitNode = node.emitNode;
+        const tokenSourceMapRanges = emitNode && emitNode.tokenSourceMapRanges;
+        return tokenSourceMapRanges && tokenSourceMapRanges[token];
+    }
+
+    /**
+     * Sets the TextRange to use for source maps for a token of a node.
+     *
+     * @param node The node.
+     * @param token The token.
+     * @param range The text range.
+     */
+    export function setTokenSourceMapRange<T extends Node>(node: T, token: SyntaxKind, range: TextRange) {
+        const emitNode = getOrCreateEmitNode(node);
+        const tokenSourceMapRanges = emitNode.tokenSourceMapRanges || (emitNode.tokenSourceMapRanges = []);
+        tokenSourceMapRanges[token] = range;
+        return node;
+    }
+
+    /**
+     * Gets a custom text range to use when emitting comments.
+     *
+     * @param node The node.
+     */
+    export function getCommentRange(node: Node) {
+        const emitNode = node.emitNode;
+        return (emitNode && emitNode.commentRange) || node;
+    }
+
+    /**
+     * Sets a custom text range to use when emitting comments.
+     */
+    export function setCommentRange<T extends Node>(node: T, range: TextRange) {
+        getOrCreateEmitNode(node).commentRange = range;
+        return node;
+    }
+
+    /**
+     * Gets the constant value to emit for an expression.
+     */
+    export function getConstantValue(node: PropertyAccessExpression | ElementAccessExpression) {
+        const emitNode = node.emitNode;
+        return emitNode && emitNode.constantValue;
+    }
+
+    /**
+     * Sets the constant value to emit for an expression.
+     */
+    export function setConstantValue(node: PropertyAccessExpression | ElementAccessExpression, value: number) {
+        const emitNode = getOrCreateEmitNode(node);
+        emitNode.constantValue = value;
+        return node;
+    }
+
+    /**
+     * Adds an EmitHelper to a node.
+     */
+    export function addEmitHelper<T extends Node>(node: T, helper: EmitHelper): T {
+        const emitNode = getOrCreateEmitNode(node);
+        emitNode.helpers = append(emitNode.helpers, helper);
+        return node;
+    }
+
+    /**
+     * Add EmitHelpers to a node.
+     */
+    export function addEmitHelpers<T extends Node>(node: T, helpers: EmitHelper[] | undefined): T {
+        if (some(helpers)) {
+            const emitNode = getOrCreateEmitNode(node);
+            for (const helper of helpers) {
+                if (!contains(emitNode.helpers, helper)) {
+                    emitNode.helpers = append(emitNode.helpers, helper);
+                }
+            }
+        }
+        return node;
+    }
+
+    /**
+     * Removes an EmitHelper from a node.
+     */
+    export function removeEmitHelper(node: Node, helper: EmitHelper): boolean {
+        const emitNode = node.emitNode;
+        if (emitNode) {
+            const helpers = emitNode.helpers;
+            if (helpers) {
+                return orderedRemoveItem(helpers, helper);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Gets the EmitHelpers of a node.
+     */
+    export function getEmitHelpers(node: Node): EmitHelper[] | undefined {
+        const emitNode = node.emitNode;
+        return emitNode && emitNode.helpers;
+    }
+
+    /**
+     * Moves matching emit helpers from a source node to a target node.
+     */
+    export function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean) {
+        const sourceEmitNode = source.emitNode;
+        const sourceEmitHelpers = sourceEmitNode && sourceEmitNode.helpers;
+        if (!some(sourceEmitHelpers)) return;
+
+        const targetEmitNode = getOrCreateEmitNode(target);
+        let helpersRemoved = 0;
+        for (let i = 0; i < sourceEmitHelpers.length; i++) {
+            const helper = sourceEmitHelpers[i];
+            if (predicate(helper)) {
+                helpersRemoved++;
+                if (!contains(targetEmitNode.helpers, helper)) {
+                    targetEmitNode.helpers = append(targetEmitNode.helpers, helper);
+                }
+            }
+            else if (helpersRemoved > 0) {
+                sourceEmitHelpers[i - helpersRemoved] = helper;
+            }
+        }
+
+        if (helpersRemoved > 0) {
+            sourceEmitHelpers.length -= helpersRemoved;
+        }
+    }
+
+    /* @internal */
+    export function compareEmitHelpers(x: EmitHelper, y: EmitHelper) {
+        if (x === y) return Comparison.EqualTo;
+        if (x.priority === y.priority) return Comparison.EqualTo;
+        if (x.priority === undefined) return Comparison.GreaterThan;
+        if (y.priority === undefined) return Comparison.LessThan;
+        return compareValues(x.priority, y.priority);
+    }
+
+    export function setOriginalNode<T extends Node>(node: T, original: Node): T {
+        node.original = original;
+        if (original) {
+            const emitNode = original.emitNode;
+            if (emitNode) node.emitNode = mergeEmitNode(emitNode, node.emitNode);
+        }
+        return node;
+    }
+
+    function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode) {
+        const {
+            flags,
+            commentRange,
+            sourceMapRange,
+            tokenSourceMapRanges,
+            constantValue,
+            helpers
+        } = sourceEmitNode;
+        if (!destEmitNode) destEmitNode = {};
+        if (flags) destEmitNode.flags = flags;
+        if (commentRange) destEmitNode.commentRange = commentRange;
+        if (sourceMapRange) destEmitNode.sourceMapRange = sourceMapRange;
+        if (tokenSourceMapRanges) destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges);
+        if (constantValue !== undefined) destEmitNode.constantValue = constantValue;
+        if (helpers) destEmitNode.helpers = addRange(destEmitNode.helpers, helpers);
+        return destEmitNode;
+    }
+
+    function mergeTokenSourceMapRanges(sourceRanges: TextRange[], destRanges: TextRange[]) {
+        if (!destRanges) destRanges = [];
+        for (const key in sourceRanges) {
+            destRanges[key] = sourceRanges[key];
+        }
+        return destRanges;
+    }
+}
+
+/* @internal */
+namespace ts {
+
+    // Compound nodes
+
     export type TypeOfTag = "undefined" | "number" | "boolean" | "string" | "symbol" | "object" | "function";
 
     export function createTypeCheck(value: Expression, tag: TypeOfTag) {
@@ -1605,35 +1931,43 @@ namespace ts {
 
     export function createMemberAccessForPropertyName(target: Expression, memberName: PropertyName, location?: TextRange): MemberExpression {
         if (isComputedPropertyName(memberName)) {
-             return createElementAccess(target, memberName.expression, location);
+             return setTextRange(createElementAccess(target, memberName.expression), location);
         }
         else {
-            const expression = isIdentifier(memberName) ? createPropertyAccess(target, memberName, location) : createElementAccess(target, memberName, location);
-            (expression.emitNode || (expression.emitNode = {})).flags |= EmitFlags.NoNestedSourceMaps;
+            const expression = setTextRange(
+                isIdentifier(memberName)
+                    ? createPropertyAccess(target, memberName)
+                    : createElementAccess(target, memberName),
+                memberName
+            );
+            getOrCreateEmitNode(expression).flags |= EmitFlags.NoNestedSourceMaps;
             return expression;
         }
     }
 
     export function createFunctionCall(func: Expression, thisArg: Expression, argumentsList: Expression[], location?: TextRange) {
-        return createCall(
-            createPropertyAccess(func, "call"),
-            /*typeArguments*/ undefined,
-            [
-                thisArg,
-                ...argumentsList
-            ],
+        return setTextRange(
+            createCall(
+                createPropertyAccess(func, "call"),
+                /*typeArguments*/ undefined,
+                [
+                    thisArg,
+                    ...argumentsList
+                ]),
             location
         );
     }
 
     export function createFunctionApply(func: Expression, thisArg: Expression, argumentsExpression: Expression, location?: TextRange) {
-        return createCall(
-            createPropertyAccess(func, "apply"),
-            /*typeArguments*/ undefined,
-            [
-                thisArg,
-                argumentsExpression
-            ],
+        return setTextRange(
+            createCall(
+                createPropertyAccess(func, "apply"),
+                /*typeArguments*/ undefined,
+                [
+                    thisArg,
+                    argumentsExpression
+                ]
+            ),
             location
         );
     }
@@ -1656,10 +1990,12 @@ namespace ts {
     }
 
     export function createMathPow(left: Expression, right: Expression, location?: TextRange) {
-        return createCall(
-            createPropertyAccess(createIdentifier("Math"), "pow"),
-            /*typeArguments*/ undefined,
-            [left, right],
+        return setTextRange(
+            createCall(
+                createPropertyAccess(createIdentifier("Math"), "pow"),
+                /*typeArguments*/ undefined,
+                [left, right]
+            ),
             location
         );
     }
@@ -1679,7 +2015,7 @@ namespace ts {
     function createJsxFactoryExpressionFromEntityName(jsxFactory: EntityName, parent: JsxOpeningLikeElement): Expression {
         if (isQualifiedName(jsxFactory)) {
             const left = createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent);
-            const right = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+            const right = createIdentifier(jsxFactory.right.text);
             right.text = jsxFactory.right.text;
             return createPropertyAccess(left, right);
         }
@@ -1719,34 +2055,16 @@ namespace ts {
             }
         }
 
-        return createCall(
-            createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement),
-            /*typeArguments*/ undefined,
-            argumentsList,
+        return setTextRange(
+            createCall(
+                createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement),
+                /*typeArguments*/ undefined,
+                argumentsList
+            ),
             location
         );
     }
 
-    export function createExportDefault(expression: Expression) {
-        return createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportEquals*/ false, expression);
-    }
-
-    export function createExternalModuleExport(exportName: Identifier) {
-        return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([createExportSpecifier(exportName)]));
-    }
-
-    export function createLetStatement(name: Identifier, initializer: Expression, location?: TextRange) {
-        return createVariableStatement(/*modifiers*/ undefined, createLetDeclarationList([createVariableDeclaration(name, /*type*/ undefined, initializer)]), location);
-    }
-
-    export function createLetDeclarationList(declarations: VariableDeclaration[], location?: TextRange) {
-        return createVariableDeclarationList(declarations, location, NodeFlags.Let);
-    }
-
-    export function createConstDeclarationList(declarations: VariableDeclaration[], location?: TextRange) {
-        return createVariableDeclarationList(declarations, location, NodeFlags.Const);
-    }
-
     // Helpers
 
     export function getHelperName(name: string) {
@@ -1809,7 +2127,9 @@ namespace ts {
         }
         else if (callee.kind === SyntaxKind.SuperKeyword) {
             thisArg = createThis();
-            target = languageVersion < ScriptTarget.ES2015 ? createIdentifier("_super", /*location*/ callee) : <PrimaryExpression>callee;
+            target = languageVersion < ScriptTarget.ES2015
+                ? setTextRange(createIdentifier("_super"), callee)
+                : <PrimaryExpression>callee;
         }
         else {
             switch (callee.kind) {
@@ -1818,14 +2138,16 @@ namespace ts {
                         // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
                         thisArg = createTempVariable(recordTempVariable);
                         target = createPropertyAccess(
-                            createAssignment(
-                                thisArg,
-                                (<PropertyAccessExpression>callee).expression,
-                                /*location*/ (<PropertyAccessExpression>callee).expression
+                            setTextRange(
+                                createAssignment(
+                                    thisArg,
+                                    (<PropertyAccessExpression>callee).expression
+                                ),
+                                (<PropertyAccessExpression>callee).expression
                             ),
-                            (<PropertyAccessExpression>callee).name,
-                            /*location*/ callee
+                            (<PropertyAccessExpression>callee).name
                         );
+                        setTextRange(target, callee);
                     }
                     else {
                         thisArg = (<PropertyAccessExpression>callee).expression;
@@ -1839,14 +2161,16 @@ namespace ts {
                         // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
                         thisArg = createTempVariable(recordTempVariable);
                         target = createElementAccess(
-                            createAssignment(
-                                thisArg,
-                                (<ElementAccessExpression>callee).expression,
-                                /*location*/ (<ElementAccessExpression>callee).expression
+                            setTextRange(
+                                createAssignment(
+                                    thisArg,
+                                    (<ElementAccessExpression>callee).expression
+                                ),
+                                (<ElementAccessExpression>callee).expression
                             ),
-                            (<ElementAccessExpression>callee).argumentExpression,
-                            /*location*/ callee
+                            (<ElementAccessExpression>callee).argumentExpression
                         );
+                        setTextRange(target, callee);
                     }
                     else {
                         thisArg = (<ElementAccessExpression>callee).expression;
@@ -1876,7 +2200,7 @@ namespace ts {
         if (isQualifiedName(node)) {
             const left = createExpressionFromEntityName(node.left);
             const right = getMutableClone(node.right);
-            return createPropertyAccess(left, right, /*location*/ node);
+            return setTextRange(createPropertyAccess(left, right), node);
         }
         else {
             return getMutableClone(node);
@@ -1885,7 +2209,7 @@ namespace ts {
 
     export function createExpressionForPropertyName(memberName: PropertyName): Expression {
         if (isIdentifier(memberName)) {
-            return createLiteral(memberName, /*location*/ undefined);
+            return createLiteral(memberName);
         }
         else if (isComputedPropertyName(memberName)) {
             return getMutableClone(memberName.expression);
@@ -1921,9 +2245,9 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     getAccessor.parameters,
                     /*type*/ undefined,
-                    getAccessor.body,
-                    /*location*/ getAccessor
+                    getAccessor.body
                 );
+                setTextRange(getterFunction, getAccessor);
                 setOriginalNode(getterFunction, getAccessor);
                 const getter = createPropertyAssignment("get", getterFunction);
                 properties.push(getter);
@@ -1937,25 +2261,27 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     setAccessor.parameters,
                     /*type*/ undefined,
-                    setAccessor.body,
-                    /*location*/ setAccessor
+                    setAccessor.body
                 );
+                setTextRange(setterFunction, setAccessor);
                 setOriginalNode(setterFunction, setAccessor);
                 const setter = createPropertyAssignment("set", setterFunction);
                 properties.push(setter);
             }
 
-            properties.push(createPropertyAssignment("enumerable", createLiteral(true)));
-            properties.push(createPropertyAssignment("configurable", createLiteral(true)));
+            properties.push(createPropertyAssignment("enumerable", createTrue()));
+            properties.push(createPropertyAssignment("configurable", createTrue()));
 
-            const expression = createCall(
-                createPropertyAccess(createIdentifier("Object"), "defineProperty"),
-                /*typeArguments*/ undefined,
-                [
-                    receiver,
-                    createExpressionForPropertyName(property.name),
-                    createObjectLiteral(properties, /*location*/ undefined, multiLine)
-                ],
+            const expression = setTextRange(
+                createCall(
+                    createPropertyAccess(createIdentifier("Object"), "defineProperty"),
+                    /*typeArguments*/ undefined,
+                    [
+                        receiver,
+                        createExpressionForPropertyName(property.name),
+                        createObjectLiteral(properties, multiLine)
+                    ]
+                ),
                 /*location*/ firstAccessor
             );
 
@@ -1968,12 +2294,14 @@ namespace ts {
     function createExpressionForPropertyAssignment(property: PropertyAssignment, receiver: Expression) {
         return aggregateTransformFlags(
             setOriginalNode(
-                createAssignment(
-                    createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name),
-                    property.initializer,
-                    /*location*/ property
+                setTextRange(
+                    createAssignment(
+                        createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name),
+                        property.initializer
+                    ),
+                    property
                 ),
-                /*original*/ property
+                property
             )
         );
     }
@@ -1981,9 +2309,11 @@ namespace ts {
     function createExpressionForShorthandPropertyAssignment(property: ShorthandPropertyAssignment, receiver: Expression) {
         return aggregateTransformFlags(
             setOriginalNode(
-                createAssignment(
-                    createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name),
-                    getSynthesizedClone(property.name),
+                setTextRange(
+                    createAssignment(
+                        createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name),
+                        getSynthesizedClone(property.name)
+                    ),
                     /*location*/ property
                 ),
                 /*original*/ property
@@ -1994,20 +2324,24 @@ namespace ts {
     function createExpressionForMethodDeclaration(method: MethodDeclaration, receiver: Expression) {
         return aggregateTransformFlags(
             setOriginalNode(
-                createAssignment(
-                    createMemberAccessForPropertyName(receiver, method.name, /*location*/ method.name),
-                    setOriginalNode(
-                        createFunctionExpression(
-                            method.modifiers,
-                            method.asteriskToken,
-                            /*name*/ undefined,
-                            /*typeParameters*/ undefined,
-                            method.parameters,
-                            /*type*/ undefined,
-                            method.body,
-                            /*location*/ method
-                        ),
-                        /*original*/ method
+                setTextRange(
+                    createAssignment(
+                        createMemberAccessForPropertyName(receiver, method.name, /*location*/ method.name),
+                        setOriginalNode(
+                            setTextRange(
+                                createFunctionExpression(
+                                    method.modifiers,
+                                    method.asteriskToken,
+                                    /*name*/ undefined,
+                                    /*typeParameters*/ undefined,
+                                    method.parameters,
+                                    /*type*/ undefined,
+                                    method.body
+                                ),
+                                /*location*/ method
+                            ),
+                            /*original*/ method
+                        )
                     ),
                     /*location*/ method
                 ),
@@ -2109,7 +2443,8 @@ namespace ts {
      * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
      */
     export function getNamespaceMemberName(ns: Identifier, name: Identifier, allowComments?: boolean, allowSourceMaps?: boolean): PropertyAccessExpression {
-        const qualifiedName = createPropertyAccess(ns, nodeIsSynthesized(name) ? name : getSynthesizedClone(name), /*location*/ name);
+        const qualifiedName = createPropertyAccess(ns, nodeIsSynthesized(name) ? name : getSynthesizedClone(name));
+        setTextRange(qualifiedName, name);
         let emitFlags: EmitFlags;
         if (!allowSourceMaps) emitFlags |= EmitFlags.NoSourceMap;
         if (!allowComments) emitFlags |= EmitFlags.NoComments;
@@ -2118,7 +2453,7 @@ namespace ts {
     }
 
     export function convertToFunctionBody(node: ConciseBody, multiLine?: boolean) {
-        return isBlock(node) ? node : createBlock([createReturn(node, /*location*/ node)], /*location*/ node, multiLine);
+        return isBlock(node) ? node : setTextRange(createBlock([setTextRange(createReturn(node), node)], multiLine), node);
     }
 
     function isUseStrictPrologue(node: ExpressionStatement): boolean {
@@ -2197,10 +2532,13 @@ namespace ts {
         }
 
         if (!foundUseStrict) {
-            return createNodeArray<Statement>([
-                startOnNewLine(createStatement(createLiteral("use strict"))),
-                ...statements
-            ], statements);
+            return setTextRange(
+                createNodeArray<Statement>([
+                    startOnNewLine(createStatement(createLiteral("use strict"))),
+                    ...statements
+                ]),
+                statements
+            );
         }
 
         return statements;
@@ -2393,7 +2731,7 @@ namespace ts {
         return condition;
     }
 
-    function parenthesizeSubexpressionOfConditionalExpression(e: Expression): Expression {
+    export function parenthesizeSubexpressionOfConditionalExpression(e: Expression): Expression {
         // per ES grammar both 'whenTrue' and 'whenFalse' parts of conditional expression are assignment expressions
         // so in case when comma expression is introduced as a part of previous transformations
         // if should be wrapped in parens since comma operator has the lowest precedence
@@ -2445,22 +2783,22 @@ namespace ts {
             return <LeftHandSideExpression>expression;
         }
 
-        return createParen(expression, /*location*/ expression);
+        return setTextRange(createParen(expression), expression);
     }
 
     export function parenthesizePostfixOperand(operand: Expression) {
         return isLeftHandSideExpression(operand)
             ? <LeftHandSideExpression>operand
-            : createParen(operand, /*location*/ operand);
+            : setTextRange(createParen(operand), operand);
     }
 
     export function parenthesizePrefixOperand(operand: Expression) {
         return isUnaryExpression(operand)
             ? <UnaryExpression>operand
-            : createParen(operand, /*location*/ operand);
+            : setTextRange(createParen(operand), operand);
     }
 
-    function parenthesizeListElements(elements: NodeArray<Expression>) {
+    export function parenthesizeListElements(elements: NodeArray<Expression>) {
         let result: Expression[];
         for (let i = 0; i < elements.length; i++) {
             const element = parenthesizeExpressionForList(elements[i]);
@@ -2474,7 +2812,7 @@ namespace ts {
         }
 
         if (result !== undefined) {
-            return createNodeArray(result, elements, elements.hasTrailingComma);
+            return setTextRange(createNodeArray(result, elements.hasTrailingComma), elements);
         }
 
         return elements;
@@ -2486,7 +2824,7 @@ namespace ts {
         const commaPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, SyntaxKind.CommaToken);
         return expressionPrecedence > commaPrecedence
             ? expression
-            : createParen(expression, /*location*/ expression);
+            : setTextRange(createParen(expression), expression);
     }
 
     export function parenthesizeExpressionForExpressionStatement(expression: Expression) {
@@ -2496,14 +2834,14 @@ namespace ts {
             const kind = skipPartiallyEmittedExpressions(callee).kind;
             if (kind === SyntaxKind.FunctionExpression || kind === SyntaxKind.ArrowFunction) {
                 const mutableCall = getMutableClone(emittedExpression);
-                mutableCall.expression = createParen(callee, /*location*/ callee);
+                mutableCall.expression = setTextRange(createParen(callee), callee);
                 return recreatePartiallyEmittedExpressions(expression, mutableCall);
             }
         }
         else {
             const leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
             if (leftmostExpressionKind === SyntaxKind.ObjectLiteralExpression || leftmostExpressionKind === SyntaxKind.FunctionExpression) {
-                return createParen(expression, /*location*/ expression);
+                return setTextRange(createParen(expression), expression);
             }
         }
 
@@ -2559,7 +2897,7 @@ namespace ts {
     export function parenthesizeConciseBody(body: ConciseBody): ConciseBody {
         const emittedBody = skipPartiallyEmittedExpressions(body);
         if (emittedBody.kind === SyntaxKind.ObjectLiteralExpression) {
-            return createParen(<Expression>body, /*location*/ body);
+            return setTextRange(createParen(<Expression>body), body);
         }
 
         return body;
@@ -2631,192 +2969,6 @@ namespace ts {
         return node;
     }
 
-    export function setOriginalNode<T extends Node>(node: T, original: Node): T {
-        node.original = original;
-        if (original) {
-            const emitNode = original.emitNode;
-            if (emitNode) node.emitNode = mergeEmitNode(emitNode, node.emitNode);
-        }
-        return node;
-    }
-
-    function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode) {
-        const {
-            flags,
-            commentRange,
-            sourceMapRange,
-            tokenSourceMapRanges,
-            constantValue,
-            helpers
-        } = sourceEmitNode;
-        if (!destEmitNode) destEmitNode = {};
-        if (flags) destEmitNode.flags = flags;
-        if (commentRange) destEmitNode.commentRange = commentRange;
-        if (sourceMapRange) destEmitNode.sourceMapRange = sourceMapRange;
-        if (tokenSourceMapRanges) destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges);
-        if (constantValue !== undefined) destEmitNode.constantValue = constantValue;
-        if (helpers) destEmitNode.helpers = addRange(destEmitNode.helpers, helpers);
-        return destEmitNode;
-    }
-
-    function mergeTokenSourceMapRanges(sourceRanges: TextRange[], destRanges: TextRange[]) {
-        if (!destRanges) destRanges = [];
-        for (const key in sourceRanges) {
-            destRanges[key] = sourceRanges[key];
-        }
-        return destRanges;
-    }
-
-    /**
-     * Clears any EmitNode entries from parse-tree nodes.
-     * @param sourceFile A source file.
-     */
-    export function disposeEmitNodes(sourceFile: SourceFile) {
-        // During transformation we may need to annotate a parse tree node with transient
-        // transformation properties. As parse tree nodes live longer than transformation
-        // nodes, we need to make sure we reclaim any memory allocated for custom ranges
-        // from these nodes to ensure we do not hold onto entire subtrees just for position
-        // information. We also need to reset these nodes to a pre-transformation state
-        // for incremental parsing scenarios so that we do not impact later emit.
-        sourceFile = getSourceFileOfNode(getParseTreeNode(sourceFile));
-        const emitNode = sourceFile && sourceFile.emitNode;
-        const annotatedNodes = emitNode && emitNode.annotatedNodes;
-        if (annotatedNodes) {
-            for (const node of annotatedNodes) {
-                node.emitNode = undefined;
-            }
-        }
-    }
-
-    /**
-     * Associates a node with the current transformation, initializing
-     * various transient transformation properties.
-     *
-     * @param node The node.
-     */
-    export function getOrCreateEmitNode(node: Node) {
-        if (!node.emitNode) {
-            if (isParseTreeNode(node)) {
-                // To avoid holding onto transformation artifacts, we keep track of any
-                // parse tree node we are annotating. This allows us to clean them up after
-                // all transformations have completed.
-                if (node.kind === SyntaxKind.SourceFile) {
-                    return node.emitNode = { annotatedNodes: [node] };
-                }
-
-                const sourceFile = getSourceFileOfNode(node);
-                getOrCreateEmitNode(sourceFile).annotatedNodes.push(node);
-            }
-
-            node.emitNode = {};
-        }
-
-        return node.emitNode;
-    }
-
-    /**
-     * Gets flags that control emit behavior of a node.
-     *
-     * @param node The node.
-     */
-    export function getEmitFlags(node: Node) {
-        const emitNode = node.emitNode;
-        return emitNode && emitNode.flags;
-    }
-
-    /**
-     * Sets flags that control emit behavior of a node.
-     *
-     * @param node The node.
-     * @param emitFlags The NodeEmitFlags for the node.
-     */
-    export function setEmitFlags<T extends Node>(node: T, emitFlags: EmitFlags) {
-        getOrCreateEmitNode(node).flags = emitFlags;
-        return node;
-    }
-
-    /**
-     * Gets a custom text range to use when emitting source maps.
-     *
-     * @param node The node.
-     */
-    export function getSourceMapRange(node: Node) {
-        const emitNode = node.emitNode;
-        return (emitNode && emitNode.sourceMapRange) || node;
-    }
-
-    /**
-     * Sets a custom text range to use when emitting source maps.
-     *
-     * @param node The node.
-     * @param range The text range.
-     */
-    export function setSourceMapRange<T extends Node>(node: T, range: TextRange) {
-        getOrCreateEmitNode(node).sourceMapRange = range;
-        return node;
-    }
-
-    /**
-     * Gets the TextRange to use for source maps for a token of a node.
-     *
-     * @param node The node.
-     * @param token The token.
-     */
-    export function getTokenSourceMapRange(node: Node, token: SyntaxKind) {
-        const emitNode = node.emitNode;
-        const tokenSourceMapRanges = emitNode && emitNode.tokenSourceMapRanges;
-        return tokenSourceMapRanges && tokenSourceMapRanges[token];
-    }
-
-    /**
-     * Sets the TextRange to use for source maps for a token of a node.
-     *
-     * @param node The node.
-     * @param token The token.
-     * @param range The text range.
-     */
-    export function setTokenSourceMapRange<T extends Node>(node: T, token: SyntaxKind, range: TextRange) {
-        const emitNode = getOrCreateEmitNode(node);
-        const tokenSourceMapRanges = emitNode.tokenSourceMapRanges || (emitNode.tokenSourceMapRanges = []);
-        tokenSourceMapRanges[token] = range;
-        return node;
-    }
-
-    /**
-     * Gets a custom text range to use when emitting comments.
-     *
-     * @param node The node.
-     */
-    export function getCommentRange(node: Node) {
-        const emitNode = node.emitNode;
-        return (emitNode && emitNode.commentRange) || node;
-    }
-
-    /**
-     * Sets a custom text range to use when emitting comments.
-     */
-    export function setCommentRange<T extends Node>(node: T, range: TextRange) {
-        getOrCreateEmitNode(node).commentRange = range;
-        return node;
-    }
-
-    /**
-     * Gets the constant value to emit for an expression.
-     */
-    export function getConstantValue(node: PropertyAccessExpression | ElementAccessExpression) {
-        const emitNode = node.emitNode;
-        return emitNode && emitNode.constantValue;
-    }
-
-    /**
-     * Sets the constant value to emit for an expression.
-     */
-    export function setConstantValue(node: PropertyAccessExpression | ElementAccessExpression, value: number) {
-        const emitNode = getOrCreateEmitNode(node);
-        emitNode.constantValue = value;
-        return node;
-    }
-
     export function getExternalHelpersModuleName(node: SourceFile) {
         const parseNode = getOriginalNode(node, isSourceFile);
         const emitNode = parseNode && parseNode.emitNode;
@@ -2842,110 +2994,6 @@ namespace ts {
             }
         }
     }
-    /**
-     * Adds an EmitHelper to a node.
-     */
-    export function addEmitHelper<T extends Node>(node: T, helper: EmitHelper): T {
-        const emitNode = getOrCreateEmitNode(node);
-        emitNode.helpers = append(emitNode.helpers, helper);
-        return node;
-    }
-
-    /**
-     * Adds an EmitHelper to a node.
-     */
-    export function addEmitHelpers<T extends Node>(node: T, helpers: EmitHelper[] | undefined): T {
-        if (some(helpers)) {
-            const emitNode = getOrCreateEmitNode(node);
-            for (const helper of helpers) {
-                if (!contains(emitNode.helpers, helper)) {
-                    emitNode.helpers = append(emitNode.helpers, helper);
-                }
-            }
-        }
-        return node;
-    }
-
-    /**
-     * Removes an EmitHelper from a node.
-     */
-    export function removeEmitHelper(node: Node, helper: EmitHelper): boolean {
-        const emitNode = node.emitNode;
-        if (emitNode) {
-            const helpers = emitNode.helpers;
-            if (helpers) {
-                return orderedRemoveItem(helpers, helper);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Gets the EmitHelpers of a node.
-     */
-    export function getEmitHelpers(node: Node): EmitHelper[] | undefined {
-        const emitNode = node.emitNode;
-        return emitNode && emitNode.helpers;
-    }
-
-    /**
-     * Moves matching emit helpers from a source node to a target node.
-     */
-    export function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean) {
-        const sourceEmitNode = source.emitNode;
-        const sourceEmitHelpers = sourceEmitNode && sourceEmitNode.helpers;
-        if (!some(sourceEmitHelpers)) return;
-
-        const targetEmitNode = getOrCreateEmitNode(target);
-        let helpersRemoved = 0;
-        for (let i = 0; i < sourceEmitHelpers.length; i++) {
-            const helper = sourceEmitHelpers[i];
-            if (predicate(helper)) {
-                helpersRemoved++;
-                if (!contains(targetEmitNode.helpers, helper)) {
-                    targetEmitNode.helpers = append(targetEmitNode.helpers, helper);
-                }
-            }
-            else if (helpersRemoved > 0) {
-                sourceEmitHelpers[i - helpersRemoved] = helper;
-            }
-        }
-
-        if (helpersRemoved > 0) {
-            sourceEmitHelpers.length -= helpersRemoved;
-        }
-    }
-
-    export function compareEmitHelpers(x: EmitHelper, y: EmitHelper) {
-        if (x === y) return Comparison.EqualTo;
-        if (x.priority === y.priority) return Comparison.EqualTo;
-        if (x.priority === undefined) return Comparison.GreaterThan;
-        if (y.priority === undefined) return Comparison.LessThan;
-        return compareValues(x.priority, y.priority);
-    }
-
-    export function setTextRange<T extends TextRange>(node: T, location: TextRange): T {
-        if (location) {
-            node.pos = location.pos;
-            node.end = location.end;
-        }
-        return node;
-    }
-
-    export function setNodeFlags<T extends Node>(node: T, flags: NodeFlags): T {
-        node.flags = flags;
-        return node;
-    }
-
-    export function setMultiLine<T extends ObjectLiteralExpression | ArrayLiteralExpression | Block>(node: T, multiLine: boolean): T {
-        node.multiLine = multiLine;
-        return node;
-    }
-
-    export function setHasTrailingComma<T extends Node>(nodes: NodeArray<T>, hasTrailingComma: boolean): NodeArray<T> {
-        nodes.hasTrailingComma = hasTrailingComma;
-        return nodes;
-    }
 
     /**
      * Get the name of that target module from an import or export declaration
@@ -3223,10 +3271,18 @@ namespace ts {
         if (isBindingElement(element)) {
             if (element.dotDotDotToken) {
                 Debug.assertNode(element.name, isIdentifier);
-                return setOriginalNode(createSpread(<Identifier>element.name, element), element);
+                return setOriginalNode(setTextRange(createSpread(<Identifier>element.name), element), element);
             }
             const expression = convertToAssignmentElementTarget(<ObjectBindingPattern | ArrayBindingPattern | Identifier>element.name);
-            return element.initializer ? setOriginalNode(createAssignment(expression, element.initializer, element), element) : expression;
+            return element.initializer
+                ? setOriginalNode(
+                    setTextRange(
+                        createAssignment(expression, element.initializer),
+                        element
+                    ),
+                    element
+                )
+                : expression;
         }
         Debug.assertNode(element, isExpression);
         return <Expression>element;
@@ -3236,14 +3292,14 @@ namespace ts {
         if (isBindingElement(element)) {
             if (element.dotDotDotToken) {
                 Debug.assertNode(element.name, isIdentifier);
-                return setOriginalNode(createSpreadAssignment(<Identifier>element.name, element), element);
+                return setOriginalNode(setTextRange(createSpreadAssignment(<Identifier>element.name), element), element);
             }
             if (element.propertyName) {
                 const expression = convertToAssignmentElementTarget(<ObjectBindingPattern | ArrayBindingPattern | Identifier>element.name);
-                return setOriginalNode(createPropertyAssignment(element.propertyName, element.initializer ? createAssignment(expression, element.initializer) : expression, element), element);
+                return setOriginalNode(setTextRange(createPropertyAssignment(element.propertyName, element.initializer ? createAssignment(expression, element.initializer) : expression), element), element);
             }
             Debug.assertNode(element.name, isIdentifier);
-            return setOriginalNode(createShorthandPropertyAssignment(<Identifier>element.name, element.initializer, element), element);
+            return setOriginalNode(setTextRange(createShorthandPropertyAssignment(<Identifier>element.name, element.initializer), element), element);
         }
         Debug.assertNode(element, isObjectLiteralElementLike);
         return <ObjectLiteralElementLike>element;
@@ -3263,7 +3319,13 @@ namespace ts {
 
     export function convertToObjectAssignmentPattern(node: ObjectBindingOrAssignmentPattern) {
         if (isObjectBindingPattern(node)) {
-            return setOriginalNode(createObjectLiteral(map(node.elements, convertToObjectAssignmentElement), node), node);
+            return setOriginalNode(
+                setTextRange(
+                    createObjectLiteral(map(node.elements, convertToObjectAssignmentElement)),
+                    node
+                ),
+                node
+            );
         }
         Debug.assertNode(node, isObjectLiteralExpression);
         return <ObjectLiteralExpression>node;
@@ -3271,7 +3333,13 @@ namespace ts {
 
     export function convertToArrayAssignmentPattern(node: ArrayBindingOrAssignmentPattern) {
         if (isArrayBindingPattern(node)) {
-            return setOriginalNode(createArrayLiteral(map(node.elements, convertToArrayAssignmentElement), node), node);
+            return setOriginalNode(
+                setTextRange(
+                    createArrayLiteral(map(node.elements, convertToArrayAssignmentElement)),
+                    node
+                ),
+                node
+            );
         }
         Debug.assertNode(node, isArrayLiteralExpression);
         return <ArrayLiteralExpression>node;
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 650711afc79..62f3c066442 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1152,13 +1152,10 @@ namespace ts {
                 && (options.isolatedModules || isExternalModuleFile)
                 && !file.isDeclarationFile) {
                 // synthesize 'import "tslib"' declaration
-                const externalHelpersModuleReference = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
-                externalHelpersModuleReference.text = externalHelpersModuleNameText;
-                const importDecl = createSynthesizedNode(SyntaxKind.ImportDeclaration);
-
-                importDecl.parent = file;
+                const externalHelpersModuleReference = createLiteral(externalHelpersModuleNameText);
+                const importDecl = createImportDeclaration(undefined, undefined, undefined);
                 externalHelpersModuleReference.parent = importDecl;
-
+                importDecl.parent = file;
                 imports = [externalHelpersModuleReference];
             }
 
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 8e32259ff0f..b4473e6a261 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -112,7 +112,10 @@ namespace ts {
             Debug.assertNode(target, createAssignmentCallback ? isIdentifier : isExpression);
             const expression = createAssignmentCallback
                 ? createAssignmentCallback(<Identifier>target, value, location)
-                : createAssignment(visitNode(<Expression>target, visitor, isExpression), value, location);
+                : setTextRange(
+                    createAssignment(visitNode(<Expression>target, visitor, isExpression), value),
+                    location
+                );
             expression.original = original;
             emitExpression(expression);
         }
@@ -174,9 +177,10 @@ namespace ts {
             const variable = createVariableDeclaration(
                 name,
                 /*type*/ undefined,
-                pendingExpressions ? inlineExpressions(append(pendingExpressions, value)) : value,
-                location);
+                pendingExpressions ? inlineExpressions(append(pendingExpressions, value)) : value
+            );
             variable.original = original;
+            setTextRange(variable, location);
             if (isIdentifier(name)) {
                 setEmitFlags(variable, EmitFlags.NoNestedSourceMaps);
             }
@@ -416,7 +420,7 @@ namespace ts {
             const temp = createTempVariable(/*recordTempVariable*/ undefined);
             if (flattenContext.hoistTempVariables) {
                 flattenContext.context.hoistVariableDeclaration(temp);
-                flattenContext.emitExpression(createAssignment(temp, value, location));
+                flattenContext.emitExpression(setTextRange(createAssignment(temp, value), location));
             }
             else {
                 flattenContext.emitBindingOrAssignment(temp, value, location, /*original*/ undefined);
@@ -492,6 +496,15 @@ namespace ts {
                 }
             }
         }
-        return createCall(getHelperName("__rest"), undefined, [value, createArrayLiteral(propertyNames, location)]);
+        return createCall(
+            getHelperName("__rest"),
+            undefined,
+            [
+                value,
+                setTextRange(
+                    createArrayLiteral(propertyNames),
+                    location
+                )
+            ]);
     }
 }
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 10ebe648fe2..6d0c9b3c5fa 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -514,7 +514,7 @@ namespace ts {
             exitSubtree(ancestorFacts, HierarchyFacts.None, HierarchyFacts.None);
             return updateSourceFileNode(
                 node,
-                createNodeArray(statements, node.statements)
+                setTextRange(createNodeArray(statements), node.statements)
             );
         }
 
@@ -671,9 +671,10 @@ namespace ts {
             setOriginalNode(variable, node);
 
             const statements: Statement[] = [];
-            const statement = createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([variable]), /*location*/ node);
+            const statement = createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([variable]));
 
             setOriginalNode(statement, node);
+            setTextRange(statement, node);
             startOnNewLine(statement);
             statements.push(statement);
 
@@ -818,7 +819,7 @@ namespace ts {
 
             addRange(statements, endLexicalEnvironment());
 
-            const block = createBlock(createNodeArray(statements, /*location*/ node.members), /*location*/ undefined, /*multiLine*/ true);
+            const block = createBlock(setTextRange(createNodeArray(statements), /*location*/ node.members), /*multiLine*/ true);
             setEmitFlags(block, EmitFlags.NoComments);
             return block;
         }
@@ -833,8 +834,10 @@ namespace ts {
         function addExtendsHelperIfNeeded(statements: Statement[], node: ClassExpression | ClassDeclaration, extendsClauseElement: ExpressionWithTypeArguments): void {
             if (extendsClauseElement) {
                 statements.push(
-                    createStatement(
-                        createExtendsHelper(context, getLocalName(node)),
+                    setTextRange(
+                        createStatement(
+                            createExtendsHelper(context, getLocalName(node))
+                        ),
                         /*location*/ extendsClauseElement
                     )
                 );
@@ -854,19 +857,18 @@ namespace ts {
             const ancestorFacts = enterSubtree(HierarchyFacts.ConstructorExcludes, HierarchyFacts.ConstructorIncludes);
             const constructor = getFirstConstructorWithBody(node);
             const hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
-            const constructorFunction =
-                createFunctionDeclaration(
-                    /*decorators*/ undefined,
-                    /*modifiers*/ undefined,
-                    /*asteriskToken*/ undefined,
-                    getDeclarationName(node),
-                    /*typeParameters*/ undefined,
-                    transformConstructorParameters(constructor, hasSynthesizedSuper),
-                    /*type*/ undefined,
-                    transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper),
-                    /*location*/ constructor || node
-                );
+            const constructorFunction = createFunctionDeclaration(
+                /*decorators*/ undefined,
+                /*modifiers*/ undefined,
+                /*asteriskToken*/ undefined,
+                getDeclarationName(node),
+                /*typeParameters*/ undefined,
+                transformConstructorParameters(constructor, hasSynthesizedSuper),
+                /*type*/ undefined,
+                transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper)
+            );
 
+            setTextRange(constructorFunction, constructor || node);
             if (extendsClauseElement) {
                 setEmitFlags(constructorFunction, EmitFlags.CapturesThis);
             }
@@ -962,14 +964,16 @@ namespace ts {
             }
 
             const block = createBlock(
-                createNodeArray(
-                    statements,
+                setTextRange(
+                    createNodeArray(
+                        statements
+                    ),
                     /*location*/ constructor ? constructor.body.statements : node.members
                 ),
-                /*location*/ constructor ? constructor.body : node,
                 /*multiLine*/ true
             );
 
+            setTextRange(block, constructor ? constructor.body : node);
             if (!constructor) {
                 setEmitFlags(block, EmitFlags.NoComments);
             }
@@ -1139,14 +1143,16 @@ namespace ts {
                 // Binding patterns are converted into a generated name and are
                 // evaluated inside the function body.
                 return setOriginalNode(
-                    createParameter(
-                        /*decorators*/ undefined,
-                        /*modifiers*/ undefined,
-                        /*dotDotDotToken*/ undefined,
-                        getGeneratedNameForNode(node),
-                        /*questionToken*/ undefined,
-                        /*type*/ undefined,
-                        /*initializer*/ undefined,
+                    setTextRange(
+                        createParameter(
+                            /*decorators*/ undefined,
+                            /*modifiers*/ undefined,
+                            /*dotDotDotToken*/ undefined,
+                            getGeneratedNameForNode(node),
+                            /*questionToken*/ undefined,
+                            /*type*/ undefined,
+                            /*initializer*/ undefined
+                        ),
                         /*location*/ node
                     ),
                     /*original*/ node
@@ -1155,14 +1161,16 @@ namespace ts {
             else if (node.initializer) {
                 // Initializers are elided
                 return setOriginalNode(
-                    createParameter(
-                        /*decorators*/ undefined,
-                        /*modifiers*/ undefined,
-                        /*dotDotDotToken*/ undefined,
-                        node.name,
-                        /*questionToken*/ undefined,
-                        /*type*/ undefined,
-                        /*initializer*/ undefined,
+                    setTextRange(
+                        createParameter(
+                            /*decorators*/ undefined,
+                            /*modifiers*/ undefined,
+                            /*dotDotDotToken*/ undefined,
+                            node.name,
+                            /*questionToken*/ undefined,
+                            /*type*/ undefined,
+                            /*initializer*/ undefined
+                        ),
                         /*location*/ node
                     ),
                     /*original*/ node
@@ -1274,21 +1282,25 @@ namespace ts {
             const statement = createIf(
                 createTypeCheck(getSynthesizedClone(name), "undefined"),
                 setEmitFlags(
-                    createBlock([
-                        createStatement(
-                            createAssignment(
-                                setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap),
-                                setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer)),
-                                /*location*/ parameter
+                    setTextRange(
+                        createBlock([
+                            createStatement(
+                                setTextRange(
+                                    createAssignment(
+                                        setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap),
+                                        setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer))
+                                    ),
+                                    parameter
+                                )
                             )
-                        )
-                    ], /*location*/ parameter),
+                        ]),
+                        parameter
+                    ),
                     EmitFlags.SingleLine | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTokenSourceMaps
-                ),
-                /*elseStatement*/ undefined,
-                /*location*/ parameter
+                )
             );
             statement.startsOnNewLine = true;
+            setTextRange(statement, parameter);
             setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.CustomPrologue);
             statements.push(statement);
         }
@@ -1332,15 +1344,17 @@ namespace ts {
             // var param = [];
             statements.push(
                 setEmitFlags(
-                    createVariableStatement(
-                        /*modifiers*/ undefined,
-                        createVariableDeclarationList([
-                            createVariableDeclaration(
-                                declarationName,
-                                /*type*/ undefined,
-                                createArrayLiteral([])
-                            )
-                        ]),
+                    setTextRange(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList([
+                                createVariableDeclaration(
+                                    declarationName,
+                                    /*type*/ undefined,
+                                    createArrayLiteral([])
+                                )
+                            ])
+                        ),
                         /*location*/ parameter
                     ),
                     EmitFlags.CustomPrologue
@@ -1351,26 +1365,33 @@ namespace ts {
             //   param[_i - restIndex] = arguments[_i];
             // }
             const forStatement = createFor(
-                createVariableDeclarationList([
-                    createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex))
-                ], /*location*/ parameter),
-                createLessThan(
-                    temp,
-                    createPropertyAccess(createIdentifier("arguments"), "length"),
-                    /*location*/ parameter
+                setTextRange(
+                    createVariableDeclarationList([
+                        createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex))
+                    ]),
+                    parameter
                 ),
-                createPostfixIncrement(temp, /*location*/ parameter),
+                setTextRange(
+                    createLessThan(
+                        temp,
+                        createPropertyAccess(createIdentifier("arguments"), "length")
+                    ),
+                    parameter
+                ),
+                setTextRange(createPostfixIncrement(temp), parameter),
                 createBlock([
                     startOnNewLine(
-                        createStatement(
-                            createAssignment(
-                                createElementAccess(
-                                    expressionName,
-                                    restIndex === 0
-                                        ? temp
-                                        : createSubtract(temp, createLiteral(restIndex))
-                                ),
-                                createElementAccess(createIdentifier("arguments"), temp)
+                        setTextRange(
+                            createStatement(
+                                createAssignment(
+                                    createElementAccess(
+                                        expressionName,
+                                        restIndex === 0
+                                            ? temp
+                                            : createSubtract(temp, createLiteral(restIndex))
+                                    ),
+                                    createElementAccess(createIdentifier("arguments"), temp)
+                                )
                             ),
                             /*location*/ parameter
                         )
@@ -1405,11 +1426,10 @@ namespace ts {
                         /*type*/ undefined,
                         initializer
                     )
-                ]),
-                originalStatement
+                ])
             );
-
             setEmitFlags(captureThisStatement, EmitFlags.NoComments | EmitFlags.CustomPrologue);
+            setTextRange(captureThisStatement, originalStatement);
             setSourceMapRange(captureThisStatement, node);
             statements.push(captureThisStatement);
         }
@@ -1529,7 +1549,7 @@ namespace ts {
          * @param member The SemicolonClassElement node.
          */
         function transformSemicolonClassElementToStatement(member: SemicolonClassElement) {
-            return createEmptyStatement(/*location*/ member);
+            return setTextRange(createEmptyStatement(), member);
         }
 
         /**
@@ -1547,8 +1567,10 @@ namespace ts {
             setEmitFlags(memberFunction, EmitFlags.NoComments);
             setSourceMapRange(memberFunction, sourceMapRange);
 
-            const statement = createStatement(
-                createAssignment(memberName, memberFunction),
+            const statement = setTextRange(
+                createStatement(
+                    createAssignment(memberName, memberFunction)
+                ),
                 /*location*/ member
             );
 
@@ -1571,15 +1593,12 @@ namespace ts {
          * @param accessors The set of related get/set accessors.
          */
         function transformAccessorsToStatement(receiver: LeftHandSideExpression, accessors: AllAccessorDeclarations, container: Node): Statement {
-            const statement = createStatement(
-                transformAccessorsToExpression(receiver, accessors, container, /*startsOnNewLine*/ false),
-                /*location*/ getSourceMapRange(accessors.firstAccessor)
-            );
-
+            const statement = createStatement(transformAccessorsToExpression(receiver, accessors, container, /*startsOnNewLine*/ false));
             // The location for the statement is used to emit source maps only.
             // No comments should be emitted for this statement to align with the
             // old emitter.
             setEmitFlags(statement, EmitFlags.NoComments);
+            setSourceMapRange(statement, getSourceMapRange(accessors.firstAccessor));
             return statement;
         }
 
@@ -1622,8 +1641,8 @@ namespace ts {
             }
 
             properties.push(
-                createPropertyAssignment("enumerable", createLiteral(true)),
-                createPropertyAssignment("configurable", createLiteral(true))
+                createPropertyAssignment("enumerable", createTrue()),
+                createPropertyAssignment("configurable", createTrue())
             );
 
             const call = createCall(
@@ -1632,7 +1651,7 @@ namespace ts {
                 [
                     target,
                     propertyName,
-                    createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)
+                    createObjectLiteral(properties, /*multiLine*/ true)
                 ]
             );
             if (startsOnNewLine) {
@@ -1662,9 +1681,9 @@ namespace ts {
                 /*typeParameters*/ undefined,
                 visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                node
+                transformFunctionBody(node)
             );
+            setTextRange(func, node);
             setOriginalNode(func, node);
             setEmitFlags(func, EmitFlags.CapturesThis);
             exitSubtree(ancestorFacts, HierarchyFacts.None, HierarchyFacts.None);
@@ -1758,14 +1777,16 @@ namespace ts {
             exitSubtree(ancestorFacts, HierarchyFacts.PropagateNewTargetMask, HierarchyFacts.None);
             convertedLoopState = savedConvertedLoopState;
             return setOriginalNode(
-                createFunctionExpression(
-                    /*modifiers*/ undefined,
-                    node.asteriskToken,
-                    name,
-                    /*typeParameters*/ undefined,
-                    parameters,
-                    /*type*/ undefined,
-                    body,
+                setTextRange(
+                    createFunctionExpression(
+                        /*modifiers*/ undefined,
+                        node.asteriskToken,
+                        name,
+                        /*typeParameters*/ undefined,
+                        parameters,
+                        /*type*/ undefined,
+                        body
+                    ),
                     location
                 ),
                 /*original*/ node
@@ -1832,7 +1853,8 @@ namespace ts {
                 }
 
                 const expression = visitNode(body, visitor, isExpression);
-                const returnStatement = createReturn(expression, /*location*/ body);
+                const returnStatement = createReturn(expression);
+                setTextRange(returnStatement, body);
                 setEmitFlags(returnStatement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTrailingComments);
                 statements.push(returnStatement);
 
@@ -1851,7 +1873,8 @@ namespace ts {
                 multiLine = true;
             }
 
-            const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+            const block = createBlock(setTextRange(createNodeArray(statements), statementsLocation), multiLine);
+            setTextRange(block, node.body);
             if (!multiLine && singleLine) {
                 setEmitFlags(block, EmitFlags.SingleLine);
             }
@@ -1868,8 +1891,10 @@ namespace ts {
             const updated = visitFunctionBody(node.body, functionBodyVisitor, context);
             return updateBlock(
                 updated,
-                createNodeArray(
-                    prependCaptureNewTargetIfNeeded(updated.statements, node, /*copyOnWrite*/ true),
+                setTextRange(
+                    createNodeArray(
+                        prependCaptureNewTargetIfNeeded(updated.statements, node, /*copyOnWrite*/ true)
+                    ),
                     /*location*/ updated.statements
                 )
             );
@@ -1969,7 +1994,7 @@ namespace ts {
                     }
                 }
                 if (assignments) {
-                    updated = createStatement(reduceLeft(assignments, (acc, v) => createBinary(v, SyntaxKind.CommaToken, acc)), node);
+                    updated = setTextRange(createStatement(reduceLeft(assignments, (acc, v) => createBinary(v, SyntaxKind.CommaToken, acc))), node);
                 }
                 else {
                     // none of declarations has initializer - the entire variable statement can be deleted
@@ -1999,8 +2024,9 @@ namespace ts {
                     ? visitVariableDeclarationInLetDeclarationList
                     : visitVariableDeclaration));
 
-                const declarationList = createVariableDeclarationList(declarations, /*location*/ node);
+                const declarationList = createVariableDeclarationList(declarations);
                 setOriginalNode(declarationList, node);
+                setTextRange(declarationList, node);
                 setCommentRange(declarationList, node);
 
                 if (node.transformFlags & TransformFlags.ContainsBindingPattern
@@ -2248,8 +2274,9 @@ namespace ts {
                         elementAccess
                     );
 
-                    const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
+                    const declarationList = createVariableDeclarationList(declarations);
                     setOriginalNode(declarationList, initializer);
+                    setTextRange(declarationList, initializer);
 
                     // Adjust the source map range for the first declaration to align with the old
                     // emitter.
@@ -2268,19 +2295,24 @@ namespace ts {
                     // The following call does not include the initializer, so we have
                     // to emit it separately.
                     statements.push(
-                        createVariableStatement(
-                            /*modifiers*/ undefined,
-                            setOriginalNode(
-                                createVariableDeclarationList([
-                                    createVariableDeclaration(
-                                        firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined),
-                                        /*type*/ undefined,
-                                        createElementAccess(rhsReference, counter)
-                                    )
-                                ], /*location*/ moveRangePos(initializer, -1)),
-                                initializer
+                        setTextRange(
+                            createVariableStatement(
+                                /*modifiers*/ undefined,
+                                setOriginalNode(
+                                    setTextRange(
+                                        createVariableDeclarationList([
+                                            createVariableDeclaration(
+                                                firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined),
+                                                /*type*/ undefined,
+                                                createElementAccess(rhsReference, counter)
+                                            )
+                                        ]),
+                                        moveRangePos(initializer, -1)
+                                    ),
+                                    initializer
+                                )
                             ),
-                            /*location*/ moveRangeEnd(initializer, -1)
+                            moveRangeEnd(initializer, -1)
                         )
                     );
                 }
@@ -2306,7 +2338,7 @@ namespace ts {
                     // Currently there is not way to check that assignment is binary expression of destructing assignment
                     // so we have to cast never type to binaryExpression
                     (<BinaryExpression>assignment).end = initializer.end;
-                    statements.push(createStatement(assignment, /*location*/ moveRangeEnd(initializer, -1)));
+                    statements.push(setTextRange(createStatement(assignment), moveRangeEnd(initializer, -1)));
                 }
             }
 
@@ -2332,33 +2364,38 @@ namespace ts {
 
             // The old emitter does not emit source maps for the block.
             // We add the location to preserve comments.
-            const body = createBlock(
-                createNodeArray(statements, /*location*/ statementsLocation),
-                /*location*/ bodyLocation
-            );
-
+            const body = createBlock(setTextRange(createNodeArray(statements), /*location*/ statementsLocation));
+            setTextRange(body, bodyLocation);
             setEmitFlags(body, EmitFlags.NoSourceMap | EmitFlags.NoTokenSourceMaps);
 
             const forStatement = createFor(
                 setEmitFlags(
-                    createVariableDeclarationList([
-                        createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0), /*location*/ moveRangePos(node.expression, -1)),
-                        createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
-                    ], /*location*/ node.expression),
+                    setTextRange(
+                        createVariableDeclarationList([
+                            setTextRange(createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0)), moveRangePos(node.expression, -1)),
+                            setTextRange(createVariableDeclaration(rhsReference, /*type*/ undefined, expression), node.expression)
+                        ]),
+                        node.expression
+                    ),
                     EmitFlags.NoHoisting
                 ),
-                createLessThan(
-                    counter,
-                    createPropertyAccess(rhsReference, "length"),
-                    /*location*/ node.expression
+                setTextRange(
+                    createLessThan(
+                        counter,
+                        createPropertyAccess(rhsReference, "length")
+                    ),
+                    node.expression
                 ),
-                createPostfixIncrement(counter, /*location*/ node.expression),
-                body,
-                /*location*/ node
+                setTextRange(
+                    createPostfixIncrement(counter),
+                    node.expression
+                ),
+                body
             );
 
             // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
             setEmitFlags(forStatement, EmitFlags.NoTokenTrailingSourceMaps);
+            setTextRange(forStatement, node);
             return restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel);
         }
 
@@ -2418,7 +2455,6 @@ namespace ts {
                     setEmitFlags(
                         createObjectLiteral(
                             visitNodes(properties, visitor, isObjectLiteralElementLike, 0, numInitialProperties),
-                            /*location*/ undefined,
                             node.multiLine
                         ),
                         EmitFlags.Indented
@@ -2546,14 +2582,14 @@ namespace ts {
                     copyOutParameters(loopOutParameters, CopyDirection.ToOutParameter, statements);
                 }
                 addRange(statements, lexicalEnvironment)
-                loopBody = createBlock(statements, /*location*/ undefined, /*multiline*/ true);
+                loopBody = createBlock(statements, /*multiline*/ true);
             }
 
             if (isBlock(loopBody)) {
                 loopBody.multiLine = true;
             }
             else {
-                loopBody = createBlock([loopBody], /*location*/ undefined, /*multiline*/ true);
+                loopBody = createBlock([loopBody], /*multiline*/ true);
             }
 
             const isAsyncBlockContainingAwait =
@@ -2687,12 +2723,7 @@ namespace ts {
                 // visit childnodes to transform initializer/condition/incrementor parts
                 clone = visitEachChild(clone, visitor, context);
                 // set loop statement
-                clone.statement = createBlock(
-                    convertedLoopBodyStatements,
-                    /*location*/ undefined,
-                    /*multiline*/ true
-                );
-
+                clone.statement = createBlock(convertedLoopBodyStatements, /*multiline*/ true);
                 // reset and re-aggregate the transform flags
                 clone.transformFlags = 0;
                 aggregateTransformFlags(clone);
@@ -2903,9 +2934,9 @@ namespace ts {
                     receiver,
                     visitNode(property.name, visitor, isPropertyName)
                 ),
-                visitNode(property.initializer, visitor, isExpression),
-                /*location*/ property
+                visitNode(property.initializer, visitor, isExpression)
             );
+            setTextRange(expression, property);
             if (startsOnNewLine) {
                 expression.startsOnNewLine = true;
             }
@@ -2925,9 +2956,9 @@ namespace ts {
                     receiver,
                     visitNode(property.name, visitor, isPropertyName)
                 ),
-                getSynthesizedClone(property.name),
-                /*location*/ property
+                getSynthesizedClone(property.name)
             );
+            setTextRange(expression, property);
             if (startsOnNewLine) {
                 expression.startsOnNewLine = true;
             }
@@ -2948,9 +2979,9 @@ namespace ts {
                     receiver,
                     visitNode(method.name, visitor, isPropertyName)
                 ),
-                transformFunctionLikeToExpression(method, /*location*/ method, /*name*/ undefined, container),
-                /*location*/ method
+                transformFunctionLikeToExpression(method, /*location*/ method, /*name*/ undefined, container)
             );
+            setTextRange(expression, method);
             if (startsOnNewLine) {
                 expression.startsOnNewLine = true;
             }
@@ -2963,7 +2994,8 @@ namespace ts {
             let updated: CatchClause;
             if (isBindingPattern(node.variableDeclaration.name)) {
                 const temp = createTempVariable(undefined);
-                const newVariableDeclaration = createVariableDeclaration(temp, undefined, undefined, node.variableDeclaration);
+                const newVariableDeclaration = createVariableDeclaration(temp);
+                setTextRange(newVariableDeclaration, node.variableDeclaration);
                 const vars = flattenDestructuringBinding(
                     node.variableDeclaration,
                     visitor,
@@ -2971,8 +3003,9 @@ namespace ts {
                     FlattenLevel.All,
                     temp
                 );
-                const list = createVariableDeclarationList(vars, /*location*/node.variableDeclaration, /*flags*/node.variableDeclaration.flags);
-                const destructure = createVariableStatement(undefined, list);
+                const list = createVariableDeclarationList(vars);
+                setTextRange(list, node.variableDeclaration);
+                const destructure = createVariableStatement(/*modifiers*/ undefined, list);
                 updated = updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure));
             }
             else {
@@ -3001,9 +3034,11 @@ namespace ts {
             Debug.assert(!isComputedPropertyName(node.name));
             const functionExpression = transformFunctionLikeToExpression(node, /*location*/ moveRangePos(node, -1), /*name*/ undefined, /*container*/ undefined);
             setEmitFlags(functionExpression, EmitFlags.NoLeadingComments | getEmitFlags(functionExpression));
-            return createPropertyAssignment(
-                node.name,
-                functionExpression,
+            return setTextRange(
+                createPropertyAssignment(
+                    node.name,
+                    functionExpression
+                ),
                 /*location*/ node
             );
         }
@@ -3030,9 +3065,11 @@ namespace ts {
          * @param node A ShorthandPropertyAssignment node.
          */
         function visitShorthandPropertyAssignment(node: ShorthandPropertyAssignment): ObjectLiteralElementLike {
-            return createPropertyAssignment(
-                node.name,
-                getSynthesizedClone(node.name),
+            return setTextRange(
+                createPropertyAssignment(
+                    node.name,
+                    getSynthesizedClone(node.name)
+                ),
                 /*location*/ node
             );
         }
@@ -3225,8 +3262,7 @@ namespace ts {
 
         function visitSpanOfNonSpreads(chunk: Expression[], multiLine: boolean, hasTrailingComma: boolean): VisitResult<Expression> {
             return createArrayLiteral(
-                visitNodes(createNodeArray(chunk, /*location*/ undefined, hasTrailingComma), visitor, isExpression),
-                /*location*/ undefined,
+                visitNodes(createNodeArray(chunk, hasTrailingComma), visitor, isExpression),
                 multiLine
             );
         }
@@ -3250,7 +3286,7 @@ namespace ts {
          * @param node A template literal.
          */
         function visitTemplateLiteral(node: LiteralExpression): LeftHandSideExpression {
-            return createLiteral(node.text, /*location*/ node);
+            return setTextRange(createLiteral(node.text), node);
         }
 
         /**
@@ -3318,7 +3354,7 @@ namespace ts {
             // ES6 Spec 11.8.6.1 - Static Semantics of TV's and TRV's
             // <CR><LF> and <CR> LineTerminatorSequences are normalized to <LF> for both TV and TRV.
             text = text.replace(/\r\n?/g, "\n");
-            return createLiteral(text, /*location*/ node);
+            return setTextRange(createLiteral(text), node);
         }
 
         /**
@@ -3342,7 +3378,8 @@ namespace ts {
             //    "abc" + (1 << 2) + ""
             const expression = reduceLeft(expressions, createAdd);
             if (nodeIsSynthesized(expression)) {
-                setTextRange(expression, node);
+                expression.pos = node.pos;
+                expression.end = node.end;
             }
 
             return expression;
@@ -3580,7 +3617,7 @@ namespace ts {
         function substituteThisKeyword(node: PrimaryExpression): PrimaryExpression {
             if (enabledSubstitutions & ES2015SubstitutionFlags.CapturedThis
                 && hierarchyFacts & HierarchyFacts.CapturesThis) {
-                return createIdentifier("_this", /*location*/ node);
+                return setTextRange(createIdentifier("_this"), node);
             }
             return node;
         }
diff --git a/src/compiler/transformers/es2016.ts b/src/compiler/transformers/es2016.ts
index 5959753fcef..1118e6ad9b6 100644
--- a/src/compiler/transformers/es2016.ts
+++ b/src/compiler/transformers/es2016.ts
@@ -48,29 +48,37 @@ namespace ts {
                 // Transforms `a[x] **= b` into `(_a = a)[_x = x] = Math.pow(_a[_x], b)`
                 const expressionTemp = createTempVariable(hoistVariableDeclaration);
                 const argumentExpressionTemp = createTempVariable(hoistVariableDeclaration);
-                target = createElementAccess(
-                    createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
-                    createAssignment(argumentExpressionTemp, left.argumentExpression, /*location*/ left.argumentExpression),
-                    /*location*/ left
+                target = setTextRange(
+                    createElementAccess(
+                        setTextRange(createAssignment(expressionTemp, left.expression), left.expression),
+                        setTextRange(createAssignment(argumentExpressionTemp, left.argumentExpression), left.argumentExpression)
+                    ),
+                    left
                 );
-                value = createElementAccess(
-                    expressionTemp,
-                    argumentExpressionTemp,
-                    /*location*/ left
+                value = setTextRange(
+                    createElementAccess(
+                        expressionTemp,
+                        argumentExpressionTemp
+                    ),
+                    left
                 );
             }
             else if (isPropertyAccessExpression(left)) {
                 // Transforms `a.x **= b` into `(_a = a).x = Math.pow(_a.x, b)`
                 const expressionTemp = createTempVariable(hoistVariableDeclaration);
-                target = createPropertyAccess(
-                    createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
-                    left.name,
-                    /*location*/ left
+                target = setTextRange(
+                    createPropertyAccess(
+                        setTextRange(createAssignment(expressionTemp, left.expression), left.expression),
+                        left.name
+                    ),
+                    left
                 );
-                value = createPropertyAccess(
-                    expressionTemp,
-                    left.name,
-                    /*location*/ left
+                value = setTextRange(
+                    createPropertyAccess(
+                        expressionTemp,
+                        left.name
+                    ),
+                    left
                 );
             }
             else {
@@ -78,7 +86,13 @@ namespace ts {
                 target = left;
                 value = left;
             }
-            return createAssignment(target, createMathPow(value, right, /*location*/ node), /*location*/ node);
+            return setTextRange(
+                createAssignment(
+                    target,
+                    createMathPow(value, right, /*location*/ node)
+                ),
+                node
+            );
         }
 
         function visitExponentiationExpression(node: BinaryExpression) {
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index a7f7b0da0ea..b437298656c 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -104,10 +104,12 @@ namespace ts {
          */
         function visitAwaitExpression(node: AwaitExpression): Expression {
             return setOriginalNode(
-                createYield(
-                    /*asteriskToken*/ undefined,
-                    visitNode(node.expression, visitor, isExpression),
-                    /*location*/ node
+                setTextRange(
+                    createYield(
+                        /*asteriskToken*/ undefined,
+                        visitNode(node.expression, visitor, isExpression)
+                    ),
+                    node
                 ),
                 node
             );
@@ -238,7 +240,8 @@ namespace ts {
 
                 addRange(statements, endLexicalEnvironment());
 
-                const block = createBlock(statements, /*location*/ node.body, /*multiLine*/ true);
+                const block = createBlock(statements, /*multiLine*/ true);
+                setTextRange(block, node.body);
 
                 // Minor optimization, emit `_super` helper to capture `super` access in an arrow.
                 // This step isn't needed if we eventually transform this to ES5.
@@ -266,7 +269,7 @@ namespace ts {
                 const declarations = endLexicalEnvironment();
                 if (some(declarations)) {
                     const block = convertToFunctionBody(expression);
-                    return updateBlock(block, createNodeArray(concatenate(block.statements, declarations), block.statements));
+                    return updateBlock(block, setTextRange(createNodeArray(concatenate(block.statements, declarations)), block.statements));
                 }
 
                 return expression;
@@ -281,7 +284,7 @@ namespace ts {
                 startLexicalEnvironment();
                 const visited = convertToFunctionBody(visitNode(body, visitor, isConciseBody));
                 const declarations = endLexicalEnvironment();
-                return updateBlock(visited, createNodeArray(concatenate(visited.statements, declarations), visited.statements));
+                return updateBlock(visited, setTextRange(createNodeArray(concatenate(visited.statements, declarations)), visited.statements));
             }
         }
 
@@ -431,21 +434,25 @@ namespace ts {
 
         function createSuperAccessInAsyncMethod(argumentExpression: Expression, flags: NodeCheckFlags, location: TextRange): LeftHandSideExpression {
             if (flags & NodeCheckFlags.AsyncMethodWithSuperBinding) {
-                return createPropertyAccess(
+                return setTextRange(
+                    createPropertyAccess(
+                        createCall(
+                            createIdentifier("_super"),
+                            /*typeArguments*/ undefined,
+                            [argumentExpression]
+                        ),
+                        "value"
+                    ),
+                    location
+                );
+            }
+            else {
+                return setTextRange(
                     createCall(
                         createIdentifier("_super"),
                         /*typeArguments*/ undefined,
                         [argumentExpression]
                     ),
-                    "value",
-                    location
-                );
-            }
-            else {
-                return createCall(
-                    createIdentifier("_super"),
-                    /*typeArguments*/ undefined,
-                    [argumentExpression],
                     location
                 );
             }
diff --git a/src/compiler/transformers/es5.ts b/src/compiler/transformers/es5.ts
index 8b030642a89..bcecb86e75d 100644
--- a/src/compiler/transformers/es5.ts
+++ b/src/compiler/transformers/es5.ts
@@ -87,7 +87,7 @@ namespace ts {
         function substitutePropertyAccessExpression(node: PropertyAccessExpression): Expression {
             const literalName = trySubstituteReservedName(node.name);
             if (literalName) {
-                return createElementAccess(node.expression, literalName, /*location*/ node);
+                return setTextRange(createElementAccess(node.expression, literalName), node);
             }
             return node;
         }
@@ -113,7 +113,7 @@ namespace ts {
         function trySubstituteReservedName(name: Identifier) {
             const token = name.originalKeywordKind || (nodeIsSynthesized(name) ? stringToToken(name.text) : undefined);
             if (token >= SyntaxKind.FirstReservedWord && token <= SyntaxKind.LastReservedWord) {
-                return createLiteral(name, /*location*/ name);
+                return setTextRange(createLiteral(name), name);
             }
             return undefined;
         }
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 8b5a095a17e..f058e627df7 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -210,36 +210,40 @@ namespace ts {
                         const statement = createVariableStatement(
                             /*modifiers*/ undefined,
                             updateVariableDeclarationList(initializer, declarations),
-                            /*location*/ initializer
                         );
+                        setTextRange(statement, initializer);
                         leadingStatements = append(leadingStatements, statement);
                     }
                 }
                 else if (isAssignmentPattern(initializer)) {
                     temp = createTempVariable(/*recordTempVariable*/ undefined);
                     const expression = flattenDestructuringAssignment(
-                        aggregateTransformFlags(createAssignment(initializer, temp, /*location*/ node.initializer)),
+                        aggregateTransformFlags(
+                            setTextRange(
+                                createAssignment(initializer, temp),
+                                node.initializer
+                            )
+                        ),
                         visitor,
                         context,
                         FlattenLevel.ObjectRest
                     );
-                    leadingStatements = append(leadingStatements, createStatement(expression, /*location*/ node.initializer));
+                    leadingStatements = append(leadingStatements, setTextRange(createStatement(expression), node.initializer));
                 }
             }
             if (temp) {
                 const expression = visitNode(node.expression, visitor, isExpression);
                 const statement = visitNode(node.statement, visitor, isStatement);
                 const block = isBlock(statement)
-                    ? updateBlock(statement, createNodeArray(concatenate(leadingStatements, statement.statements), statement.statements))
-                    : createBlock(append(leadingStatements, statement), statement, /*multiLine*/ true);
+                    ? updateBlock(statement, setTextRange(createNodeArray(concatenate(leadingStatements, statement.statements)), statement.statements))
+                    : setTextRange(createBlock(append(leadingStatements, statement), /*multiLine*/ true), statement);
                 return updateForOf(
                     node,
-                    createVariableDeclarationList(
-                        [
-                            createVariableDeclaration(temp, /*type*/ undefined, /*initializer*/ undefined, node.initializer)
-                        ],
-                        node.initializer,
-                        NodeFlags.Let
+                    setTextRange(
+                        createVariableDeclarationList([
+                            setTextRange(createVariableDeclaration(temp), node.initializer)
+                        ], NodeFlags.Let),
+                        node.initializer
                     ),
                     expression,
                     block
@@ -380,7 +384,7 @@ namespace ts {
             const trailingStatements = endLexicalEnvironment();
             if (some(leadingStatements) || some(trailingStatements)) {
                 const block = convertToFunctionBody(body, /*multiLine*/ true);
-                return updateBlock(block, createNodeArray(concatenate(concatenate(leadingStatements, block.statements), trailingStatements), block.statements));
+                return updateBlock(block, setTextRange(createNodeArray(concatenate(concatenate(leadingStatements, block.statements), trailingStatements)), block.statements));
             }
             return body;
         }
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
index ee17bdacbaf..cabd5d2a96d 100644
--- a/src/compiler/transformers/generators.ts
+++ b/src/compiler/transformers/generators.ts
@@ -450,15 +450,17 @@ namespace ts {
             // Currently, we only support generators that were originally async functions.
             if (node.asteriskToken && getEmitFlags(node) & EmitFlags.AsyncFunctionBody) {
                 node = setOriginalNode(
-                    createFunctionDeclaration(
-                        /*decorators*/ undefined,
-                        node.modifiers,
-                        /*asteriskToken*/ undefined,
-                        node.name,
-                        /*typeParameters*/ undefined,
-                        visitParameterList(node.parameters, visitor, context),
-                        /*type*/ undefined,
-                        transformGeneratorFunctionBody(node.body),
+                    setTextRange(
+                        createFunctionDeclaration(
+                            /*decorators*/ undefined,
+                            node.modifiers,
+                            /*asteriskToken*/ undefined,
+                            node.name,
+                            /*typeParameters*/ undefined,
+                            visitParameterList(node.parameters, visitor, context),
+                            /*type*/ undefined,
+                            transformGeneratorFunctionBody(node.body)
+                        ),
                         /*location*/ node
                     ),
                     node
@@ -498,14 +500,16 @@ namespace ts {
             // Currently, we only support generators that were originally async functions.
             if (node.asteriskToken && getEmitFlags(node) & EmitFlags.AsyncFunctionBody) {
                 node = setOriginalNode(
-                    createFunctionExpression(
-                        /*modifiers*/ undefined,
-                        /*asteriskToken*/ undefined,
-                        node.name,
-                        /*typeParameters*/ undefined,
-                        visitParameterList(node.parameters, visitor, context),
-                        /*type*/ undefined,
-                        transformGeneratorFunctionBody(node.body),
+                    setTextRange(
+                        createFunctionExpression(
+                            /*modifiers*/ undefined,
+                            /*asteriskToken*/ undefined,
+                            node.name,
+                            /*typeParameters*/ undefined,
+                            visitParameterList(node.parameters, visitor, context),
+                            /*type*/ undefined,
+                            transformGeneratorFunctionBody(node.body)
+                        ),
                         /*location*/ node
                     ),
                     node
@@ -606,7 +610,7 @@ namespace ts {
             operationLocations = savedOperationLocations;
             state = savedState;
 
-            return createBlock(statements, /*location*/ body, body.multiLine);
+            return setTextRange(createBlock(statements, body.multiLine), body);
         }
 
         /**
@@ -739,14 +743,17 @@ namespace ts {
 
                 const operator = node.operatorToken.kind;
                 if (isCompoundAssignment(operator)) {
-                    return createBinary(
-                        target,
-                        SyntaxKind.EqualsToken,
-                        createBinary(
-                            cacheExpression(target),
-                            getOperatorForCompoundAssignment(operator),
-                            visitNode(right, visitor, isExpression),
-                            node
+                    return setTextRange(
+                        createAssignment(
+                            target,
+                            setTextRange(
+                                createBinary(
+                                    cacheExpression(target),
+                                    getOperatorForCompoundAssignment(operator),
+                                    visitNode(right, visitor, isExpression)
+                                ),
+                                node
+                            )
                         ),
                         node
                     );
@@ -988,8 +995,11 @@ namespace ts {
 
             const expressions = reduceLeft(elements, reduceElement, <Expression[]>[], numInitialElements);
             return hasAssignedTemp
-                ? createArrayConcat(temp, [createArrayLiteral(expressions, /*location*/ undefined, multiLine)])
-                : createArrayLiteral(leadingElement ? [leadingElement, ...expressions] : expressions, location, multiLine);
+                ? createArrayConcat(temp, [createArrayLiteral(expressions, multiLine)])
+                : setTextRange(
+                    createArrayLiteral(leadingElement ? [leadingElement, ...expressions] : expressions, multiLine),
+                    location
+                );
 
             function reduceElement(expressions: Expression[], element: Expression) {
                 if (containsYield(element) && expressions.length > 0) {
@@ -998,11 +1008,10 @@ namespace ts {
                         hasAssignedTemp
                             ? createArrayConcat(
                                 temp,
-                                [createArrayLiteral(expressions, /*location*/ undefined, multiLine)]
+                                [createArrayLiteral(expressions, multiLine)]
                             )
                             : createArrayLiteral(
                                 leadingElement ? [leadingElement, ...expressions] : expressions,
-                                /*location*/ undefined,
                                 multiLine
                             )
                     );
@@ -1043,7 +1052,6 @@ namespace ts {
             emitAssignment(temp,
                 createObjectLiteral(
                     visitNodes(properties, visitor, isObjectLiteralElementLike, 0, numInitialProperties),
-                    /*location*/ undefined,
                     multiLine
                 )
             );
@@ -1139,18 +1147,20 @@ namespace ts {
 
                 const { target, thisArg } = createCallBinding(createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration);
                 return setOriginalNode(
-                    createNew(
-                        createFunctionApply(
-                            cacheExpression(visitNode(target, visitor, isExpression)),
-                            thisArg,
-                            visitElements(
-                                node.arguments,
-                                /*leadingElement*/ createVoidZero()
-                            )
+                    setTextRange(
+                        createNew(
+                            createFunctionApply(
+                                cacheExpression(visitNode(target, visitor, isExpression)),
+                                thisArg,
+                                visitElements(
+                                    node.arguments,
+                                    /*leadingElement*/ createVoidZero()
+                                )
+                            ),
+                            /*typeArguments*/ undefined,
+                            []
                         ),
-                        /*typeArguments*/ undefined,
-                        [],
-                        /*location*/ node
+                        node
                     ),
                     node
                 );
@@ -1423,9 +1433,11 @@ namespace ts {
                     }
                     else {
                         emitStatement(
-                            createStatement(
-                                visitNode(initializer, visitor, isExpression),
-                                /*location*/ initializer
+                            setTextRange(
+                                createStatement(
+                                    visitNode(initializer, visitor, isExpression)
+                                ),
+                                initializer
                             )
                         );
                     }
@@ -1441,9 +1453,11 @@ namespace ts {
                 markLabel(incrementLabel);
                 if (node.incrementor) {
                     emitStatement(
-                        createStatement(
-                            visitNode(node.incrementor, visitor, isExpression),
-                            /*location*/ node.incrementor
+                        setTextRange(
+                            createStatement(
+                                visitNode(node.incrementor, visitor, isExpression)
+                            ),
+                            node.incrementor
                         )
                     );
                 }
@@ -2417,11 +2431,13 @@ namespace ts {
          */
         function createInlineBreak(label: Label, location?: TextRange): ReturnStatement {
             Debug.assert(label > 0, `Invalid label: ${label}`);
-            return createReturn(
-                createArrayLiteral([
-                    createInstruction(Instruction.Break),
-                    createLabel(label)
-                ]),
+            return setTextRange(
+                createReturn(
+                    createArrayLiteral([
+                        createInstruction(Instruction.Break),
+                        createLabel(label)
+                    ])
+                ),
                 location
             );
         }
@@ -2433,10 +2449,12 @@ namespace ts {
          * @param location An optional source map location for the statement.
          */
         function createInlineReturn(expression?: Expression, location?: TextRange): ReturnStatement {
-            return createReturn(
-                createArrayLiteral(expression
-                    ? [createInstruction(Instruction.Return), expression]
-                    : [createInstruction(Instruction.Return)]
+            return setTextRange(
+                createReturn(
+                    createArrayLiteral(expression
+                        ? [createInstruction(Instruction.Return), expression]
+                        : [createInstruction(Instruction.Return)]
+                    )
                 ),
                 location
             );
@@ -2446,7 +2464,14 @@ namespace ts {
          * Creates an expression that can be used to resume from a Yield operation.
          */
         function createGeneratorResume(location?: TextRange): LeftHandSideExpression {
-            return createCall(createPropertyAccess(state, "sent"), /*typeArguments*/ undefined, [], location);
+            return setTextRange(
+                createCall(
+                    createPropertyAccess(state, "sent"),
+                    /*typeArguments*/ undefined,
+                    []
+                ),
+                location
+            );
         }
 
         /**
@@ -2614,7 +2639,6 @@ namespace ts {
                         /*type*/ undefined,
                         createBlock(
                             buildResult,
-                            /*location*/ undefined,
                             /*multiLine*/ buildResult.length > 0
                         )
                     ),
@@ -2944,7 +2968,7 @@ namespace ts {
          * @param operationLocation The source map location for the operation.
          */
         function writeAssign(left: Expression, right: Expression, operationLocation: TextRange): void {
-            writeStatement(createStatement(createAssignment(left, right), operationLocation));
+            writeStatement(setTextRange(createStatement(createAssignment(left, right)), operationLocation));
         }
 
         /**
@@ -2956,7 +2980,7 @@ namespace ts {
         function writeThrow(expression: Expression, operationLocation: TextRange): void {
             lastOperationWasAbrupt = true;
             lastOperationWasCompletion = true;
-            writeStatement(createThrow(expression, operationLocation));
+            writeStatement(setTextRange(createThrow(expression), operationLocation));
         }
 
         /**
@@ -2970,10 +2994,12 @@ namespace ts {
             lastOperationWasCompletion = true;
             writeStatement(
                 setEmitFlags(
-                    createReturn(
-                        createArrayLiteral(expression
-                            ? [createInstruction(Instruction.Return), expression]
-                            : [createInstruction(Instruction.Return)]
+                    setTextRange(
+                        createReturn(
+                            createArrayLiteral(expression
+                                ? [createInstruction(Instruction.Return), expression]
+                                : [createInstruction(Instruction.Return)]
+                            )
                         ),
                         operationLocation
                     ),
@@ -2992,11 +3018,13 @@ namespace ts {
             lastOperationWasAbrupt = true;
             writeStatement(
                 setEmitFlags(
-                    createReturn(
-                        createArrayLiteral([
-                            createInstruction(Instruction.Break),
-                            createLabel(label)
-                        ]),
+                    setTextRange(
+                        createReturn(
+                            createArrayLiteral([
+                                createInstruction(Instruction.Break),
+                                createLabel(label)
+                            ])
+                        ),
                         operationLocation
                     ),
                     EmitFlags.NoTokenSourceMaps
@@ -3017,11 +3045,13 @@ namespace ts {
                     createIf(
                         condition,
                         setEmitFlags(
-                            createReturn(
-                                createArrayLiteral([
-                                    createInstruction(Instruction.Break),
-                                    createLabel(label)
-                                ]),
+                            setTextRange(
+                                createReturn(
+                                    createArrayLiteral([
+                                        createInstruction(Instruction.Break),
+                                        createLabel(label)
+                                    ])
+                                ),
                                 operationLocation
                             ),
                             EmitFlags.NoTokenSourceMaps
@@ -3045,11 +3075,13 @@ namespace ts {
                     createIf(
                         createLogicalNot(condition),
                         setEmitFlags(
-                            createReturn(
-                                createArrayLiteral([
-                                    createInstruction(Instruction.Break),
-                                    createLabel(label)
-                                ]),
+                            setTextRange(
+                                createReturn(
+                                    createArrayLiteral([
+                                        createInstruction(Instruction.Break),
+                                        createLabel(label)
+                                    ])
+                                ),
                                 operationLocation
                             ),
                             EmitFlags.NoTokenSourceMaps
@@ -3070,11 +3102,13 @@ namespace ts {
             lastOperationWasAbrupt = true;
             writeStatement(
                 setEmitFlags(
-                    createReturn(
-                        createArrayLiteral(
-                            expression
-                                ? [createInstruction(Instruction.Yield), expression]
-                                : [createInstruction(Instruction.Yield)]
+                    setTextRange(
+                        createReturn(
+                            createArrayLiteral(
+                                expression
+                                    ? [createInstruction(Instruction.Yield), expression]
+                                    : [createInstruction(Instruction.Yield)]
+                            )
                         ),
                         operationLocation
                     ),
@@ -3093,11 +3127,13 @@ namespace ts {
             lastOperationWasAbrupt = true;
             writeStatement(
                 setEmitFlags(
-                    createReturn(
-                        createArrayLiteral([
-                            createInstruction(Instruction.YieldStar),
-                            expression
-                        ]),
+                    setTextRange(
+                        createReturn(
+                            createArrayLiteral([
+                                createInstruction(Instruction.YieldStar),
+                                expression
+                            ])
+                        ),
                         operationLocation
                     ),
                     EmitFlags.NoTokenSourceMaps
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
index 1307a7f8551..60053d98e57 100644
--- a/src/compiler/transformers/jsx.ts
+++ b/src/compiler/transformers/jsx.ts
@@ -143,15 +143,15 @@ namespace ts {
 
         function transformJsxAttributeInitializer(node: StringLiteral | JsxExpression) {
             if (node === undefined) {
-                return createLiteral(true);
+                return createTrue();
             }
             else if (node.kind === SyntaxKind.StringLiteral) {
                 const decoded = tryDecodeEntities((<StringLiteral>node).text);
-                return decoded ? createLiteral(decoded, /*location*/ node) : node;
+                return decoded ? setTextRange(createLiteral(decoded), node) : node;
             }
             else if (node.kind === SyntaxKind.JsxExpression) {
                 if (node.expression === undefined) {
-                    return createLiteral(true);
+                    return createTrue();
                 }
                 return visitJsxExpression(<JsxExpression>node);
             }
diff --git a/src/compiler/transformers/module/es2015.ts b/src/compiler/transformers/module/es2015.ts
index 86fa1295f7b..cc197073c32 100644
--- a/src/compiler/transformers/module/es2015.ts
+++ b/src/compiler/transformers/module/es2015.ts
@@ -37,7 +37,7 @@ namespace ts {
                     addRange(statements, visitNodes(node.statements, visitor, isStatement, statementOffset));
                     return updateSourceFileNode(
                         node,
-                        createNodeArray(statements, node.statements));
+                        setTextRange(createNodeArray(statements), node.statements));
                 }
                 else {
                     return visitEachChild(node, visitor, context);
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index e072429292a..f6e51fa9fdd 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -88,7 +88,7 @@ namespace ts {
             addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
 
-            const updated = updateSourceFileNode(node, createNodeArray(statements, node.statements));
+            const updated = updateSourceFileNode(node, setTextRange(createNodeArray(statements), node.statements));
             if (currentModuleInfo.hasExportStarsToExportValues) {
                 addEmitHelper(updated, exportStarHelper);
             }
@@ -131,47 +131,49 @@ namespace ts {
             // Create an updated SourceFile:
             //
             //     define(moduleName?, ["module1", "module2"], function ...
-            return updateSourceFileNode(node, createNodeArray(
-                [
-                    createStatement(
-                        createCall(
-                            define,
-                            /*typeArguments*/ undefined,
-                            [
-                                // Add the module name (if provided).
-                                ...(moduleName ? [moduleName] : []),
+            return updateSourceFileNode(node,
+                setTextRange(
+                    createNodeArray([
+                        createStatement(
+                            createCall(
+                                define,
+                                /*typeArguments*/ undefined,
+                                [
+                                    // Add the module name (if provided).
+                                    ...(moduleName ? [moduleName] : []),
 
-                                // Add the dependency array argument:
-                                //
-                                //     ["require", "exports", module1", "module2", ...]
-                                createArrayLiteral([
-                                    createLiteral("require"),
-                                    createLiteral("exports"),
-                                    ...aliasedModuleNames,
-                                    ...unaliasedModuleNames
-                                ]),
+                                    // Add the dependency array argument:
+                                    //
+                                    //     ["require", "exports", module1", "module2", ...]
+                                    createArrayLiteral([
+                                        createLiteral("require"),
+                                        createLiteral("exports"),
+                                        ...aliasedModuleNames,
+                                        ...unaliasedModuleNames
+                                    ]),
 
-                                // Add the module body function argument:
-                                //
-                                //     function (require, exports, module1, module2) ...
-                                createFunctionExpression(
-                                    /*modifiers*/ undefined,
-                                    /*asteriskToken*/ undefined,
-                                    /*name*/ undefined,
-                                    /*typeParameters*/ undefined,
-                                    [
-                                        createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"),
-                                        createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports"),
-                                        ...importAliasNames
-                                    ],
-                                    /*type*/ undefined,
-                                    transformAsynchronousModuleBody(node)
-                                )
-                            ]
+                                    // Add the module body function argument:
+                                    //
+                                    //     function (require, exports, module1, module2) ...
+                                    createFunctionExpression(
+                                        /*modifiers*/ undefined,
+                                        /*asteriskToken*/ undefined,
+                                        /*name*/ undefined,
+                                        /*typeParameters*/ undefined,
+                                        [
+                                            createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"),
+                                            createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports"),
+                                            ...importAliasNames
+                                        ],
+                                        /*type*/ undefined,
+                                        transformAsynchronousModuleBody(node)
+                                    )
+                                ]
+                            )
                         )
-                    )
-                ],
-                /*location*/ node.statements)
+                    ]),
+                    /*location*/ node.statements
+                )
             );
         }
 
@@ -189,74 +191,76 @@ namespace ts {
                 /*typeParameters*/ undefined,
                 [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "factory")],
                 /*type*/ undefined,
-                createBlock(
-                    [
-                        createIf(
-                            createLogicalAnd(
-                                createTypeCheck(createIdentifier("module"), "object"),
-                                createTypeCheck(createPropertyAccess(createIdentifier("module"), "exports"), "object")
-                            ),
-                            createBlock([
-                                createVariableStatement(
-                                    /*modifiers*/ undefined,
-                                    [
-                                        createVariableDeclaration(
-                                            "v",
-                                            /*type*/ undefined,
+                setTextRange(
+                    createBlock(
+                        [
+                            createIf(
+                                createLogicalAnd(
+                                    createTypeCheck(createIdentifier("module"), "object"),
+                                    createTypeCheck(createPropertyAccess(createIdentifier("module"), "exports"), "object")
+                                ),
+                                createBlock([
+                                    createVariableStatement(
+                                        /*modifiers*/ undefined,
+                                        [
+                                            createVariableDeclaration(
+                                                "v",
+                                                /*type*/ undefined,
+                                                createCall(
+                                                    createIdentifier("factory"),
+                                                    /*typeArguments*/ undefined,
+                                                    [
+                                                        createIdentifier("require"),
+                                                        createIdentifier("exports")
+                                                    ]
+                                                )
+                                            )
+                                        ]
+                                    ),
+                                    setEmitFlags(
+                                        createIf(
+                                            createStrictInequality(
+                                                createIdentifier("v"),
+                                                createIdentifier("undefined")
+                                            ),
+                                            createStatement(
+                                                createAssignment(
+                                                    createPropertyAccess(createIdentifier("module"), "exports"),
+                                                    createIdentifier("v")
+                                                )
+                                            )
+                                        ),
+                                        EmitFlags.SingleLine
+                                    )
+                                ]),
+                                createIf(
+                                    createLogicalAnd(
+                                        createTypeCheck(createIdentifier("define"), "function"),
+                                        createPropertyAccess(createIdentifier("define"), "amd")
+                                    ),
+                                    createBlock([
+                                        createStatement(
                                             createCall(
-                                                createIdentifier("factory"),
+                                                createIdentifier("define"),
                                                 /*typeArguments*/ undefined,
                                                 [
-                                                    createIdentifier("require"),
-                                                    createIdentifier("exports")
+                                                    createArrayLiteral([
+                                                        createLiteral("require"),
+                                                        createLiteral("exports"),
+                                                        ...aliasedModuleNames,
+                                                        ...unaliasedModuleNames
+                                                    ]),
+                                                    createIdentifier("factory")
                                                 ]
                                             )
                                         )
-                                    ]
-                                ),
-                                setEmitFlags(
-                                    createIf(
-                                        createStrictInequality(
-                                            createIdentifier("v"),
-                                            createIdentifier("undefined")
-                                        ),
-                                        createStatement(
-                                            createAssignment(
-                                                createPropertyAccess(createIdentifier("module"), "exports"),
-                                                createIdentifier("v")
-                                            )
-                                        )
-                                    ),
-                                    EmitFlags.SingleLine
+                                    ])
                                 )
-                            ]),
-                            createIf(
-                                createLogicalAnd(
-                                    createTypeCheck(createIdentifier("define"), "function"),
-                                    createPropertyAccess(createIdentifier("define"), "amd")
-                                ),
-                                createBlock([
-                                    createStatement(
-                                        createCall(
-                                            createIdentifier("define"),
-                                            /*typeArguments*/ undefined,
-                                            [
-                                                createArrayLiteral([
-                                                    createLiteral("require"),
-                                                    createLiteral("exports"),
-                                                    ...aliasedModuleNames,
-                                                    ...unaliasedModuleNames
-                                                ]),
-                                                createIdentifier("factory")
-                                            ]
-                                        )
-                                    )
-                                ])
                             )
-                        )
-                    ],
-                    /*location*/ undefined,
-                    /*multiLine*/ true
+                        ],
+                        /*multiLine*/ true
+                    ),
+                    /*location*/ undefined
                 )
             );
 
@@ -274,8 +278,8 @@ namespace ts {
 
             return updateSourceFileNode(
                 node,
-                createNodeArray(
-                    [
+                setTextRange(
+                    createNodeArray([
                         createStatement(
                             createCall(
                                 umdHeader,
@@ -300,7 +304,7 @@ namespace ts {
                                 ]
                             )
                         )
-                    ],
+                    ]),
                     /*location*/ node.statements
                 )
             );
@@ -378,7 +382,7 @@ namespace ts {
             // Append the 'export =' statement if provided.
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
 
-            const body = createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
+            const body = createBlock(statements, /*multiLine*/ true);
             if (currentModuleInfo.hasExportStarsToExportValues) {
                 // If we have any `export * from ...` declarations
                 // we need to inform the emitter to add the __export helper.
@@ -399,11 +403,8 @@ namespace ts {
         function addExportEqualsIfNeeded(statements: Statement[], emitAsReturn: boolean) {
             if (currentModuleInfo.exportEquals) {
                 if (emitAsReturn) {
-                    const statement = createReturn(
-                        currentModuleInfo.exportEquals.expression,
-                        /*location*/ currentModuleInfo.exportEquals
-                    );
-
+                    const statement = createReturn(currentModuleInfo.exportEquals.expression);
+                    setTextRange(statement, currentModuleInfo.exportEquals);
                     setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoComments);
                     statements.push(statement);
                 }
@@ -415,10 +416,10 @@ namespace ts {
                                 "exports"
                             ),
                             currentModuleInfo.exportEquals.expression
-                        ),
-                        /*location*/ currentModuleInfo.exportEquals
+                        )
                     );
 
+                    setTextRange(statement, currentModuleInfo.exportEquals);
                     setEmitFlags(statement, EmitFlags.NoComments);
                     statements.push(statement);
                 }
@@ -481,7 +482,7 @@ namespace ts {
             if (moduleKind !== ModuleKind.AMD) {
                 if (!node.importClause) {
                     // import "mod";
-                    return createStatement(createRequireCall(node), /*location*/ node);
+                    return setTextRange(createStatement(createRequireCall(node)), node);
                 }
                 else {
                     const variables: VariableDeclaration[] = [];
@@ -520,12 +521,13 @@ namespace ts {
                     }
 
                     statements = append(statements,
-                        createVariableStatement(
-                            /*modifiers*/ undefined,
-                            createVariableDeclarationList(
-                                variables,
-                                /*location*/ undefined,
-                                languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None
+                        setTextRange(
+                            createVariableStatement(
+                                /*modifiers*/ undefined,
+                                createVariableDeclarationList(
+                                    variables,
+                                    languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None
+                                )
                             ),
                             /*location*/ node
                         )
@@ -539,14 +541,15 @@ namespace ts {
                         /*modifiers*/ undefined,
                         createVariableDeclarationList(
                             [
-                                createVariableDeclaration(
-                                    getSynthesizedClone(namespaceDeclaration.name),
-                                    /*type*/ undefined,
-                                    getGeneratedNameForNode(node),
+                                setTextRange(
+                                    createVariableDeclaration(
+                                        getSynthesizedClone(namespaceDeclaration.name),
+                                        /*type*/ undefined,
+                                        getGeneratedNameForNode(node)
+                                    ),
                                     /*location*/ node
                                 )
                             ],
-                            /*location*/ undefined,
                             languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None
                         )
                     )
@@ -592,31 +595,34 @@ namespace ts {
             if (moduleKind !== ModuleKind.AMD) {
                 if (hasModifier(node, ModifierFlags.Export)) {
                     statements = append(statements,
-                        createStatement(
-                            createExportExpression(
-                                node.name,
-                                createRequireCall(node)
+                        setTextRange(
+                            createStatement(
+                                createExportExpression(
+                                    node.name,
+                                    createRequireCall(node)
+                                )
                             ),
-                            /*location*/ node
+                            node
                         )
                     );
                 }
                 else {
                     statements = append(statements,
-                        createVariableStatement(
-                            /*modifiers*/ undefined,
-                            createVariableDeclarationList(
-                                [
-                                    createVariableDeclaration(
-                                        getSynthesizedClone(node.name),
-                                        /*type*/ undefined,
-                                        createRequireCall(node)
-                                    )
-                                ],
-                                /*location*/ undefined,
-                                /*flags*/ languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None
+                        setTextRange(
+                            createVariableStatement(
+                                /*modifiers*/ undefined,
+                                createVariableDeclarationList(
+                                    [
+                                        createVariableDeclaration(
+                                            getSynthesizedClone(node.name),
+                                            /*type*/ undefined,
+                                            createRequireCall(node)
+                                        )
+                                    ],
+                                    /*flags*/ languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None
+                                )
                             ),
-                            /*location*/ node
+                            node
                         )
                     );
                 }
@@ -624,9 +630,11 @@ namespace ts {
             else {
                 if (hasModifier(node, ModifierFlags.Export)) {
                     statements = append(statements,
-                        createStatement(
-                            createExportExpression(getExportName(node), getLocalName(node)),
-                            /*location*/ node
+                        setTextRange(
+                            createStatement(
+                                createExportExpression(getExportName(node), getLocalName(node))
+                            ),
+                            node
                         )
                     );
                 }
@@ -662,15 +670,17 @@ namespace ts {
                 // export { x, y } from "mod";
                 if (moduleKind !== ModuleKind.AMD) {
                     statements.push(
-                        createVariableStatement(
-                            /*modifiers*/ undefined,
-                            createVariableDeclarationList([
-                                createVariableDeclaration(
-                                    generatedName,
-                                    /*type*/ undefined,
-                                    createRequireCall(node)
-                                )
-                            ]),
+                        setTextRange(
+                            createVariableStatement(
+                                /*modifiers*/ undefined,
+                                createVariableDeclarationList([
+                                    createVariableDeclaration(
+                                        generatedName,
+                                        /*type*/ undefined,
+                                        createRequireCall(node)
+                                    )
+                                ])
+                            ),
                             /*location*/ node
                         )
                     );
@@ -681,9 +691,11 @@ namespace ts {
                         specifier.propertyName || specifier.name
                     );
                     statements.push(
-                        createStatement(
-                            createExportExpression(getExportName(specifier), exportedValue),
-                            /*location*/ specifier
+                        setTextRange(
+                            createStatement(
+                                createExportExpression(getExportName(specifier), exportedValue)
+                            ),
+                            specifier
                         )
                     );
                 }
@@ -692,17 +704,19 @@ namespace ts {
             }
             else {
                 // export * from "mod";
-                return createStatement(
-                    createCall(
-                        createIdentifier("__export"),
-                        /*typeArguments*/ undefined,
-                        [
-                            moduleKind !== ModuleKind.AMD
-                                ? createRequireCall(node)
-                                : generatedName
-                        ]
+                return setTextRange(
+                    createStatement(
+                        createCall(
+                            createIdentifier("__export"),
+                            /*typeArguments*/ undefined,
+                            [
+                                moduleKind !== ModuleKind.AMD
+                                    ? createRequireCall(node)
+                                    : generatedName
+                            ]
+                        )
                     ),
-                    /*location*/ node
+                    node
                 );
             }
         }
@@ -741,15 +755,17 @@ namespace ts {
             if (hasModifier(node, ModifierFlags.Export)) {
                 statements = append(statements,
                     setOriginalNode(
-                        createFunctionDeclaration(
-                            /*decorators*/ undefined,
-                            visitNodes(node.modifiers, modifierVisitor, isModifier),
-                            node.asteriskToken,
-                            getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true),
-                            /*typeParameters*/ undefined,
-                            node.parameters,
-                            /*type*/ undefined,
-                            node.body,
+                        setTextRange(
+                            createFunctionDeclaration(
+                                /*decorators*/ undefined,
+                                visitNodes(node.modifiers, modifierVisitor, isModifier),
+                                node.asteriskToken,
+                                getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true),
+                                /*typeParameters*/ undefined,
+                                node.parameters,
+                                /*type*/ undefined,
+                                node.body
+                            ),
                             /*location*/ node
                         ),
                         /*original*/ node
@@ -782,16 +798,18 @@ namespace ts {
             if (hasModifier(node, ModifierFlags.Export)) {
                 statements = append(statements,
                     setOriginalNode(
-                        createClassDeclaration(
-                            /*decorators*/ undefined,
-                            visitNodes(node.modifiers, modifierVisitor, isModifier),
-                            getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true),
-                            /*typeParameters*/ undefined,
-                            node.heritageClauses,
-                            node.members,
-                            /*location*/ node
+                        setTextRange(
+                            createClassDeclaration(
+                                /*decorators*/ undefined,
+                                visitNodes(node.modifiers, modifierVisitor, isModifier),
+                                getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true),
+                                /*typeParameters*/ undefined,
+                                node.heritageClauses,
+                                node.members
+                            ),
+                            node
                         ),
-                        /*original*/ node
+                        node
                     )
                 );
             }
@@ -843,7 +861,7 @@ namespace ts {
                 }
 
                 if (expressions) {
-                    statements = append(statements, createStatement(inlineExpressions(expressions), /*location*/ node));
+                    statements = append(statements, setTextRange(createStatement(inlineExpressions(expressions)), node));
                 }
             }
             else {
@@ -880,9 +898,11 @@ namespace ts {
             }
             else {
                 return createAssignment(
-                    createPropertyAccess(
-                        createIdentifier("exports"),
-                        node.name,
+                    setTextRange(
+                        createPropertyAccess(
+                            createIdentifier("exports"),
+                            node.name
+                        ),
                         /*location*/ node.name
                     ),
                     node.initializer
@@ -1115,7 +1135,7 @@ namespace ts {
                             createStatement(
                                 createExportExpression(
                                     createIdentifier("__esModule"),
-                                    createLiteral(true)
+                                    createTrue()
                                 )
                             )
                         );
@@ -1130,7 +1150,7 @@ namespace ts {
                                         createIdentifier("exports"),
                                         createLiteral("__esModule"),
                                         createObjectLiteral([
-                                            createPropertyAssignment("value", createLiteral(true))
+                                            createPropertyAssignment("value", createTrue())
                                         ])
                                     ]
                                 )
@@ -1153,7 +1173,7 @@ namespace ts {
          * @param allowComments An optional value indicating whether to emit comments for the statement.
          */
         function createExportStatement(name: Identifier, value: Expression, location?: TextRange, allowComments?: boolean) {
-            const statement = createStatement(createExportExpression(name, value), location);
+            const statement = setTextRange(createStatement(createExportExpression(name, value)), location);
             startOnNewLine(statement);
             if (!allowComments) {
                 setEmitFlags(statement, EmitFlags.NoComments);
@@ -1170,12 +1190,14 @@ namespace ts {
          * @param location The location to use for source maps and comments for the export.
          */
         function createExportExpression(name: Identifier, value: Expression, location?: TextRange) {
-            return createAssignment(
-                createPropertyAccess(
-                    createIdentifier("exports"),
-                    getSynthesizedClone(name)
+            return setTextRange(
+                createAssignment(
+                    createPropertyAccess(
+                        createIdentifier("exports"),
+                        getSynthesizedClone(name)
+                    ),
+                    value
                 ),
-                value,
                 location
             );
         }
@@ -1268,9 +1290,9 @@ namespace ts {
                 // destructuring assignment
                 if (node.objectAssignmentInitializer) {
                     const initializer = createAssignment(exportedOrImportedName, node.objectAssignmentInitializer);
-                    return createPropertyAssignment(name, initializer, /*location*/ node);
+                    return setTextRange(createPropertyAssignment(name, initializer), node);
                 }
-                return createPropertyAssignment(name, exportedOrImportedName, /*location*/ node);
+                return setTextRange(createPropertyAssignment(name, exportedOrImportedName), node);
             }
             return node;
         }
@@ -1312,9 +1334,11 @@ namespace ts {
             if (!isGeneratedIdentifier(node) && !isLocalName(node)) {
                 const exportContainer = resolver.getReferencedExportContainer(node, isExportName(node));
                 if (exportContainer && exportContainer.kind === SyntaxKind.SourceFile) {
-                    return createPropertyAccess(
-                        createIdentifier("exports"),
-                        getSynthesizedClone(node),
+                    return setTextRange(
+                        createPropertyAccess(
+                            createIdentifier("exports"),
+                            getSynthesizedClone(node)
+                        ),
                         /*location*/ node
                     );
                 }
@@ -1322,17 +1346,21 @@ namespace ts {
                 const importDeclaration = resolver.getReferencedImportDeclaration(node);
                 if (importDeclaration) {
                     if (isImportClause(importDeclaration)) {
-                        return createPropertyAccess(
-                            getGeneratedNameForNode(importDeclaration.parent),
-                            createIdentifier("default"),
+                        return setTextRange(
+                            createPropertyAccess(
+                                getGeneratedNameForNode(importDeclaration.parent),
+                                createIdentifier("default")
+                            ),
                             /*location*/ node
                         );
                     }
                     else if (isImportSpecifier(importDeclaration)) {
                         const name = importDeclaration.propertyName || importDeclaration.name;
-                        return createPropertyAccess(
-                            getGeneratedNameForNode(importDeclaration.parent.parent.parent),
-                            getSynthesizedClone(name),
+                        return setTextRange(
+                            createPropertyAccess(
+                                getGeneratedNameForNode(importDeclaration.parent.parent.parent),
+                                getSynthesizedClone(name)
+                            ),
                             /*location*/ node
                         );
                     }
@@ -1400,10 +1428,12 @@ namespace ts {
                 const exportedNames = getExports(node.operand);
                 if (exportedNames) {
                     let expression: Expression = node.kind === SyntaxKind.PostfixUnaryExpression
-                        ? createBinary(
-                            node.operand,
-                            createToken(node.operator === SyntaxKind.PlusPlusToken ? SyntaxKind.PlusEqualsToken : SyntaxKind.MinusEqualsToken),
-                            createLiteral(1),
+                        ? setTextRange(
+                            createBinary(
+                                node.operand,
+                                createToken(node.operator === SyntaxKind.PlusPlusToken ? SyntaxKind.PlusEqualsToken : SyntaxKind.MinusEqualsToken),
+                                createLiteral(1)
+                            ),
                             /*location*/ node)
                         : node;
                     for (const exportName of exportedNames) {
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index 6c59ea194cb..b2999201504 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -105,17 +105,20 @@ namespace ts {
             const updated = setEmitFlags(
                 updateSourceFileNode(
                     node,
-                    createNodeArray([
-                        createStatement(
-                            createCall(
-                                createPropertyAccess(createIdentifier("System"), "register"),
-                            /*typeArguments*/ undefined,
-                                moduleName
-                                    ? [moduleName, dependencies, moduleBodyFunction]
-                                    : [dependencies, moduleBodyFunction]
+                    setTextRange(
+                        createNodeArray([
+                            createStatement(
+                                createCall(
+                                    createPropertyAccess(createIdentifier("System"), "register"),
+                                /*typeArguments*/ undefined,
+                                    moduleName
+                                        ? [moduleName, dependencies, moduleBodyFunction]
+                                        : [dependencies, moduleBodyFunction]
+                                )
                             )
-                        )
-                    ], node.statements)
+                        ]),
+                        node.statements
+                    )
                 ), EmitFlags.NoTrailingComments);
 
             if (!(compilerOptions.outFile || compilerOptions.out)) {
@@ -260,35 +263,26 @@ namespace ts {
             addRange(statements, endLexicalEnvironment());
 
             const exportStarFunction = addExportStarIfNeeded(statements);
-            statements.push(
-                createReturn(
-                    setMultiLine(
-                        createObjectLiteral([
-                            createPropertyAssignment("setters",
-                                createSettersArray(exportStarFunction, dependencyGroups)
-                            ),
-                            createPropertyAssignment("execute",
-                                createFunctionExpression(
-                                    /*modifiers*/ undefined,
-                                    /*asteriskToken*/ undefined,
-                                    /*name*/ undefined,
-                                    /*typeParameters*/ undefined,
-                                    /*parameters*/ [],
-                                    /*type*/ undefined,
-                                    createBlock(
-                                        executeStatements,
-                                        /*location*/ undefined,
-                                        /*multiLine*/ true
-                                    )
-                                )
-                            )
-                        ]),
-                        /*multiLine*/ true
+            const moduleObject = createObjectLiteral([
+                createPropertyAssignment("setters",
+                    createSettersArray(exportStarFunction, dependencyGroups)
+                ),
+                createPropertyAssignment("execute",
+                    createFunctionExpression(
+                        /*modifiers*/ undefined,
+                        /*asteriskToken*/ undefined,
+                        /*name*/ undefined,
+                        /*typeParameters*/ undefined,
+                        /*parameters*/ [],
+                        /*type*/ undefined,
+                        createBlock(executeStatements, /*multiLine*/ true)
                     )
                 )
-            );
+            ]);
 
-            return createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
+            moduleObject.multiLine = true;
+            statements.push(createReturn(moduleObject));
+            return createBlock(statements, /*multiLine*/ true);
         }
 
         /**
@@ -337,7 +331,7 @@ namespace ts {
                     exportedNames.push(
                         createPropertyAssignment(
                             createLiteral(exportedLocalName),
-                            createLiteral(true)
+                            createTrue()
                         )
                     );
                 }
@@ -359,7 +353,7 @@ namespace ts {
                     exportedNames.push(
                         createPropertyAssignment(
                             createLiteral((element.name || element.propertyName).text),
-                            createLiteral(true)
+                            createTrue()
                         )
                     );
                 }
@@ -373,7 +367,7 @@ namespace ts {
                         createVariableDeclaration(
                             exportedNamesStorageRef,
                             /*type*/ undefined,
-                            createObjectLiteral(exportedNames, /*location*/ undefined, /*multiline*/ true)
+                            createObjectLiteral(exportedNames, /*multiline*/ true)
                         )
                     ])
                 )
@@ -456,9 +450,7 @@ namespace ts {
                             [exports]
                         )
                     )
-                ],
-                /*location*/ undefined,
-                /*multiline*/ true)
+                ], /*multiline*/ true)
             );
         }
 
@@ -525,7 +517,7 @@ namespace ts {
                                         createCall(
                                             exportFunction,
                                             /*typeArguments*/ undefined,
-                                            [createObjectLiteral(properties, /*location*/ undefined, /*multiline*/ true)]
+                                            [createObjectLiteral(properties, /*multiline*/ true)]
                                         )
                                     )
                                 );
@@ -558,12 +550,12 @@ namespace ts {
                         /*typeParameters*/ undefined,
                         [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)],
                         /*type*/ undefined,
-                        createBlock(statements, /*location*/ undefined, /*multiLine*/ true)
+                        createBlock(statements, /*multiLine*/ true)
                     )
                 );
             }
 
-            return createArrayLiteral(setters, /*location*/ undefined, /*multiLine*/ true);
+            return createArrayLiteral(setters, /*multiLine*/ true);
         }
 
         //
@@ -713,19 +705,23 @@ namespace ts {
 
             // Rewrite the class declaration into an assignment of a class expression.
             statements = append(statements,
-                createStatement(
-                    createAssignment(
-                        name,
-                        createClassExpression(
-                            /*modifiers*/ undefined,
-                            node.name,
-                            /*typeParameters*/ undefined,
-                            visitNodes(node.heritageClauses, destructuringVisitor, isHeritageClause),
-                            visitNodes(node.members, destructuringVisitor, isClassElement),
-                            /*location*/ node
+                setTextRange(
+                    createStatement(
+                        createAssignment(
+                            name,
+                            setTextRange(
+                                createClassExpression(
+                                    /*modifiers*/ undefined,
+                                    node.name,
+                                    /*typeParameters*/ undefined,
+                                    visitNodes(node.heritageClauses, destructuringVisitor, isHeritageClause),
+                                    visitNodes(node.members, destructuringVisitor, isClassElement)
+                                ),
+                                node
+                            )
                         )
                     ),
-                    /*location*/ node
+                    node
                 )
             );
 
@@ -766,7 +762,7 @@ namespace ts {
 
             let statements: Statement[];
             if (expressions) {
-                statements = append(statements, createStatement(inlineExpressions(expressions), /*location*/ node));
+                statements = append(statements, setTextRange(createStatement(inlineExpressions(expressions)), node));
             }
 
             if (isMarkedDeclaration) {
@@ -864,8 +860,8 @@ namespace ts {
         function createVariableAssignment(name: Identifier, value: Expression, location: TextRange, isExportedDeclaration: boolean) {
             hoistVariableDeclaration(getSynthesizedClone(name));
             return isExportedDeclaration
-                ? createExportExpression(name, preventSubstitution(createAssignment(name, value, location)))
-                : preventSubstitution(createAssignment(name, value, location));
+                ? createExportExpression(name, preventSubstitution(setTextRange(createAssignment(name, value), location)))
+                : preventSubstitution(setTextRange(createAssignment(name, value), location));
         }
 
         /**
@@ -1642,16 +1638,20 @@ namespace ts {
                 const importDeclaration = resolver.getReferencedImportDeclaration(node);
                 if (importDeclaration) {
                     if (isImportClause(importDeclaration)) {
-                        return createPropertyAccess(
-                            getGeneratedNameForNode(importDeclaration.parent),
-                            createIdentifier("default"),
+                        return setTextRange(
+                            createPropertyAccess(
+                                getGeneratedNameForNode(importDeclaration.parent),
+                                createIdentifier("default")
+                            ),
                             /*location*/ node
                         );
                     }
                     else if (isImportSpecifier(importDeclaration)) {
-                        return createPropertyAccess(
-                            getGeneratedNameForNode(importDeclaration.parent.parent.parent),
-                            getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name),
+                        return setTextRange(
+                            createPropertyAccess(
+                                getGeneratedNameForNode(importDeclaration.parent.parent.parent),
+                                getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name)
+                            ),
                             /*location*/ node
                         );
                     }
@@ -1718,10 +1718,13 @@ namespace ts {
                 const exportedNames = getExports(node.operand);
                 if (exportedNames) {
                     let expression: Expression = node.kind === SyntaxKind.PostfixUnaryExpression
-                        ? createPrefix(
-                            node.operator,
-                            node.operand,
-                            /*location*/ node)
+                        ? setTextRange(
+                            createPrefix(
+                                node.operator,
+                                node.operand
+                            ),
+                            node
+                        )
                         : node;
 
                     for (const exportName of exportedNames) {
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index a61998e8af9..b18ab67381e 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -588,17 +588,17 @@ namespace ts {
                 name,
                 /*typeParameters*/ undefined,
                 visitNodes(node.heritageClauses, visitor, isHeritageClause),
-                transformClassMembers(node, hasExtendsClause),
-                node);
-
-            let emitFlags = getEmitFlags(node);
+                transformClassMembers(node, hasExtendsClause)
+            );
 
             // To better align with the old emitter, we should not emit a trailing source map
             // entry if the class has static properties.
+            let emitFlags = getEmitFlags(node);
             if (hasStaticProperties) {
                 emitFlags |= EmitFlags.NoTrailingSourceMap;
             }
 
+            setTextRange(classDeclaration, node);
             setOriginalNode(classDeclaration, node);
             setEmitFlags(classDeclaration, emitFlags);
             return classDeclaration;
@@ -709,13 +709,24 @@ namespace ts {
             //  }
             const heritageClauses = visitNodes(node.heritageClauses, visitor, isHeritageClause);
             const members = transformClassMembers(node, hasExtendsClause);
-            const classExpression = createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members, location);
+            const classExpression = createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members);
             setOriginalNode(classExpression, node);
+            setTextRange(classExpression, location);
 
             //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
             //                                         or decoratedClassAlias if the class contain self-reference.
-            const statement = createLetStatement(declName, classAlias ? createAssignment(classAlias, classExpression) : classExpression, location);
+            const statement = createVariableStatement(
+                /*modifiers*/ undefined,
+                createVariableDeclarationList([
+                    createVariableDeclaration(
+                        declName,
+                        /*type*/ undefined,
+                        classAlias ? createAssignment(classAlias, classExpression) : classExpression
+                    )
+                ], NodeFlags.Let)
+            );
             setOriginalNode(statement, node);
+            setTextRange(statement, location);
             setCommentRange(statement, node);
             return statement;
         }
@@ -734,18 +745,17 @@ namespace ts {
             const heritageClauses = visitNodes(node.heritageClauses, visitor, isHeritageClause);
             const members = transformClassMembers(node, some(heritageClauses, c => c.token === SyntaxKind.ExtendsKeyword));
 
-            const classExpression = setOriginalNode(
-                createClassExpression(
-                    /*modifiers*/ undefined,
-                    node.name,
-                    /*typeParameters*/ undefined,
-                    heritageClauses,
-                    members,
-                    /*location*/ node
-                ),
-                node
+            const classExpression = createClassExpression(
+                /*modifiers*/ undefined,
+                node.name,
+                /*typeParameters*/ undefined,
+                heritageClauses,
+                members
             );
 
+            setOriginalNode(classExpression, node);
+            setTextRange(classExpression, node);
+
             if (staticProperties.length > 0) {
                 const expressions: Expression[] = [];
                 const temp = createTempVariable(hoistVariableDeclaration);
@@ -781,7 +791,7 @@ namespace ts {
             }
 
             addRange(members, visitNodes(node.members, classElementVisitor, isClassElement));
-            return createNodeArray(members, /*location*/ node.members);
+            return setTextRange(createNodeArray(members), /*location*/ node.members);
         }
 
         /**
@@ -812,12 +822,14 @@ namespace ts {
             //  }
             return startOnNewLine(
                 setOriginalNode(
-                    createConstructor(
-                        /*decorators*/ undefined,
-                        /*modifiers*/ undefined,
-                        parameters,
-                        body,
-                        /*location*/ constructor || node
+                    setTextRange(
+                        createConstructor(
+                            /*decorators*/ undefined,
+                            /*modifiers*/ undefined,
+                            parameters,
+                            body
+                        ),
+                        constructor || node
                     ),
                     constructor
                 )
@@ -919,13 +931,15 @@ namespace ts {
 
             // End the lexical environment.
             addRange(statements, endLexicalEnvironment());
-            return createBlock(
-                createNodeArray(
-                    statements,
-                    /*location*/ constructor ? constructor.body.statements : node.members
+            return setTextRange(
+                createBlock(
+                    setTextRange(
+                        createNodeArray(statements),
+                        /*location*/ constructor ? constructor.body.statements : node.members
+                    ),
+                    /*multiLine*/ true
                 ),
-                /*location*/ constructor ? constructor.body : /*location*/ undefined,
-                /*multiLine*/ true
+                /*location*/ constructor ? constructor.body : undefined
             );
         }
 
@@ -991,16 +1005,20 @@ namespace ts {
             setEmitFlags(localName, EmitFlags.NoComments);
 
             return startOnNewLine(
-                createStatement(
-                    createAssignment(
-                        createPropertyAccess(
-                            createThis(),
-                            propertyName,
-                            /*location*/ node.name
-                        ),
-                        localName
+                setTextRange(
+                    createStatement(
+                        createAssignment(
+                            setTextRange(
+                                createPropertyAccess(
+                                    createThis(),
+                                    propertyName
+                                ),
+                                node.name
+                            ),
+                            localName
+                        )
                     ),
-                    /*location*/ moveRangePos(node, -1)
+                    moveRangePos(node, -1)
                 )
             );
         }
@@ -1504,7 +1522,7 @@ namespace ts {
                     (properties || (properties = [])).push(createPropertyAssignment("returnType", createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, createToken(SyntaxKind.EqualsGreaterThanToken), serializeReturnTypeOfNode(node))));
                 }
                 if (properties) {
-                    decoratorExpressions.push(createMetadataHelper(context, "design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
+                    decoratorExpressions.push(createMetadataHelper(context, "design:typeinfo", createObjectLiteral(properties, /*multiLine*/ true)));
                 }
             }
         }
@@ -1939,10 +1957,7 @@ namespace ts {
                     expression = createAssignment(generatedName, expression);
                 }
 
-                return setOriginalNode(
-                    createComputedPropertyName(expression, /*location*/ name),
-                    name
-                );
+                return updateComputedPropertyName(name, expression);
             }
             else {
                 return name;
@@ -1961,9 +1976,11 @@ namespace ts {
         function visitHeritageClause(node: HeritageClause): HeritageClause {
             if (node.token === SyntaxKind.ExtendsKeyword) {
                 const types = visitNodes(node.types, visitor, isExpressionWithTypeArguments, 0, 1);
-                return createHeritageClause(
-                    SyntaxKind.ExtendsKeyword,
-                    types,
+                return setTextRange(
+                    createHeritageClause(
+                        SyntaxKind.ExtendsKeyword,
+                        types
+                    ),
                     node
                 );
             }
@@ -1980,11 +1997,10 @@ namespace ts {
          * @param node The ExpressionWithTypeArguments to transform.
          */
         function visitExpressionWithTypeArguments(node: ExpressionWithTypeArguments): ExpressionWithTypeArguments {
-            const expression = visitNode(node.expression, visitor, isLeftHandSideExpression);
-            return createExpressionWithTypeArguments(
+            return updateExpressionWithTypeArguments(
+                node,
                 /*typeArguments*/ undefined,
-                expression,
-                node
+                visitNode(node.expression, visitor, isLeftHandSideExpression)
             );
         }
 
@@ -2205,13 +2221,13 @@ namespace ts {
                 visitNode(node.name, visitor, isBindingName),
                 /*questionToken*/ undefined,
                 /*type*/ undefined,
-                visitNode(node.initializer, visitor, isExpression),
-                /*location*/ moveRangePastModifiers(node)
+                visitNode(node.initializer, visitor, isExpression)
             );
 
             // While we emit the source map for the node after skipping decorators and modifiers,
             // we need to emit the comments for the original range.
             setOriginalNode(parameter, node);
+            setTextRange(parameter, moveRangePastModifiers(node));
             setCommentRange(parameter, node);
             setSourceMapRange(parameter, moveRangePastModifiers(node));
             setEmitFlags(parameter.name, EmitFlags.NoTrailingSourceMap);
@@ -2233,11 +2249,13 @@ namespace ts {
                     return undefined;
                 }
 
-                return createStatement(
-                    inlineExpressions(
-                        map(variables, transformInitializedVariable)
+                return setTextRange(
+                    createStatement(
+                        inlineExpressions(
+                            map(variables, transformInitializedVariable)
+                        )
                     ),
-                    /*location*/ node
+                    node
                 );
             }
             else {
@@ -2258,9 +2276,11 @@ namespace ts {
                 );
             }
             else {
-                return createAssignment(
-                    getNamespaceMemberNameWithSourceMapsAndWithoutComments(name),
-                    visitNode(node.initializer, visitor, isExpression),
+                return setTextRange(
+                    createAssignment(
+                        getNamespaceMemberNameWithSourceMapsAndWithoutComments(name),
+                        visitNode(node.initializer, visitor, isExpression)
+                    ),
                     /*location*/ node
                 );
             }
@@ -2418,11 +2438,11 @@ namespace ts {
                     ),
                     /*typeArguments*/ undefined,
                     [moduleArg]
-                ),
-                /*location*/ node
+                )
             );
 
             setOriginalNode(enumStatement, node);
+            setTextRange(enumStatement, node);
             setEmitFlags(enumStatement, emitFlags);
             statements.push(enumStatement);
 
@@ -2448,8 +2468,7 @@ namespace ts {
 
             currentNamespaceContainerName = savedCurrentNamespaceLocalName;
             return createBlock(
-                createNodeArray(statements, /*location*/ node.members),
-                /*location*/ undefined,
+                setTextRange(createNodeArray(statements), /*location*/ node.members),
                 /*multiLine*/ true
             );
         }
@@ -2464,22 +2483,26 @@ namespace ts {
             // we pass false as 'generateNameForComputedPropertyName' for a backward compatibility purposes
             // old emitter always generate 'expression' part of the name as-is.
             const name = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ false);
-            return createStatement(
-                createAssignment(
-                    createElementAccess(
-                        currentNamespaceContainerName,
+            return setTextRange(
+                createStatement(
+                    setTextRange(
                         createAssignment(
                             createElementAccess(
                                 currentNamespaceContainerName,
-                                name
+                                createAssignment(
+                                    createElementAccess(
+                                        currentNamespaceContainerName,
+                                        name
+                                    ),
+                                    transformEnumMemberDeclarationValue(member)
+                                )
                             ),
-                            transformEnumMemberDeclarationValue(member)
-                        )
-                    ),
-                    name,
-                    /*location*/ member
+                            name
+                        ),
+                        member
+                    )
                 ),
-                /*location*/ member
+                member
             );
         }
 
@@ -2697,11 +2720,11 @@ namespace ts {
                     ),
                     /*typeArguments*/ undefined,
                     [moduleArg]
-                ),
-                /*location*/ node
+                )
             );
 
             setOriginalNode(moduleStatement, node);
+            setTextRange(moduleStatement, node);
             setEmitFlags(moduleStatement, emitFlags);
             statements.push(moduleStatement);
 
@@ -2756,13 +2779,13 @@ namespace ts {
             currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
 
             const block = createBlock(
-                createNodeArray(
-                    statements,
+                setTextRange(
+                    createNodeArray(statements),
                     /*location*/ statementsLocation
                 ),
-                /*location*/ blockLocation,
                 /*multiLine*/ true
             );
+            setTextRange(block, blockLocation);
 
             // namespace hello.hi.world {
             //      function foo() {}
@@ -2962,18 +2985,20 @@ namespace ts {
                 //  export var ${name} = ${moduleReference};
                 //  var ${name} = ${moduleReference};
                 return setOriginalNode(
-                    createVariableStatement(
-                        visitNodes(node.modifiers, modifierVisitor, isModifier),
-                        createVariableDeclarationList([
-                            setOriginalNode(
-                                createVariableDeclaration(
-                                    node.name,
-                                    /*type*/ undefined,
-                                    moduleReference
-                                ),
-                                node
-                            )
-                        ]),
+                    setTextRange(
+                        createVariableStatement(
+                            visitNodes(node.modifiers, modifierVisitor, isModifier),
+                            createVariableDeclarationList([
+                                setOriginalNode(
+                                    createVariableDeclaration(
+                                        node.name,
+                                        /*type*/ undefined,
+                                        moduleReference
+                                    ),
+                                    node
+                                )
+                            ])
+                        ),
                         node
                     ),
                     node
@@ -3034,7 +3059,7 @@ namespace ts {
          * Creates a statement for the provided expression. This is used in calls to `map`.
          */
         function expressionToStatement(expression: Expression) {
-            return createStatement(expression, /*location*/ undefined);
+            return createStatement(expression);
         }
 
         function addExportMemberAssignment(statements: Statement[], node: ClassDeclaration | FunctionDeclaration) {
@@ -3050,17 +3075,19 @@ namespace ts {
         }
 
         function createNamespaceExport(exportName: Identifier, exportValue: Expression, location?: TextRange) {
-            return createStatement(
-                createAssignment(
-                    getNamespaceMemberName(currentNamespaceContainerName, exportName, /*allowComments*/ false, /*allowSourceMaps*/ true),
-                    exportValue
+            return setTextRange(
+                createStatement(
+                    createAssignment(
+                        getNamespaceMemberName(currentNamespaceContainerName, exportName, /*allowComments*/ false, /*allowSourceMaps*/ true),
+                        exportValue
+                    )
                 ),
                 location
             );
         }
 
         function createNamespaceExportExpression(exportName: Identifier, exportValue: Expression, location?: TextRange) {
-            return createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue, location);
+            return setTextRange(createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue), location);
         }
 
         function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name: Identifier) {
@@ -3201,9 +3228,9 @@ namespace ts {
                     // destructuring assignment
                     if (node.objectAssignmentInitializer) {
                         const initializer = createAssignment(exportedName, node.objectAssignmentInitializer);
-                        return createPropertyAssignment(name, initializer, /*location*/ node);
+                        return setTextRange(createPropertyAssignment(name, initializer), node);
                     }
-                    return createPropertyAssignment(name, exportedName, /*location*/ node);
+                    return setTextRange(createPropertyAssignment(name, exportedName), node);
                 }
             }
             return node;
@@ -3263,7 +3290,10 @@ namespace ts {
                         (applicableSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports && container.kind === SyntaxKind.ModuleDeclaration) ||
                         (applicableSubstitutions & TypeScriptSubstitutionFlags.NonQualifiedEnumMembers && container.kind === SyntaxKind.EnumDeclaration);
                     if (substitute) {
-                        return createPropertyAccess(getGeneratedNameForNode(container), node, /*location*/ node);
+                        return setTextRange(
+                            createPropertyAccess(getGeneratedNameForNode(container), node),
+                            /*location*/ node
+                        );
                     }
                 }
             }
@@ -3322,13 +3352,15 @@ namespace ts {
 
     function createParamHelper(context: TransformationContext, expression: Expression, parameterOffset: number, location?: TextRange) {
         context.requestEmitHelper(paramHelper);
-        return createCall(
-            getHelperName("__param"),
-            /*typeArguments*/ undefined,
-            [
-                createLiteral(parameterOffset),
-                expression
-            ],
+        return setTextRange(
+            createCall(
+                getHelperName("__param"),
+                /*typeArguments*/ undefined,
+                [
+                    createLiteral(parameterOffset),
+                    expression
+                ]
+            ),
             location
         );
     }
@@ -3371,7 +3403,7 @@ namespace ts {
     function createDecorateHelper(context: TransformationContext, decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression, location?: TextRange) {
         context.requestEmitHelper(decorateHelper);
         const argumentsArray: Expression[] = [];
-        argumentsArray.push(createArrayLiteral(decoratorExpressions, /*location*/ undefined, /*multiLine*/ true));
+        argumentsArray.push(createArrayLiteral(decoratorExpressions, /*multiLine*/ true));
         argumentsArray.push(target);
         if (memberName) {
             argumentsArray.push(memberName);
@@ -3380,6 +3412,13 @@ namespace ts {
             }
         }
 
-        return createCall(getHelperName("__decorate"), /*typeArguments*/ undefined, argumentsArray, location);
+        return setTextRange(
+            createCall(
+                getHelperName("__decorate"),
+                /*typeArguments*/ undefined,
+                argumentsArray
+            ),
+            location
+        );
     }
 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 8660e6138cd..ae678f429f1 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -958,8 +958,7 @@
     }
 
     // Represents an expression that is elided as part of a transformation to emit comments on a
-    // not-emitted node. The 'expression' property of a NotEmittedExpression should be emitted.
-    // @internal
+    // not-emitted node. The 'expression' property of a PartiallyEmittedExpression should be emitted.
     export interface PartiallyEmittedExpression extends LeftHandSideExpression {
         kind: SyntaxKind.PartiallyEmittedExpression;
         expression: Expression;
@@ -1538,7 +1537,6 @@
 
     // Represents a statement that is elided as part of a transformation to emit comments on a
     // not-emitted node.
-    // @internal
     export interface NotEmittedStatement extends Statement {
         kind: SyntaxKind.NotEmittedStatement;
     }
@@ -3730,7 +3728,6 @@
         helpers?: EmitHelper[];                 // Emit helpers for the node
     }
 
-    /* @internal */
     export const enum EmitFlags {
         SingleLine = 1 << 0,                     // The contents of this node should be emitted on a single line.
         AdviseOnEmitNode = 1 << 1,               // The printer should invoke the onEmitNode callback when printing this node.
@@ -3759,7 +3756,6 @@
         HasEndOfDeclarationMarker = 1 << 21,     // Declaration has an associated NotEmittedStatement to mark the end of the declaration
     }
 
-    /* @internal */
     export interface EmitHelper {
         readonly name: string;      // A unique name for this helper.
         readonly scoped: boolean;   // Indicates whether ther helper MUST be emitted in the current scope.
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 01cfcb08047..6004bee466a 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -3331,6 +3331,14 @@ namespace ts {
         }
     }
 
+    export function getRangePos(range: TextRange | undefined) {
+        return range ? range.pos : -1;
+    }
+
+    export function getRangeEnd(range: TextRange | undefined) {
+        return range ? range.end : -1;
+    }
+
     /**
      * Increases (or decreases) a position by the provided amount.
      *
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index f3efc040e35..b6e0adc1294 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -627,8 +627,7 @@ namespace ts {
             // If we are not visiting all of the original nodes, we must always create a new array.
             // Since this is a fragment of a node array, we do not copy over the previous location
             // and will only copy over `hasTrailingComma` if we are including the last element.
-            updated = createNodeArray<Node>([], /*location*/ undefined,
-                /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length);
+            updated = createNodeArray<Node>([], /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length);
         }
 
         // Visit each original node.
@@ -639,7 +638,8 @@ namespace ts {
             if (updated !== undefined || visited === undefined || visited !== node) {
                 if (updated === undefined) {
                     // Ensure we have a copy of `nodes`, up to the current index.
-                    updated = createNodeArray(nodes.slice(0, i), /*location*/ nodes, nodes.hasTrailingComma);
+                    updated = createNodeArray(nodes.slice(0, i), nodes.hasTrailingComma);
+                    setTextRange(updated, nodes);
                 }
                 if (visited) {
                     if (isArray(visited)) {
@@ -675,10 +675,10 @@ namespace ts {
         context.startLexicalEnvironment();
         statements = visitNodes(statements, visitor, isStatement, start);
         if (ensureUseStrict && !startsWithUseStrict(statements)) {
-            statements = createNodeArray([createStatement(createLiteral("use strict")), ...statements], statements);
+            statements = setTextRange(createNodeArray([createStatement(createLiteral("use strict")), ...statements]), statements);
         }
         const declarations = context.endLexicalEnvironment();
-        return createNodeArray(concatenate(statements, declarations), statements);
+        return setTextRange(createNodeArray(concatenate(statements, declarations)), statements);
     }
 
     /**
@@ -1228,7 +1228,7 @@ namespace ts {
             return statements;
         }
         return isNodeArray(statements)
-            ? createNodeArray(concatenate(statements, declarations), statements)
+            ? setTextRange(createNodeArray(concatenate(statements, declarations)), statements)
             : addRange(statements, declarations);
     }
 
@@ -1252,13 +1252,19 @@ namespace ts {
     export function mergeFunctionBodyLexicalEnvironment(body: ConciseBody, declarations: Statement[]): ConciseBody {
         if (body && declarations !== undefined && declarations.length > 0) {
             if (isBlock(body)) {
-                return updateBlock(body, createNodeArray(concatenate(body.statements, declarations), body.statements));
+                return updateBlock(body, setTextRange(createNodeArray(concatenate(body.statements, declarations)), body.statements));
             }
             else {
-                return createBlock(
-                    createNodeArray([createReturn(body, /*location*/ body), ...declarations], body),
-                    /*location*/ body,
-                    /*multiLine*/ true);
+                return setTextRange(
+                    createBlock(
+                        setTextRange(
+                            createNodeArray([setTextRange(createReturn(body), body), ...declarations]),
+                            body
+                        ),
+                        /*multiLine*/ true
+                    ),
+                    /*location*/ body
+                );
             }
         }
         return body;

From a72abc8ebc5c4c76122126b2212449fafa1277db Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Wed, 1 Feb 2017 19:41:28 -0800
Subject: [PATCH 071/127] Make getOriginalNode/getParseTreeNode public

---
 src/compiler/utilities.ts | 102 +++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 6004bee466a..66efce4fef8 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2042,57 +2042,6 @@ namespace ts {
             || positionIsSynthesized(node.end);
     }
 
-    export function getOriginalNode(node: Node): Node;
-    export function getOriginalNode<T extends Node>(node: Node, nodeTest: (node: Node) => node is T): T;
-    export function getOriginalNode(node: Node, nodeTest?: (node: Node) => boolean): Node {
-        if (node) {
-            while (node.original !== undefined) {
-                node = node.original;
-            }
-        }
-
-        return !nodeTest || nodeTest(node) ? node : undefined;
-    }
-
-    /**
-     * Gets a value indicating whether a node originated in the parse tree.
-     *
-     * @param node The node to test.
-     */
-    export function isParseTreeNode(node: Node): boolean {
-        return (node.flags & NodeFlags.Synthesized) === 0;
-    }
-
-    /**
-     * Gets the original parse tree node for a node.
-     *
-     * @param node The original node.
-     * @returns The original parse tree node if found; otherwise, undefined.
-     */
-    export function getParseTreeNode(node: Node): Node;
-
-    /**
-     * Gets the original parse tree node for a node.
-     *
-     * @param node The original node.
-     * @param nodeTest A callback used to ensure the correct type of parse tree node is returned.
-     * @returns The original parse tree node if found; otherwise, undefined.
-     */
-    export function getParseTreeNode<T extends Node>(node: Node, nodeTest?: (node: Node) => node is T): T;
-    export function getParseTreeNode(node: Node, nodeTest?: (node: Node) => boolean): Node {
-        if (isParseTreeNode(node)) {
-            return node;
-        }
-
-        node = getOriginalNode(node);
-
-        if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) {
-            return node;
-        }
-
-        return undefined;
-    }
-
     export function getOriginalSourceFileOrBundle(sourceFileOrBundle: SourceFile | Bundle) {
         if (sourceFileOrBundle.kind === SyntaxKind.Bundle) {
             return updateBundle(sourceFileOrBundle, sameMap(sourceFileOrBundle.sourceFiles, getOriginalSourceFile));
@@ -4530,4 +4479,55 @@ namespace ts {
             return true;
         }
     }
+
+    export function getOriginalNode(node: Node): Node;
+    export function getOriginalNode<T extends Node>(node: Node, nodeTest: (node: Node) => node is T): T;
+    export function getOriginalNode(node: Node, nodeTest?: (node: Node) => boolean): Node {
+        if (node) {
+            while (node.original !== undefined) {
+                node = node.original;
+            }
+        }
+
+        return !nodeTest || nodeTest(node) ? node : undefined;
+    }
+
+    /**
+     * Gets a value indicating whether a node originated in the parse tree.
+     *
+     * @param node The node to test.
+     */
+    export function isParseTreeNode(node: Node): boolean {
+        return (node.flags & NodeFlags.Synthesized) === 0;
+    }
+
+    /**
+     * Gets the original parse tree node for a node.
+     *
+     * @param node The original node.
+     * @returns The original parse tree node if found; otherwise, undefined.
+     */
+    export function getParseTreeNode(node: Node): Node;
+
+    /**
+     * Gets the original parse tree node for a node.
+     *
+     * @param node The original node.
+     * @param nodeTest A callback used to ensure the correct type of parse tree node is returned.
+     * @returns The original parse tree node if found; otherwise, undefined.
+     */
+    export function getParseTreeNode<T extends Node>(node: Node, nodeTest?: (node: Node) => node is T): T;
+    export function getParseTreeNode(node: Node, nodeTest?: (node: Node) => boolean): Node {
+        if (isParseTreeNode(node)) {
+            return node;
+        }
+
+        node = getOriginalNode(node);
+
+        if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) {
+            return node;
+        }
+
+        return undefined;
+    }
 }

From 1f92bacdc81e7ae6706ad8776121e1db986a8b27 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 1 Feb 2017 22:08:08 -0800
Subject: [PATCH 072/127] Update AUTHORS for release-2.2

---
 .mailmap   | 14 +++++++++++++-
 AUTHORS.md | 12 ++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index ede478c8a18..6a9362f6e4c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,11 +8,14 @@ Alexander Rusakov  <a_s_rusakov@mail.ru>
 Alex Eagle <alexeagle@google.com>
 Anatoly Ressin  <anatoly.ressin@icloud.com>
 Anders Hejlsberg <andersh@microsoft.com> unknown <andersh@AndersX1.NOE.Nokia.com> unknown <andersh@andersh-yoga.redmond.corp.microsoft.com>
+about-code  <about-code@users.noreply.github.com> # Andreas Martin
 Andrej Baran  <andrej.baran@gmail.com>
+Andrew Ochsner  <andrew.ochsner@wipro.com>
 Andrew Z Allen <me@andrewzallen.com>
 Andy Hanson <anhans@microsoft.com> Andy <anhans@microsoft.com>
 Anil Anar <anilanar@hotmail.com>
 Anton Tolmachev <myste@mail.ru>
+Anubha Mathur  <anubmat@microsoft.com> anubmat  <anubmat@microsoft.com>
 Arnavion <arnavion@gmail.com> # Arnav Singh
 Arthur Ozga <aozgaa@umich.edu> Arthur Ozga <t-arthoz@microsoft.com> Arthur Ozga  <aozgaa-ms@outlook.com> Arthur Ozga  <aozgaa@users.noreply.github.com> Arthur Ozga  <arozga@microsoft.com>
 Asad Saeeduddin <masaeedu@gmail.com>
@@ -37,6 +40,7 @@ Dan Corder <dev@dancorder.com>
 Dan Quirk <danquirk@microsoft.com> Dan Quirk <danquirk@users.noreply.github.com> nknown <danquirk@DANQUIRK1.redmond.corp.microsoft.com>
 Daniel Rosenwasser <drosen@microsoft.com> Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> Daniel Rosenwasser <DanielRosenwasser@gmail.com> Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com> Daniel Rosenwasser <DanielRosenwasser@microsoft.com>
 David Li <jiawei.davidli@gmail.com>
+David Sheldrick  <david@futurice.com>
 David Souther <davidsouther@gmail.com>
 Denis Nedelyaev <denvned@gmail.com>
 Dick van den Brink <d_vandenbrink@outlook.com> unknown <d_vandenbrink@outlook.com> unknown <d_vandenbrink@live.com>
@@ -52,6 +56,7 @@ Evan Sebastian <evanlhoini@gmail.com>
 Eyas <eyas.sharaiha@gmail.com> # Eyas Sharaiha
 Fabian Cook  <faybecook@gmail.com>
 falsandtru <falsandtru@users.noreply.github.com> # @falsandtru
+flowmemo  <flowmemo@outlook.com> # @flowmemo
 Frank Wallis <fwallis@outlook.com>
 František Žiacik <fziacik@gratex.com> František Žiacik <ziacik@gmail.com>
 Gabe Moothart  <gmoothart@gmail.com>
@@ -62,6 +67,7 @@ Graeme Wicksted <graeme.wicksted@gmail.com>
 Guillaume Salles <guillaume.salles@me.com>
 Guy Bedford <guybedford@gmail.com> guybedford <guybedford@gmail.com>
 Harald Niesche <harald@niesche.de>
+Homa Wong  <homawong@gmail.com>
 Iain Monro <iain.monro@softwire.com>
 Ingvar Stepanyan <me@rreverser.com>
 impinball <impinball@gmail.com> # Isiah Meadows
@@ -81,6 +87,7 @@ Jonathan Park <jpark@daptiv.com>
 Jonathan Turner <jont@microsoft.com> Jonathan Turner <probata@hotmail.com>
 Jonathan Toland <toland@dnalot.com>
 Jesse Schalken <me@jesseschalken.com>
+Joel Day  <joelday@gmail.com>
 Josh Abernathy  <joshaber@gmail.com> joshaber  <joshaber@gmail.com>
 Josh Kalderimis <josh.kalderimis@gmail.com>
 Josh Soref <jsoref@users.noreply.github.com>
@@ -95,10 +102,12 @@ Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui T <yuisu@microsoft.com>
 Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui <yuit@users.noreply.github.com>
 Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui <yuisu@microsoft.com>
 Kanchalai Tanglertsampan <yuisu@microsoft.com> yui T <yuisu@microsoft.com>
+Kārlis Gaņģis <Knagis@users.noreply.github.com>
 Keith Mashinter <kmashint@yahoo.com> kmashint <kmashint@yahoo.com>
 Ken Howard <ken@simplicatedweb.com>
 Kevin Lang  <klang2012@gmail.com>
 kimamula <kenji.imamula@gmail.com> # Kenji Imamula
+Klaus Meinhardt  <klaus.meinhardt1@gmail.com>
 Kyle Kelley <rgbkrk@gmail.com>
 Lorant Pinter <lorant.pinter@prezi.com>
 Lucien Greathouse <me@lpghatguy.com>
@@ -107,6 +116,7 @@ Martin Vseticka <vseticka.martin@gmail.com> Martin Všeticka <vseticka.martin@gm
 gcnew  <gcnew@abv.bg> # Marin Marinov
 vvakame <vvakame+dev@gmail.com> # Masahiro Wakame
 Matt McCutchen <rmccutch@mit.edu>
+MANISH-GIRI  <manish.giri.me@gmail.com> # Manish Giri
 Max Deepfield <maxdeepfield@absolutefreakout.com>
 Micah Zoltu <micah@zoltu.net>
 Michael  <maykelchiche@gmail.com>
@@ -213,4 +223,6 @@ Tim Perry <tim.perry@softwire.com>
 Vidar Tonaas Fauske <vidartf@gmail.com>
 Viktor Zozulyak <zozulyakviktor@gmail.com>
 rix <rix@rixs-MacBook-Pro.local> # Richard Sentino
-rohitverma007 <rohitverma@live.ca> # Rohit Verma
\ No newline at end of file
+rohitverma007 <rohitverma@live.ca> # Rohit Verma
+rdosanjh  <me@rajdeep.io> # Raj Dosanjh
+gdh1995  <gdh1995@qq.com> # Dahan Gong
\ No newline at end of file
diff --git a/AUTHORS.md b/AUTHORS.md
index ae7832176ea..196f5e84542 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -12,13 +12,16 @@ TypeScript is authored by:
 * Aliaksandr Radzivanovich
 * Anatoly Ressin 
 * Anders Hejlsberg
+* Andreas Martin
 * Andrej Baran 
+* Andrew Ochsner 
 * Andrew Z Allen
 * András Parditka 
 * Andy Hanson
 * Anil Anar
 * Anton Khlynovskiy 
 * Anton Tolmachev
+* Anubha Mathur 
 * Arnav Singh
 * Arthur Ozga
 * Asad Saeeduddin
@@ -42,12 +45,14 @@ TypeScript is authored by:
 * Cotton Hou 
 * Cyrus Najmabadi
 * Dafrok Zhang
+* Dahan Gong
 * Dan Corder
 * Dan Quirk
 * Daniel Hollocher
 * Daniel Rosenwasser
 * David Kmenta
 * David Li
+* David Sheldrick 
 * David Souther
 * Denis Nedelyaev
 * Dick van den Brink
@@ -66,6 +71,7 @@ TypeScript is authored by:
 * Eyas Sharaiha
 * Fabian Cook 
 * @falsandtru
+* @flowmemo
 * Frank Wallis
 * Franklin Tse
 * František Žiacik
@@ -79,6 +85,7 @@ TypeScript is authored by:
 * Guy Bedford
 * Harald Niesche
 * Herrington Darkholme
+* Homa Wong 
 * Iain Monro
 * Ingvar Stepanyan
 * Isiah Meadows
@@ -93,6 +100,7 @@ TypeScript is authored by:
 * Jeffrey Morlan
 * Jesse Schalken
 * Jiri Tobisek
+* Joel Day 
 * Joey Wilson
 * Johannes Rieken
 * John Vilk
@@ -114,10 +122,13 @@ TypeScript is authored by:
 * Ken Howard
 * Kenji Imamula
 * Kevin Lang 
+* Klaus Meinhardt 
 * Kyle Kelley
+* Kārlis Gaņģis
 * Lorant Pinter
 * Lucien Greathouse
 * Lukas Elmer 
+* Manish Giri
 * Marin Marinov
 * Marius Schulz 
 * Martin Vseticka
@@ -155,6 +166,7 @@ TypeScript is authored by:
 * @progre
 * Punya Biswal
 * Rado Kirov
+* Raj Dosanjh
 * Richard Knoll
 * Richard Sentino
 * Robert Coie

From 6c56b3d957d43dd180f72f6f4af430c10da6c2e7 Mon Sep 17 00:00:00 2001
From: Zhengbo Li <zhengbli@microsoft.com>
Date: Thu, 2 Feb 2017 02:17:49 -0800
Subject: [PATCH 073/127] Fix casing in import quick fix

---
 src/services/codefixes/importFixes.ts         | 31 +++++++------------
 .../importNameCodeFixNewImportFile1.ts        |  4 +--
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index 49b8526a1e0..3642e46612c 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -416,8 +416,8 @@ namespace ts.codefix {
                     );
 
                     function getModuleSpecifierForNewImport() {
-                        const fileName = sourceFile.path;
-                        const moduleFileName = moduleSymbol.valueDeclaration.getSourceFile().path;
+                        const fileName = sourceFile.fileName;
+                        const moduleFileName = moduleSymbol.valueDeclaration.getSourceFile().fileName;
                         const sourceDirectory = getDirectoryPath(fileName);
                         const options = context.program.getCompilerOptions();
 
@@ -439,8 +439,7 @@ namespace ts.codefix {
                                 return undefined;
                             }
 
-                            const normalizedBaseUrl = toPath(options.baseUrl, getDirectoryPath(options.baseUrl), getCanonicalFileName);
-                            let relativeName = tryRemoveParentDirectoryName(moduleFileName, normalizedBaseUrl);
+                            let relativeName = getRelativePathIfInDirectory(moduleFileName, options.baseUrl);
                             if (!relativeName) {
                                 return undefined;
                             }
@@ -477,9 +476,8 @@ namespace ts.codefix {
 
                         function tryGetModuleNameFromRootDirs() {
                             if (options.rootDirs) {
-                                const normalizedRootDirs = map(options.rootDirs, rootDir => toPath(rootDir, /*basePath*/ undefined, getCanonicalFileName));
-                                const normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, normalizedRootDirs);
-                                const normalizedSourcePath = getPathRelativeToRootDirs(sourceDirectory, normalizedRootDirs);
+                                const normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, options.rootDirs);
+                                const normalizedSourcePath = getPathRelativeToRootDirs(sourceDirectory, options.rootDirs);
                                 if (normalizedTargetPath !== undefined) {
                                     const relativePath = normalizedSourcePath !== undefined ? getRelativePath(normalizedTargetPath, normalizedSourcePath) : normalizedTargetPath;
                                     return removeFileExtension(relativePath);
@@ -546,9 +544,9 @@ namespace ts.codefix {
                         }
                     }
 
-                    function getPathRelativeToRootDirs(path: Path, rootDirs: Path[]) {
+                    function getPathRelativeToRootDirs(path: string, rootDirs: string[]) {
                         for (const rootDir of rootDirs) {
-                            const relativeName = tryRemoveParentDirectoryName(path, rootDir);
+                            const relativeName = getRelativePathIfInDirectory(path, rootDir);
                             if (relativeName !== undefined) {
                                 return relativeName;
                             }
@@ -564,20 +562,15 @@ namespace ts.codefix {
                         return fileName;
                     }
 
+                    function getRelativePathIfInDirectory(path: string, directoryPath: string) {
+                        const relativePath = getRelativePathToDirectoryOrUrl(directoryPath, path, directoryPath, getCanonicalFileName, false);
+                        return isRootedDiskPath(relativePath) || startsWith(relativePath, "..") ? undefined : relativePath;
+                    }
+
                     function getRelativePath(path: string, directoryPath: string) {
                         const relativePath = getRelativePathToDirectoryOrUrl(directoryPath, path, directoryPath, getCanonicalFileName, false);
                         return moduleHasNonRelativeName(relativePath) ? "./" + relativePath : relativePath;
                     }
-
-                    function tryRemoveParentDirectoryName(path: Path, parentDirectory: Path) {
-                        const index = path.indexOf(parentDirectory);
-                        if (index === 0) {
-                            return endsWith(parentDirectory, directorySeparator)
-                                ? path.substring(parentDirectory.length)
-                                : path.substring(parentDirectory.length + 1);
-                        }
-                        return undefined;
-                    }
                 }
 
             }
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile1.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile1.ts
index 0223d96e018..9f6cac0b7c1 100644
--- a/tests/cases/fourslash/importNameCodeFixNewImportFile1.ts
+++ b/tests/cases/fourslash/importNameCodeFixNewImportFile1.ts
@@ -3,7 +3,7 @@
 //// [|/// <reference path="./tripleSlashReference.ts" />
 //// f1/*0*/();|]
 
-// @Filename: module.ts
+// @Filename: Module.ts
 //// export function f1() {}
 //// export var v1 = 5;
 
@@ -12,7 +12,7 @@
 
 verify.importFixAtPosition([
 `/// <reference path="./tripleSlashReference.ts" />
-import { f1 } from "./module";
+import { f1 } from "./Module";
 
 f1();`
 ]);
\ No newline at end of file

From 2f49eeca26a228ce9f9bce849198d1a2c2efc182 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 2 Feb 2017 08:29:00 -0800
Subject: [PATCH 074/127] Remove useless test file

---
 tests/cases/fourslash/goToDefinitionFoo.ts | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 tests/cases/fourslash/goToDefinitionFoo.ts

diff --git a/tests/cases/fourslash/goToDefinitionFoo.ts b/tests/cases/fourslash/goToDefinitionFoo.ts
deleted file mode 100644
index 3e05ee20ecb..00000000000
--- a/tests/cases/fourslash/goToDefinitionFoo.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-////function /*def*/f() {}
-/////*use*/f(123);
-
-verify.goToDefinition("use", "def");

From 62f716aaa60ee39b696a2adeb582ec3f06ea72ea Mon Sep 17 00:00:00 2001
From: zhengbli <zhengbli@microsoft.com>
Date: Thu, 2 Feb 2017 13:50:34 -0800
Subject: [PATCH 075/127] avoid removing comments when removing unused locals

---
 .../codefixes/unusedIdentifierFixes.ts        | 48 ++++++++++++-------
 .../fourslash/unusedFunctionInNamespace1.ts   |  2 +
 tests/cases/fourslash/unusedImports3FS.ts     |  4 +-
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index 2784a09a504..0ca01a81eb1 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -25,7 +25,7 @@ namespace ts.codefix {
                                     const forStatement = <ForStatement>token.parent.parent.parent;
                                     const forInitializer = <VariableDeclarationList>forStatement.initializer;
                                     if (forInitializer.declarations.length === 1) {
-                                        return createCodeFix("", forInitializer.pos, forInitializer.end - forInitializer.pos);
+                                        return createCodeFixToRemoveNode(forInitializer);
                                     }
                                     else {
                                         return removeSingleItem(forInitializer.declarations, token);
@@ -35,7 +35,7 @@ namespace ts.codefix {
                                     const forOfStatement = <ForOfStatement>token.parent.parent.parent;
                                     if (forOfStatement.initializer.kind === SyntaxKind.VariableDeclarationList) {
                                         const forOfInitializer = <VariableDeclarationList>forOfStatement.initializer;
-                                        return createCodeFix("{}", forOfInitializer.declarations[0].pos, forOfInitializer.declarations[0].end - forOfInitializer.declarations[0].pos);
+                                        return createCodeFix("{}", forOfInitializer.declarations[0].getStart(), forOfInitializer.declarations[0].getWidth());
                                     }
                                     break;
 
@@ -47,12 +47,12 @@ namespace ts.codefix {
                                 case SyntaxKind.CatchClause:
                                     const catchClause = <CatchClause>token.parent.parent;
                                     const parameter = catchClause.variableDeclaration.getChildren()[0];
-                                    return createCodeFix("", parameter.pos, parameter.end - parameter.pos);
+                                    return createCodeFixToRemoveNode(parameter);
 
                                 default:
                                     const variableStatement = <VariableStatement>token.parent.parent.parent;
                                     if (variableStatement.declarationList.declarations.length === 1) {
-                                        return createCodeFix("", variableStatement.pos, variableStatement.end - variableStatement.pos);
+                                        return createCodeFixToRemoveNode(variableStatement);
                                     }
                                     else {
                                         const declarations = variableStatement.declarationList.declarations;
@@ -72,7 +72,7 @@ namespace ts.codefix {
                         case ts.SyntaxKind.Parameter:
                             const functionDeclaration = <FunctionDeclaration>token.parent.parent;
                             if (functionDeclaration.parameters.length === 1) {
-                                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                                return createCodeFixToRemoveNode(token.parent);
                             }
                             else {
                                 return removeSingleItem(functionDeclaration.parameters, token);
@@ -81,14 +81,14 @@ namespace ts.codefix {
                         // handle case where 'import a = A;'
                         case SyntaxKind.ImportEqualsDeclaration:
                             const importEquals = findImportDeclaration(token);
-                            return createCodeFix("", importEquals.pos, importEquals.end - importEquals.pos);
+                            return createCodeFixToRemoveNode(importEquals);
 
                         case SyntaxKind.ImportSpecifier:
                             const namedImports = <NamedImports>token.parent.parent;
                             if (namedImports.elements.length === 1) {
                                 // Only 1 import and it is unused. So the entire declaration should be removed.
                                 const importSpec = findImportDeclaration(token);
-                                return createCodeFix("", importSpec.pos, importSpec.end - importSpec.pos);
+                                return createCodeFixToRemoveNode(importSpec);
                             }
                             else {
                                 return removeSingleItem(namedImports.elements, token);
@@ -100,17 +100,24 @@ namespace ts.codefix {
                             const importClause = <ImportClause>token.parent;
                             if (!importClause.namedBindings) { // |import d from './file'| or |import * as ns from './file'|
                                 const importDecl = findImportDeclaration(importClause);
-                                return createCodeFix("", importDecl.pos, importDecl.end - importDecl.pos);
+                                return createCodeFixToRemoveNode(importDecl);
                             }
-                            else { // import |d,| * as ns from './file'
-                                return createCodeFix("", importClause.name.pos, importClause.namedBindings.pos - importClause.name.pos);
+                            else {
+                                // import |d,| * as ns from './file'
+                                const start = importClause.name.getStart();
+                                let end = findFirstNonSpaceCharPosStarting(importClause.name.end);
+                                if (sourceFile.text.charCodeAt(end) === CharacterCodes.comma) {
+                                    end = findFirstNonSpaceCharPosStarting(end + 1);
+                                }
+
+                                return createCodeFix("", start, end - start);
                             }
 
                         case SyntaxKind.NamespaceImport:
                             const namespaceImport = <NamespaceImport>token.parent;
                             if (namespaceImport.name == token && !(<ImportClause>namespaceImport.parent).name) {
                                 const importDecl = findImportDeclaration(namespaceImport);
-                                return createCodeFix("", importDecl.pos, importDecl.end - importDecl.pos);
+                                return createCodeFixToRemoveNode(importDecl);
                             }
                             else {
                                 const start = (<ImportClause>namespaceImport.parent).name.end;
@@ -120,16 +127,14 @@ namespace ts.codefix {
                     break;
 
                 case SyntaxKind.PropertyDeclaration:
-                    return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
-
                 case SyntaxKind.NamespaceImport:
-                    return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                    return createCodeFixToRemoveNode(token.parent);
             }
             if (isDeclarationName(token)) {
-                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                return createCodeFixToRemoveNode(token.parent);
             }
             else if (isLiteralComputedPropertyDeclarationName(token)) {
-                return createCodeFix("", token.parent.parent.pos, token.parent.parent.end - token.parent.parent.pos);
+                return createCodeFixToRemoveNode(token.parent.parent);
             }
             else {
                 return undefined;
@@ -144,6 +149,17 @@ namespace ts.codefix {
                 return importDecl;
             }
 
+            function createCodeFixToRemoveNode(node: Node) {
+                return createCodeFix("", node.getStart(), node.getWidth());
+            }
+
+            function findFirstNonSpaceCharPosStarting(start: number) {
+                while (isWhiteSpace(sourceFile.text.charCodeAt(start))) {
+                    start += 1;
+                }
+                return start;
+            }
+
             function createCodeFix(newText: string, start: number, length: number): CodeAction[] {
                 return [{
                     description: formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Remove_declaration_for_Colon_0), { 0: token.getText() }),
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace1.ts b/tests/cases/fourslash/unusedFunctionInNamespace1.ts
index 8ebf1f7072a..288573608f2 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace1.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace1.ts
@@ -2,9 +2,11 @@
 
 // @noUnusedLocals: true
 //// [| namespace greeter {
+////   // some legit comments
 ////   function function1() {
 ////   }/*1*/
 //// } |]
 
 verify.rangeAfterCodeFix(`namespace greeter {
+    // some legit comments
 }`);
diff --git a/tests/cases/fourslash/unusedImports3FS.ts b/tests/cases/fourslash/unusedImports3FS.ts
index 98dc30c4336..6926f97bb4f 100644
--- a/tests/cases/fourslash/unusedImports3FS.ts
+++ b/tests/cases/fourslash/unusedImports3FS.ts
@@ -2,7 +2,7 @@
 
 // @noUnusedLocals: true
 // @Filename: file2.ts
-////[| import {Calculator, test, test2} from "./file1" |]
+////[| import {Calculator, /*some comments*/ test, test2} from "./file1" |]
 
 //// test();
 //// test2();
@@ -20,5 +20,5 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {test, test2} from "./file1"`);
+verify.rangeAfterCodeFix(`import {/*some comments*/ test, test2} from "./file1"`);
 

From e532744f16bb79f114ea0899262a78df7610e8d8 Mon Sep 17 00:00:00 2001
From: zhengbli <zhengbli@microsoft.com>
Date: Thu, 2 Feb 2017 14:14:40 -0800
Subject: [PATCH 076/127] Add test case for nested namespace

---
 .../fourslash/importNameCodeFixNewImportFile4.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportFile4.ts

diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile4.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile4.ts
new file mode 100644
index 00000000000..62cf48c4977
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportFile4.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts" />
+
+//// [|let t: A/*0*/.B.I;|]
+
+// @Filename: ./module.ts
+//// export namespace A {
+////    export namespace B {
+////        export interface I { }
+////    }
+//// }
+
+verify.importFixAtPosition([
+`import { A } from "./module";
+
+let t: A.B.I;`
+]);
\ No newline at end of file

From 5f1fafce5e76311cc8ef0f3c76f8b4a9008687f7 Mon Sep 17 00:00:00 2001
From: zhengbli <zhengbli@microsoft.com>
Date: Thu, 2 Feb 2017 15:25:05 -0800
Subject: [PATCH 077/127] routine lib files update

---
 src/lib/dom.generated.d.ts                    | 1929 +++++++++++++----
 src/lib/webworker.generated.d.ts              |  797 +++++--
 .../modularizeLibrary_Dom.iterable.types      |    4 +-
 3 files changed, 2202 insertions(+), 528 deletions(-)

diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts
index d9825897ebc..b4217c131f9 100644
--- a/src/lib/dom.generated.d.ts
+++ b/src/lib/dom.generated.d.ts
@@ -3,18 +3,50 @@
 /// IE DOM APIs
 /////////////////////////////
 
+interface Account {
+    rpDisplayName?: string;
+    displayName?: string;
+    id?: string;
+    name?: string;
+    imageURL?: string;
+}
+
 interface Algorithm {
     name: string;
 }
 
-interface AriaRequestEventInit extends EventInit {
-    attributeName?: string;
-    attributeValue?: string;
+interface AnimationEventInit extends EventInit {
+    animationName?: string;
+    elapsedTime?: number;
 }
 
-interface CommandEventInit extends EventInit {
-    commandName?: string;
-    detail?: string;
+interface AssertionOptions {
+    timeoutSeconds?: number;
+    rpId?: USVString;
+    allowList?: ScopedCredentialDescriptor[];
+    extensions?: WebAuthnExtensions;
+}
+
+interface CacheQueryOptions {
+    ignoreSearch?: boolean;
+    ignoreMethod?: boolean;
+    ignoreVary?: boolean;
+    cacheName?: string;
+}
+
+interface ClientData {
+    challenge?: string;
+    origin?: string;
+    rpId?: string;
+    hashAlg?: string | Algorithm;
+    tokenBinding?: string;
+    extensions?: WebAuthnExtensions;
+}
+
+interface CloseEventInit extends EventInit {
+    wasClean?: boolean;
+    code?: number;
+    reason?: string;
 }
 
 interface CompositionEventInit extends UIEventInit {
@@ -54,6 +86,13 @@ interface CustomEventInit extends EventInit {
     detail?: any;
 }
 
+interface DOMRectInit {
+    x?: any;
+    y?: any;
+    width?: any;
+    height?: any;
+}
+
 interface DeviceAccelerationDict {
     x?: number;
     y?: number;
@@ -64,6 +103,20 @@ interface DeviceLightEventInit extends EventInit {
     value?: number;
 }
 
+interface DeviceMotionEventInit extends EventInit {
+    acceleration?: DeviceAccelerationDict;
+    accelerationIncludingGravity?: DeviceAccelerationDict;
+    rotationRate?: DeviceRotationRateDict;
+    interval?: number;
+}
+
+interface DeviceOrientationEventInit extends EventInit {
+    alpha?: number;
+    beta?: number;
+    gamma?: number;
+    absolute?: boolean;
+}
+
 interface DeviceRotationRateDict {
     alpha?: number;
     beta?: number;
@@ -75,6 +128,14 @@ interface DoubleRange {
     min?: number;
 }
 
+interface ErrorEventInit extends EventInit {
+    message?: string;
+    filename?: string;
+    lineno?: number;
+    colno?: number;
+    error?: any;
+}
+
 interface EventInit {
     scoped?: boolean;
     bubbles?: boolean;
@@ -107,6 +168,29 @@ interface FocusEventInit extends UIEventInit {
     relatedTarget?: EventTarget;
 }
 
+interface FocusNavigationEventInit extends EventInit {
+    navigationReason?: string;
+    originLeft?: number;
+    originTop?: number;
+    originWidth?: number;
+    originHeight?: number;
+}
+
+interface FocusNavigationOrigin {
+    originLeft?: number;
+    originTop?: number;
+    originWidth?: number;
+    originHeight?: number;
+}
+
+interface GamepadEventInit extends EventInit {
+    gamepad?: Gamepad;
+}
+
+interface GetNotificationOptions {
+    tag?: string;
+}
+
 interface HashChangeEventInit extends EventInit {
     newURL?: string;
     oldURL?: string;
@@ -122,6 +206,20 @@ interface IDBObjectStoreParameters {
     keyPath?: IDBKeyPath;
 }
 
+interface IntersectionObserverEntryInit {
+    time?: number;
+    rootBounds?: DOMRectInit;
+    boundingClientRect?: DOMRectInit;
+    intersectionRect?: DOMRectInit;
+    target?: Element;
+}
+
+interface IntersectionObserverInit {
+    root?: Element;
+    rootMargin?: string;
+    threshold?: number | number[];
+}
+
 interface KeyAlgorithm {
     name?: string;
 }
@@ -324,6 +422,11 @@ interface MSPayloadBase extends RTCStats {
     payloadDescription?: string;
 }
 
+interface MSPortRange {
+    min?: number;
+    max?: number;
+}
+
 interface MSRelayAddress {
     relayAddress?: string;
     port?: number;
@@ -374,7 +477,7 @@ interface MSUtilization {
 }
 
 interface MSVideoPayload extends MSPayloadBase {
-    resoluton?: string;
+    resolution?: string;
     videoBitRateAvg?: number;
     videoBitRateMax?: number;
     videoFrameRateAvg?: number;
@@ -457,6 +560,10 @@ interface MediaStreamErrorEventInit extends EventInit {
     error?: MediaStreamError;
 }
 
+interface MediaStreamEventInit extends EventInit {
+    stream?: MediaStream;
+}
+
 interface MediaStreamTrackEventInit extends EventInit {
     track?: MediaStreamTrack;
 }
@@ -521,6 +628,15 @@ interface MediaTrackSupportedConstraints {
     groupId?: boolean;
 }
 
+interface MessageEventInit extends EventInit {
+    lastEventId?: string;
+    channel?: string;
+    data?: any;
+    origin?: string;
+    source?: Window;
+    ports?: MessagePort[];
+}
+
 interface MouseEventInit extends EventModifierInit {
     screenX?: number;
     screenY?: number;
@@ -550,10 +666,68 @@ interface MutationObserverInit {
     attributeFilter?: string[];
 }
 
+interface NotificationOptions {
+    dir?: string;
+    lang?: string;
+    body?: string;
+    tag?: string;
+    icon?: string;
+}
+
 interface ObjectURLOptions {
     oneTimeOnly?: boolean;
 }
 
+interface PaymentCurrencyAmount {
+    currency?: string;
+    value?: string;
+    currencySystem?: string;
+}
+
+interface PaymentDetails {
+    total?: PaymentItem;
+    displayItems?: PaymentItem[];
+    shippingOptions?: PaymentShippingOption[];
+    modifiers?: PaymentDetailsModifier[];
+    error?: string;
+}
+
+interface PaymentDetailsModifier {
+    supportedMethods?: string[];
+    total?: PaymentItem;
+    additionalDisplayItems?: PaymentItem[];
+    data?: any;
+}
+
+interface PaymentItem {
+    label?: string;
+    amount?: PaymentCurrencyAmount;
+    pending?: boolean;
+}
+
+interface PaymentMethodData {
+    supportedMethods?: string[];
+    data?: any;
+}
+
+interface PaymentOptions {
+    requestPayerName?: boolean;
+    requestPayerEmail?: boolean;
+    requestPayerPhone?: boolean;
+    requestShipping?: boolean;
+    shippingType?: string;
+}
+
+interface PaymentRequestUpdateEventInit extends EventInit {
+}
+
+interface PaymentShippingOption {
+    id?: string;
+    label?: string;
+    amount?: PaymentCurrencyAmount;
+    selected?: boolean;
+}
+
 interface PeriodicWaveConstraints {
     disableNormalization?: boolean;
 }
@@ -569,12 +743,34 @@ interface PointerEventInit extends MouseEventInit {
     isPrimary?: boolean;
 }
 
+interface PopStateEventInit extends EventInit {
+    state?: any;
+}
+
 interface PositionOptions {
     enableHighAccuracy?: boolean;
     timeout?: number;
     maximumAge?: number;
 }
 
+interface ProgressEventInit extends EventInit {
+    lengthComputable?: boolean;
+    loaded?: number;
+    total?: number;
+}
+
+interface PushSubscriptionOptionsInit {
+    userVisibleOnly?: boolean;
+    applicationServerKey?: any;
+}
+
+interface RTCConfiguration {
+    iceServers?: RTCIceServer[];
+    iceTransportPolicy?: string;
+    bundlePolicy?: string;
+    peerIdentity?: string;
+}
+
 interface RTCDTMFToneChangeEventInit extends EventInit {
     tone?: string;
 }
@@ -589,18 +785,6 @@ interface RTCDtlsParameters {
     fingerprints?: RTCDtlsFingerprint[];
 }
 
-interface RTCIceCandidate {
-    foundation?: string;
-    priority?: number;
-    ip?: string;
-    protocol?: string;
-    port?: number;
-    type?: string;
-    tcpType?: string;
-    relatedAddress?: string;
-    relatedPort?: number;
-}
-
 interface RTCIceCandidateAttributes extends RTCStats {
     ipAddress?: string;
     portNumber?: number;
@@ -613,9 +797,28 @@ interface RTCIceCandidateAttributes extends RTCStats {
 interface RTCIceCandidateComplete {
 }
 
+interface RTCIceCandidateDictionary {
+    foundation?: string;
+    priority?: number;
+    ip?: string;
+    protocol?: string;
+    port?: number;
+    type?: string;
+    tcpType?: string;
+    relatedAddress?: string;
+    relatedPort?: number;
+    msMTurnSessionId?: string;
+}
+
+interface RTCIceCandidateInit {
+    candidate?: string;
+    sdpMid?: string;
+    sdpMLineIndex?: number;
+}
+
 interface RTCIceCandidatePair {
-    local?: RTCIceCandidate;
-    remote?: RTCIceCandidate;
+    local?: RTCIceCandidateDictionary;
+    remote?: RTCIceCandidateDictionary;
 }
 
 interface RTCIceCandidatePairStats extends RTCStats {
@@ -637,11 +840,13 @@ interface RTCIceCandidatePairStats extends RTCStats {
 interface RTCIceGatherOptions {
     gatherPolicy?: string;
     iceservers?: RTCIceServer[];
+    portRange?: MSPortRange;
 }
 
 interface RTCIceParameters {
     usernameFragment?: string;
     password?: string;
+    iceLite?: boolean;
 }
 
 interface RTCIceServer {
@@ -675,6 +880,13 @@ interface RTCMediaStreamTrackStats extends RTCStats {
     echoReturnLossEnhancement?: number;
 }
 
+interface RTCOfferOptions {
+    offerToReceiveVideo?: number;
+    offerToReceiveAudio?: number;
+    voiceActivityDetection?: boolean;
+    iceRestart?: boolean;
+}
+
 interface RTCOutboundRTPStreamStats extends RTCRTPStreamStats {
     packetsSent?: number;
     bytesSent?: number;
@@ -682,6 +894,10 @@ interface RTCOutboundRTPStreamStats extends RTCRTPStreamStats {
     roundTripTime?: number;
 }
 
+interface RTCPeerConnectionIceEventInit extends EventInit {
+    candidate?: RTCIceCandidate;
+}
+
 interface RTCRTPStreamStats extends RTCStats {
     ssrc?: string;
     associateStatsId?: string;
@@ -719,6 +935,7 @@ interface RTCRtpCodecCapability {
     clockRate?: number;
     preferredPayloadType?: number;
     maxptime?: number;
+    ptime?: number;
     numChannels?: number;
     rtcpFeedback?: RTCRtcpFeedback[];
     parameters?: any;
@@ -733,6 +950,7 @@ interface RTCRtpCodecParameters {
     payloadType?: any;
     clockRate?: number;
     maxptime?: number;
+    ptime?: number;
     numChannels?: number;
     rtcpFeedback?: RTCRtcpFeedback[];
     parameters?: any;
@@ -752,9 +970,9 @@ interface RTCRtpEncodingParameters {
     priority?: number;
     maxBitrate?: number;
     minQuality?: number;
-    framerateBias?: number;
     resolutionScale?: number;
     framerateScale?: number;
+    maxFramerate?: number;
     active?: boolean;
     encodingId?: string;
     dependencyEncodingIds?: string[];
@@ -785,6 +1003,7 @@ interface RTCRtpParameters {
     headerExtensions?: RTCRtpHeaderExtensionParameters[];
     encodings?: RTCRtpEncodingParameters[];
     rtcp?: RTCRtcpParameters;
+    degradationPreference?: string;
 }
 
 interface RTCRtpRtxParameters {
@@ -797,6 +1016,11 @@ interface RTCRtpUnhandled {
     muxId?: string;
 }
 
+interface RTCSessionDescriptionInit {
+    type?: string;
+    sdp?: string;
+}
+
 interface RTCSrtpKeyParam {
     keyMethod?: string;
     keySalt?: string;
@@ -837,6 +1061,64 @@ interface RTCTransportStats extends RTCStats {
     remoteCertificateId?: string;
 }
 
+interface RegistrationOptions {
+    scope?: string;
+}
+
+interface RequestInit {
+    method?: string;
+    headers?: any;
+    body?: any;
+    referrer?: string;
+    referrerPolicy?: string;
+    mode?: string;
+    credentials?: string;
+    cache?: string;
+    redirect?: string;
+    integrity?: string;
+    keepalive?: boolean;
+    window?: any;
+}
+
+interface ResponseInit {
+    status?: number;
+    statusText?: string;
+    headers?: any;
+}
+
+interface ScopedCredentialDescriptor {
+    type?: string;
+    id?: any;
+    transports?: string[];
+}
+
+interface ScopedCredentialOptions {
+    timeoutSeconds?: number;
+    rpId?: USVString;
+    excludeList?: ScopedCredentialDescriptor[];
+    extensions?: WebAuthnExtensions;
+}
+
+interface ScopedCredentialParameters {
+    type?: string;
+    algorithm?: string | Algorithm;
+}
+
+interface ServiceWorkerMessageEventInit extends EventInit {
+    data?: any;
+    origin?: string;
+    lastEventId?: string;
+    source?: ServiceWorker | MessagePort;
+    ports?: MessagePort[];
+}
+
+interface SpeechSynthesisEventInit extends EventInit {
+    utterance?: SpeechSynthesisUtterance;
+    charIndex?: number;
+    elapsedTime?: number;
+    name?: string;
+}
+
 interface StoreExceptionsInformation extends ExceptionInformation {
     siteName?: string;
     explanationString?: string;
@@ -847,11 +1129,23 @@ interface StoreSiteSpecificExceptionsInformation extends StoreExceptionsInformat
     arrayOfDomainStrings?: string[];
 }
 
+interface TrackEventInit extends EventInit {
+    track?: VideoTrack | AudioTrack | TextTrack;
+}
+
+interface TransitionEventInit extends EventInit {
+    propertyName?: string;
+    elapsedTime?: number;
+}
+
 interface UIEventInit extends EventInit {
     view?: Window;
     detail?: number;
 }
 
+interface WebAuthnExtensions {
+}
+
 interface WebGLContextAttributes {
     failIfMajorPerformanceCaveat?: boolean;
     alpha?: boolean;
@@ -877,6 +1171,18 @@ interface EventListener {
     (evt: Event): void;
 }
 
+interface WebKitEntriesCallback {
+    (evt: Event): void;
+}
+
+interface WebKitErrorCallback {
+    (evt: Event): void;
+}
+
+interface WebKitFileCallback {
+    (evt: Event): void;
+}
+
 interface ANGLE_instanced_arrays {
     drawArraysInstancedANGLE(mode: number, first: number, count: number, primcount: number): void;
     drawElementsInstancedANGLE(mode: number, count: number, type: number, offset: number, primcount: number): void;
@@ -915,14 +1221,14 @@ interface AnimationEvent extends Event {
 
 declare var AnimationEvent: {
     prototype: AnimationEvent;
-    new(): AnimationEvent;
+    new(typeArg: string, eventInitDict?: AnimationEventInit): AnimationEvent;
 }
 
 interface ApplicationCacheEventMap {
     "cached": Event;
     "checking": Event;
     "downloading": Event;
-    "error": ErrorEvent;
+    "error": Event;
     "noupdate": Event;
     "obsolete": Event;
     "progress": ProgressEvent;
@@ -933,7 +1239,7 @@ interface ApplicationCache extends EventTarget {
     oncached: (this: ApplicationCache, ev: Event) => any;
     onchecking: (this: ApplicationCache, ev: Event) => any;
     ondownloading: (this: ApplicationCache, ev: Event) => any;
-    onerror: (this: ApplicationCache, ev: ErrorEvent) => any;
+    onerror: (this: ApplicationCache, ev: Event) => any;
     onnoupdate: (this: ApplicationCache, ev: Event) => any;
     onobsolete: (this: ApplicationCache, ev: Event) => any;
     onprogress: (this: ApplicationCache, ev: ProgressEvent) => any;
@@ -963,16 +1269,6 @@ declare var ApplicationCache: {
     readonly UPDATEREADY: number;
 }
 
-interface AriaRequestEvent extends Event {
-    readonly attributeName: string;
-    attributeValue: string | null;
-}
-
-declare var AriaRequestEvent: {
-    prototype: AriaRequestEvent;
-    new(type: string, eventInitDict?: AriaRequestEventInit): AriaRequestEvent;
-}
-
 interface Attr extends Node {
     readonly name: string;
     readonly ownerElement: Element;
@@ -1024,12 +1320,18 @@ declare var AudioBufferSourceNode: {
     new(): AudioBufferSourceNode;
 }
 
-interface AudioContext extends EventTarget {
+interface AudioContextEventMap {
+    "statechange": Event;
+}
+
+interface AudioContextBase extends EventTarget {
     readonly currentTime: number;
     readonly destination: AudioDestinationNode;
     readonly listener: AudioListener;
+    onstatechange: (this: AudioContext, ev: Event) => any;
     readonly sampleRate: number;
-    state: string;
+    readonly state: string;
+    close(): PromiseLike<void>;
     createAnalyser(): AnalyserNode;
     createBiquadFilter(): BiquadFilterNode;
     createBuffer(numberOfChannels: number, length: number, sampleRate: number): AudioBuffer;
@@ -1040,6 +1342,7 @@ interface AudioContext extends EventTarget {
     createDelay(maxDelayTime?: number): DelayNode;
     createDynamicsCompressor(): DynamicsCompressorNode;
     createGain(): GainNode;
+    createIIRFilter(feedforward: number[], feedback: number[]): IIRFilterNode;
     createMediaElementSource(mediaElement: HTMLMediaElement): MediaElementAudioSourceNode;
     createMediaStreamSource(mediaStream: MediaStream): MediaStreamAudioSourceNode;
     createOscillator(): OscillatorNode;
@@ -1049,6 +1352,13 @@ interface AudioContext extends EventTarget {
     createStereoPanner(): StereoPannerNode;
     createWaveShaper(): WaveShaperNode;
     decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): PromiseLike<AudioBuffer>;
+    resume(): PromiseLike<void>;
+    addEventListener<K extends keyof AudioContextEventMap>(type: K, listener: (this: AudioContext, ev: AudioContextEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+interface AudioContext extends AudioContextBase {
+    suspend(): PromiseLike<void>;
 }
 
 declare var AudioContext: {
@@ -1085,7 +1395,7 @@ interface AudioNode extends EventTarget {
     readonly context: AudioContext;
     readonly numberOfInputs: number;
     readonly numberOfOutputs: number;
-    connect(destination: AudioNode, output?: number, input?: number): void;
+    connect(destination: AudioNode, output?: number, input?: number): AudioNode;
     disconnect(output?: number): void;
     disconnect(destination: AudioNode, output?: number, input?: number): void;
     disconnect(destination: AudioParam, output?: number): void;
@@ -1099,12 +1409,12 @@ declare var AudioNode: {
 interface AudioParam {
     readonly defaultValue: number;
     value: number;
-    cancelScheduledValues(startTime: number): void;
-    exponentialRampToValueAtTime(value: number, endTime: number): void;
-    linearRampToValueAtTime(value: number, endTime: number): void;
-    setTargetAtTime(target: number, startTime: number, timeConstant: number): void;
-    setValueAtTime(value: number, startTime: number): void;
-    setValueCurveAtTime(values: Float32Array, startTime: number, duration: number): void;
+    cancelScheduledValues(startTime: number): AudioParam;
+    exponentialRampToValueAtTime(value: number, endTime: number): AudioParam;
+    linearRampToValueAtTime(value: number, endTime: number): AudioParam;
+    setTargetAtTime(target: number, startTime: number, timeConstant: number): AudioParam;
+    setValueAtTime(value: number, startTime: number): AudioParam;
+    setValueCurveAtTime(values: Float32Array, startTime: number, duration: number): AudioParam;
 }
 
 declare var AudioParam: {
@@ -1481,10 +1791,16 @@ interface CSSStyleDeclaration {
     imeMode: string | null;
     justifyContent: string | null;
     kerning: string | null;
+    layoutGrid: string | null;
+    layoutGridChar: string | null;
+    layoutGridLine: string | null;
+    layoutGridMode: string | null;
+    layoutGridType: string | null;
     left: string | null;
     readonly length: number;
     letterSpacing: string | null;
     lightingColor: string | null;
+    lineBreak: string | null;
     lineHeight: string | null;
     listStyle: string | null;
     listStyleImage: string | null;
@@ -1556,6 +1872,7 @@ interface CSSStyleDeclaration {
     orphans: string | null;
     outline: string | null;
     outlineColor: string | null;
+    outlineOffset: string | null;
     outlineStyle: string | null;
     outlineWidth: string | null;
     overflow: string | null;
@@ -1576,9 +1893,11 @@ interface CSSStyleDeclaration {
     position: string | null;
     quotes: string | null;
     right: string | null;
+    rotate: string | null;
     rubyAlign: string | null;
     rubyOverhang: string | null;
     rubyPosition: string | null;
+    scale: string | null;
     stopColor: string | null;
     stopOpacity: string | null;
     stroke: string | null;
@@ -1612,6 +1931,7 @@ interface CSSStyleDeclaration {
     transitionDuration: string | null;
     transitionProperty: string | null;
     transitionTimingFunction: string | null;
+    translate: string | null;
     unicodeBidi: string | null;
     verticalAlign: string | null;
     visibility: string | null;
@@ -1672,6 +1992,9 @@ interface CSSStyleDeclaration {
     webkitTapHighlightColor: string | null;
     webkitTextFillColor: string | null;
     webkitTextSizeAdjust: any;
+    webkitTextStroke: string | null;
+    webkitTextStrokeColor: string | null;
+    webkitTextStrokeWidth: string | null;
     webkitTransform: string | null;
     webkitTransformOrigin: string | null;
     webkitTransformStyle: string | null;
@@ -1693,6 +2016,7 @@ interface CSSStyleDeclaration {
     zIndex: string | null;
     zoom: string | null;
     resize: string | null;
+    userSelect: string | null;
     getPropertyPriority(propertyName: string): string;
     getPropertyValue(propertyName: string): string;
     item(index: number): string;
@@ -1720,7 +2044,6 @@ declare var CSSStyleRule: {
 interface CSSStyleSheet extends StyleSheet {
     readonly cssRules: CSSRuleList;
     cssText: string;
-    readonly href: string;
     readonly id: string;
     readonly imports: StyleSheetList;
     readonly isAlternate: boolean;
@@ -1752,6 +2075,34 @@ declare var CSSSupportsRule: {
     new(): CSSSupportsRule;
 }
 
+interface Cache {
+    add(request: RequestInfo): PromiseLike<void>;
+    addAll(requests: RequestInfo[]): PromiseLike<void>;
+    delete(request: RequestInfo, options?: CacheQueryOptions): PromiseLike<boolean>;
+    keys(request?: RequestInfo, options?: CacheQueryOptions): any;
+    match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike<Response>;
+    matchAll(request?: RequestInfo, options?: CacheQueryOptions): any;
+    put(request: RequestInfo, response: Response): PromiseLike<void>;
+}
+
+declare var Cache: {
+    prototype: Cache;
+    new(): Cache;
+}
+
+interface CacheStorage {
+    delete(cacheName: string): PromiseLike<boolean>;
+    has(cacheName: string): PromiseLike<boolean>;
+    keys(): any;
+    match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike<any>;
+    open(cacheName: string): PromiseLike<Cache>;
+}
+
+declare var CacheStorage: {
+    prototype: CacheStorage;
+    new(): CacheStorage;
+}
+
 interface CanvasGradient {
     addColorStop(offset: number, color: string): void;
 }
@@ -1776,13 +2127,13 @@ interface CanvasRenderingContext2D extends Object, CanvasPathMethods {
     font: string;
     globalAlpha: number;
     globalCompositeOperation: string;
+    imageSmoothingEnabled: boolean;
     lineCap: string;
     lineDashOffset: number;
     lineJoin: string;
     lineWidth: number;
     miterLimit: number;
     msFillRule: string;
-    msImageSmoothingEnabled: boolean;
     shadowBlur: number;
     shadowColor: string;
     shadowOffsetX: number;
@@ -1800,6 +2151,7 @@ interface CanvasRenderingContext2D extends Object, CanvasPathMethods {
     createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
     createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern;
     createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient;
+    drawFocusIfNeeded(element: Element): void;
     drawImage(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, offsetX: number, offsetY: number, width?: number, height?: number, canvasOffsetX?: number, canvasOffsetY?: number, canvasImageWidth?: number, canvasImageHeight?: number): void;
     fill(fillRule?: string): void;
     fillRect(x: number, y: number, w: number, h: number): void;
@@ -1815,7 +2167,7 @@ interface CanvasRenderingContext2D extends Object, CanvasPathMethods {
     scale(x: number, y: number): void;
     setLineDash(segments: number[]): void;
     setTransform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): void;
-    stroke(): void;
+    stroke(path?: Path2D): void;
     strokeRect(x: number, y: number, w: number, h: number): void;
     strokeText(text: string, x: number, y: number, maxWidth?: number): void;
     transform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): void;
@@ -1901,17 +2253,7 @@ interface CloseEvent extends Event {
 
 declare var CloseEvent: {
     prototype: CloseEvent;
-    new(): CloseEvent;
-}
-
-interface CommandEvent extends Event {
-    readonly commandName: string;
-    readonly detail: string | null;
-}
-
-declare var CommandEvent: {
-    prototype: CommandEvent;
-    new(type: string, eventInitDict?: CommandEventInit): CommandEvent;
+    new(typeArg: string, eventInitDict?: CloseEventInit): CloseEvent;
 }
 
 interface Comment extends CharacterData {
@@ -1938,7 +2280,7 @@ interface Console {
     assert(test?: boolean, message?: string, ...optionalParams: any[]): void;
     clear(): void;
     count(countTitle?: string): void;
-    debug(message?: string, ...optionalParams: any[]): void;
+    debug(message?: any, ...optionalParams: any[]): void;
     dir(value?: any, ...optionalParams: any[]): void;
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
@@ -2108,9 +2450,9 @@ declare var DOMException: {
 
 interface DOMImplementation {
     createDocument(namespaceURI: string | null, qualifiedName: string | null, doctype: DocumentType): Document;
-    createDocumentType(qualifiedName: string, publicId: string | null, systemId: string | null): DocumentType;
+    createDocumentType(qualifiedName: string, publicId: string, systemId: string): DocumentType;
     createHTMLDocument(title: string): Document;
-    hasFeature(feature: string | null, version: string | null): boolean;
+    hasFeature(): boolean;
 }
 
 declare var DOMImplementation: {
@@ -2149,7 +2491,7 @@ declare var DOMStringList: {
 }
 
 interface DOMStringMap {
-    [name: string]: string;
+    [name: string]: string | undefined;
 }
 
 declare var DOMStringMap: {
@@ -2175,7 +2517,7 @@ declare var DOMTokenList: {
 
 interface DataCue extends TextTrackCue {
     data: ArrayBuffer;
-    addEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: TextTrackCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: DataCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -2205,6 +2547,7 @@ interface DataTransferItem {
     readonly type: string;
     getAsFile(): File | null;
     getAsString(_callback: FunctionStringCallback | null): void;
+    webkitGetAsEntry(): any;
 }
 
 declare var DataTransferItem: {
@@ -2265,7 +2608,7 @@ interface DeviceLightEvent extends Event {
 
 declare var DeviceLightEvent: {
     prototype: DeviceLightEvent;
-    new(type: string, eventInitDict?: DeviceLightEventInit): DeviceLightEvent;
+    new(typeArg: string, eventInitDict?: DeviceLightEventInit): DeviceLightEvent;
 }
 
 interface DeviceMotionEvent extends Event {
@@ -2278,7 +2621,7 @@ interface DeviceMotionEvent extends Event {
 
 declare var DeviceMotionEvent: {
     prototype: DeviceMotionEvent;
-    new(): DeviceMotionEvent;
+    new(typeArg: string, eventInitDict?: DeviceMotionEventInit): DeviceMotionEvent;
 }
 
 interface DeviceOrientationEvent extends Event {
@@ -2291,7 +2634,7 @@ interface DeviceOrientationEvent extends Event {
 
 declare var DeviceOrientationEvent: {
     prototype: DeviceOrientationEvent;
-    new(): DeviceOrientationEvent;
+    new(typeArg: string, eventInitDict?: DeviceOrientationEventInit): DeviceOrientationEvent;
 }
 
 interface DeviceRotationRate {
@@ -2373,7 +2716,7 @@ interface DocumentEventMap extends GlobalEventHandlersEventMap {
     "pointerlockerror": Event;
     "progress": ProgressEvent;
     "ratechange": Event;
-    "readystatechange": ProgressEvent;
+    "readystatechange": Event;
     "reset": Event;
     "scroll": UIEvent;
     "seeked": Event;
@@ -2444,10 +2787,6 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     readonly compatMode: string;
     cookie: string;
     readonly currentScript: HTMLScriptElement | SVGScriptElement;
-    /**
-      * Gets the default character set from the current regional language settings.
-      */
-    readonly defaultCharset: string;
     readonly defaultView: Window;
     /**
       * Sets or gets a value that indicates whether the document can be edited.
@@ -2754,7 +3093,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Fires when the state of the object has changed.
       * @param ev The event
       */
-    onreadystatechange: (this: Document, ev: ProgressEvent) => any;
+    onreadystatechange: (this: Document, ev: Event) => any;
     /**
       * Fires when the user resets a form. 
       * @param ev The event.
@@ -3122,8 +3461,8 @@ interface DocumentType extends Node, ChildNode {
     readonly internalSubset: string | null;
     readonly name: string;
     readonly notations: NamedNodeMap;
-    readonly publicId: string | null;
-    readonly systemId: string | null;
+    readonly publicId: string;
+    readonly systemId: string;
 }
 
 declare var DocumentType: {
@@ -3146,7 +3485,7 @@ interface DynamicsCompressorNode extends AudioNode {
     readonly attack: AudioParam;
     readonly knee: AudioParam;
     readonly ratio: AudioParam;
-    readonly reduction: AudioParam;
+    readonly reduction: number;
     readonly release: AudioParam;
     readonly threshold: AudioParam;
 }
@@ -3177,8 +3516,8 @@ declare var EXT_texture_filter_anisotropic: {
 }
 
 interface ElementEventMap extends GlobalEventHandlersEventMap {
-    "ariarequest": AriaRequestEvent;
-    "command": CommandEvent;
+    "ariarequest": Event;
+    "command": Event;
     "gotpointercapture": PointerEvent;
     "lostpointercapture": PointerEvent;
     "MSGestureChange": MSGestureEvent;
@@ -3214,10 +3553,11 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     readonly clientTop: number;
     readonly clientWidth: number;
     id: string;
+    innerHTML: string;
     msContentZoomFactor: number;
     readonly msRegionOverflow: string;
-    onariarequest: (this: Element, ev: AriaRequestEvent) => any;
-    oncommand: (this: Element, ev: CommandEvent) => any;
+    onariarequest: (this: Element, ev: Event) => any;
+    oncommand: (this: Element, ev: Event) => any;
     ongotpointercapture: (this: Element, ev: PointerEvent) => any;
     onlostpointercapture: (this: Element, ev: PointerEvent) => any;
     onmsgesturechange: (this: Element, ev: MSGestureEvent) => any;
@@ -3243,13 +3583,13 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     ontouchstart: (ev: TouchEvent) => any;
     onwebkitfullscreenchange: (this: Element, ev: Event) => any;
     onwebkitfullscreenerror: (this: Element, ev: Event) => any;
+    outerHTML: string;
     readonly prefix: string | null;
     readonly scrollHeight: number;
     scrollLeft: number;
     scrollTop: number;
     readonly scrollWidth: number;
     readonly tagName: string;
-    innerHTML: string;
     readonly assignedSlot: HTMLSlotElement | null;
     slot: string;
     readonly shadowRoot: ShadowRoot | null;
@@ -3273,7 +3613,7 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     msSetPointerCapture(pointerId: number): void;
     msZoomTo(args: MsZoomToOptions): void;
     releasePointerCapture(pointerId: number): void;
-    removeAttribute(name?: string): void;
+    removeAttribute(qualifiedName: string): void;
     removeAttributeNS(namespaceURI: string, localName: string): void;
     removeAttributeNode(oldAttr: Attr): Attr;
     requestFullscreen(): void;
@@ -3320,7 +3660,7 @@ interface ErrorEvent extends Event {
 
 declare var ErrorEvent: {
     prototype: ErrorEvent;
-    new(): ErrorEvent;
+    new(type: string, errorEventInitDict?: ErrorEventInit): ErrorEvent;
 }
 
 interface Event {
@@ -3349,7 +3689,7 @@ interface Event {
 
 declare var Event: {
     prototype: Event;
-    new(type: string, eventInitDict?: EventInit): Event;
+    new(typeArg: string, eventInitDict?: EventInit): Event;
     readonly AT_TARGET: number;
     readonly BUBBLING_PHASE: number;
     readonly CAPTURING_PHASE: number;
@@ -3366,6 +3706,21 @@ declare var EventTarget: {
     new(): EventTarget;
 }
 
+interface ExtensionScriptApis {
+    extensionIdToShortId(extensionId: string): number;
+    fireExtensionApiTelemetry(functionName: string, isSucceeded: boolean, isSupported: boolean): void;
+    genericFunction(routerAddress: any, parameters?: string, callbackId?: number): void;
+    genericSynchronousFunction(functionId: number, parameters?: string): string;
+    getExtensionId(): string;
+    registerGenericFunctionCallbackHandler(callbackHandler: any): void;
+    registerGenericPersistentCallbackHandler(callbackHandler: any): void;
+}
+
+declare var ExtensionScriptApis: {
+    prototype: ExtensionScriptApis;
+    new(): ExtensionScriptApis;
+}
+
 interface External {
 }
 
@@ -3402,7 +3757,7 @@ interface FileReader extends EventTarget, MSBaseReader {
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
     readAsText(blob: Blob, encoding?: string): void;
-    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: FileReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3421,6 +3776,20 @@ declare var FocusEvent: {
     new(typeArg: string, eventInitDict?: FocusEventInit): FocusEvent;
 }
 
+interface FocusNavigationEvent extends Event {
+    readonly navigationReason: string;
+    readonly originHeight: number;
+    readonly originLeft: number;
+    readonly originTop: number;
+    readonly originWidth: number;
+    requestFocus(): void;
+}
+
+declare var FocusNavigationEvent: {
+    prototype: FocusNavigationEvent;
+    new(type: string, eventInitDict?: FocusNavigationEventInit): FocusNavigationEvent;
+}
+
 interface FormData {
     append(name: any, value: any, blobName?: string): void;
 }
@@ -3470,7 +3839,7 @@ interface GamepadEvent extends Event {
 
 declare var GamepadEvent: {
     prototype: GamepadEvent;
-    new(): GamepadEvent;
+    new(typeArg: string, eventInitDict?: GamepadEventInit): GamepadEvent;
 }
 
 interface Geolocation {
@@ -3484,8 +3853,11 @@ declare var Geolocation: {
     new(): Geolocation;
 }
 
-interface HTMLAllCollection extends HTMLCollection {
-    namedItem(name: string): Element;
+interface HTMLAllCollection {
+    readonly length: number;
+    item(nameOrIndex?: string): HTMLCollection | Element | null;
+    namedItem(name: string): HTMLCollection | Element | null;
+    [index: number]: Element;
 }
 
 declare var HTMLAllCollection: {
@@ -3573,7 +3945,7 @@ interface HTMLAnchorElement extends HTMLElement {
       * Returns a string representation of an object.
       */
     toString(): string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAnchorElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3647,7 +4019,7 @@ interface HTMLAppletElement extends HTMLElement {
     useMap: string;
     vspace: number;
     width: number;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAppletElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3715,7 +4087,7 @@ interface HTMLAreaElement extends HTMLElement {
       * Returns a string representation of an object.
       */
     toString(): string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAreaElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3724,15 +4096,7 @@ declare var HTMLAreaElement: {
     new(): HTMLAreaElement;
 }
 
-interface HTMLAreasCollection extends HTMLCollection {
-    /**
-      * Adds an element to the areas, controlRange, or options collection.
-      */
-    add(element: HTMLElement, before?: HTMLElement | number): void;
-    /**
-      * Removes an element from the collection.
-      */
-    remove(index?: number): void;
+interface HTMLAreasCollection extends HTMLCollectionBase {
 }
 
 declare var HTMLAreasCollection: {
@@ -3741,7 +4105,7 @@ declare var HTMLAreasCollection: {
 }
 
 interface HTMLAudioElement extends HTMLMediaElement {
-    addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLMediaElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLAudioElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3755,7 +4119,7 @@ interface HTMLBRElement extends HTMLElement {
       * Sets or retrieves the side on which floating objects are not to be positioned when any IHTMLBlockElement is inserted into the document.
       */
     clear: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBRElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3773,7 +4137,7 @@ interface HTMLBaseElement extends HTMLElement {
       * Sets or retrieves the window or frame at which to target content.
       */
     target: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBaseElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3791,7 +4155,7 @@ interface HTMLBaseFontElement extends HTMLElement, DOML2DeprecatedColorProperty
       * Sets or retrieves the font size of the object.
       */
     size: number;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBaseFontElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3817,6 +4181,7 @@ interface HTMLBodyElementEventMap extends HTMLElementEventMap {
     "pageshow": PageTransitionEvent;
     "popstate": PopStateEvent;
     "resize": UIEvent;
+    "scroll": UIEvent;
     "storage": StorageEvent;
     "unload": Event;
 }
@@ -3844,6 +4209,7 @@ interface HTMLBodyElement extends HTMLElement {
     onpageshow: (this: HTMLBodyElement, ev: PageTransitionEvent) => any;
     onpopstate: (this: HTMLBodyElement, ev: PopStateEvent) => any;
     onresize: (this: HTMLBodyElement, ev: UIEvent) => any;
+    onscroll: (this: HTMLBodyElement, ev: UIEvent) => any;
     onstorage: (this: HTMLBodyElement, ev: StorageEvent) => any;
     onunload: (this: HTMLBodyElement, ev: Event) => any;
     text: any;
@@ -3921,7 +4287,7 @@ interface HTMLButtonElement extends HTMLElement {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLButtonElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3956,7 +4322,7 @@ interface HTMLCanvasElement extends HTMLElement {
       */
     toDataURL(type?: string, ...args: any[]): string;
     toBlob(callback: (result: Blob | null) => void, type?: string, ...arguments: any[]): void;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLCanvasElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3965,7 +4331,7 @@ declare var HTMLCanvasElement: {
     new(): HTMLCanvasElement;
 }
 
-interface HTMLCollection {
+interface HTMLCollectionBase {
     /**
       * Sets or retrieves the number of objects in a collection.
       */
@@ -3974,11 +4340,14 @@ interface HTMLCollection {
       * Retrieves an object from various collections.
       */
     item(index: number): Element;
+    [index: number]: Element;
+}
+
+interface HTMLCollection extends HTMLCollectionBase {
     /**
       * Retrieves a select object or an object from an options collection.
       */
-    namedItem(name: string): Element;
-    [index: number]: Element;
+    namedItem(name: string): Element | null;
 }
 
 declare var HTMLCollection: {
@@ -3988,7 +4357,7 @@ declare var HTMLCollection: {
 
 interface HTMLDListElement extends HTMLElement {
     compact: boolean;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3997,9 +4366,20 @@ declare var HTMLDListElement: {
     new(): HTMLDListElement;
 }
 
+interface HTMLDataElement extends HTMLElement {
+    value: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var HTMLDataElement: {
+    prototype: HTMLDataElement;
+    new(): HTMLDataElement;
+}
+
 interface HTMLDataListElement extends HTMLElement {
     options: HTMLCollectionOf<HTMLOptionElement>;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4010,7 +4390,7 @@ declare var HTMLDataListElement: {
 
 interface HTMLDirectoryElement extends HTMLElement {
     compact: boolean;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDirectoryElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4028,7 +4408,7 @@ interface HTMLDivElement extends HTMLElement {
       * Sets or retrieves whether the browser automatically performs wordwrap.
       */
     noWrap: boolean;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDivElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4038,7 +4418,7 @@ declare var HTMLDivElement: {
 }
 
 interface HTMLDocument extends Document {
-    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: HTMLDocument, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4126,7 +4506,6 @@ interface HTMLElement extends Element {
     draggable: boolean;
     hidden: boolean;
     hideFocus: boolean;
-    innerHTML: string;
     innerText: string;
     readonly isContentEditable: boolean;
     lang: string;
@@ -4202,7 +4581,6 @@ interface HTMLElement extends Element {
     ontimeupdate: (this: HTMLElement, ev: Event) => any;
     onvolumechange: (this: HTMLElement, ev: Event) => any;
     onwaiting: (this: HTMLElement, ev: Event) => any;
-    outerHTML: string;
     outerText: string;
     spellcheck: boolean;
     readonly style: CSSStyleDeclaration;
@@ -4213,7 +4591,6 @@ interface HTMLElement extends Element {
     dragDrop(): boolean;
     focus(): void;
     msGetInputContext(): MSInputMethodContext;
-    setActive(): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -4270,7 +4647,7 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves the width of the object.
       */
     width: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLEmbedElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4289,6 +4666,7 @@ interface HTMLFieldSetElement extends HTMLElement {
       * Retrieves a reference to the form that the object is embedded in.
       */
     readonly form: HTMLFormElement;
+    name: string;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
@@ -4310,7 +4688,7 @@ interface HTMLFieldSetElement extends HTMLElement {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFieldSetElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4324,7 +4702,7 @@ interface HTMLFontElement extends HTMLElement, DOML2DeprecatedColorProperty, DOM
       * Sets or retrieves the current typeface family.
       */
     face: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFontElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4333,6 +4711,15 @@ declare var HTMLFontElement: {
     new(): HTMLFontElement;
 }
 
+interface HTMLFormControlsCollection extends HTMLCollectionBase {
+    namedItem(name: string): HTMLCollection | Element | null;
+}
+
+declare var HTMLFormControlsCollection: {
+    prototype: HTMLFormControlsCollection;
+    new(): HTMLFormControlsCollection;
+}
+
 interface HTMLFormElement extends HTMLElement {
     /**
       * Sets or retrieves a list of character encodings for input data that must be accepted by the server processing the form.
@@ -4349,7 +4736,7 @@ interface HTMLFormElement extends HTMLElement {
     /**
       * Retrieves a collection, in source order, of all controls in a given form.
       */
-    readonly elements: HTMLCollection;
+    readonly elements: HTMLFormControlsCollection;
     /**
       * Sets or retrieves the MIME encoding for the form.
       */
@@ -4400,7 +4787,7 @@ interface HTMLFormElement extends HTMLElement {
       * Fires when a FORM is about to be submitted.
       */
     submit(): void;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFormElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [name: string]: any;
 }
@@ -4489,6 +4876,7 @@ declare var HTMLFrameElement: {
 }
 
 interface HTMLFrameSetElementEventMap extends HTMLElementEventMap {
+    "afterprint": Event;
     "beforeprint": Event;
     "beforeunload": BeforeUnloadEvent;
     "blur": FocusEvent;
@@ -4502,7 +4890,9 @@ interface HTMLFrameSetElementEventMap extends HTMLElementEventMap {
     "orientationchange": Event;
     "pagehide": PageTransitionEvent;
     "pageshow": PageTransitionEvent;
+    "popstate": PopStateEvent;
     "resize": UIEvent;
+    "scroll": UIEvent;
     "storage": StorageEvent;
     "unload": Event;
 }
@@ -4546,7 +4936,9 @@ interface HTMLFrameSetElement extends HTMLElement {
     onorientationchange: (this: HTMLFrameSetElement, ev: Event) => any;
     onpagehide: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any;
     onpageshow: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any;
+    onpopstate: (this: HTMLFrameSetElement, ev: PopStateEvent) => any;
     onresize: (this: HTMLFrameSetElement, ev: UIEvent) => any;
+    onscroll: (this: HTMLFrameSetElement, ev: UIEvent) => any;
     onstorage: (this: HTMLFrameSetElement, ev: StorageEvent) => any;
     onunload: (this: HTMLFrameSetElement, ev: Event) => any;
     /**
@@ -4575,7 +4967,7 @@ interface HTMLHRElement extends HTMLElement, DOML2DeprecatedColorProperty, DOML2
       * Sets or retrieves the width of the object.
       */
     width: number;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHRElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4586,7 +4978,7 @@ declare var HTMLHRElement: {
 
 interface HTMLHeadElement extends HTMLElement {
     profile: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4600,7 +4992,7 @@ interface HTMLHeadingElement extends HTMLElement {
       * Sets or retrieves a value that indicates the table alignment.
       */
     align: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadingElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4614,7 +5006,7 @@ interface HTMLHtmlElement extends HTMLElement {
       * Sets or retrieves the DTD version that governs the current document.
       */
     version: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHtmlElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4633,6 +5025,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
       */
     align: string;
     allowFullscreen: boolean;
+    allowPaymentRequest: boolean;
     /**
       * Specifies the properties of a border drawn around an object.
       */
@@ -4728,7 +5121,7 @@ interface HTMLImageElement extends HTMLElement {
       * Retrieves whether the object is fully loaded.
       */
     readonly complete: boolean;
-    crossOrigin: string;
+    crossOrigin: string | null;
     readonly currentSrc: string;
     /**
       * Sets or retrieves the height of the object.
@@ -4793,14 +5186,13 @@ interface HTMLImageElement extends HTMLElement {
     readonly x: number;
     readonly y: number;
     msGetAsCastingSource(): any;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLImageElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLImageElement: {
     prototype: HTMLImageElement;
     new(): HTMLImageElement;
-    create(): HTMLImageElement;
 }
 
 interface HTMLInputElement extends HTMLElement {
@@ -5006,7 +5398,7 @@ interface HTMLInputElement extends HTMLElement {
       * @param n Value to increment the value by.
       */
     stepUp(n?: number): void;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLInputElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5021,7 +5413,7 @@ interface HTMLLIElement extends HTMLElement {
       * Sets or retrieves the value of a list item.
       */
     value: number;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLIElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5039,7 +5431,7 @@ interface HTMLLabelElement extends HTMLElement {
       * Sets or retrieves the object to which the given label object is assigned.
       */
     htmlFor: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLabelElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5057,7 +5449,7 @@ interface HTMLLegendElement extends HTMLElement {
       * Retrieves a reference to the form that the object is embedded in.
       */
     readonly form: HTMLFormElement;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLegendElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5102,7 +5494,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
     type: string;
     import?: Document;
     integrity: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLinkElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5120,7 +5512,7 @@ interface HTMLMapElement extends HTMLElement {
       * Sets or retrieves the name of the object.
       */
     name: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMapElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5183,7 +5575,7 @@ interface HTMLMediaElement extends HTMLElement {
       * Gets or sets a flag that indicates whether the client provides a set of controls for the media (in case the developer does not include controls for the player).
       */
     controls: boolean;
-    crossOrigin: string;
+    crossOrigin: string | null;
     /**
       * Gets the address or URL of the current media resource that is selected by IHTMLMediaElement.
       */
@@ -5355,7 +5747,7 @@ declare var HTMLMediaElement: {
 interface HTMLMenuElement extends HTMLElement {
     compact: boolean;
     type: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMenuElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5389,7 +5781,7 @@ interface HTMLMetaElement extends HTMLElement {
       * Sets or retrieves the URL property that will be loaded after the specified time has elapsed. 
       */
     url: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMetaElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5405,7 +5797,7 @@ interface HTMLMeterElement extends HTMLElement {
     min: number;
     optimum: number;
     value: number;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMeterElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5423,7 +5815,7 @@ interface HTMLModElement extends HTMLElement {
       * Sets or retrieves the date and time of a modification to the object.
       */
     dateTime: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLModElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5439,7 +5831,7 @@ interface HTMLOListElement extends HTMLElement {
       */
     start: number;
     type: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5517,10 +5909,6 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves the name of the object.
       */
     name: string;
-    /**
-      * Retrieves the contained object.
-      */
-    readonly object: any;
     readonly readyState: number;
     /**
       * Sets or retrieves a message to be displayed while an object is loading.
@@ -5560,7 +5948,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLObjectElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5599,7 +5987,7 @@ interface HTMLOptGroupElement extends HTMLElement {
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
     value: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOptGroupElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5638,14 +6026,13 @@ interface HTMLOptionElement extends HTMLElement {
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
     value: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOptionElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLOptionElement: {
     prototype: HTMLOptionElement;
     new(): HTMLOptionElement;
-    create(): HTMLOptionElement;
 }
 
 interface HTMLOptionsCollection extends HTMLCollectionOf<HTMLOptionElement> {
@@ -5660,13 +6047,35 @@ declare var HTMLOptionsCollection: {
     new(): HTMLOptionsCollection;
 }
 
+interface HTMLOutputElement extends HTMLElement {
+    defaultValue: string;
+    readonly form: HTMLFormElement;
+    readonly htmlFor: DOMSettableTokenList;
+    name: string;
+    readonly type: string;
+    readonly validationMessage: string;
+    readonly validity: ValidityState;
+    value: string;
+    readonly willValidate: boolean;
+    checkValidity(): boolean;
+    reportValidity(): boolean;
+    setCustomValidity(error: string): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOutputElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var HTMLOutputElement: {
+    prototype: HTMLOutputElement;
+    new(): HTMLOutputElement;
+}
+
 interface HTMLParagraphElement extends HTMLElement {
     /**
       * Sets or retrieves how the object is aligned with adjacent text. 
       */
     align: string;
     clear: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParagraphElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5692,7 +6101,7 @@ interface HTMLParamElement extends HTMLElement {
       * Sets or retrieves the data type of the value attribute.
       */
     valueType: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParamElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5702,7 +6111,7 @@ declare var HTMLParamElement: {
 }
 
 interface HTMLPictureElement extends HTMLElement {
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLPictureElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5716,7 +6125,7 @@ interface HTMLPreElement extends HTMLElement {
       * Sets or gets a value that you can use to implement your own width functionality for the object.
       */
     width: number;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLPreElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5742,7 +6151,7 @@ interface HTMLProgressElement extends HTMLElement {
       * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value.
       */
     value: number;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLProgressElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5756,7 +6165,7 @@ interface HTMLQuoteElement extends HTMLElement {
       * Sets or retrieves reference information about the object.
       */
     cite: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLQuoteElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5771,6 +6180,7 @@ interface HTMLScriptElement extends HTMLElement {
       * Sets or retrieves the character set used to encode the object.
       */
     charset: string;
+    crossOrigin: string | null;
     /**
       * Sets or retrieves the status of the script.
       */
@@ -5796,7 +6206,7 @@ interface HTMLScriptElement extends HTMLElement {
       */
     type: string;
     integrity: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLScriptElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5892,7 +6302,7 @@ interface HTMLSelectElement extends HTMLElement {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSelectElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [name: string]: any;
 }
@@ -5918,7 +6328,7 @@ interface HTMLSourceElement extends HTMLElement {
      * Gets or sets the MIME type of a media resource.
      */
     type: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSourceElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5928,7 +6338,7 @@ declare var HTMLSourceElement: {
 }
 
 interface HTMLSpanElement extends HTMLElement {
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSpanElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5947,7 +6357,7 @@ interface HTMLStyleElement extends HTMLElement, LinkStyle {
       * Retrieves the CSS language in which the style sheet is written.
       */
     type: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLStyleElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5965,7 +6375,7 @@ interface HTMLTableCaptionElement extends HTMLElement {
       * Sets or retrieves whether the caption appears at the top or bottom of the table.
       */
     vAlign: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableCaptionElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6020,7 +6430,7 @@ interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment {
       * Sets or retrieves the width of the object.
       */
     width: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableCellElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6042,7 +6452,7 @@ interface HTMLTableColElement extends HTMLElement, HTMLTableAlignment {
       * Sets or retrieves the width of the object.
       */
     width: any;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableColElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6052,6 +6462,8 @@ declare var HTMLTableColElement: {
 }
 
 interface HTMLTableDataCellElement extends HTMLTableCellElement {
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableDataCellElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTableDataCellElement: {
@@ -6163,7 +6575,7 @@ interface HTMLTableElement extends HTMLElement {
       * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection.
       */
     insertRow(index?: number): HTMLTableRowElement;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6177,6 +6589,8 @@ interface HTMLTableHeaderCellElement extends HTMLTableCellElement {
       * Sets or retrieves the group of cells in a table to which the object's information applies.
       */
     scope: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableHeaderCellElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTableHeaderCellElement: {
@@ -6216,7 +6630,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
       * @param index Number that specifies where to insert the cell in the tr. The default value is -1, which appends the new cell to the end of the cells collection.
       */
     insertCell(index?: number): HTMLTableDataCellElement;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableRowElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6244,7 +6658,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment {
       * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection.
       */
     insertRow(index?: number): HTMLTableRowElement;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableSectionElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6255,7 +6669,7 @@ declare var HTMLTableSectionElement: {
 
 interface HTMLTemplateElement extends HTMLElement {
     readonly content: DocumentFragment;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTemplateElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6362,7 +6776,7 @@ interface HTMLTextAreaElement extends HTMLElement {
       * @param end The offset into the text field for the end of the selection.
       */
     setSelectionRange(start: number, end: number): void;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTextAreaElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6371,12 +6785,23 @@ declare var HTMLTextAreaElement: {
     new(): HTMLTextAreaElement;
 }
 
+interface HTMLTimeElement extends HTMLElement {
+    dateTime: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTimeElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var HTMLTimeElement: {
+    prototype: HTMLTimeElement;
+    new(): HTMLTimeElement;
+}
+
 interface HTMLTitleElement extends HTMLElement {
     /**
       * Retrieves or sets the text of the object as a string. 
       */
     text: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTitleElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6397,7 +6822,7 @@ interface HTMLTrackElement extends HTMLElement {
     readonly LOADED: number;
     readonly LOADING: number;
     readonly NONE: number;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTrackElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6413,7 +6838,7 @@ declare var HTMLTrackElement: {
 interface HTMLUListElement extends HTMLElement {
     compact: boolean;
     type: string;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLUListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6423,7 +6848,7 @@ declare var HTMLUListElement: {
 }
 
 interface HTMLUnknownElement extends HTMLElement {
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLUnknownElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6494,7 +6919,21 @@ interface HashChangeEvent extends Event {
 
 declare var HashChangeEvent: {
     prototype: HashChangeEvent;
-    new(type: string, eventInitDict?: HashChangeEventInit): HashChangeEvent;
+    new(typeArg: string, eventInitDict?: HashChangeEventInit): HashChangeEvent;
+}
+
+interface Headers {
+    append(name: string, value: string): void;
+    delete(name: string): void;
+    forEach(callback: ForEachCallback): void;
+    get(name: string): string | null;
+    has(name: string): boolean;
+    set(name: string, value: string): void;
+}
+
+declare var Headers: {
+    prototype: Headers;
+    new(init?: any): Headers;
 }
 
 interface History {
@@ -6548,14 +6987,14 @@ declare var IDBCursorWithValue: {
 
 interface IDBDatabaseEventMap {
     "abort": Event;
-    "error": ErrorEvent;
+    "error": Event;
 }
 
 interface IDBDatabase extends EventTarget {
     readonly name: string;
     readonly objectStoreNames: DOMStringList;
     onabort: (this: IDBDatabase, ev: Event) => any;
-    onerror: (this: IDBDatabase, ev: ErrorEvent) => any;
+    onerror: (this: IDBDatabase, ev: Event) => any;
     version: number;
     onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
@@ -6658,13 +7097,13 @@ declare var IDBOpenDBRequest: {
 }
 
 interface IDBRequestEventMap {
-    "error": ErrorEvent;
+    "error": Event;
     "success": Event;
 }
 
 interface IDBRequest extends EventTarget {
     readonly error: DOMError;
-    onerror: (this: IDBRequest, ev: ErrorEvent) => any;
+    onerror: (this: IDBRequest, ev: Event) => any;
     onsuccess: (this: IDBRequest, ev: Event) => any;
     readonly readyState: string;
     readonly result: any;
@@ -6682,7 +7121,7 @@ declare var IDBRequest: {
 interface IDBTransactionEventMap {
     "abort": Event;
     "complete": Event;
-    "error": ErrorEvent;
+    "error": Event;
 }
 
 interface IDBTransaction extends EventTarget {
@@ -6691,7 +7130,7 @@ interface IDBTransaction extends EventTarget {
     readonly mode: string;
     onabort: (this: IDBTransaction, ev: Event) => any;
     oncomplete: (this: IDBTransaction, ev: Event) => any;
-    onerror: (this: IDBTransaction, ev: ErrorEvent) => any;
+    onerror: (this: IDBTransaction, ev: Event) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
     readonly READ_ONLY: string;
@@ -6719,6 +7158,15 @@ declare var IDBVersionChangeEvent: {
     new(): IDBVersionChangeEvent;
 }
 
+interface IIRFilterNode extends AudioNode {
+    getFrequencyResponse(frequencyHz: Float32Array, magResponse: Float32Array, phaseResponse: Float32Array): void;
+}
+
+declare var IIRFilterNode: {
+    prototype: IIRFilterNode;
+    new(): IIRFilterNode;
+}
+
 interface ImageData {
     data: Uint8ClampedArray;
     readonly height: number;
@@ -6731,6 +7179,35 @@ declare var ImageData: {
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 }
 
+interface IntersectionObserver {
+    readonly root: Element | null;
+    readonly rootMargin: string;
+    readonly thresholds: number[];
+    disconnect(): void;
+    observe(target: Element): void;
+    takeRecords(): IntersectionObserverEntry[];
+    unobserve(target: Element): void;
+}
+
+declare var IntersectionObserver: {
+    prototype: IntersectionObserver;
+    new(callback: IntersectionObserverCallback, options?: IntersectionObserverInit): IntersectionObserver;
+}
+
+interface IntersectionObserverEntry {
+    readonly boundingClientRect: ClientRect;
+    readonly intersectionRatio: number;
+    readonly intersectionRect: ClientRect;
+    readonly rootBounds: ClientRect;
+    readonly target: Element;
+    readonly time: number;
+}
+
+declare var IntersectionObserverEntry: {
+    prototype: IntersectionObserverEntry;
+    new(intersectionObserverEntryInit: IntersectionObserverEntryInit): IntersectionObserverEntry;
+}
+
 interface KeyboardEvent extends UIEvent {
     readonly altKey: boolean;
     readonly char: string | null;
@@ -6832,13 +7309,13 @@ declare var MSApp: MSApp;
 
 interface MSAppAsyncOperationEventMap {
     "complete": Event;
-    "error": ErrorEvent;
+    "error": Event;
 }
 
 interface MSAppAsyncOperation extends EventTarget {
     readonly error: DOMError;
     oncomplete: (this: MSAppAsyncOperation, ev: Event) => any;
-    onerror: (this: MSAppAsyncOperation, ev: ErrorEvent) => any;
+    onerror: (this: MSAppAsyncOperation, ev: Event) => any;
     readonly readyState: number;
     readonly result: any;
     start(): void;
@@ -6995,12 +7472,13 @@ interface MSHTMLWebViewElement extends HTMLElement {
     goForward(): void;
     invokeScriptAsync(scriptName: string, ...args: any[]): MSWebViewAsyncOperation;
     navigate(uri: string): void;
+    navigateFocus(navigationReason: string, origin: FocusNavigationOrigin): void;
     navigateToLocalStreamUri(source: string, streamResolver: any): void;
     navigateToString(contents: string): void;
     navigateWithHttpRequestMessage(requestMessage: any): void;
     refresh(): void;
     stop(): void;
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: MSHTMLWebViewElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7192,7 +7670,7 @@ interface MSStreamReader extends EventTarget, MSBaseReader {
     readAsBlob(stream: MSStream, size?: number): void;
     readAsDataURL(stream: MSStream, size?: number): void;
     readAsText(stream: MSStream, encoding?: string, size?: number): void;
-    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSStreamReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7203,13 +7681,13 @@ declare var MSStreamReader: {
 
 interface MSWebViewAsyncOperationEventMap {
     "complete": Event;
-    "error": ErrorEvent;
+    "error": Event;
 }
 
 interface MSWebViewAsyncOperation extends EventTarget {
     readonly error: DOMError;
     oncomplete: (this: MSWebViewAsyncOperation, ev: Event) => any;
-    onerror: (this: MSWebViewAsyncOperation, ev: ErrorEvent) => any;
+    onerror: (this: MSWebViewAsyncOperation, ev: Event) => any;
     readonly readyState: number;
     readonly result: any;
     readonly target: MSHTMLWebViewElement;
@@ -7419,18 +7897,18 @@ declare var MediaSource: {
 
 interface MediaStreamEventMap {
     "active": Event;
-    "addtrack": TrackEvent;
+    "addtrack": MediaStreamTrackEvent;
     "inactive": Event;
-    "removetrack": TrackEvent;
+    "removetrack": MediaStreamTrackEvent;
 }
 
 interface MediaStream extends EventTarget {
     readonly active: boolean;
     readonly id: string;
     onactive: (this: MediaStream, ev: Event) => any;
-    onaddtrack: (this: MediaStream, ev: TrackEvent) => any;
+    onaddtrack: (this: MediaStream, ev: MediaStreamTrackEvent) => any;
     oninactive: (this: MediaStream, ev: Event) => any;
-    onremovetrack: (this: MediaStream, ev: TrackEvent) => any;
+    onremovetrack: (this: MediaStream, ev: MediaStreamTrackEvent) => any;
     addTrack(track: MediaStreamTrack): void;
     clone(): MediaStream;
     getAudioTracks(): MediaStreamTrack[];
@@ -7473,7 +7951,16 @@ interface MediaStreamErrorEvent extends Event {
 
 declare var MediaStreamErrorEvent: {
     prototype: MediaStreamErrorEvent;
-    new(type: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
+    new(typeArg: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
+}
+
+interface MediaStreamEvent extends Event {
+    readonly stream: MediaStream | null;
+}
+
+declare var MediaStreamEvent: {
+    prototype: MediaStreamEvent;
+    new(type: string, eventInitDict: MediaStreamEventInit): MediaStreamEvent;
 }
 
 interface MediaStreamTrackEventMap {
@@ -7517,7 +8004,7 @@ interface MediaStreamTrackEvent extends Event {
 
 declare var MediaStreamTrackEvent: {
     prototype: MediaStreamTrackEvent;
-    new(type: string, eventInitDict?: MediaStreamTrackEventInit): MediaStreamTrackEvent;
+    new(typeArg: string, eventInitDict?: MediaStreamTrackEventInit): MediaStreamTrackEvent;
 }
 
 interface MessageChannel {
@@ -7550,7 +8037,7 @@ interface MessagePortEventMap {
 interface MessagePort extends EventTarget {
     onmessage: (this: MessagePort, ev: MessageEvent) => any;
     close(): void;
-    postMessage(message?: any, ports?: any): void;
+    postMessage(message?: any, transfer?: any[]): void;
     start(): void;
     addEventListener<K extends keyof MessagePortEventMap>(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -7712,9 +8199,10 @@ declare var NavigationEventWithReferrer: {
     new(): NavigationEventWithReferrer;
 }
 
-interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver, NavigatorUserMedia {
-    readonly appCodeName: string;
+interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver, NavigatorBeacon, NavigatorConcurrentHardware, NavigatorUserMedia {
+    readonly authentication: WebAuthentication;
     readonly cookieEnabled: boolean;
+    gamepadInputEmulation: string;
     readonly language: string;
     readonly maxTouchPoints: number;
     readonly mimeTypes: MimeTypeArray;
@@ -7723,6 +8211,7 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte
     readonly msPointerEnabled: boolean;
     readonly plugins: PluginArray;
     readonly pointerEnabled: boolean;
+    readonly serviceWorker: ServiceWorkerContainer;
     readonly webdriver: boolean;
     readonly hardwareConcurrency: number;
     getGamepads(): Gamepad[];
@@ -7754,7 +8243,7 @@ interface Node extends EventTarget {
     readonly parentNode: Node | null;
     readonly previousSibling: Node | null;
     textContent: string | null;
-    appendChild(newChild: Node): Node;
+    appendChild<T extends Node>(newChild: T): T;
     cloneNode(deep?: boolean): Node;
     compareDocumentPosition(other: Node): number;
     contains(child: Node): boolean;
@@ -7861,6 +8350,36 @@ declare var NodeList: {
     new(): NodeList;
 }
 
+interface NotificationEventMap {
+    "click": Event;
+    "close": Event;
+    "error": Event;
+    "show": Event;
+}
+
+interface Notification extends EventTarget {
+    readonly body: string;
+    readonly dir: string;
+    readonly icon: string;
+    readonly lang: string;
+    onclick: (this: Notification, ev: Event) => any;
+    onclose: (this: Notification, ev: Event) => any;
+    onerror: (this: Notification, ev: Event) => any;
+    onshow: (this: Notification, ev: Event) => any;
+    readonly permission: string;
+    readonly tag: string;
+    readonly title: string;
+    close(): void;
+    addEventListener<K extends keyof NotificationEventMap>(type: K, listener: (this: Notification, ev: NotificationEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var Notification: {
+    prototype: Notification;
+    new(title: string, options?: NotificationOptions): Notification;
+    requestPermission(callback?: NotificationPermissionCallback): PromiseLike<string>;
+}
+
 interface OES_element_index_uint {
 }
 
@@ -7895,6 +8414,24 @@ declare var OES_texture_float_linear: {
     new(): OES_texture_float_linear;
 }
 
+interface OES_texture_half_float {
+    readonly HALF_FLOAT_OES: number;
+}
+
+declare var OES_texture_half_float: {
+    prototype: OES_texture_half_float;
+    new(): OES_texture_half_float;
+    readonly HALF_FLOAT_OES: number;
+}
+
+interface OES_texture_half_float_linear {
+}
+
+declare var OES_texture_half_float_linear: {
+    prototype: OES_texture_half_float_linear;
+    new(): OES_texture_half_float_linear;
+}
+
 interface OfflineAudioCompletionEvent extends Event {
     readonly renderedBuffer: AudioBuffer;
 }
@@ -7904,13 +8441,15 @@ declare var OfflineAudioCompletionEvent: {
     new(): OfflineAudioCompletionEvent;
 }
 
-interface OfflineAudioContextEventMap {
-    "complete": Event;
+interface OfflineAudioContextEventMap extends AudioContextEventMap {
+    "complete": OfflineAudioCompletionEvent;
 }
 
-interface OfflineAudioContext extends AudioContext {
-    oncomplete: (this: OfflineAudioContext, ev: Event) => any;
+interface OfflineAudioContext extends AudioContextBase {
+    readonly length: number;
+    oncomplete: (this: OfflineAudioContext, ev: OfflineAudioCompletionEvent) => any;
     startRendering(): PromiseLike<AudioBuffer>;
+    suspend(suspendTime: number): PromiseLike<void>;
     addEventListener<K extends keyof OfflineAudioContextEventMap>(type: K, listener: (this: OfflineAudioContext, ev: OfflineAudioContextEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -7986,6 +8525,82 @@ declare var PannerNode: {
     new(): PannerNode;
 }
 
+interface Path2D extends Object, CanvasPathMethods {
+}
+
+declare var Path2D: {
+    prototype: Path2D;
+    new(path?: Path2D): Path2D;
+}
+
+interface PaymentAddress {
+    readonly addressLine: string[];
+    readonly city: string;
+    readonly country: string;
+    readonly dependentLocality: string;
+    readonly languageCode: string;
+    readonly organization: string;
+    readonly phone: string;
+    readonly postalCode: string;
+    readonly recipient: string;
+    readonly region: string;
+    readonly sortingCode: string;
+    toJSON(): any;
+}
+
+declare var PaymentAddress: {
+    prototype: PaymentAddress;
+    new(): PaymentAddress;
+}
+
+interface PaymentRequestEventMap {
+    "shippingaddresschange": Event;
+    "shippingoptionchange": Event;
+}
+
+interface PaymentRequest extends EventTarget {
+    onshippingaddresschange: (this: PaymentRequest, ev: Event) => any;
+    onshippingoptionchange: (this: PaymentRequest, ev: Event) => any;
+    readonly shippingAddress: PaymentAddress | null;
+    readonly shippingOption: string | null;
+    readonly shippingType: string | null;
+    abort(): PromiseLike<void>;
+    show(): PromiseLike<PaymentResponse>;
+    addEventListener<K extends keyof PaymentRequestEventMap>(type: K, listener: (this: PaymentRequest, ev: PaymentRequestEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var PaymentRequest: {
+    prototype: PaymentRequest;
+    new(methodData: PaymentMethodData[], details: PaymentDetails, options?: PaymentOptions): PaymentRequest;
+}
+
+interface PaymentRequestUpdateEvent extends Event {
+    updateWith(d: PromiseLike<PaymentDetails>): void;
+}
+
+declare var PaymentRequestUpdateEvent: {
+    prototype: PaymentRequestUpdateEvent;
+    new(type: string, eventInitDict?: PaymentRequestUpdateEventInit): PaymentRequestUpdateEvent;
+}
+
+interface PaymentResponse {
+    readonly details: any;
+    readonly methodName: string;
+    readonly payerEmail: string | null;
+    readonly payerName: string | null;
+    readonly payerPhone: string | null;
+    readonly shippingAddress: PaymentAddress | null;
+    readonly shippingOption: string | null;
+    complete(result?: string): PromiseLike<void>;
+    toJSON(): any;
+}
+
+declare var PaymentResponse: {
+    prototype: PaymentResponse;
+    new(): PaymentResponse;
+}
+
 interface PerfWidgetExternal {
     readonly activeNetworkRequestCount: number;
     readonly averageFrameTime: number;
@@ -8251,7 +8866,7 @@ interface PopStateEvent extends Event {
 
 declare var PopStateEvent: {
     prototype: PopStateEvent;
-    new(): PopStateEvent;
+    new(typeArg: string, eventInitDict?: PopStateEventInit): PopStateEvent;
 }
 
 interface Position {
@@ -8302,23 +8917,57 @@ declare var ProgressEvent: {
     new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
 }
 
+interface PushManager {
+    getSubscription(): PromiseLike<PushSubscription>;
+    permissionState(options?: PushSubscriptionOptionsInit): PromiseLike<string>;
+    subscribe(options?: PushSubscriptionOptionsInit): PromiseLike<PushSubscription>;
+}
+
+declare var PushManager: {
+    prototype: PushManager;
+    new(): PushManager;
+}
+
+interface PushSubscription {
+    readonly endpoint: USVString;
+    readonly options: PushSubscriptionOptions;
+    getKey(name: string): ArrayBuffer | null;
+    toJSON(): any;
+    unsubscribe(): PromiseLike<boolean>;
+}
+
+declare var PushSubscription: {
+    prototype: PushSubscription;
+    new(): PushSubscription;
+}
+
+interface PushSubscriptionOptions {
+    readonly applicationServerKey: ArrayBuffer | null;
+    readonly userVisibleOnly: boolean;
+}
+
+declare var PushSubscriptionOptions: {
+    prototype: PushSubscriptionOptions;
+    new(): PushSubscriptionOptions;
+}
+
 interface RTCDTMFToneChangeEvent extends Event {
     readonly tone: string;
 }
 
 declare var RTCDTMFToneChangeEvent: {
     prototype: RTCDTMFToneChangeEvent;
-    new(type: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent;
+    new(typeArg: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent;
 }
 
 interface RTCDtlsTransportEventMap {
     "dtlsstatechange": RTCDtlsTransportStateChangedEvent;
-    "error": ErrorEvent;
+    "error": Event;
 }
 
 interface RTCDtlsTransport extends RTCStatsProvider {
     ondtlsstatechange: ((this: RTCDtlsTransport, ev: RTCDtlsTransportStateChangedEvent) => any) | null;
-    onerror: ((this: RTCDtlsTransport, ev: ErrorEvent) => any) | null;
+    onerror: ((this: RTCDtlsTransport, ev: Event) => any) | null;
     readonly state: string;
     readonly transport: RTCIceTransport;
     getLocalParameters(): RTCDtlsParameters;
@@ -8365,6 +9014,18 @@ declare var RTCDtmfSender: {
     new(sender: RTCRtpSender): RTCDtmfSender;
 }
 
+interface RTCIceCandidate {
+    candidate: string | null;
+    sdpMLineIndex: number | null;
+    sdpMid: string | null;
+    toJSON(): any;
+}
+
+declare var RTCIceCandidate: {
+    prototype: RTCIceCandidate;
+    new(candidateInitDict?: RTCIceCandidateInit): RTCIceCandidate;
+}
+
 interface RTCIceCandidatePairChangedEvent extends Event {
     readonly pair: RTCIceCandidatePair;
 }
@@ -8375,16 +9036,16 @@ declare var RTCIceCandidatePairChangedEvent: {
 }
 
 interface RTCIceGathererEventMap {
-    "error": ErrorEvent;
+    "error": Event;
     "localcandidate": RTCIceGathererEvent;
 }
 
 interface RTCIceGatherer extends RTCStatsProvider {
     readonly component: string;
-    onerror: ((this: RTCIceGatherer, ev: ErrorEvent) => any) | null;
+    onerror: ((this: RTCIceGatherer, ev: Event) => any) | null;
     onlocalcandidate: ((this: RTCIceGatherer, ev: RTCIceGathererEvent) => any) | null;
     createAssociatedGatherer(): RTCIceGatherer;
-    getLocalCandidates(): RTCIceCandidate[];
+    getLocalCandidates(): RTCIceCandidateDictionary[];
     getLocalParameters(): RTCIceParameters;
     addEventListener<K extends keyof RTCIceGathererEventMap>(type: K, listener: (this: RTCIceGatherer, ev: RTCIceGathererEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -8396,7 +9057,7 @@ declare var RTCIceGatherer: {
 }
 
 interface RTCIceGathererEvent extends Event {
-    readonly candidate: RTCIceCandidate | RTCIceCandidateComplete;
+    readonly candidate: RTCIceCandidateDictionary | RTCIceCandidateComplete;
 }
 
 declare var RTCIceGathererEvent: {
@@ -8416,12 +9077,12 @@ interface RTCIceTransport extends RTCStatsProvider {
     onicestatechange: ((this: RTCIceTransport, ev: RTCIceTransportStateChangedEvent) => any) | null;
     readonly role: string;
     readonly state: string;
-    addRemoteCandidate(remoteCandidate: RTCIceCandidate | RTCIceCandidateComplete): void;
+    addRemoteCandidate(remoteCandidate: RTCIceCandidateDictionary | RTCIceCandidateComplete): void;
     createAssociatedTransport(): RTCIceTransport;
     getNominatedCandidatePair(): RTCIceCandidatePair | null;
-    getRemoteCandidates(): RTCIceCandidate[];
+    getRemoteCandidates(): RTCIceCandidateDictionary[];
     getRemoteParameters(): RTCIceParameters | null;
-    setRemoteCandidates(remoteCandidates: RTCIceCandidate[]): void;
+    setRemoteCandidates(remoteCandidates: RTCIceCandidateDictionary[]): void;
     start(gatherer: RTCIceGatherer, remoteParameters: RTCIceParameters, role?: string): void;
     stop(): void;
     addEventListener<K extends keyof RTCIceTransportEventMap>(type: K, listener: (this: RTCIceTransport, ev: RTCIceTransportEventMap[K]) => any, useCapture?: boolean): void;
@@ -8442,12 +9103,67 @@ declare var RTCIceTransportStateChangedEvent: {
     new(): RTCIceTransportStateChangedEvent;
 }
 
+interface RTCPeerConnectionEventMap {
+    "addstream": MediaStreamEvent;
+    "icecandidate": RTCPeerConnectionIceEvent;
+    "iceconnectionstatechange": Event;
+    "icegatheringstatechange": Event;
+    "negotiationneeded": Event;
+    "removestream": MediaStreamEvent;
+    "signalingstatechange": Event;
+}
+
+interface RTCPeerConnection extends EventTarget {
+    readonly canTrickleIceCandidates: boolean | null;
+    readonly iceConnectionState: string;
+    readonly iceGatheringState: string;
+    readonly localDescription: RTCSessionDescription | null;
+    onaddstream: (this: RTCPeerConnection, ev: MediaStreamEvent) => any;
+    onicecandidate: (this: RTCPeerConnection, ev: RTCPeerConnectionIceEvent) => any;
+    oniceconnectionstatechange: (this: RTCPeerConnection, ev: Event) => any;
+    onicegatheringstatechange: (this: RTCPeerConnection, ev: Event) => any;
+    onnegotiationneeded: (this: RTCPeerConnection, ev: Event) => any;
+    onremovestream: (this: RTCPeerConnection, ev: MediaStreamEvent) => any;
+    onsignalingstatechange: (this: RTCPeerConnection, ev: Event) => any;
+    readonly remoteDescription: RTCSessionDescription | null;
+    readonly signalingState: string;
+    addIceCandidate(candidate: RTCIceCandidate, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike<void>;
+    addStream(stream: MediaStream): void;
+    close(): void;
+    createAnswer(successCallback?: RTCSessionDescriptionCallback, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike<RTCSessionDescription>;
+    createOffer(successCallback?: RTCSessionDescriptionCallback, failureCallback?: RTCPeerConnectionErrorCallback, options?: RTCOfferOptions): PromiseLike<RTCSessionDescription>;
+    getConfiguration(): RTCConfiguration;
+    getLocalStreams(): MediaStream[];
+    getRemoteStreams(): MediaStream[];
+    getStats(selector: MediaStreamTrack | null, successCallback?: RTCStatsCallback, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike<RTCStatsReport>;
+    getStreamById(streamId: string): MediaStream | null;
+    removeStream(stream: MediaStream): void;
+    setLocalDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike<void>;
+    setRemoteDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike<void>;
+    addEventListener<K extends keyof RTCPeerConnectionEventMap>(type: K, listener: (this: RTCPeerConnection, ev: RTCPeerConnectionEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCPeerConnection: {
+    prototype: RTCPeerConnection;
+    new(configuration: RTCConfiguration): RTCPeerConnection;
+}
+
+interface RTCPeerConnectionIceEvent extends Event {
+    readonly candidate: RTCIceCandidate;
+}
+
+declare var RTCPeerConnectionIceEvent: {
+    prototype: RTCPeerConnectionIceEvent;
+    new(type: string, eventInitDict: RTCPeerConnectionIceEventInit): RTCPeerConnectionIceEvent;
+}
+
 interface RTCRtpReceiverEventMap {
-    "error": ErrorEvent;
+    "error": Event;
 }
 
 interface RTCRtpReceiver extends RTCStatsProvider {
-    onerror: ((this: RTCRtpReceiver, ev: ErrorEvent) => any) | null;
+    onerror: ((this: RTCRtpReceiver, ev: Event) => any) | null;
     readonly rtcpTransport: RTCDtlsTransport;
     readonly track: MediaStreamTrack | null;
     readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
@@ -8467,12 +9183,12 @@ declare var RTCRtpReceiver: {
 }
 
 interface RTCRtpSenderEventMap {
-    "error": ErrorEvent;
+    "error": Event;
     "ssrcconflict": RTCSsrcConflictEvent;
 }
 
 interface RTCRtpSender extends RTCStatsProvider {
-    onerror: ((this: RTCRtpSender, ev: ErrorEvent) => any) | null;
+    onerror: ((this: RTCRtpSender, ev: Event) => any) | null;
     onssrcconflict: ((this: RTCRtpSender, ev: RTCSsrcConflictEvent) => any) | null;
     readonly rtcpTransport: RTCDtlsTransport;
     readonly track: MediaStreamTrack;
@@ -8491,12 +9207,23 @@ declare var RTCRtpSender: {
     getCapabilities(kind?: string): RTCRtpCapabilities;
 }
 
+interface RTCSessionDescription {
+    sdp: string | null;
+    type: string | null;
+    toJSON(): any;
+}
+
+declare var RTCSessionDescription: {
+    prototype: RTCSessionDescription;
+    new(descriptionInitDict?: RTCSessionDescriptionInit): RTCSessionDescription;
+}
+
 interface RTCSrtpSdesTransportEventMap {
-    "error": ErrorEvent;
+    "error": Event;
 }
 
 interface RTCSrtpSdesTransport extends EventTarget {
-    onerror: ((this: RTCSrtpSdesTransport, ev: ErrorEvent) => any) | null;
+    onerror: ((this: RTCSrtpSdesTransport, ev: Event) => any) | null;
     readonly transport: RTCIceTransport;
     addEventListener<K extends keyof RTCSrtpSdesTransportEventMap>(type: K, listener: (this: RTCSrtpSdesTransport, ev: RTCSrtpSdesTransportEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -8571,9 +9298,69 @@ declare var Range: {
     readonly START_TO_START: number;
 }
 
-interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
+interface ReadableStream {
+    readonly locked: boolean;
+    cancel(): PromiseLike<void>;
+    getReader(): ReadableStreamReader;
+}
+
+declare var ReadableStream: {
+    prototype: ReadableStream;
+    new(): ReadableStream;
+}
+
+interface ReadableStreamReader {
+    cancel(): PromiseLike<void>;
+    read(): PromiseLike<any>;
+    releaseLock(): void;
+}
+
+declare var ReadableStreamReader: {
+    prototype: ReadableStreamReader;
+    new(): ReadableStreamReader;
+}
+
+interface Request extends Object, Body {
+    readonly cache: string;
+    readonly credentials: string;
+    readonly destination: string;
+    readonly headers: Headers;
+    readonly integrity: string;
+    readonly keepalive: boolean;
+    readonly method: string;
+    readonly mode: string;
+    readonly redirect: string;
+    readonly referrer: string;
+    readonly referrerPolicy: string;
+    readonly type: string;
+    readonly url: string;
+    clone(): Request;
+}
+
+declare var Request: {
+    prototype: Request;
+    new(input: Request | string, init?: RequestInit): Request;
+}
+
+interface Response extends Object, Body {
+    readonly body: ReadableStream | null;
+    readonly headers: Headers;
+    readonly ok: boolean;
+    readonly status: number;
+    readonly statusText: string;
+    readonly type: string;
+    readonly url: string;
+    clone(): Response;
+}
+
+declare var Response: {
+    prototype: Response;
+    new(body?: any, init?: ResponseInit): Response;
+}
+
+interface SVGAElement extends SVGGraphicsElement, SVGURIReference {
     readonly target: SVGAnimatedString;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8726,11 +9513,11 @@ declare var SVGAnimatedTransformList: {
     new(): SVGAnimatedTransformList;
 }
 
-interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+interface SVGCircleElement extends SVGGraphicsElement {
     readonly cx: SVGAnimatedLength;
     readonly cy: SVGAnimatedLength;
     readonly r: SVGAnimatedLength;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGCircleElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8739,9 +9526,9 @@ declare var SVGCircleElement: {
     new(): SVGCircleElement;
 }
 
-interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
+interface SVGClipPathElement extends SVGGraphicsElement, SVGUnitTypes {
     readonly clipPathUnits: SVGAnimatedEnumeration;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGClipPathElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8764,7 +9551,7 @@ interface SVGComponentTransferFunctionElement extends SVGElement {
     readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGComponentTransferFunctionElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8779,8 +9566,8 @@ declare var SVGComponentTransferFunctionElement: {
     readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
 }
 
-interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+interface SVGDefsElement extends SVGGraphicsElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDefsElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8789,8 +9576,8 @@ declare var SVGDefsElement: {
     new(): SVGDefsElement;
 }
 
-interface SVGDescElement extends SVGElement, SVGStylable, SVGLangSpace {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+interface SVGDescElement extends SVGElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDescElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8813,6 +9600,7 @@ interface SVGElementEventMap extends ElementEventMap {
 }
 
 interface SVGElement extends Element {
+    className: any;
     onclick: (this: SVGElement, ev: MouseEvent) => any;
     ondblclick: (this: SVGElement, ev: MouseEvent) => any;
     onfocusin: (this: SVGElement, ev: FocusEvent) => any;
@@ -8824,9 +9612,9 @@ interface SVGElement extends Element {
     onmouseover: (this: SVGElement, ev: MouseEvent) => any;
     onmouseup: (this: SVGElement, ev: MouseEvent) => any;
     readonly ownerSVGElement: SVGSVGElement;
+    readonly style: CSSStyleDeclaration;
     readonly viewportElement: SVGElement;
     xmlbase: string;
-    className: any;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -8862,12 +9650,12 @@ declare var SVGElementInstanceList: {
     new(): SVGElementInstanceList;
 }
 
-interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+interface SVGEllipseElement extends SVGGraphicsElement {
     readonly cx: SVGAnimatedLength;
     readonly cy: SVGAnimatedLength;
     readonly rx: SVGAnimatedLength;
     readonly ry: SVGAnimatedLength;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGEllipseElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8897,7 +9685,7 @@ interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttrib
     readonly SVG_FEBLEND_MODE_SCREEN: number;
     readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
     readonly SVG_FEBLEND_MODE_UNKNOWN: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEBlendElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8932,7 +9720,7 @@ interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandard
     readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
     readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
     readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEColorMatrixElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8948,7 +9736,7 @@ declare var SVGFEColorMatrixElement: {
 
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEComponentTransferElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8972,7 +9760,7 @@ interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAt
     readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
     readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
     readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFECompositeElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9005,7 +9793,7 @@ interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStand
     readonly SVG_EDGEMODE_NONE: number;
     readonly SVG_EDGEMODE_UNKNOWN: number;
     readonly SVG_EDGEMODE_WRAP: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEConvolveMatrixElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9024,7 +9812,7 @@ interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStan
     readonly kernelUnitLengthX: SVGAnimatedNumber;
     readonly kernelUnitLengthY: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDiffuseLightingElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9044,7 +9832,7 @@ interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStan
     readonly SVG_CHANNEL_G: number;
     readonly SVG_CHANNEL_R: number;
     readonly SVG_CHANNEL_UNKNOWN: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDisplacementMapElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9061,7 +9849,7 @@ declare var SVGFEDisplacementMapElement: {
 interface SVGFEDistantLightElement extends SVGElement {
     readonly azimuth: SVGAnimatedNumber;
     readonly elevation: SVGAnimatedNumber;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDistantLightElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9071,7 +9859,7 @@ declare var SVGFEDistantLightElement: {
 }
 
 interface SVGFEFloodElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFloodElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9081,6 +9869,8 @@ declare var SVGFEFloodElement: {
 }
 
 interface SVGFEFuncAElement extends SVGComponentTransferFunctionElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncAElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEFuncAElement: {
@@ -9089,6 +9879,8 @@ declare var SVGFEFuncAElement: {
 }
 
 interface SVGFEFuncBElement extends SVGComponentTransferFunctionElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncBElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEFuncBElement: {
@@ -9097,6 +9889,8 @@ declare var SVGFEFuncBElement: {
 }
 
 interface SVGFEFuncGElement extends SVGComponentTransferFunctionElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEFuncGElement: {
@@ -9105,6 +9899,8 @@ declare var SVGFEFuncGElement: {
 }
 
 interface SVGFEFuncRElement extends SVGComponentTransferFunctionElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncRElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEFuncRElement: {
@@ -9117,7 +9913,7 @@ interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandar
     readonly stdDeviationX: SVGAnimatedNumber;
     readonly stdDeviationY: SVGAnimatedNumber;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEGaussianBlurElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9126,9 +9922,9 @@ declare var SVGFEGaussianBlurElement: {
     new(): SVGFEGaussianBlurElement;
 }
 
-interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
+interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGURIReference {
     readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEImageElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9138,7 +9934,7 @@ declare var SVGFEImageElement: {
 }
 
 interface SVGFEMergeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9149,7 +9945,7 @@ declare var SVGFEMergeElement: {
 
 interface SVGFEMergeNodeElement extends SVGElement {
     readonly in1: SVGAnimatedString;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeNodeElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9166,7 +9962,7 @@ interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
     readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
     readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMorphologyElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9182,7 +9978,7 @@ interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttri
     readonly dx: SVGAnimatedNumber;
     readonly dy: SVGAnimatedNumber;
     readonly in1: SVGAnimatedString;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEOffsetElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9195,7 +9991,7 @@ interface SVGFEPointLightElement extends SVGElement {
     readonly x: SVGAnimatedNumber;
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEPointLightElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9211,7 +10007,7 @@ interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveSta
     readonly specularConstant: SVGAnimatedNumber;
     readonly specularExponent: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFESpecularLightingElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9229,7 +10025,7 @@ interface SVGFESpotLightElement extends SVGElement {
     readonly x: SVGAnimatedNumber;
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFESpotLightElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9240,7 +10036,7 @@ declare var SVGFESpotLightElement: {
 
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFETileElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9262,7 +10058,7 @@ interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
     readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
     readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFETurbulenceElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9277,7 +10073,7 @@ declare var SVGFETurbulenceElement: {
     readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
 }
 
-interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
+interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGURIReference {
     readonly filterResX: SVGAnimatedInteger;
     readonly filterResY: SVGAnimatedInteger;
     readonly filterUnits: SVGAnimatedEnumeration;
@@ -9287,7 +10083,7 @@ interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLan
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
     setFilterRes(filterResX: number, filterResY: number): void;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFilterElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9296,12 +10092,12 @@ declare var SVGFilterElement: {
     new(): SVGFilterElement;
 }
 
-interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+interface SVGForeignObjectElement extends SVGGraphicsElement {
     readonly height: SVGAnimatedLength;
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGForeignObjectElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9310,8 +10106,8 @@ declare var SVGForeignObjectElement: {
     new(): SVGForeignObjectElement;
 }
 
-interface SVGGElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+interface SVGGElement extends SVGGraphicsElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9320,7 +10116,7 @@ declare var SVGGElement: {
     new(): SVGGElement;
 }
 
-interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourcesRequired, SVGURIReference, SVGUnitTypes {
+interface SVGGradientElement extends SVGElement, SVGUnitTypes, SVGURIReference {
     readonly gradientTransform: SVGAnimatedTransformList;
     readonly gradientUnits: SVGAnimatedEnumeration;
     readonly spreadMethod: SVGAnimatedEnumeration;
@@ -9328,7 +10124,7 @@ interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourc
     readonly SVG_SPREADMETHOD_REFLECT: number;
     readonly SVG_SPREADMETHOD_REPEAT: number;
     readonly SVG_SPREADMETHOD_UNKNOWN: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGGradientElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9341,13 +10137,30 @@ declare var SVGGradientElement: {
     readonly SVG_SPREADMETHOD_UNKNOWN: number;
 }
 
-interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
+interface SVGGraphicsElement extends SVGElement, SVGTests {
+    readonly farthestViewportElement: SVGElement;
+    readonly nearestViewportElement: SVGElement;
+    readonly transform: SVGAnimatedTransformList;
+    getBBox(): SVGRect;
+    getCTM(): SVGMatrix;
+    getScreenCTM(): SVGMatrix;
+    getTransformToElement(element: SVGElement): SVGMatrix;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGGraphicsElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var SVGGraphicsElement: {
+    prototype: SVGGraphicsElement;
+    new(): SVGGraphicsElement;
+}
+
+interface SVGImageElement extends SVGGraphicsElement, SVGURIReference {
     readonly height: SVGAnimatedLength;
     readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGImageElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9408,12 +10221,12 @@ declare var SVGLengthList: {
     new(): SVGLengthList;
 }
 
-interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+interface SVGLineElement extends SVGGraphicsElement {
     readonly x1: SVGAnimatedLength;
     readonly x2: SVGAnimatedLength;
     readonly y1: SVGAnimatedLength;
     readonly y2: SVGAnimatedLength;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGLineElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9427,6 +10240,8 @@ interface SVGLinearGradientElement extends SVGGradientElement {
     readonly x2: SVGAnimatedLength;
     readonly y1: SVGAnimatedLength;
     readonly y2: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGLinearGradientElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGLinearGradientElement: {
@@ -9434,7 +10249,7 @@ declare var SVGLinearGradientElement: {
     new(): SVGLinearGradientElement;
 }
 
-interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
+interface SVGMarkerElement extends SVGElement, SVGFitToViewBox {
     readonly markerHeight: SVGAnimatedLength;
     readonly markerUnits: SVGAnimatedEnumeration;
     readonly markerWidth: SVGAnimatedLength;
@@ -9450,7 +10265,7 @@ interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExt
     readonly SVG_MARKER_ORIENT_ANGLE: number;
     readonly SVG_MARKER_ORIENT_AUTO: number;
     readonly SVG_MARKER_ORIENT_UNKNOWN: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMarkerElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9465,14 +10280,14 @@ declare var SVGMarkerElement: {
     readonly SVG_MARKER_ORIENT_UNKNOWN: number;
 }
 
-interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
+interface SVGMaskElement extends SVGElement, SVGTests, SVGUnitTypes {
     readonly height: SVGAnimatedLength;
     readonly maskContentUnits: SVGAnimatedEnumeration;
     readonly maskUnits: SVGAnimatedEnumeration;
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMaskElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9507,7 +10322,7 @@ declare var SVGMatrix: {
 }
 
 interface SVGMetadataElement extends SVGElement {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMetadataElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9541,7 +10356,8 @@ declare var SVGNumberList: {
     new(): SVGNumberList;
 }
 
-interface SVGPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPathData {
+interface SVGPathElement extends SVGGraphicsElement {
+    readonly pathSegList: SVGPathSegList;
     createSVGPathSegArcAbs(x: number, y: number, r1: number, r2: number, angle: number, largeArcFlag: boolean, sweepFlag: boolean): SVGPathSegArcAbs;
     createSVGPathSegArcRel(x: number, y: number, r1: number, r2: number, angle: number, largeArcFlag: boolean, sweepFlag: boolean): SVGPathSegArcRel;
     createSVGPathSegClosePath(): SVGPathSegClosePath;
@@ -9564,7 +10380,7 @@ interface SVGPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGT
     getPathSegAtLength(distance: number): number;
     getPointAtLength(distance: number): SVGPoint;
     getTotalLength(): number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPathElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9849,7 +10665,7 @@ declare var SVGPathSegMovetoRel: {
     new(): SVGPathSegMovetoRel;
 }
 
-interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGURIReference, SVGUnitTypes {
+interface SVGPatternElement extends SVGElement, SVGTests, SVGUnitTypes, SVGFitToViewBox, SVGURIReference {
     readonly height: SVGAnimatedLength;
     readonly patternContentUnits: SVGAnimatedEnumeration;
     readonly patternTransform: SVGAnimatedTransformList;
@@ -9857,7 +10673,7 @@ interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSp
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPatternElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9893,8 +10709,8 @@ declare var SVGPointList: {
     new(): SVGPointList;
 }
 
-interface SVGPolygonElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+interface SVGPolygonElement extends SVGGraphicsElement, SVGAnimatedPoints {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolygonElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9903,8 +10719,8 @@ declare var SVGPolygonElement: {
     new(): SVGPolygonElement;
 }
 
-interface SVGPolylineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+interface SVGPolylineElement extends SVGGraphicsElement, SVGAnimatedPoints {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolylineElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9957,6 +10773,8 @@ interface SVGRadialGradientElement extends SVGGradientElement {
     readonly fx: SVGAnimatedLength;
     readonly fy: SVGAnimatedLength;
     readonly r: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGRadialGradientElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGRadialGradientElement: {
@@ -9976,14 +10794,14 @@ declare var SVGRect: {
     new(): SVGRect;
 }
 
-interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+interface SVGRectElement extends SVGGraphicsElement {
     readonly height: SVGAnimatedLength;
     readonly rx: SVGAnimatedLength;
     readonly ry: SVGAnimatedLength;
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGRectElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10001,7 +10819,7 @@ interface SVGSVGElementEventMap extends SVGElementEventMap {
     "SVGZoom": SVGZoomEvent;
 }
 
-interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTests, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
+interface SVGSVGElement extends SVGGraphicsElement, DocumentEvent, SVGFitToViewBox, SVGZoomAndPan {
     contentScriptType: string;
     contentStyleType: string;
     currentScale: number;
@@ -10053,9 +10871,9 @@ declare var SVGSVGElement: {
     new(): SVGSVGElement;
 }
 
-interface SVGScriptElement extends SVGElement, SVGExternalResourcesRequired, SVGURIReference {
+interface SVGScriptElement extends SVGElement, SVGURIReference {
     type: string;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGScriptElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10064,9 +10882,9 @@ declare var SVGScriptElement: {
     new(): SVGScriptElement;
 }
 
-interface SVGStopElement extends SVGElement, SVGStylable {
+interface SVGStopElement extends SVGElement {
     readonly offset: SVGAnimatedNumber;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGStopElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10091,12 +10909,12 @@ declare var SVGStringList: {
     new(): SVGStringList;
 }
 
-interface SVGStyleElement extends SVGElement, SVGLangSpace {
+interface SVGStyleElement extends SVGElement {
     disabled: boolean;
     media: string;
     title: string;
     type: string;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGStyleElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10105,8 +10923,8 @@ declare var SVGStyleElement: {
     new(): SVGStyleElement;
 }
 
-interface SVGSwitchElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+interface SVGSwitchElement extends SVGGraphicsElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSwitchElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10115,8 +10933,8 @@ declare var SVGSwitchElement: {
     new(): SVGSwitchElement;
 }
 
-interface SVGSymbolElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+interface SVGSymbolElement extends SVGElement, SVGFitToViewBox {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSymbolElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10126,6 +10944,8 @@ declare var SVGSymbolElement: {
 }
 
 interface SVGTSpanElement extends SVGTextPositioningElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTSpanElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTSpanElement: {
@@ -10133,7 +10953,7 @@ declare var SVGTSpanElement: {
     new(): SVGTSpanElement;
 }
 
-interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+interface SVGTextContentElement extends SVGGraphicsElement {
     readonly lengthAdjust: SVGAnimatedEnumeration;
     readonly textLength: SVGAnimatedLength;
     getCharNumAtPosition(point: SVGPoint): number;
@@ -10148,7 +10968,7 @@ interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLa
     readonly LENGTHADJUST_SPACING: number;
     readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
     readonly LENGTHADJUST_UNKNOWN: number;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextContentElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10160,7 +10980,9 @@ declare var SVGTextContentElement: {
     readonly LENGTHADJUST_UNKNOWN: number;
 }
 
-interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable {
+interface SVGTextElement extends SVGTextPositioningElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextElement: {
@@ -10178,6 +11000,8 @@ interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
     readonly TEXTPATH_SPACINGTYPE_AUTO: number;
     readonly TEXTPATH_SPACINGTYPE_EXACT: number;
     readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextPathElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextPathElement: {
@@ -10197,6 +11021,8 @@ interface SVGTextPositioningElement extends SVGTextContentElement {
     readonly rotate: SVGAnimatedNumberList;
     readonly x: SVGAnimatedLengthList;
     readonly y: SVGAnimatedLengthList;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextPositioningElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextPositioningElement: {
@@ -10204,8 +11030,8 @@ declare var SVGTextPositioningElement: {
     new(): SVGTextPositioningElement;
 }
 
-interface SVGTitleElement extends SVGElement, SVGStylable, SVGLangSpace {
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+interface SVGTitleElement extends SVGElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTitleElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10270,14 +11096,14 @@ interface SVGUnitTypes {
 }
 declare var SVGUnitTypes: SVGUnitTypes;
 
-interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
+interface SVGUseElement extends SVGGraphicsElement, SVGURIReference {
     readonly animatedInstanceRoot: SVGElementInstance;
     readonly height: SVGAnimatedLength;
     readonly instanceRoot: SVGElementInstance;
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGUseElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10286,9 +11112,9 @@ declare var SVGUseElement: {
     new(): SVGUseElement;
 }
 
-interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
+interface SVGViewElement extends SVGElement, SVGZoomAndPan, SVGFitToViewBox {
     readonly viewTarget: SVGStringList;
-    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGViewElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10320,6 +11146,26 @@ declare var SVGZoomEvent: {
     new(): SVGZoomEvent;
 }
 
+interface ScopedCredential {
+    readonly id: ArrayBuffer;
+    readonly type: string;
+}
+
+declare var ScopedCredential: {
+    prototype: ScopedCredential;
+    new(): ScopedCredential;
+}
+
+interface ScopedCredentialInfo {
+    readonly credential: ScopedCredential;
+    readonly publicKey: CryptoKey;
+}
+
+declare var ScopedCredentialInfo: {
+    prototype: ScopedCredentialInfo;
+    new(): ScopedCredentialInfo;
+}
+
 interface ScreenEventMap {
     "MSOrientationChange": Event;
 }
@@ -10381,6 +11227,10 @@ declare var ScriptProcessorNode: {
 interface Selection {
     readonly anchorNode: Node;
     readonly anchorOffset: number;
+    readonly baseNode: Node;
+    readonly baseOffset: number;
+    readonly extentNode: Node;
+    readonly extentOffset: number;
     readonly focusNode: Node;
     readonly focusOffset: number;
     readonly isCollapsed: boolean;
@@ -10399,6 +11249,7 @@ interface Selection {
     removeRange(range: Range): void;
     selectAllChildren(parentNode: Node): void;
     setBaseAndExtent(baseNode: Node, baseOffset: number, extentNode: Node, extentOffset: number): void;
+    setPosition(parentNode: Node, offset: number): void;
     toString(): string;
 }
 
@@ -10407,6 +11258,84 @@ declare var Selection: {
     new(): Selection;
 }
 
+interface ServiceWorkerEventMap extends AbstractWorkerEventMap {
+    "statechange": Event;
+}
+
+interface ServiceWorker extends EventTarget, AbstractWorker {
+    onstatechange: (this: ServiceWorker, ev: Event) => any;
+    readonly scriptURL: USVString;
+    readonly state: string;
+    postMessage(message: any, transfer?: any[]): void;
+    addEventListener<K extends keyof ServiceWorkerEventMap>(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var ServiceWorker: {
+    prototype: ServiceWorker;
+    new(): ServiceWorker;
+}
+
+interface ServiceWorkerContainerEventMap {
+    "controllerchange": Event;
+    "message": ServiceWorkerMessageEvent;
+}
+
+interface ServiceWorkerContainer extends EventTarget {
+    readonly controller: ServiceWorker | null;
+    oncontrollerchange: (this: ServiceWorkerContainer, ev: Event) => any;
+    onmessage: (this: ServiceWorkerContainer, ev: ServiceWorkerMessageEvent) => any;
+    readonly ready: PromiseLike<ServiceWorkerRegistration>;
+    getRegistration(clientURL?: USVString): PromiseLike<any>;
+    getRegistrations(): any;
+    register(scriptURL: USVString, options?: RegistrationOptions): PromiseLike<ServiceWorkerRegistration>;
+    addEventListener<K extends keyof ServiceWorkerContainerEventMap>(type: K, listener: (this: ServiceWorkerContainer, ev: ServiceWorkerContainerEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var ServiceWorkerContainer: {
+    prototype: ServiceWorkerContainer;
+    new(): ServiceWorkerContainer;
+}
+
+interface ServiceWorkerMessageEvent extends Event {
+    readonly data: any;
+    readonly lastEventId: string;
+    readonly origin: string;
+    readonly ports: MessagePort[] | null;
+    readonly source: ServiceWorker | MessagePort | null;
+}
+
+declare var ServiceWorkerMessageEvent: {
+    prototype: ServiceWorkerMessageEvent;
+    new(type: string, eventInitDict?: ServiceWorkerMessageEventInit): ServiceWorkerMessageEvent;
+}
+
+interface ServiceWorkerRegistrationEventMap {
+    "updatefound": Event;
+}
+
+interface ServiceWorkerRegistration extends EventTarget {
+    readonly active: ServiceWorker | null;
+    readonly installing: ServiceWorker | null;
+    onupdatefound: (this: ServiceWorkerRegistration, ev: Event) => any;
+    readonly pushManager: PushManager;
+    readonly scope: USVString;
+    readonly sync: SyncManager;
+    readonly waiting: ServiceWorker | null;
+    getNotifications(filter?: GetNotificationOptions): any;
+    showNotification(title: string, options?: NotificationOptions): PromiseLike<void>;
+    unregister(): PromiseLike<boolean>;
+    update(): PromiseLike<void>;
+    addEventListener<K extends keyof ServiceWorkerRegistrationEventMap>(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var ServiceWorkerRegistration: {
+    prototype: ServiceWorkerRegistration;
+    new(): ServiceWorkerRegistration;
+}
+
 interface SourceBuffer extends EventTarget {
     appendWindowEnd: number;
     appendWindowStart: number;
@@ -10438,6 +11367,87 @@ declare var SourceBufferList: {
     new(): SourceBufferList;
 }
 
+interface SpeechSynthesisEventMap {
+    "voiceschanged": Event;
+}
+
+interface SpeechSynthesis extends EventTarget {
+    onvoiceschanged: (this: SpeechSynthesis, ev: Event) => any;
+    readonly paused: boolean;
+    readonly pending: boolean;
+    readonly speaking: boolean;
+    cancel(): void;
+    getVoices(): SpeechSynthesisVoice[];
+    pause(): void;
+    resume(): void;
+    speak(utterance: SpeechSynthesisUtterance): void;
+    addEventListener<K extends keyof SpeechSynthesisEventMap>(type: K, listener: (this: SpeechSynthesis, ev: SpeechSynthesisEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var SpeechSynthesis: {
+    prototype: SpeechSynthesis;
+    new(): SpeechSynthesis;
+}
+
+interface SpeechSynthesisEvent extends Event {
+    readonly charIndex: number;
+    readonly elapsedTime: number;
+    readonly name: string;
+    readonly utterance: SpeechSynthesisUtterance | null;
+}
+
+declare var SpeechSynthesisEvent: {
+    prototype: SpeechSynthesisEvent;
+    new(type: string, eventInitDict?: SpeechSynthesisEventInit): SpeechSynthesisEvent;
+}
+
+interface SpeechSynthesisUtteranceEventMap {
+    "boundary": Event;
+    "end": Event;
+    "error": Event;
+    "mark": Event;
+    "pause": Event;
+    "resume": Event;
+    "start": Event;
+}
+
+interface SpeechSynthesisUtterance extends EventTarget {
+    lang: string;
+    onboundary: (this: SpeechSynthesisUtterance, ev: Event) => any;
+    onend: (this: SpeechSynthesisUtterance, ev: Event) => any;
+    onerror: (this: SpeechSynthesisUtterance, ev: Event) => any;
+    onmark: (this: SpeechSynthesisUtterance, ev: Event) => any;
+    onpause: (this: SpeechSynthesisUtterance, ev: Event) => any;
+    onresume: (this: SpeechSynthesisUtterance, ev: Event) => any;
+    onstart: (this: SpeechSynthesisUtterance, ev: Event) => any;
+    pitch: number;
+    rate: number;
+    text: string;
+    voice: SpeechSynthesisVoice;
+    volume: number;
+    addEventListener<K extends keyof SpeechSynthesisUtteranceEventMap>(type: K, listener: (this: SpeechSynthesisUtterance, ev: SpeechSynthesisUtteranceEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var SpeechSynthesisUtterance: {
+    prototype: SpeechSynthesisUtterance;
+    new(text?: string): SpeechSynthesisUtterance;
+}
+
+interface SpeechSynthesisVoice {
+    readonly default: boolean;
+    readonly lang: string;
+    readonly localService: boolean;
+    readonly name: string;
+    readonly voiceURI: string;
+}
+
+declare var SpeechSynthesisVoice: {
+    prototype: SpeechSynthesisVoice;
+    new(): SpeechSynthesisVoice;
+}
+
 interface StereoPannerNode extends AudioNode {
     readonly pan: AudioParam;
 }
@@ -10549,6 +11559,16 @@ declare var SubtleCrypto: {
     new(): SubtleCrypto;
 }
 
+interface SyncManager {
+    getTags(): any;
+    register(tag: string): PromiseLike<void>;
+}
+
+declare var SyncManager: {
+    prototype: SyncManager;
+    new(): SyncManager;
+}
+
 interface Text extends CharacterData {
     readonly wholeText: string;
     readonly assignedSlot: HTMLSlotElement | null;
@@ -10603,7 +11623,7 @@ declare var TextMetrics: {
 
 interface TextTrackEventMap {
     "cuechange": Event;
-    "error": ErrorEvent;
+    "error": Event;
     "load": Event;
 }
 
@@ -10616,7 +11636,7 @@ interface TextTrack extends EventTarget {
     readonly language: string;
     mode: any;
     oncuechange: (this: TextTrack, ev: Event) => any;
-    onerror: (this: TextTrack, ev: ErrorEvent) => any;
+    onerror: (this: TextTrack, ev: Event) => any;
     onload: (this: TextTrack, ev: Event) => any;
     readonly readyState: number;
     addCue(cue: TextTrackCue): void;
@@ -10728,11 +11748,14 @@ declare var Touch: {
 interface TouchEvent extends UIEvent {
     readonly altKey: boolean;
     readonly changedTouches: TouchList;
+    readonly charCode: number;
     readonly ctrlKey: boolean;
+    readonly keyCode: number;
     readonly metaKey: boolean;
     readonly shiftKey: boolean;
     readonly targetTouches: TouchList;
     readonly touches: TouchList;
+    readonly which: number;
 }
 
 declare var TouchEvent: {
@@ -10752,12 +11775,12 @@ declare var TouchList: {
 }
 
 interface TrackEvent extends Event {
-    readonly track: any;
+    readonly track: VideoTrack | AudioTrack | TextTrack | null;
 }
 
 declare var TrackEvent: {
     prototype: TrackEvent;
-    new(): TrackEvent;
+    new(typeArg: string, eventInitDict?: TrackEventInit): TrackEvent;
 }
 
 interface TransitionEvent extends Event {
@@ -10768,7 +11791,7 @@ interface TransitionEvent extends Event {
 
 declare var TransitionEvent: {
     prototype: TransitionEvent;
-    new(): TransitionEvent;
+    new(typeArg: string, eventInitDict?: TransitionEventInit): TransitionEvent;
 }
 
 interface TreeWalker {
@@ -10799,7 +11822,7 @@ interface UIEvent extends Event {
 
 declare var UIEvent: {
     prototype: UIEvent;
-    new(type: string, eventInitDict?: UIEventInit): UIEvent;
+    new(typeArg: string, eventInitDict?: UIEventInit): UIEvent;
 }
 
 interface URL {
@@ -10814,6 +11837,7 @@ interface URL {
     protocol: string;
     search: string;
     username: string;
+    readonly searchparams: URLSearchParams;
     toString(): string;
 }
 
@@ -10950,6 +11974,28 @@ declare var WaveShaperNode: {
     new(): WaveShaperNode;
 }
 
+interface WebAuthentication {
+    getAssertion(assertionChallenge: any, options?: AssertionOptions): PromiseLike<WebAuthnAssertion>;
+    makeCredential(accountInformation: Account, cryptoParameters: ScopedCredentialParameters[], attestationChallenge: any, options?: ScopedCredentialOptions): PromiseLike<ScopedCredentialInfo>;
+}
+
+declare var WebAuthentication: {
+    prototype: WebAuthentication;
+    new(): WebAuthentication;
+}
+
+interface WebAuthnAssertion {
+    readonly authenticatorData: ArrayBuffer;
+    readonly clientData: ArrayBuffer;
+    readonly credential: ScopedCredential;
+    readonly signature: ArrayBuffer;
+}
+
+declare var WebAuthnAssertion: {
+    prototype: WebAuthnAssertion;
+    new(): WebAuthnAssertion;
+}
+
 interface WebGLActiveInfo {
     readonly name: string;
     readonly size: number;
@@ -10975,7 +12021,7 @@ interface WebGLContextEvent extends Event {
 
 declare var WebGLContextEvent: {
     prototype: WebGLContextEvent;
-    new(type: string, eventInitDict?: WebGLContextEventInit): WebGLContextEvent;
+    new(typeArg: string, eventInitDict?: WebGLContextEventInit): WebGLContextEvent;
 }
 
 interface WebGLFramebuffer extends WebGLObject {
@@ -11102,7 +12148,7 @@ interface WebGLRenderingContext {
     isTexture(texture: WebGLTexture | null): boolean;
     lineWidth(width: number): void;
     linkProgram(program: WebGLProgram | null): void;
-    pixelStorei(pname: number, param: number): void;
+    pixelStorei(pname: number, param: number | boolean): void;
     polygonOffset(factor: number, units: number): void;
     readPixels(x: number, y: number, width: number, height: number, format: number, type: number, pixels: ArrayBufferView | null): void;
     renderbufferStorage(target: number, internalformat: number, width: number, height: number): void;
@@ -11828,6 +12874,56 @@ declare var WebKitCSSMatrix: {
     new(text?: string): WebKitCSSMatrix;
 }
 
+interface WebKitDirectoryEntry extends WebKitEntry {
+    createReader(): WebKitDirectoryReader;
+}
+
+declare var WebKitDirectoryEntry: {
+    prototype: WebKitDirectoryEntry;
+    new(): WebKitDirectoryEntry;
+}
+
+interface WebKitDirectoryReader {
+    readEntries(successCallback: WebKitEntriesCallback, errorCallback?: WebKitErrorCallback): void;
+}
+
+declare var WebKitDirectoryReader: {
+    prototype: WebKitDirectoryReader;
+    new(): WebKitDirectoryReader;
+}
+
+interface WebKitEntry {
+    readonly filesystem: WebKitFileSystem;
+    readonly fullPath: string;
+    readonly isDirectory: boolean;
+    readonly isFile: boolean;
+    readonly name: string;
+}
+
+declare var WebKitEntry: {
+    prototype: WebKitEntry;
+    new(): WebKitEntry;
+}
+
+interface WebKitFileEntry extends WebKitEntry {
+    file(successCallback: WebKitFileCallback, errorCallback?: WebKitErrorCallback): void;
+}
+
+declare var WebKitFileEntry: {
+    prototype: WebKitFileEntry;
+    new(): WebKitFileEntry;
+}
+
+interface WebKitFileSystem {
+    readonly name: string;
+    readonly root: WebKitDirectoryEntry;
+}
+
+declare var WebKitFileSystem: {
+    prototype: WebKitFileSystem;
+    new(): WebKitFileSystem;
+}
+
 interface WebKitPoint {
     x: number;
     y: number;
@@ -11840,7 +12936,7 @@ declare var WebKitPoint: {
 
 interface WebSocketEventMap {
     "close": CloseEvent;
-    "error": ErrorEvent;
+    "error": Event;
     "message": MessageEvent;
     "open": Event;
 }
@@ -11850,7 +12946,7 @@ interface WebSocket extends EventTarget {
     readonly bufferedAmount: number;
     readonly extensions: string;
     onclose: (this: WebSocket, ev: CloseEvent) => any;
-    onerror: (this: WebSocket, ev: ErrorEvent) => any;
+    onerror: (this: WebSocket, ev: Event) => any;
     onmessage: (this: WebSocket, ev: MessageEvent) => any;
     onopen: (this: WebSocket, ev: Event) => any;
     readonly protocol: string;
@@ -11987,8 +13083,9 @@ interface WindowEventMap extends GlobalEventHandlersEventMap {
     "waiting": Event;
 }
 
-interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 {
+interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64, GlobalFetch {
     readonly applicationCache: ApplicationCache;
+    readonly caches: CacheStorage;
     readonly clientInformation: Navigator;
     readonly closed: boolean;
     readonly crypto: Crypto;
@@ -12003,10 +13100,12 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     readonly history: History;
     readonly innerHeight: number;
     readonly innerWidth: number;
+    readonly isSecureContext: boolean;
     readonly length: number;
     readonly location: Location;
     readonly locationbar: BarProp;
     readonly menubar: BarProp;
+    readonly msContentScript: ExtensionScriptApis;
     readonly msCredentials: MSCredentials;
     name: string;
     readonly navigator: Navigator;
@@ -12120,6 +13219,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     readonly scrollY: number;
     readonly scrollbars: BarProp;
     readonly self: Window;
+    readonly speechSynthesis: SpeechSynthesis;
     status: string;
     readonly statusbar: BarProp;
     readonly styleMedia: StyleMedia;
@@ -12128,12 +13228,14 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     readonly window: Window;
     URL: typeof URL;
     Blob: typeof Blob;
+    customElements: CustomElementRegistry;
     alert(message?: any): void;
     blur(): void;
     cancelAnimationFrame(handle: number): void;
     captureEvents(): void;
     close(): void;
     confirm(message?: string): boolean;
+    departFocus(navigationReason: string, origin: FocusNavigationOrigin): void;
     focus(): void;
     getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration;
     getMatchedCSSRules(elt: Element, pseudoElt?: string): CSSRuleList;
@@ -12153,6 +13255,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     scroll(x?: number, y?: number): void;
     scrollBy(x?: number, y?: number): void;
     scrollTo(x?: number, y?: number): void;
+    stop(): void;
     webkitCancelAnimationFrame(handle: number): void;
     webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
     webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
@@ -12175,7 +13278,7 @@ interface WorkerEventMap extends AbstractWorkerEventMap {
 
 interface Worker extends EventTarget, AbstractWorker {
     onmessage: (this: Worker, ev: MessageEvent) => any;
-    postMessage(message: any, ports?: any): void;
+    postMessage(message: any, transfer?: any[]): void;
     terminate(): void;
     addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -12187,7 +13290,7 @@ declare var Worker: {
 }
 
 interface XMLDocument extends Document {
-    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: XMLDocument, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12206,14 +13309,14 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly response: any;
     readonly responseText: string;
     responseType: string;
-    readonly responseXML: any;
+    readonly responseURL: string;
+    readonly responseXML: Document | null;
     readonly status: number;
     readonly statusText: string;
     timeout: number;
     readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     msCaching?: string;
-    readonly responseURL: string;
     abort(): void;
     getAllResponseHeaders(): string;
     getResponseHeader(header: string): string | null;
@@ -12241,11 +13344,10 @@ declare var XMLHttpRequest: {
     readonly LOADING: number;
     readonly OPENED: number;
     readonly UNSENT: number;
-    create(): XMLHttpRequest;
 }
 
 interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
-    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestUpload, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12345,6 +13447,16 @@ declare var XSLTProcessor: {
     new(): XSLTProcessor;
 }
 
+interface webkitRTCPeerConnection extends RTCPeerConnection {
+    addEventListener<K extends keyof RTCPeerConnectionEventMap>(type: K, listener: (this: webkitRTCPeerConnection, ev: RTCPeerConnectionEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var webkitRTCPeerConnection: {
+    prototype: webkitRTCPeerConnection;
+    new(configuration: RTCConfiguration): webkitRTCPeerConnection;
+}
+
 interface AbstractWorkerEventMap {
     "error": ErrorEvent;
 }
@@ -12355,6 +13467,14 @@ interface AbstractWorker {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface Body {
+    readonly bodyUsed: boolean;
+    arrayBuffer(): PromiseLike<ArrayBuffer>;
+    blob(): PromiseLike<Blob>;
+    json(): PromiseLike<any>;
+    text(): PromiseLike<string>;
+}
+
 interface CanvasPathMethods {
     arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
@@ -12381,12 +13501,10 @@ interface DOML2DeprecatedSizeProperty {
 
 interface DocumentEvent {
     createEvent(eventInterface:"AnimationEvent"): AnimationEvent;
-    createEvent(eventInterface:"AriaRequestEvent"): AriaRequestEvent;
     createEvent(eventInterface:"AudioProcessingEvent"): AudioProcessingEvent;
     createEvent(eventInterface:"BeforeUnloadEvent"): BeforeUnloadEvent;
     createEvent(eventInterface:"ClipboardEvent"): ClipboardEvent;
     createEvent(eventInterface:"CloseEvent"): CloseEvent;
-    createEvent(eventInterface:"CommandEvent"): CommandEvent;
     createEvent(eventInterface:"CompositionEvent"): CompositionEvent;
     createEvent(eventInterface:"CustomEvent"): CustomEvent;
     createEvent(eventInterface:"DeviceLightEvent"): DeviceLightEvent;
@@ -12397,6 +13515,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"Event"): Event;
     createEvent(eventInterface:"Events"): Event;
     createEvent(eventInterface:"FocusEvent"): FocusEvent;
+    createEvent(eventInterface:"FocusNavigationEvent"): FocusNavigationEvent;
     createEvent(eventInterface:"GamepadEvent"): GamepadEvent;
     createEvent(eventInterface:"HashChangeEvent"): HashChangeEvent;
     createEvent(eventInterface:"IDBVersionChangeEvent"): IDBVersionChangeEvent;
@@ -12412,6 +13531,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"MediaEncryptedEvent"): MediaEncryptedEvent;
     createEvent(eventInterface:"MediaKeyMessageEvent"): MediaKeyMessageEvent;
     createEvent(eventInterface:"MediaStreamErrorEvent"): MediaStreamErrorEvent;
+    createEvent(eventInterface:"MediaStreamEvent"): MediaStreamEvent;
     createEvent(eventInterface:"MediaStreamTrackEvent"): MediaStreamTrackEvent;
     createEvent(eventInterface:"MessageEvent"): MessageEvent;
     createEvent(eventInterface:"MouseEvent"): MouseEvent;
@@ -12424,6 +13544,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"OfflineAudioCompletionEvent"): OfflineAudioCompletionEvent;
     createEvent(eventInterface:"OverflowEvent"): OverflowEvent;
     createEvent(eventInterface:"PageTransitionEvent"): PageTransitionEvent;
+    createEvent(eventInterface:"PaymentRequestUpdateEvent"): PaymentRequestUpdateEvent;
     createEvent(eventInterface:"PermissionRequestedEvent"): PermissionRequestedEvent;
     createEvent(eventInterface:"PointerEvent"): PointerEvent;
     createEvent(eventInterface:"PopStateEvent"): PopStateEvent;
@@ -12433,10 +13554,13 @@ interface DocumentEvent {
     createEvent(eventInterface:"RTCIceCandidatePairChangedEvent"): RTCIceCandidatePairChangedEvent;
     createEvent(eventInterface:"RTCIceGathererEvent"): RTCIceGathererEvent;
     createEvent(eventInterface:"RTCIceTransportStateChangedEvent"): RTCIceTransportStateChangedEvent;
+    createEvent(eventInterface:"RTCPeerConnectionIceEvent"): RTCPeerConnectionIceEvent;
     createEvent(eventInterface:"RTCSsrcConflictEvent"): RTCSsrcConflictEvent;
     createEvent(eventInterface:"SVGZoomEvent"): SVGZoomEvent;
     createEvent(eventInterface:"SVGZoomEvents"): SVGZoomEvent;
     createEvent(eventInterface:"ScriptNotifyEvent"): ScriptNotifyEvent;
+    createEvent(eventInterface:"ServiceWorkerMessageEvent"): ServiceWorkerMessageEvent;
+    createEvent(eventInterface:"SpeechSynthesisEvent"): SpeechSynthesisEvent;
     createEvent(eventInterface:"StorageEvent"): StorageEvent;
     createEvent(eventInterface:"TextEvent"): TextEvent;
     createEvent(eventInterface:"TouchEvent"): TouchEvent;
@@ -12452,10 +13576,10 @@ interface DocumentEvent {
 
 interface ElementTraversal {
     readonly childElementCount: number;
-    readonly firstElementChild: Element;
-    readonly lastElementChild: Element;
-    readonly nextElementSibling: Element;
-    readonly previousElementSibling: Element;
+    readonly firstElementChild: Element | null;
+    readonly lastElementChild: Element | null;
+    readonly nextElementSibling: Element | null;
+    readonly previousElementSibling: Element | null;
 }
 
 interface GetSVGDocument {
@@ -12488,6 +13612,10 @@ interface GlobalEventHandlers {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface GlobalFetch {
+    fetch(input: RequestInfo, init?: RequestInit): PromiseLike<Response>;
+}
+
 interface HTMLTableAlignment {
     /**
       * Sets or retrieves a value that you can use to implement your own ch functionality for the object.
@@ -12551,6 +13679,14 @@ interface MSNavigatorDoNotTrack {
     storeWebWideTrackingException(args: StoreExceptionsInformation): void;
 }
 
+interface NavigatorBeacon {
+    sendBeacon(url: USVString, data?: BodyInit): boolean;
+}
+
+interface NavigatorConcurrentHardware {
+    readonly hardwareConcurrency: number;
+}
+
 interface NavigatorContentUtils {
 }
 
@@ -12559,6 +13695,7 @@ interface NavigatorGeolocation {
 }
 
 interface NavigatorID {
+    readonly appCodeName: string;
     readonly appName: string;
     readonly appVersion: string;
     readonly platform: string;
@@ -12592,20 +13729,12 @@ interface RandomSource {
     getRandomValues(array: ArrayBufferView): ArrayBufferView;
 }
 
-interface SVGAnimatedPathData {
-    readonly pathSegList: SVGPathSegList;
-}
-
 interface SVGAnimatedPoints {
     readonly animatedPoints: SVGPointList;
     readonly points: SVGPointList;
 }
 
-interface SVGExternalResourcesRequired {
-    readonly externalResourcesRequired: SVGAnimatedBoolean;
-}
-
-interface SVGFilterPrimitiveStandardAttributes extends SVGStylable {
+interface SVGFilterPrimitiveStandardAttributes {
     readonly height: SVGAnimatedLength;
     readonly result: SVGAnimatedString;
     readonly width: SVGAnimatedLength;
@@ -12618,25 +13747,6 @@ interface SVGFitToViewBox {
     readonly viewBox: SVGAnimatedRect;
 }
 
-interface SVGLangSpace {
-    xmllang: string;
-    xmlspace: string;
-}
-
-interface SVGLocatable {
-    readonly farthestViewportElement: SVGElement;
-    readonly nearestViewportElement: SVGElement;
-    getBBox(): SVGRect;
-    getCTM(): SVGMatrix;
-    getScreenCTM(): SVGMatrix;
-    getTransformToElement(element: SVGElement): SVGMatrix;
-}
-
-interface SVGStylable {
-    className: any;
-    readonly style: CSSStyleDeclaration;
-}
-
 interface SVGTests {
     readonly requiredExtensions: SVGStringList;
     readonly requiredFeatures: SVGStringList;
@@ -12644,10 +13754,6 @@ interface SVGTests {
     hasExtension(extension: string): boolean;
 }
 
-interface SVGTransformable extends SVGLocatable {
-    readonly transform: SVGAnimatedTransformList;
-}
-
 interface SVGURIReference {
     readonly href: SVGAnimatedString;
 }
@@ -12706,6 +13812,14 @@ interface XMLHttpRequestEventTarget {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface ErrorEventInit {
+    message?: string;
+    filename?: string;
+    lineno?: number;
+    conlno?: number;
+    error?: any;
+}
+
 interface StorageEventInit extends EventInit {
     key?: string;
     oldValue?: string;
@@ -12721,6 +13835,41 @@ interface Canvas2DContextAttributes {
     [attribute: string]: boolean | string | undefined;
 }
 
+interface URLSearchParams {
+    /**
+      * Appends a specified key/value pair as a new search parameter.
+      */
+    append(name: string, value: string): void;
+    /**
+      * Deletes the given search parameter, and its associated value, from the list of all search parameters.
+      */
+    delete(name: string): void;
+    /**
+      * Returns the first value associated to the given search parameter.
+      */
+    get(name: string): string | null;
+    /**
+      * Returns all the values association with a given search parameter.
+      */
+    getAll(name: string): string[];
+    /**
+      * Returns a Boolean indicating if such a search parameter exists.
+      */
+    has(name: string): boolean;
+    /**
+      * Sets the value associated to a given search parameter to the given value. If there were several values, delete the others.
+      */
+    set(name: string, value: string): void;
+}
+
+declare var URLSearchParams: {
+    prototype: URLSearchParams;
+    /**
+      * Constructor returning a URLSearchParams object.
+      */
+    new (init?: string | URLSearchParams): URLSearchParams;
+}
+
 interface NodeListOf<TNode extends Node> extends NodeList {
     length: number;
     item(index: number): TNode;
@@ -12730,7 +13879,6 @@ interface NodeListOf<TNode extends Node> extends NodeList {
 interface HTMLCollectionOf<T extends Element> extends HTMLCollection {
     item(index: number): T;
     namedItem(name: string): T;
-    [index: number]: T;
 }
 
 interface BlobPropertyBag {
@@ -12747,15 +13895,6 @@ interface EventListenerObject {
     handleEvent(evt: Event): void;
 }
 
-interface MessageEventInit extends EventInit {
-    data?: any;
-    origin?: string;
-    lastEventId?: string;
-    channel?: string;
-    source?: any;
-    ports?: MessagePort[];
-}
-
 interface ProgressEventInit extends EventInit {
     lengthComputable?: boolean;
     loaded?: number;
@@ -12957,8 +14096,8 @@ interface JsonWebKey {
 
 interface ParentNode {
     readonly children: HTMLCollection;
-    readonly firstElementChild: Element;
-    readonly lastElementChild: Element;
+    readonly firstElementChild: Element | null;
+    readonly lastElementChild: Element | null;
     readonly childElementCount: number;
 }
 
@@ -12989,6 +14128,26 @@ interface AssignedNodesOptions {
     flatten?: boolean;
 }
 
+interface ElementDefinitionOptions {
+    extends: string;
+}
+
+interface CustomElementRegistry {
+    define(name: string, constructor: Function, options?: ElementDefinitionOptions): void;
+    get(name: string): any;
+    whenDefined(name: string): PromiseLike<void>;
+}
+
+interface PromiseRejectionEvent extends Event {
+    readonly promise: PromiseLike<any>;
+    readonly reason: any;
+}
+
+interface PromiseRejectionEventInit extends EventInit {
+    promise: PromiseLike<any>;
+    reason?: any;
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -13024,6 +14183,18 @@ interface DecodeSuccessCallback {
 interface DecodeErrorCallback {
     (error: DOMException): void;
 }
+interface VoidFunction {
+    (): void;
+}
+interface RTCSessionDescriptionCallback {
+    (sdp: RTCSessionDescription): void;
+}
+interface RTCPeerConnectionErrorCallback {
+    (error: DOMError): void;
+}
+interface RTCStatsCallback {
+    (report: RTCStatsReport): void;
+}
 interface FunctionStringCallback {
     (data: string): void;
 }
@@ -13036,6 +14207,12 @@ interface NavigatorUserMediaErrorCallback {
 interface ForEachCallback {
     (keyId: any, status: string): void;
 }
+interface NotificationPermissionCallback {
+    (permission: string): void;
+}
+interface IntersectionObserverCallback {
+    (entries: IntersectionObserverEntry[], observer: IntersectionObserver): void;
+}
 interface HTMLElementTagNameMap {
     "a": HTMLAnchorElement;
     "applet": HTMLAppletElement;
@@ -13051,6 +14228,7 @@ interface HTMLElementTagNameMap {
     "caption": HTMLTableCaptionElement;
     "col": HTMLTableColElement;
     "colgroup": HTMLTableColElement;
+    "data": HTMLDataElement;
     "datalist": HTMLDataListElement;
     "del": HTMLModElement;
     "dir": HTMLDirectoryElement;
@@ -13091,6 +14269,7 @@ interface HTMLElementTagNameMap {
     "ol": HTMLOListElement;
     "optgroup": HTMLOptGroupElement;
     "option": HTMLOptionElement;
+    "output": HTMLOutputElement;
     "p": HTMLParagraphElement;
     "param": HTMLParamElement;
     "picture": HTMLPictureElement;
@@ -13110,6 +14289,7 @@ interface HTMLElementTagNameMap {
     "tfoot": HTMLTableSectionElement;
     "th": HTMLTableHeaderCellElement;
     "thead": HTMLTableSectionElement;
+    "time": HTMLTimeElement;
     "title": HTMLTitleElement;
     "tr": HTMLTableRowElement;
     "track": HTMLTrackElement;
@@ -13147,6 +14327,7 @@ interface ElementTagNameMap {
     "code": HTMLElement;
     "col": HTMLTableColElement;
     "colgroup": HTMLTableColElement;
+    "data": HTMLDataElement;
     "datalist": HTMLDataListElement;
     "dd": HTMLElement;
     "defs": SVGDefsElement;
@@ -13240,6 +14421,7 @@ interface ElementTagNameMap {
     "ol": HTMLOListElement;
     "optgroup": HTMLOptGroupElement;
     "option": HTMLOptionElement;
+    "output": HTMLOutputElement;
     "p": HTMLParagraphElement;
     "param": HTMLParamElement;
     "path": SVGPathElement;
@@ -13282,6 +14464,7 @@ interface ElementTagNameMap {
     "tfoot": HTMLTableSectionElement;
     "th": HTMLTableHeaderCellElement;
     "thead": HTMLTableSectionElement;
+    "time": HTMLTimeElement;
     "title": HTMLTitleElement;
     "tr": HTMLTableRowElement;
     "track": HTMLTrackElement;
@@ -13326,6 +14509,7 @@ interface ElementListTagNameMap {
     "code": NodeListOf<HTMLElement>;
     "col": NodeListOf<HTMLTableColElement>;
     "colgroup": NodeListOf<HTMLTableColElement>;
+    "data": NodeListOf<HTMLDataElement>;
     "datalist": NodeListOf<HTMLDataListElement>;
     "dd": NodeListOf<HTMLElement>;
     "defs": NodeListOf<SVGDefsElement>;
@@ -13419,6 +14603,7 @@ interface ElementListTagNameMap {
     "ol": NodeListOf<HTMLOListElement>;
     "optgroup": NodeListOf<HTMLOptGroupElement>;
     "option": NodeListOf<HTMLOptionElement>;
+    "output": NodeListOf<HTMLOutputElement>;
     "p": NodeListOf<HTMLParagraphElement>;
     "param": NodeListOf<HTMLParamElement>;
     "path": NodeListOf<SVGPathElement>;
@@ -13461,6 +14646,7 @@ interface ElementListTagNameMap {
     "tfoot": NodeListOf<HTMLTableSectionElement>;
     "th": NodeListOf<HTMLTableHeaderCellElement>;
     "thead": NodeListOf<HTMLTableSectionElement>;
+    "time": NodeListOf<HTMLTimeElement>;
     "title": NodeListOf<HTMLTitleElement>;
     "tr": NodeListOf<HTMLTableRowElement>;
     "track": NodeListOf<HTMLTrackElement>;
@@ -13481,6 +14667,7 @@ declare var Audio: {new(src?: string): HTMLAudioElement; };
 declare var Image: {new(width?: number, height?: number): HTMLImageElement; };
 declare var Option: {new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement; };
 declare var applicationCache: ApplicationCache;
+declare var caches: CacheStorage;
 declare var clientInformation: Navigator;
 declare var closed: boolean;
 declare var crypto: Crypto;
@@ -13495,10 +14682,12 @@ declare var frames: Window;
 declare var history: History;
 declare var innerHeight: number;
 declare var innerWidth: number;
+declare var isSecureContext: boolean;
 declare var length: number;
 declare var location: Location;
 declare var locationbar: BarProp;
 declare var menubar: BarProp;
+declare var msContentScript: ExtensionScriptApis;
 declare var msCredentials: MSCredentials;
 declare const name: never;
 declare var navigator: Navigator;
@@ -13612,18 +14801,21 @@ declare var scrollX: number;
 declare var scrollY: number;
 declare var scrollbars: BarProp;
 declare var self: Window;
+declare var speechSynthesis: SpeechSynthesis;
 declare var status: string;
 declare var statusbar: BarProp;
 declare var styleMedia: StyleMedia;
 declare var toolbar: BarProp;
 declare var top: Window;
 declare var window: Window;
+declare var customElements: CustomElementRegistry;
 declare function alert(message?: any): void;
 declare function blur(): void;
 declare function cancelAnimationFrame(handle: number): void;
 declare function captureEvents(): void;
 declare function close(): void;
 declare function confirm(message?: string): boolean;
+declare function departFocus(navigationReason: string, origin: FocusNavigationOrigin): void;
 declare function focus(): void;
 declare function getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration;
 declare function getMatchedCSSRules(elt: Element, pseudoElt?: string): CSSRuleList;
@@ -13643,6 +14835,7 @@ declare function resizeTo(x?: number, y?: number): void;
 declare function scroll(x?: number, y?: number): void;
 declare function scrollBy(x?: number, y?: number): void;
 declare function scrollTo(x?: number, y?: number): void;
+declare function stop(): void;
 declare function webkitCancelAnimationFrame(handle: number): void;
 declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
 declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
@@ -13677,10 +14870,13 @@ declare var onwheel: (this: Window, ev: WheelEvent) => any;
 declare var indexedDB: IDBFactory;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
+declare function fetch(input: RequestInfo, init?: RequestInit): PromiseLike<Response>;
 declare function addEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, useCapture?: boolean): void;
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 type AAGUID = string;
 type AlgorithmIdentifier = string | Algorithm;
+type BodyInit = any;
+type ByteString = string;
 type ConstrainBoolean = boolean | ConstrainBooleanParameters;
 type ConstrainDOMString = string | string[] | ConstrainDOMStringParameters;
 type ConstrainDouble = number | ConstrainDoubleRange;
@@ -13700,6 +14896,7 @@ type GLsizeiptr = number;
 type GLubyte = number;
 type GLuint = number;
 type GLushort = number;
+type HeadersInit = any;
 type IDBKeyPath = string;
 type KeyFormat = string;
 type KeyType = string;
@@ -13707,8 +14904,10 @@ type KeyUsage = string;
 type MSInboundPayload = MSVideoRecvPayload | MSAudioRecvPayload;
 type MSLocalClientEvent = MSLocalClientEventBase | MSAudioLocalClientEvent;
 type MSOutboundPayload = MSVideoSendPayload | MSAudioSendPayload;
-type RTCIceGatherCandidate = RTCIceCandidate | RTCIceCandidateComplete;
+type RTCIceGatherCandidate = RTCIceCandidateDictionary | RTCIceCandidateComplete;
 type RTCTransport = RTCDtlsTransport | RTCSrtpSdesTransport;
+type RequestInfo = Request | string;
+type USVString = string;
 type payloadtype = number;
 type ScrollBehavior = "auto" | "instant" | "smooth";
 type ScrollLogicalPosition = "start" | "center" | "end" | "nearest";
diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts
index 089d0bdc5d5..e949526641b 100644
--- a/src/lib/webworker.generated.d.ts
+++ b/src/lib/webworker.generated.d.ts
@@ -7,12 +7,29 @@ interface Algorithm {
     name: string;
 }
 
+interface CacheQueryOptions {
+    ignoreSearch?: boolean;
+    ignoreMethod?: boolean;
+    ignoreVary?: boolean;
+    cacheName?: string;
+}
+
+interface CloseEventInit extends EventInit {
+    wasClean?: boolean;
+    code?: number;
+    reason?: string;
+}
+
 interface EventInit {
     scoped?: boolean;
     bubbles?: boolean;
     cancelable?: boolean;
 }
 
+interface GetNotificationOptions {
+    tag?: string;
+}
+
 interface IDBIndexParameters {
     multiEntry?: boolean;
     unique?: boolean;
@@ -27,10 +44,101 @@ interface KeyAlgorithm {
     name?: string;
 }
 
+interface MessageEventInit extends EventInit {
+    lastEventId?: string;
+    channel?: string;
+    data?: any;
+    origin?: string;
+    source?: any;
+    ports?: MessagePort[];
+}
+
+interface NotificationOptions {
+    dir?: string;
+    lang?: string;
+    body?: string;
+    tag?: string;
+    icon?: string;
+}
+
+interface PushSubscriptionOptionsInit {
+    userVisibleOnly?: boolean;
+    applicationServerKey?: any;
+}
+
+interface RequestInit {
+    method?: string;
+    headers?: any;
+    body?: any;
+    referrer?: string;
+    referrerPolicy?: string;
+    mode?: string;
+    credentials?: string;
+    cache?: string;
+    redirect?: string;
+    integrity?: string;
+    keepalive?: boolean;
+    window?: any;
+}
+
+interface ResponseInit {
+    status?: number;
+    statusText?: string;
+    headers?: any;
+}
+
+interface ClientQueryOptions {
+    includeUncontrolled?: boolean;
+    type?: string;
+}
+
+interface ExtendableEventInit extends EventInit {
+}
+
+interface ExtendableMessageEventInit extends ExtendableEventInit {
+    data?: any;
+    origin?: string;
+    lastEventId?: string;
+    source?: Client | ServiceWorker | MessagePort;
+    ports?: MessagePort[];
+}
+
+interface FetchEventInit extends ExtendableEventInit {
+    request?: Request;
+    clientId?: string;
+    isReload?: boolean;
+}
+
+interface NotificationEventInit extends ExtendableEventInit {
+    notification?: Notification;
+    action?: string;
+}
+
+interface PushEventInit extends ExtendableEventInit {
+    data?: any;
+}
+
+interface SyncEventInit extends ExtendableEventInit {
+    tag?: string;
+    lastChance?: boolean;
+}
+
 interface EventListener {
     (evt: Event): void;
 }
 
+interface WebKitEntriesCallback {
+    (evt: Event): void;
+}
+
+interface WebKitErrorCallback {
+    (evt: Event): void;
+}
+
+interface WebKitFileCallback {
+    (evt: Event): void;
+}
+
 interface AudioBuffer {
     readonly duration: number;
     readonly length: number;
@@ -59,6 +167,34 @@ declare var Blob: {
     new (blobParts?: any[], options?: BlobPropertyBag): Blob;
 }
 
+interface Cache {
+    add(request: RequestInfo): PromiseLike<void>;
+    addAll(requests: RequestInfo[]): PromiseLike<void>;
+    delete(request: RequestInfo, options?: CacheQueryOptions): PromiseLike<boolean>;
+    keys(request?: RequestInfo, options?: CacheQueryOptions): any;
+    match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike<Response>;
+    matchAll(request?: RequestInfo, options?: CacheQueryOptions): any;
+    put(request: RequestInfo, response: Response): PromiseLike<void>;
+}
+
+declare var Cache: {
+    prototype: Cache;
+    new(): Cache;
+}
+
+interface CacheStorage {
+    delete(cacheName: string): PromiseLike<boolean>;
+    has(cacheName: string): PromiseLike<boolean>;
+    keys(): any;
+    match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike<any>;
+    open(cacheName: string): PromiseLike<Cache>;
+}
+
+declare var CacheStorage: {
+    prototype: CacheStorage;
+    new(): CacheStorage;
+}
+
 interface CloseEvent extends Event {
     readonly code: number;
     readonly reason: string;
@@ -68,14 +204,14 @@ interface CloseEvent extends Event {
 
 declare var CloseEvent: {
     prototype: CloseEvent;
-    new(): CloseEvent;
+    new(typeArg: string, eventInitDict?: CloseEventInit): CloseEvent;
 }
 
 interface Console {
     assert(test?: boolean, message?: string, ...optionalParams: any[]): void;
     clear(): void;
     count(countTitle?: string): void;
-    debug(message?: string, ...optionalParams: any[]): void;
+    debug(message?: any, ...optionalParams: any[]): void;
     dir(value?: any, ...optionalParams: any[]): void;
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
@@ -227,7 +363,7 @@ interface ErrorEvent extends Event {
 
 declare var ErrorEvent: {
     prototype: ErrorEvent;
-    new(): ErrorEvent;
+    new(type: string, errorEventInitDict?: ErrorEventInit): ErrorEvent;
 }
 
 interface Event {
@@ -256,7 +392,7 @@ interface Event {
 
 declare var Event: {
     prototype: Event;
-    new(type: string, eventInitDict?: EventInit): Event;
+    new(typeArg: string, eventInitDict?: EventInit): Event;
     readonly AT_TARGET: number;
     readonly BUBBLING_PHASE: number;
     readonly CAPTURING_PHASE: number;
@@ -301,7 +437,7 @@ interface FileReader extends EventTarget, MSBaseReader {
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
     readAsText(blob: Blob, encoding?: string): void;
-    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: FileReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -310,6 +446,20 @@ declare var FileReader: {
     new(): FileReader;
 }
 
+interface Headers {
+    append(name: string, value: string): void;
+    delete(name: string): void;
+    forEach(callback: ForEachCallback): void;
+    get(name: string): string | null;
+    has(name: string): boolean;
+    set(name: string, value: string): void;
+}
+
+declare var Headers: {
+    prototype: Headers;
+    new(init?: any): Headers;
+}
+
 interface IDBCursor {
     readonly direction: string;
     key: IDBKeyRange | IDBValidKey;
@@ -345,14 +495,14 @@ declare var IDBCursorWithValue: {
 
 interface IDBDatabaseEventMap {
     "abort": Event;
-    "error": ErrorEvent;
+    "error": Event;
 }
 
 interface IDBDatabase extends EventTarget {
     readonly name: string;
     readonly objectStoreNames: DOMStringList;
     onabort: (this: IDBDatabase, ev: Event) => any;
-    onerror: (this: IDBDatabase, ev: ErrorEvent) => any;
+    onerror: (this: IDBDatabase, ev: Event) => any;
     version: number;
     onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
@@ -455,13 +605,13 @@ declare var IDBOpenDBRequest: {
 }
 
 interface IDBRequestEventMap {
-    "error": ErrorEvent;
+    "error": Event;
     "success": Event;
 }
 
 interface IDBRequest extends EventTarget {
     readonly error: DOMError;
-    onerror: (this: IDBRequest, ev: ErrorEvent) => any;
+    onerror: (this: IDBRequest, ev: Event) => any;
     onsuccess: (this: IDBRequest, ev: Event) => any;
     readonly readyState: string;
     readonly result: any;
@@ -479,7 +629,7 @@ declare var IDBRequest: {
 interface IDBTransactionEventMap {
     "abort": Event;
     "complete": Event;
-    "error": ErrorEvent;
+    "error": Event;
 }
 
 interface IDBTransaction extends EventTarget {
@@ -488,7 +638,7 @@ interface IDBTransaction extends EventTarget {
     readonly mode: string;
     onabort: (this: IDBTransaction, ev: Event) => any;
     oncomplete: (this: IDBTransaction, ev: Event) => any;
-    onerror: (this: IDBTransaction, ev: ErrorEvent) => any;
+    onerror: (this: IDBTransaction, ev: Event) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
     readonly READ_ONLY: string;
@@ -528,105 +678,6 @@ declare var ImageData: {
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 }
 
-interface MSApp {
-    clearTemporaryWebDataAsync(): MSAppAsyncOperation;
-    createBlobFromRandomAccessStream(type: string, seeker: any): Blob;
-    createDataPackage(object: any): any;
-    createDataPackageFromSelection(): any;
-    createFileFromStorageFile(storageFile: any): File;
-    createStreamFromInputStream(type: string, inputStream: any): MSStream;
-    execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void;
-    execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any;
-    getCurrentPriority(): string;
-    getHtmlPrintDocumentSourceAsync(htmlDoc: any): PromiseLike<any>;
-    getViewId(view: any): any;
-    isTaskScheduledAtPriorityOrHigher(priority: string): boolean;
-    pageHandlesAllApplicationActivations(enabled: boolean): void;
-    suppressSubdownloadCredentialPrompts(suppress: boolean): void;
-    terminateApp(exceptionObject: any): void;
-    readonly CURRENT: string;
-    readonly HIGH: string;
-    readonly IDLE: string;
-    readonly NORMAL: string;
-}
-declare var MSApp: MSApp;
-
-interface MSAppAsyncOperationEventMap {
-    "complete": Event;
-    "error": ErrorEvent;
-}
-
-interface MSAppAsyncOperation extends EventTarget {
-    readonly error: DOMError;
-    oncomplete: (this: MSAppAsyncOperation, ev: Event) => any;
-    onerror: (this: MSAppAsyncOperation, ev: ErrorEvent) => any;
-    readonly readyState: number;
-    readonly result: any;
-    start(): void;
-    readonly COMPLETED: number;
-    readonly ERROR: number;
-    readonly STARTED: number;
-    addEventListener<K extends keyof MSAppAsyncOperationEventMap>(type: K, listener: (this: MSAppAsyncOperation, ev: MSAppAsyncOperationEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var MSAppAsyncOperation: {
-    prototype: MSAppAsyncOperation;
-    new(): MSAppAsyncOperation;
-    readonly COMPLETED: number;
-    readonly ERROR: number;
-    readonly STARTED: number;
-}
-
-interface MSBlobBuilder {
-    append(data: any, endings?: string): void;
-    getBlob(contentType?: string): Blob;
-}
-
-declare var MSBlobBuilder: {
-    prototype: MSBlobBuilder;
-    new(): MSBlobBuilder;
-}
-
-interface MSStream {
-    readonly type: string;
-    msClose(): void;
-    msDetachStream(): any;
-}
-
-declare var MSStream: {
-    prototype: MSStream;
-    new(): MSStream;
-}
-
-interface MSStreamReader extends EventTarget, MSBaseReader {
-    readonly error: DOMError;
-    readAsArrayBuffer(stream: MSStream, size?: number): void;
-    readAsBinaryString(stream: MSStream, size?: number): void;
-    readAsBlob(stream: MSStream, size?: number): void;
-    readAsDataURL(stream: MSStream, size?: number): void;
-    readAsText(stream: MSStream, encoding?: string, size?: number): void;
-    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
-declare var MSStreamReader: {
-    prototype: MSStreamReader;
-    new(): MSStreamReader;
-}
-
-interface MediaQueryList {
-    readonly matches: boolean;
-    readonly media: string;
-    addListener(listener: MediaQueryListListener): void;
-    removeListener(listener: MediaQueryListListener): void;
-}
-
-declare var MediaQueryList: {
-    prototype: MediaQueryList;
-    new(): MediaQueryList;
-}
-
 interface MessageChannel {
     readonly port1: MessagePort;
     readonly port2: MessagePort;
@@ -657,7 +708,7 @@ interface MessagePortEventMap {
 interface MessagePort extends EventTarget {
     onmessage: (this: MessagePort, ev: MessageEvent) => any;
     close(): void;
-    postMessage(message?: any, ports?: any): void;
+    postMessage(message?: any, transfer?: any[]): void;
     start(): void;
     addEventListener<K extends keyof MessagePortEventMap>(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -668,6 +719,109 @@ declare var MessagePort: {
     new(): MessagePort;
 }
 
+interface NotificationEventMap {
+    "click": Event;
+    "close": Event;
+    "error": Event;
+    "show": Event;
+}
+
+interface Notification extends EventTarget {
+    readonly body: string;
+    readonly dir: string;
+    readonly icon: string;
+    readonly lang: string;
+    onclick: (this: Notification, ev: Event) => any;
+    onclose: (this: Notification, ev: Event) => any;
+    onerror: (this: Notification, ev: Event) => any;
+    onshow: (this: Notification, ev: Event) => any;
+    readonly permission: string;
+    readonly tag: string;
+    readonly title: string;
+    close(): void;
+    addEventListener<K extends keyof NotificationEventMap>(type: K, listener: (this: Notification, ev: NotificationEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var Notification: {
+    prototype: Notification;
+    new(title: string, options?: NotificationOptions): Notification;
+    requestPermission(callback?: NotificationPermissionCallback): PromiseLike<string>;
+}
+
+interface Performance {
+    readonly navigation: PerformanceNavigation;
+    readonly timing: PerformanceTiming;
+    clearMarks(markName?: string): void;
+    clearMeasures(measureName?: string): void;
+    clearResourceTimings(): void;
+    getEntries(): any;
+    getEntriesByName(name: string, entryType?: string): any;
+    getEntriesByType(entryType: string): any;
+    getMarks(markName?: string): any;
+    getMeasures(measureName?: string): any;
+    mark(markName: string): void;
+    measure(measureName: string, startMarkName?: string, endMarkName?: string): void;
+    now(): number;
+    setResourceTimingBufferSize(maxSize: number): void;
+    toJSON(): any;
+}
+
+declare var Performance: {
+    prototype: Performance;
+    new(): Performance;
+}
+
+interface PerformanceNavigation {
+    readonly redirectCount: number;
+    readonly type: number;
+    toJSON(): any;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
+}
+
+declare var PerformanceNavigation: {
+    prototype: PerformanceNavigation;
+    new(): PerformanceNavigation;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
+}
+
+interface PerformanceTiming {
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domComplete: number;
+    readonly domContentLoadedEventEnd: number;
+    readonly domContentLoadedEventStart: number;
+    readonly domInteractive: number;
+    readonly domLoading: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly loadEventEnd: number;
+    readonly loadEventStart: number;
+    readonly msFirstPaint: number;
+    readonly navigationStart: number;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
+    readonly unloadEventEnd: number;
+    readonly unloadEventStart: number;
+    readonly secureConnectionStart: number;
+    toJSON(): any;
+}
+
+declare var PerformanceTiming: {
+    prototype: PerformanceTiming;
+    new(): PerformanceTiming;
+}
+
 interface Position {
     readonly coords: Coordinates;
     readonly timestamp: number;
@@ -707,9 +861,156 @@ declare var ProgressEvent: {
     new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
 }
 
+interface PushManager {
+    getSubscription(): PromiseLike<PushSubscription>;
+    permissionState(options?: PushSubscriptionOptionsInit): PromiseLike<string>;
+    subscribe(options?: PushSubscriptionOptionsInit): PromiseLike<PushSubscription>;
+}
+
+declare var PushManager: {
+    prototype: PushManager;
+    new(): PushManager;
+}
+
+interface PushSubscription {
+    readonly endpoint: USVString;
+    readonly options: PushSubscriptionOptions;
+    getKey(name: string): ArrayBuffer | null;
+    toJSON(): any;
+    unsubscribe(): PromiseLike<boolean>;
+}
+
+declare var PushSubscription: {
+    prototype: PushSubscription;
+    new(): PushSubscription;
+}
+
+interface PushSubscriptionOptions {
+    readonly applicationServerKey: ArrayBuffer | null;
+    readonly userVisibleOnly: boolean;
+}
+
+declare var PushSubscriptionOptions: {
+    prototype: PushSubscriptionOptions;
+    new(): PushSubscriptionOptions;
+}
+
+interface ReadableStream {
+    readonly locked: boolean;
+    cancel(): PromiseLike<void>;
+    getReader(): ReadableStreamReader;
+}
+
+declare var ReadableStream: {
+    prototype: ReadableStream;
+    new(): ReadableStream;
+}
+
+interface ReadableStreamReader {
+    cancel(): PromiseLike<void>;
+    read(): PromiseLike<any>;
+    releaseLock(): void;
+}
+
+declare var ReadableStreamReader: {
+    prototype: ReadableStreamReader;
+    new(): ReadableStreamReader;
+}
+
+interface Request extends Object, Body {
+    readonly cache: string;
+    readonly credentials: string;
+    readonly destination: string;
+    readonly headers: Headers;
+    readonly integrity: string;
+    readonly keepalive: boolean;
+    readonly method: string;
+    readonly mode: string;
+    readonly redirect: string;
+    readonly referrer: string;
+    readonly referrerPolicy: string;
+    readonly type: string;
+    readonly url: string;
+    clone(): Request;
+}
+
+declare var Request: {
+    prototype: Request;
+    new(input: Request | string, init?: RequestInit): Request;
+}
+
+interface Response extends Object, Body {
+    readonly body: ReadableStream | null;
+    readonly headers: Headers;
+    readonly ok: boolean;
+    readonly status: number;
+    readonly statusText: string;
+    readonly type: string;
+    readonly url: string;
+    clone(): Response;
+}
+
+declare var Response: {
+    prototype: Response;
+    new(body?: any, init?: ResponseInit): Response;
+}
+
+interface ServiceWorkerEventMap extends AbstractWorkerEventMap {
+    "statechange": Event;
+}
+
+interface ServiceWorker extends EventTarget, AbstractWorker {
+    onstatechange: (this: ServiceWorker, ev: Event) => any;
+    readonly scriptURL: USVString;
+    readonly state: string;
+    postMessage(message: any, transfer?: any[]): void;
+    addEventListener<K extends keyof ServiceWorkerEventMap>(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var ServiceWorker: {
+    prototype: ServiceWorker;
+    new(): ServiceWorker;
+}
+
+interface ServiceWorkerRegistrationEventMap {
+    "updatefound": Event;
+}
+
+interface ServiceWorkerRegistration extends EventTarget {
+    readonly active: ServiceWorker | null;
+    readonly installing: ServiceWorker | null;
+    onupdatefound: (this: ServiceWorkerRegistration, ev: Event) => any;
+    readonly pushManager: PushManager;
+    readonly scope: USVString;
+    readonly sync: SyncManager;
+    readonly waiting: ServiceWorker | null;
+    getNotifications(filter?: GetNotificationOptions): any;
+    showNotification(title: string, options?: NotificationOptions): PromiseLike<void>;
+    unregister(): PromiseLike<boolean>;
+    update(): PromiseLike<void>;
+    addEventListener<K extends keyof ServiceWorkerRegistrationEventMap>(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var ServiceWorkerRegistration: {
+    prototype: ServiceWorkerRegistration;
+    new(): ServiceWorkerRegistration;
+}
+
+interface SyncManager {
+    getTags(): any;
+    register(tag: string): PromiseLike<void>;
+}
+
+declare var SyncManager: {
+    prototype: SyncManager;
+    new(): SyncManager;
+}
+
 interface WebSocketEventMap {
     "close": CloseEvent;
-    "error": ErrorEvent;
+    "error": Event;
     "message": MessageEvent;
     "open": Event;
 }
@@ -719,7 +1020,7 @@ interface WebSocket extends EventTarget {
     readonly bufferedAmount: number;
     readonly extensions: string;
     onclose: (this: WebSocket, ev: CloseEvent) => any;
-    onerror: (this: WebSocket, ev: ErrorEvent) => any;
+    onerror: (this: WebSocket, ev: Event) => any;
     onmessage: (this: WebSocket, ev: MessageEvent) => any;
     onopen: (this: WebSocket, ev: Event) => any;
     readonly protocol: string;
@@ -750,7 +1051,7 @@ interface WorkerEventMap extends AbstractWorkerEventMap {
 
 interface Worker extends EventTarget, AbstractWorker {
     onmessage: (this: Worker, ev: MessageEvent) => any;
-    postMessage(message: any, ports?: any): void;
+    postMessage(message: any, transfer?: any[]): void;
     terminate(): void;
     addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -771,6 +1072,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly response: any;
     readonly responseText: string;
     responseType: string;
+    readonly responseURL: string;
     readonly responseXML: any;
     readonly status: number;
     readonly statusText: string;
@@ -778,7 +1080,6 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     msCaching?: string;
-    readonly responseURL: string;
     abort(): void;
     getAllResponseHeaders(): string;
     getResponseHeader(header: string): string | null;
@@ -805,11 +1106,10 @@ declare var XMLHttpRequest: {
     readonly LOADING: number;
     readonly OPENED: number;
     readonly UNSENT: number;
-    create(): XMLHttpRequest;
 }
 
 interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
-    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestUpload, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -828,6 +1128,18 @@ interface AbstractWorker {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface Body {
+    readonly bodyUsed: boolean;
+    arrayBuffer(): PromiseLike<ArrayBuffer>;
+    blob(): PromiseLike<Blob>;
+    json(): PromiseLike<any>;
+    text(): PromiseLike<string>;
+}
+
+interface GlobalFetch {
+    fetch(input: RequestInfo, init?: RequestInit): PromiseLike<Response>;
+}
+
 interface MSBaseReaderEventMap {
     "abort": Event;
     "error": ErrorEvent;
@@ -854,7 +1166,16 @@ interface MSBaseReader {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface NavigatorBeacon {
+    sendBeacon(url: USVString, data?: BodyInit): boolean;
+}
+
+interface NavigatorConcurrentHardware {
+    readonly hardwareConcurrency: number;
+}
+
 interface NavigatorID {
+    readonly appCodeName: string;
     readonly appName: string;
     readonly appVersion: string;
     readonly platform: string;
@@ -900,6 +1221,81 @@ interface XMLHttpRequestEventTarget {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface Client {
+    readonly frameType: string;
+    readonly id: string;
+    readonly url: USVString;
+    postMessage(message: any, transfer?: any[]): void;
+}
+
+declare var Client: {
+    prototype: Client;
+    new(): Client;
+}
+
+interface Clients {
+    claim(): PromiseLike<void>;
+    get(id: string): PromiseLike<any>;
+    matchAll(options?: ClientQueryOptions): any;
+    openWindow(url: USVString): PromiseLike<WindowClient>;
+}
+
+declare var Clients: {
+    prototype: Clients;
+    new(): Clients;
+}
+
+interface DedicatedWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap {
+    "message": MessageEvent;
+}
+
+interface DedicatedWorkerGlobalScope extends WorkerGlobalScope {
+    onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any;
+    close(): void;
+    postMessage(message: any, transfer?: any[]): void;
+    addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var DedicatedWorkerGlobalScope: {
+    prototype: DedicatedWorkerGlobalScope;
+    new(): DedicatedWorkerGlobalScope;
+}
+
+interface ExtendableEvent extends Event {
+    waitUntil(f: PromiseLike<any>): void;
+}
+
+declare var ExtendableEvent: {
+    prototype: ExtendableEvent;
+    new(type: string, eventInitDict?: ExtendableEventInit): ExtendableEvent;
+}
+
+interface ExtendableMessageEvent extends ExtendableEvent {
+    readonly data: any;
+    readonly lastEventId: string;
+    readonly origin: string;
+    readonly ports: MessagePort[] | null;
+    readonly source: Client | ServiceWorker | MessagePort | null;
+}
+
+declare var ExtendableMessageEvent: {
+    prototype: ExtendableMessageEvent;
+    new(type: string, eventInitDict?: ExtendableMessageEventInit): ExtendableMessageEvent;
+}
+
+interface FetchEvent extends ExtendableEvent {
+    readonly clientId: string | null;
+    readonly isReload: boolean;
+    readonly request: Request;
+    respondWith(r: PromiseLike<Response>): void;
+}
+
+declare var FetchEvent: {
+    prototype: FetchEvent;
+    new(type: string, eventInitDict: FetchEventInit): FetchEvent;
+}
+
 interface FileReaderSync {
     readAsArrayBuffer(blob: Blob): any;
     readAsBinaryString(blob: Blob): void;
@@ -912,17 +1308,105 @@ declare var FileReaderSync: {
     new(): FileReaderSync;
 }
 
-interface WorkerGlobalScopeEventMap extends DedicatedWorkerGlobalScopeEventMap {
+interface NotificationEvent extends ExtendableEvent {
+    readonly action: string;
+    readonly notification: Notification;
+}
+
+declare var NotificationEvent: {
+    prototype: NotificationEvent;
+    new(type: string, eventInitDict: NotificationEventInit): NotificationEvent;
+}
+
+interface PushEvent extends ExtendableEvent {
+    readonly data: PushMessageData | null;
+}
+
+declare var PushEvent: {
+    prototype: PushEvent;
+    new(type: string, eventInitDict?: PushEventInit): PushEvent;
+}
+
+interface PushMessageData {
+    arrayBuffer(): ArrayBuffer;
+    blob(): Blob;
+    json(): JSON;
+    text(): USVString;
+}
+
+declare var PushMessageData: {
+    prototype: PushMessageData;
+    new(): PushMessageData;
+}
+
+interface ServiceWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap {
+    "activate": ExtendableEvent;
+    "fetch": FetchEvent;
+    "install": ExtendableEvent;
+    "message": ExtendableMessageEvent;
+    "notificationclick": NotificationEvent;
+    "notificationclose": NotificationEvent;
+    "push": PushEvent;
+    "pushsubscriptionchange": ExtendableEvent;
+    "sync": SyncEvent;
+}
+
+interface ServiceWorkerGlobalScope extends WorkerGlobalScope {
+    readonly clients: Clients;
+    onactivate: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any;
+    onfetch: (this: ServiceWorkerGlobalScope, ev: FetchEvent) => any;
+    oninstall: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any;
+    onmessage: (this: ServiceWorkerGlobalScope, ev: ExtendableMessageEvent) => any;
+    onnotificationclick: (this: ServiceWorkerGlobalScope, ev: NotificationEvent) => any;
+    onnotificationclose: (this: ServiceWorkerGlobalScope, ev: NotificationEvent) => any;
+    onpush: (this: ServiceWorkerGlobalScope, ev: PushEvent) => any;
+    onpushsubscriptionchange: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any;
+    onsync: (this: ServiceWorkerGlobalScope, ev: SyncEvent) => any;
+    readonly registration: ServiceWorkerRegistration;
+    skipWaiting(): PromiseLike<void>;
+    addEventListener<K extends keyof ServiceWorkerGlobalScopeEventMap>(type: K, listener: (this: ServiceWorkerGlobalScope, ev: ServiceWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var ServiceWorkerGlobalScope: {
+    prototype: ServiceWorkerGlobalScope;
+    new(): ServiceWorkerGlobalScope;
+}
+
+interface SyncEvent extends ExtendableEvent {
+    readonly lastChance: boolean;
+    readonly tag: string;
+}
+
+declare var SyncEvent: {
+    prototype: SyncEvent;
+    new(type: string, init: SyncEventInit): SyncEvent;
+}
+
+interface WindowClient extends Client {
+    readonly focused: boolean;
+    readonly visibilityState: string;
+    focus(): PromiseLike<WindowClient>;
+    navigate(url: USVString): PromiseLike<WindowClient>;
+}
+
+declare var WindowClient: {
+    prototype: WindowClient;
+    new(): WindowClient;
+}
+
+interface WorkerGlobalScopeEventMap {
     "error": ErrorEvent;
 }
 
-interface WorkerGlobalScope extends EventTarget, WorkerUtils, DedicatedWorkerGlobalScope, WindowConsole {
+interface WorkerGlobalScope extends EventTarget, WorkerUtils, WindowConsole, GlobalFetch {
+    readonly caches: CacheStorage;
+    readonly isSecureContext: boolean;
     readonly location: WorkerLocation;
     onerror: (this: WorkerGlobalScope, ev: ErrorEvent) => any;
+    readonly performance: Performance;
     readonly self: WorkerGlobalScope;
-    close(): void;
     msWriteProfilerMark(profilerMarkName: string): void;
-    toString(): string;
     addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -937,6 +1421,7 @@ interface WorkerLocation {
     readonly host: string;
     readonly hostname: string;
     readonly href: string;
+    readonly origin: string;
     readonly pathname: string;
     readonly port: string;
     readonly protocol: string;
@@ -949,7 +1434,7 @@ declare var WorkerLocation: {
     new(): WorkerLocation;
 }
 
-interface WorkerNavigator extends Object, NavigatorID, NavigatorOnLine {
+interface WorkerNavigator extends Object, NavigatorID, NavigatorOnLine, NavigatorBeacon, NavigatorConcurrentHardware {
     readonly hardwareConcurrency: number;
 }
 
@@ -958,17 +1443,6 @@ declare var WorkerNavigator: {
     new(): WorkerNavigator;
 }
 
-interface DedicatedWorkerGlobalScopeEventMap {
-    "message": MessageEvent;
-}
-
-interface DedicatedWorkerGlobalScope {
-    onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any;
-    postMessage(data: any): void;
-    addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-}
-
 interface WorkerUtils extends Object, WindowBase64 {
     readonly indexedDB: IDBFactory;
     readonly msIndexedDB: IDBFactory;
@@ -985,6 +1459,14 @@ interface WorkerUtils extends Object, WindowBase64 {
     setTimeout(handler: any, timeout?: any, ...args: any[]): number;
 }
 
+interface ErrorEventInit {
+    message?: string;
+    filename?: string;
+    lineno?: number;
+    conlno?: number;
+    error?: any;
+}
+
 interface BlobPropertyBag {
     type?: string;
     endings?: string;
@@ -999,15 +1481,6 @@ interface EventListenerObject {
     handleEvent(evt: Event): void;
 }
 
-interface MessageEventInit extends EventInit {
-    data?: any;
-    origin?: string;
-    lastEventId?: string;
-    channel?: string;
-    source?: any;
-    ports?: MessagePort[];
-}
-
 interface ProgressEventInit extends EventInit {
     lengthComputable?: boolean;
     loaded?: number;
@@ -1199,18 +1672,6 @@ interface PositionCallback {
 interface PositionErrorCallback {
     (error: PositionError): void;
 }
-interface MediaQueryListListener {
-    (mql: MediaQueryList): void;
-}
-interface MSLaunchUriCallback {
-    (): void;
-}
-interface MSUnsafeFunctionCallback {
-    (): any;
-}
-interface MSExecAtPriorityFunctionCallback {
-    (...args: any[]): any;
-}
 interface DecodeSuccessCallback {
     (decodedData: AudioBuffer): void;
 }
@@ -1220,12 +1681,22 @@ interface DecodeErrorCallback {
 interface FunctionStringCallback {
     (data: string): void;
 }
-declare var location: WorkerLocation;
-declare var onerror: (this: WorkerGlobalScope, ev: ErrorEvent) => any;
-declare var self: WorkerGlobalScope;
+interface ForEachCallback {
+    (keyId: any, status: string): void;
+}
+interface NotificationPermissionCallback {
+    (permission: string): void;
+}
+declare var onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any;
 declare function close(): void;
+declare function postMessage(message: any, transfer?: any[]): void;
+declare var caches: CacheStorage;
+declare var isSecureContext: boolean;
+declare var location: WorkerLocation;
+declare var onerror: (this: DedicatedWorkerGlobalScope, ev: ErrorEvent) => any;
+declare var performance: Performance;
+declare var self: WorkerGlobalScope;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
-declare function toString(): string;
 declare function dispatchEvent(evt: Event): boolean;
 declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare var indexedDB: IDBFactory;
@@ -1243,12 +1714,16 @@ declare function setTimeout(handler: (...args: any[]) => void, timeout: number):
 declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
-declare var onmessage: (this: WorkerGlobalScope, ev: MessageEvent) => any;
-declare function postMessage(data: any): void;
 declare var console: Console;
-declare function addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
+declare function fetch(input: RequestInfo, init?: RequestInit): PromiseLike<Response>;
+declare function dispatchEvent(evt: Event): boolean;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 type AlgorithmIdentifier = string | Algorithm;
+type BodyInit = any;
 type IDBKeyPath = string;
+type RequestInfo = Request | string;
+type USVString = string;
 type IDBValidKey = number | string | Date | IDBArrayKey;
 type BufferSource = ArrayBuffer | ArrayBufferView;
\ No newline at end of file
diff --git a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
index 054923fb5ee..b3758008918 100644
--- a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
+++ b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
@@ -3,9 +3,9 @@
 for (const element of document.getElementsByTagName("a")) {
 >element : HTMLAnchorElement
 >document.getElementsByTagName("a") : NodeListOf<HTMLAnchorElement>
->document.getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
+>document.getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
 >document : Document
->getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
+>getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
 >"a" : "a"
 
     element.href;

From a8db366f6b6afa0ac452c50e061882de555fdb95 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Thu, 2 Feb 2017 17:47:06 -0800
Subject: [PATCH 078/127] Check original variable statement node to check if it
 contains es6 export

---
 src/compiler/transformers/module/module.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 7318e03b352..68f49dba42c 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -831,6 +831,13 @@ namespace ts {
             let statements: Statement[];
             let variables: VariableDeclaration[];
             let expressions: Expression[];
+
+            const parseTreeNode = getParseTreeNode(node);
+            if (!shouldAppendUnderscoreUnderscoreEsModule) {
+                // class declaration get down-level transformed to be variable statement
+                shouldAppendUnderscoreUnderscoreEsModule = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration) && hasModifier(parseTreeNode, ModifierFlags.Export);
+            }
+ 
             if (hasModifier(node, ModifierFlags.Export)) {
                 let modifiers: NodeArray<Modifier>;
 
@@ -845,7 +852,6 @@ namespace ts {
                         variables = append(variables, variable);
                     }
                     else if (variable.initializer) {
-                        shouldAppendUnderscoreUnderscoreEsModule = true;
                         expressions = append(expressions, transformInitializedVariable(variable));
                     }
                 }

From 3f57f01e692298521e4a5faab7bd6967ea8742c9 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Thu, 2 Feb 2017 17:47:33 -0800
Subject: [PATCH 079/127] Update baselines

---
 tests/baselines/reference/ExportAssignment7.js              | 1 +
 tests/baselines/reference/ExportAssignment8.js              | 1 +
 tests/baselines/reference/aliasUsedAsNameValue.js           | 1 +
 .../reference/classMemberInitializerWithLamdaScoping4.js    | 1 +
 .../baselines/reference/commentsBeforeVariableStatement1.js | 1 +
 tests/baselines/reference/declFileAccessors.js              | 1 +
 .../reference/declFileAliasUseBeforeDeclaration.js          | 2 ++
 ...declFileAmbientExternalModuleWithSingleExportedModule.js | 1 +
 .../declFileClassWithStaticMethodReturningConstructor.js    | 1 +
 tests/baselines/reference/declFileConstructors.js           | 1 +
 .../reference/declFileExportAssignmentOfGenericInterface.js | 1 +
 tests/baselines/reference/declFileExportImportChain.js      | 1 +
 tests/baselines/reference/declFileExportImportChain2.js     | 1 +
 tests/baselines/reference/declFileForExportedImport.js      | 1 +
 tests/baselines/reference/declFileFunctions.js              | 1 +
 tests/baselines/reference/declFileGenericType.js            | 1 +
 .../reference/declFileImportModuleWithExportAssignment.js   | 1 +
 tests/baselines/reference/declFileMethods.js                | 1 +
 .../reference/declarationEmitClassMemberNameConflict.js     | 1 +
 .../baselines/reference/declarationEmitExportAssignment.js  | 1 +
 .../baselines/reference/declarationEmitExportDeclaration.js | 2 ++
 .../reference/declarationEmitExpressionInExtends3.js        | 1 +
 .../reference/declarationEmitIdentifierPredicates01.js      | 1 +
 .../declarationEmitIdentifierPredicatesWithPrivateName01.js | 1 +
 .../reference/declarationEmitInferedDefaultExportType.js    | 2 +-
 .../baselines/reference/declarationEmitInferedTypeAlias1.js | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias2.js | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias3.js | 2 +-
 .../baselines/reference/declarationEmitInferedTypeAlias5.js | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias6.js | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias7.js | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias9.js | 1 +
 tests/baselines/reference/declarationEmitPromise.js         | 1 +
 .../baselines/reference/declarationEmitThisPredicates01.js  | 1 +
 .../baselines/reference/declarationEmitThisPredicates02.js  | 1 +
 .../declarationEmitThisPredicatesWithPrivateName01.js       | 1 +
 .../declarationEmitThisPredicatesWithPrivateName02.js       | 1 +
 .../declarationEmitTypeAliasWithTypeParameters1.js          | 1 +
 .../declarationEmitTypeAliasWithTypeParameters2.js          | 1 +
 tests/baselines/reference/declarationEmitUnknownImport.js   | 1 +
 tests/baselines/reference/declarationEmitUnknownImport2.js  | 2 +-
 tests/baselines/reference/declarationMerging2.js            | 1 +
 tests/baselines/reference/decoratedClassExportsCommonJS1.js | 1 +
 tests/baselines/reference/decoratedClassExportsCommonJS2.js | 1 +
 .../reference/decoratedDefaultExportsGetExportedAmd.js      | 4 ++--
 .../reference/decoratedDefaultExportsGetExportedCommonjs.js | 4 ++--
 .../reference/decoratedDefaultExportsGetExportedUmd.js      | 4 ++--
 .../decoratorInstantiateModulesInFunctionBodies.js          | 1 +
 tests/baselines/reference/decoratorMetadata.js              | 2 +-
 .../baselines/reference/decoratorMetadataOnInferredType.js  | 1 +
 .../decoratorMetadataRestParameterWithImportedType.js       | 4 ++++
 .../reference/decoratorMetadataWithConstructorType.js       | 1 +
 .../decoratorMetadataWithImportDeclarationNameCollision.js  | 2 ++
 .../decoratorMetadataWithImportDeclarationNameCollision2.js | 2 ++
 .../decoratorMetadataWithImportDeclarationNameCollision3.js | 2 ++
 .../decoratorMetadataWithImportDeclarationNameCollision4.js | 2 ++
 .../decoratorMetadataWithImportDeclarationNameCollision5.js | 3 ++-
 .../decoratorMetadataWithImportDeclarationNameCollision6.js | 3 ++-
 .../decoratorMetadataWithImportDeclarationNameCollision7.js | 3 ++-
 .../decoratorMetadataWithImportDeclarationNameCollision8.js | 2 ++
 tests/baselines/reference/decoratorOnClass2.js              | 1 +
 tests/baselines/reference/decoratorOnClassConstructor2.js   | 2 ++
 tests/baselines/reference/decoratorOnClassConstructor3.js   | 2 ++
 tests/baselines/reference/decoratorOnImportEquals2.js       | 1 +
 .../baselines/reference/defaultExportInAwaitExpression01.js | 2 +-
 .../baselines/reference/defaultExportInAwaitExpression02.js | 2 +-
 tests/baselines/reference/defaultExportWithOverloads01.js   | 2 +-
 tests/baselines/reference/defaultExportsCannotMerge01.js    | 2 +-
 tests/baselines/reference/defaultExportsCannotMerge02.js    | 2 +-
 tests/baselines/reference/defaultExportsCannotMerge03.js    | 2 +-
 tests/baselines/reference/defaultExportsCannotMerge04.js    | 2 +-
 tests/baselines/reference/defaultExportsGetExportedAmd.js   | 4 ++--
 .../reference/defaultExportsGetExportedCommonjs.js          | 4 ++--
 tests/baselines/reference/defaultExportsGetExportedUmd.js   | 4 ++--
 tests/baselines/reference/dependencyViaImportAlias.js       | 1 +
 .../reference/destructuringInVariableDeclarations1.js       | 1 +
 .../reference/destructuringInVariableDeclarations3.js       | 1 +
 .../reference/destructuringInVariableDeclarations5.js       | 1 +
 tests/baselines/reference/downlevelLetConst13.js            | 1 +
 tests/baselines/reference/duplicateLocalVariable1.js        | 1 +
 tests/baselines/reference/duplicateLocalVariable2.js        | 1 +
 tests/baselines/reference/dynamicModuleTypecheckError.js    | 1 +
 tests/baselines/reference/elidingImportNames.js             | 2 ++
 .../reference/errorForConflictingExportEqualsValue.js       | 1 +
 tests/baselines/reference/es3defaultAliasIsQuoted.js        | 2 +-
 tests/baselines/reference/es5-commonjs.js                   | 2 +-
 tests/baselines/reference/es5-commonjs2.js                  | 2 +-
 tests/baselines/reference/es5-commonjs5.js                  | 2 +-
 tests/baselines/reference/es5-commonjs6.js                  | 2 +-
 .../baselines/reference/es5-importHelpersAsyncFunctions.js  | 1 +
 tests/baselines/reference/es5-umd2.js                       | 1 +
 tests/baselines/reference/es5-umd3.js                       | 2 +-
 .../baselines/reference/es5ExportDefaultClassDeclaration.js | 2 +-
 .../reference/es5ExportDefaultClassDeclaration2.js          | 2 +-
 .../reference/es5ExportDefaultClassDeclaration3.js          | 2 +-
 tests/baselines/reference/es5ExportDefaultExpression.js     | 2 +-
 .../reference/es5ExportDefaultFunctionDeclaration.js        | 2 +-
 .../reference/es5ExportDefaultFunctionDeclaration2.js       | 2 +-
 .../reference/es5ExportDefaultFunctionDeclaration3.js       | 2 +-
 tests/baselines/reference/es5ExportDefaultIdentifier.js     | 2 +-
 tests/baselines/reference/es5ModuleWithModuleGenAmd.js      | 1 +
 tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js | 1 +
 .../baselines/reference/es5ModuleWithoutModuleGenTarget.js  | 1 +
 tests/baselines/reference/es6-umd2.js                       | 1 +
 tests/baselines/reference/es6ExportAllInEs5.js              | 2 ++
 tests/baselines/reference/es6ExportClauseInEs5.js           | 1 +
 .../reference/es6ExportClauseWithAssignmentInEs5.js         | 1 +
 .../reference/es6ExportClauseWithoutModuleSpecifierInEs5.js | 2 ++
 tests/baselines/reference/es6ExportEqualsInterop.js         | 1 +
 tests/baselines/reference/es6ImportDefaultBindingAmd.js     | 2 +-
 tests/baselines/reference/es6ImportDefaultBindingDts.js     | 3 ++-
 .../es6ImportDefaultBindingFollowedWithNamedImport.js       | 2 +-
 .../es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js | 2 +-
 ...mportDefaultBindingFollowedWithNamedImport1WithExport.js | 3 ++-
 .../es6ImportDefaultBindingFollowedWithNamedImportDts.js    | 2 ++
 .../es6ImportDefaultBindingFollowedWithNamedImportDts1.js   | 3 ++-
 .../es6ImportDefaultBindingFollowedWithNamedImportInEs5.js  | 1 +
 ...ImportDefaultBindingFollowedWithNamedImportWithExport.js | 3 ++-
 ...mportDefaultBindingFollowedWithNamespaceBinding1InEs5.js | 2 +-
 ...DefaultBindingFollowedWithNamespaceBinding1WithExport.js | 3 ++-
 ...s6ImportDefaultBindingFollowedWithNamespaceBindingDts.js | 2 ++
 ...6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js | 3 ++-
 ...ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js | 1 +
 ...tDefaultBindingFollowedWithNamespaceBindingWithExport.js | 2 ++
 .../reference/es6ImportDefaultBindingMergeErrors.js         | 2 +-
 .../reference/es6ImportDefaultBindingNoDefaultProperty.js   | 1 +
 .../reference/es6ImportDefaultBindingWithExport.js          | 3 ++-
 tests/baselines/reference/es6ImportNameSpaceImport.js       | 1 +
 tests/baselines/reference/es6ImportNameSpaceImportAmd.js    | 1 +
 tests/baselines/reference/es6ImportNameSpaceImportDts.js    | 2 ++
 tests/baselines/reference/es6ImportNameSpaceImportInEs5.js  | 1 +
 .../reference/es6ImportNameSpaceImportMergeErrors.js        | 1 +
 .../reference/es6ImportNameSpaceImportWithExport.js         | 2 ++
 tests/baselines/reference/es6ImportNamedImport.js           | 1 +
 tests/baselines/reference/es6ImportNamedImportAmd.js        | 1 +
 tests/baselines/reference/es6ImportNamedImportDts.js        | 2 ++
 tests/baselines/reference/es6ImportNamedImportInEs5.js      | 1 +
 .../reference/es6ImportNamedImportInExportAssignment.js     | 1 +
 .../baselines/reference/es6ImportNamedImportMergeErrors.js  | 1 +
 .../reference/es6ImportNamedImportNoExportMember.js         | 1 +
 tests/baselines/reference/es6ImportNamedImportWithExport.js | 2 ++
 .../reference/es6ImportNamedImportWithTypesAndValues.js     | 2 ++
 tests/baselines/reference/es6ImportWithoutFromClauseAmd.js  | 2 ++
 .../baselines/reference/es6ImportWithoutFromClauseInEs5.js  | 1 +
 .../reference/es6ImportWithoutFromClauseWithExport.js       | 1 +
 .../baselines/reference/es6ModuleWithModuleGenTargetAmd.js  | 1 +
 .../reference/es6ModuleWithModuleGenTargetCommonjs.js       | 1 +
 tests/baselines/reference/exportAndImport-es3-amd.js        | 4 ++--
 tests/baselines/reference/exportAndImport-es3.js            | 4 ++--
 tests/baselines/reference/exportAndImport-es5-amd.js        | 4 ++--
 tests/baselines/reference/exportAndImport-es5.js            | 4 ++--
 tests/baselines/reference/exportArrayBindingPattern.js      | 1 +
 tests/baselines/reference/exportAssignDottedName.js         | 1 +
 tests/baselines/reference/exportAssignImportedIdentifier.js | 1 +
 tests/baselines/reference/exportAssignmentWithExports.js    | 1 +
 .../exportDeclarationWithModuleSpecifierNameOnNextLine1.js  | 4 ++++
 tests/baselines/reference/exportDefaultProperty.js          | 4 ++--
 tests/baselines/reference/exportDefaultProperty2.js         | 2 +-
 tests/baselines/reference/exportImport.js                   | 1 +
 tests/baselines/reference/exportImportMultipleFiles.js      | 1 +
 .../reference/exportImportNonInstantiatedModule2.js         | 1 +
 .../baselines/reference/exportNonInitializedVariablesAMD.js | 1 +
 .../reference/exportNonInitializedVariablesCommonJS.js      | 1 +
 .../baselines/reference/exportNonInitializedVariablesUMD.js | 1 +
 tests/baselines/reference/exportRedeclarationTypeAliases.js | 1 +
 tests/baselines/reference/exportSameNameFuncVar.js          | 1 +
 tests/baselines/reference/exportSpecifierForAGlobal.js      | 1 +
 tests/baselines/reference/exportStar-amd.js                 | 5 ++++-
 tests/baselines/reference/exportStar.js                     | 5 ++++-
 tests/baselines/reference/exportStarForValues5.js           | 1 +
 tests/baselines/reference/exportStarForValues7.js           | 2 ++
 tests/baselines/reference/exportStarForValues8.js           | 4 ++++
 tests/baselines/reference/exportStarForValues9.js           | 2 ++
 tests/baselines/reference/exportStarFromEmptyModule.js      | 2 ++
 tests/baselines/reference/exportToString.js                 | 1 +
 tests/baselines/reference/exportVisibility.js               | 1 +
 .../baselines/reference/exportedBlockScopedDeclarations.js  | 1 +
 tests/baselines/reference/exportedVariable1.js              | 1 +
 tests/baselines/reference/exportingContainingVisibleType.js | 1 +
 tests/baselines/reference/exportsAndImports1-amd.js         | 3 +++
 tests/baselines/reference/exportsAndImports1-es6.js         | 3 +++
 tests/baselines/reference/exportsAndImports1.js             | 3 +++
 tests/baselines/reference/exportsAndImports2-amd.js         | 3 +++
 tests/baselines/reference/exportsAndImports2-es6.js         | 3 +++
 tests/baselines/reference/exportsAndImports2.js             | 3 +++
 tests/baselines/reference/exportsAndImports3-amd.js         | 3 +++
 tests/baselines/reference/exportsAndImports3-es6.js         | 3 +++
 tests/baselines/reference/exportsAndImports3.js             | 3 +++
 tests/baselines/reference/exportsAndImports4-amd.js         | 3 ++-
 tests/baselines/reference/exportsAndImports4-es6.js         | 3 ++-
 tests/baselines/reference/exportsAndImports4.js             | 3 ++-
 .../exportsAndImportsWithContextualKeywordNames01.js        | 1 +
 .../exportsAndImportsWithContextualKeywordNames02.js        | 1 +
 .../reference/exportsAndImportsWithUnderscores1.js          | 2 +-
 .../reference/exportsAndImportsWithUnderscores2.js          | 2 +-
 .../reference/exportsAndImportsWithUnderscores3.js          | 2 +-
 .../reference/exportsAndImportsWithUnderscores4.js          | 1 +
 .../reference/extendingClassFromAliasAndUsageInIndexer.js   | 3 +++
 tests/baselines/reference/externalModuleAssignToVar.js      | 1 +
 .../baselines/reference/externalModuleImmutableBindings.js  | 1 +
 ...ernalModuleRefernceResolutionOrderInImportDeclaration.js | 1 +
 tests/baselines/reference/fieldAndGetterWithSameName.js     | 1 +
 .../reference/filesEmittingIntoSameOutputWithOutOption.js   | 1 +
 tests/baselines/reference/functionAndImportNameConflict.js  | 2 ++
 .../reference/functionLikeInParameterInitializer.js         | 1 +
 tests/baselines/reference/generatorES6InAMDModule.js        | 1 +
 tests/baselines/reference/genericClassesInModule2.js        | 1 +
 .../reference/genericInterfaceFunctionTypeParameter.js      | 1 +
 tests/baselines/reference/genericMemberFunction.js          | 1 +
 tests/baselines/reference/genericReturnTypeFromGetter1.js   | 1 +
 .../reference/genericWithIndexerOfTypeParameterType2.js     | 1 +
 .../reference/getEmitOutputWithDeclarationFile2.baseline    | 1 +
 tests/baselines/reference/giant.js                          | 1 +
 tests/baselines/reference/importAsBaseClass.js              | 1 +
 tests/baselines/reference/importDecl.js                     | 6 ++++++
 .../baselines/reference/importDeclarationUsedAsTypeQuery.js | 2 ++
 tests/baselines/reference/importHelpers.js                  | 1 +
 tests/baselines/reference/importHelpersAmd.js               | 2 ++
 tests/baselines/reference/importHelpersInIsolatedModules.js | 1 +
 tests/baselines/reference/importHelpersInTsx.js             | 1 +
 tests/baselines/reference/importHelpersNoHelpers.js         | 1 +
 tests/baselines/reference/importHelpersNoModule.js          | 1 +
 tests/baselines/reference/importHelpersOutFile.js           | 3 +++
 tests/baselines/reference/importImportOnlyModule.js         | 1 +
 tests/baselines/reference/importTsBeforeDTs.js              | 1 +
 tests/baselines/reference/importUsedInExtendsList1.js       | 1 +
 tests/baselines/reference/importWithTrailingSlash.js        | 4 ++--
 .../import_var-referencing-an-imported-module-alias.js      | 1 +
 tests/baselines/reference/importsImplicitlyReadonly.js      | 1 +
 tests/baselines/reference/inferenceLimit.js                 | 1 +
 tests/baselines/reference/instanceOfInExternalModules.js    | 1 +
 tests/baselines/reference/interfaceDeclaration5.js          | 1 +
 tests/baselines/reference/interfaceImplementation6.js       | 1 +
 .../internalAliasClassInsideLocalModuleWithExport.js        | 1 +
 ...alAliasClassInsideLocalModuleWithoutExportAccessError.js | 1 +
 .../internalAliasClassInsideTopLevelModuleWithExport.js     | 1 +
 .../internalAliasClassInsideTopLevelModuleWithoutExport.js  | 1 +
 .../internalAliasEnumInsideTopLevelModuleWithExport.js      | 1 +
 .../internalAliasEnumInsideTopLevelModuleWithoutExport.js   | 1 +
 .../internalAliasFunctionInsideTopLevelModuleWithExport.js  | 1 +
 ...nternalAliasFunctionInsideTopLevelModuleWithoutExport.js | 1 +
 ...alizedModuleInsideLocalModuleWithoutExportAccessError.js | 1 +
 ...lAliasInitializedModuleInsideTopLevelModuleWithExport.js | 1 +
 ...iasInitializedModuleInsideTopLevelModuleWithoutExport.js | 1 +
 .../internalAliasInterfaceInsideTopLevelModuleWithExport.js | 1 +
 ...ternalAliasInterfaceInsideTopLevelModuleWithoutExport.js | 1 +
 ...alizedModuleInsideLocalModuleWithoutExportAccessError.js | 1 +
 ...liasUninitializedModuleInsideTopLevelModuleWithExport.js | 1 +
 ...sUninitializedModuleInsideTopLevelModuleWithoutExport.js | 1 +
 ...rnalAliasVarInsideLocalModuleWithoutExportAccessError.js | 1 +
 .../internalAliasVarInsideTopLevelModuleWithExport.js       | 1 +
 .../internalAliasVarInsideTopLevelModuleWithoutExport.js    | 1 +
 tests/baselines/reference/intersectionTypeInference1.js     | 1 +
 .../reference/isolatedModulesImportExportElision.js         | 1 +
 tests/baselines/reference/isolatedModulesSpecifiedModule.js | 1 +
 .../baselines/reference/isolatedModulesUnspecifiedModule.js | 1 +
 .../reference/jsFileCompilationRestParamJsDocFunction.js    | 2 +-
 tests/baselines/reference/jsxEmitWithAttributes.js          | 1 +
 tests/baselines/reference/jsxFactoryAndReactNamespace.js    | 1 +
 tests/baselines/reference/jsxFactoryIdentifier.js           | 1 +
 .../baselines/reference/jsxFactoryIdentifierAsParameter.js  | 1 +
 .../reference/jsxFactoryIdentifierWithAbsentParameter.js    | 1 +
 .../reference/jsxFactoryNotIdentifierOrQualifiedName.js     | 1 +
 .../reference/jsxFactoryNotIdentifierOrQualifiedName2.js    | 1 +
 tests/baselines/reference/jsxFactoryQualifiedName.js        | 1 +
 .../reference/jsxFactoryQualifiedNameResolutionError.js     | 1 +
 tests/baselines/reference/mapOnTupleTypes01.js              | 1 +
 tests/baselines/reference/mapOnTupleTypes02.js              | 1 +
 .../reference/memberAccessMustUseModuleInstances.js         | 1 +
 tests/baselines/reference/mergedDeclarations6.js            | 2 ++
 tests/baselines/reference/metadataOfEventAlias.js           | 1 +
 tests/baselines/reference/missingFunctionImplementation.js  | 1 +
 .../reference/missingSemicolonInModuleSpecifier.js          | 1 +
 tests/baselines/reference/moduleAliasAsFunctionArgument.js  | 1 +
 .../reference/moduleAugmentationDisallowedExtensions.js     | 3 +++
 tests/baselines/reference/moduleAugmentationGlobal1.js      | 1 +
 tests/baselines/reference/moduleAugmentationGlobal2.js      | 1 +
 tests/baselines/reference/moduleAugmentationGlobal3.js      | 1 +
 .../reference/moduleAugmentationImportsAndExports1.js       | 2 ++
 .../reference/moduleAugmentationImportsAndExports2.js       | 2 ++
 .../reference/moduleAugmentationImportsAndExports3.js       | 2 ++
 .../reference/moduleAugmentationImportsAndExports4.js       | 2 ++
 .../reference/moduleAugmentationImportsAndExports5.js       | 2 ++
 .../reference/moduleAugmentationImportsAndExports6.js       | 2 ++
 .../reference/moduleAugmentationsBundledOutput1.js          | 2 ++
 tests/baselines/reference/moduleAugmentationsImports1.js    | 2 ++
 tests/baselines/reference/moduleAugmentationsImports2.js    | 2 ++
 tests/baselines/reference/moduleAugmentationsImports3.js    | 2 ++
 tests/baselines/reference/moduleAugmentationsImports4.js    | 2 ++
 tests/baselines/reference/moduleCodeGenTest5.js             | 1 +
 tests/baselines/reference/moduleDuplicateIdentifiers.js     | 1 +
 tests/baselines/reference/moduleInTypePosition1.js          | 1 +
 tests/baselines/reference/moduleNoneErrors.js               | 1 +
 tests/baselines/reference/modulePrologueAMD.js              | 1 +
 tests/baselines/reference/modulePrologueCommonjs.js         | 1 +
 tests/baselines/reference/modulePrologueUmd.js              | 1 +
 tests/baselines/reference/moduleResolutionNoResolve.js      | 1 +
 tests/baselines/reference/moduleResolutionNoTs.js           | 4 ++--
 tests/baselines/reference/moduleResolutionWithExtensions.js | 2 +-
 .../reference/moduleResolutionWithExtensions_preferTs.js    | 2 +-
 tests/baselines/reference/moduleResolutionWithSymlinks.js   | 2 ++
 .../moduleResolutionWithSymlinks_notInNodeModules.js        | 2 ++
 .../reference/moduleResolutionWithSymlinks_withOutDir.js    | 2 ++
 .../reference/moduleSameValueDuplicateExportedBindings1.js  | 3 +++
 .../reference/moduleSameValueDuplicateExportedBindings2.js  | 2 ++
 tests/baselines/reference/moduleScoping.js                  | 1 +
 tests/baselines/reference/multipleDefaultExports01.js       | 4 +---
 tests/baselines/reference/multipleDefaultExports02.js       | 3 +--
 tests/baselines/reference/multipleDefaultExports03.js       | 3 +--
 tests/baselines/reference/multipleDefaultExports04.js       | 3 +--
 tests/baselines/reference/multipleExportDefault1.js         | 3 +--
 tests/baselines/reference/multipleExportDefault2.js         | 3 +--
 tests/baselines/reference/multipleExportDefault3.js         | 3 +--
 tests/baselines/reference/multipleExportDefault4.js         | 3 +--
 tests/baselines/reference/multipleExportDefault5.js         | 3 +--
 tests/baselines/reference/multipleExportDefault6.js         | 3 +--
 316 files changed, 431 insertions(+), 99 deletions(-)

diff --git a/tests/baselines/reference/ExportAssignment7.js b/tests/baselines/reference/ExportAssignment7.js
index 461631e0e7d..66cb5909075 100644
--- a/tests/baselines/reference/ExportAssignment7.js
+++ b/tests/baselines/reference/ExportAssignment7.js
@@ -12,3 +12,4 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ExportAssignment8.js b/tests/baselines/reference/ExportAssignment8.js
index d0963008012..8e29d7914fd 100644
--- a/tests/baselines/reference/ExportAssignment8.js
+++ b/tests/baselines/reference/ExportAssignment8.js
@@ -12,3 +12,4 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js
index 5febf4b90e7..b86051d7b19 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.js
+++ b/tests/baselines/reference/aliasUsedAsNameValue.js
@@ -20,6 +20,7 @@ export var a = function () {
 
 //// [aliasUsedAsNameValue_0.js]
 "use strict";
+exports.__esModule = true;
 //// [aliasUsedAsNameValue_1.js]
 "use strict";
 function b(a) { return null; }
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
index 49f5f916cd3..890d2bbd500 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
@@ -17,6 +17,7 @@ export class Test1 {
 
 //// [classMemberInitializerWithLamdaScoping3_0.js]
 "use strict";
+exports.__esModule = true;
 //// [classMemberInitializerWithLamdaScoping3_1.js]
 "use strict";
 var Test1 = (function () {
diff --git a/tests/baselines/reference/commentsBeforeVariableStatement1.js b/tests/baselines/reference/commentsBeforeVariableStatement1.js
index f172c40cc0d..9a06a3e7c22 100644
--- a/tests/baselines/reference/commentsBeforeVariableStatement1.js
+++ b/tests/baselines/reference/commentsBeforeVariableStatement1.js
@@ -6,4 +6,5 @@ export var b: number;
 //// [commentsBeforeVariableStatement1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
index 2bd51bfbfb2..b0cc0c8fbaa 100644
--- a/tests/baselines/reference/declFileAccessors.js
+++ b/tests/baselines/reference/declFileAccessors.js
@@ -185,6 +185,7 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileAccessors_1.js]
 /** This is comment for c2 - the global class*/
 var c2 = (function () {
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
index e5219508329..f89863a3029 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
@@ -16,10 +16,12 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+exports.__esModule = true;
 //// [declFileAliasUseBeforeDeclaration_test.js]
 "use strict";
 function bar(a) { }
 exports.bar = bar;
+exports.__esModule = true;
 
 
 //// [declFileAliasUseBeforeDeclaration_foo.d.ts]
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
index f98e2f6aafb..6d626e2963d 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
@@ -21,6 +21,7 @@ export var x: SubModule.m.m3.c;
 //// [declFileAmbientExternalModuleWithSingleExportedModule_0.js]
 //// [declFileAmbientExternalModuleWithSingleExportedModule_1.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts]
diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
index 844559232e4..218157185af 100644
--- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
+++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
@@ -17,6 +17,7 @@ var Enhancement = (function () {
     return Enhancement;
 }());
 exports.Enhancement = Enhancement;
+exports.__esModule = true;
 
 
 //// [declFileClassWithStaticMethodReturningConstructor.d.ts]
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
index 44e816712fb..87cf77e733e 100644
--- a/tests/baselines/reference/declFileConstructors.js
+++ b/tests/baselines/reference/declFileConstructors.js
@@ -162,6 +162,7 @@ var ConstructorWithParameterInitializer = (function () {
     return ConstructorWithParameterInitializer;
 }());
 exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileConstructors_1.js]
 var GlobalSimpleConstructor = (function () {
     /** This comment should appear for foo*/
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
index c54c3c7e731..4103ac6976e 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
@@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x.a;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js
index 99affd5eb4d..5f583d2b6e1 100644
--- a/tests/baselines/reference/declFileExportImportChain.js
+++ b/tests/baselines/reference/declFileExportImportChain.js
@@ -59,6 +59,7 @@ define(["require", "exports", "declFileExportImportChain_b1"], function (require
 //// [declFileExportImportChain_d.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js
index 27c61e9e43d..5fe546663e4 100644
--- a/tests/baselines/reference/declFileExportImportChain2.js
+++ b/tests/baselines/reference/declFileExportImportChain2.js
@@ -51,6 +51,7 @@ define(["require", "exports", "declFileExportImportChain2_b"], function (require
 //// [declFileExportImportChain2_d.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js
index 6870e16f941..8e07b99c8af 100644
--- a/tests/baselines/reference/declFileForExportedImport.js
+++ b/tests/baselines/reference/declFileForExportedImport.js
@@ -13,6 +13,7 @@ var z = b.x;
 
 //// [declFileForExportedImport_0.js]
 "use strict";
+exports.__esModule = true;
 //// [declFileForExportedImport_1.js]
 "use strict";
 ///<reference path='declFileForExportedImport_0.ts'/>
diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js
index e4f674d43c0..c93dee4e30e 100644
--- a/tests/baselines/reference/declFileFunctions.js
+++ b/tests/baselines/reference/declFileFunctions.js
@@ -145,6 +145,7 @@ function nonExportedFooWithRestParameters(a) {
 function nonExportedFooWithOverloads(a) {
     return a;
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileFunctions_1.js]
 /** This comment should appear for foo*/
 function globalfoo() {
diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js
index c17463a6d15..ab3fc63f450 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -102,6 +102,7 @@ var h = (function (_super) {
 }(C.A));
 exports.h = h;
 exports.j = C.F6;
+exports.__esModule = true;
 
 
 //// [declFileGenericType.d.ts]
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
index a733e1332a7..d1d9589e8c7 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
@@ -36,6 +36,7 @@ module.exports = m2;
 var a1 = require("./declFileImportModuleWithExportAssignment_0");
 exports.a = a1;
 exports.a.test1(null, null, null);
+exports.__esModule = true;
 
 
 //// [declFileImportModuleWithExportAssignment_0.d.ts]
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
index 4a317a4e720..dee10473f2c 100644
--- a/tests/baselines/reference/declFileMethods.js
+++ b/tests/baselines/reference/declFileMethods.js
@@ -274,6 +274,7 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileMethods_1.js]
 var c2 = (function () {
     function c2() {
diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
index 23c83276201..35a861a6046 100644
--- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
+++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
@@ -91,6 +91,7 @@ var C4 = (function () {
     return C4;
 }());
 exports.C4 = C4;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitClassMemberNameConflict.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js
index 8c97ef8eb07..5557ff71020 100644
--- a/tests/baselines/reference/declarationEmitExportAssignment.js
+++ b/tests/baselines/reference/declarationEmitExportAssignment.js
@@ -16,6 +16,7 @@ function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
 var utils_1 = require("./utils");
diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js
index dfbed90742d..e019203030e 100644
--- a/tests/baselines/reference/declarationEmitExportDeclaration.js
+++ b/tests/baselines/reference/declarationEmitExportDeclaration.js
@@ -19,12 +19,14 @@ function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
 var utils_1 = require("./utils");
 exports.bar = utils_1.bar;
 utils_1.foo();
 var obj;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [utils.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
index 960a7af6780..a1e3aac8823 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -104,3 +104,4 @@ var MyClass4 = (function (_super) {
     return MyClass4;
 }(getExportedClass(undefined)));
 exports.MyClass4 = MyClass4;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
index 73141eb9af9..87141cfb699 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
@@ -10,6 +10,7 @@ function f(x) {
     return typeof x === "number";
 }
 exports.f = f;
+exports.__esModule = true;
 
 
 //// [declarationEmitIdentifierPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
index 234542d8d99..f20654d508c 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
@@ -14,3 +14,4 @@ function f(x) {
     return typeof x.a === "number";
 }
 exports.f = f;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
index 608f172cd1f..55500652830 100644
--- a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
+++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
@@ -9,13 +9,13 @@ export default {
 
 //// [declarationEmitInferedDefaultExportType.js]
 "use strict";
-exports.__esModule = true;
 // test.ts
 exports["default"] = {
     foo: [],
     bar: undefined,
     baz: null
 };
+exports.__esModule = true;
 
 
 //// [declarationEmitInferedDefaultExportType.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
index 05ce74e3bad..5afadf8723a 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
@@ -21,6 +21,7 @@ export { v }
 "use strict";
 var v = "str" || true;
 exports.v = v;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
index 307a9b82d67..130122ac840 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
@@ -28,6 +28,7 @@ function bar() {
     return v;
 }
 exports.bar = bar;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
index c99e5c429dd..44d086abac6 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
@@ -20,8 +20,8 @@ export default x;
 //// [1.js]
 "use strict";
 var x = "hi" || 5;
-exports.__esModule = true;
 exports["default"] = x;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
index 79d28d3d181..3c136865c53 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
@@ -19,6 +19,7 @@ var obj = true;
 //let v2: Z.Data;
 var v = "str" || true;
 exports.v = v;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
index 924f73d0ed9..d5d455c35e3 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
@@ -21,6 +21,7 @@ export { v }
 "use strict";
 var v = "str" || true;
 exports.v = v;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
index 2fba057fc91..e3493762072 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
@@ -16,6 +16,7 @@ var obj = true;
 "use strict";
 var v = "str" || true;
 exports.v = v;
+exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
index 667acdff49c..70560f5a54d 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
@@ -14,6 +14,7 @@ function returnSomeGlobalValue() {
     return x;
 }
 exports.returnSomeGlobalValue = returnSomeGlobalValue;
+exports.__esModule = true;
 
 
 //// [declarationEmitInferedTypeAlias9.d.ts]
diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js
index 9e820a789c9..4f56ad91864 100644
--- a/tests/baselines/reference/declarationEmitPromise.js
+++ b/tests/baselines/reference/declarationEmitPromise.js
@@ -53,6 +53,7 @@ function runSampleBreaks(a, b, c, d, e) {
     });
 }
 exports.runSampleBreaks = runSampleBreaks;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitPromise.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js
index 04c49422c5c..2845a120b74 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -38,6 +38,7 @@ var D = (function (_super) {
     return D;
 }(C));
 exports.D = D;
+exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js
index e938a615b6d..b9a81b2fb8e 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates02.js
@@ -21,6 +21,7 @@ exports.obj = {
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
+exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates02.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
index 79156f795ea..16ae267bc3c 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -37,3 +37,4 @@ var D = (function (_super) {
     }
     return D;
 }(C));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
index df0d5b7903a..fcc373ccbe8 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
@@ -21,3 +21,4 @@ exports.obj = {
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
index 6079de35964..303959f5504 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
@@ -7,6 +7,7 @@ export const y = (x: Foo<string>) => 1
 //// [declarationEmitTypeAliasWithTypeParameters1.js]
 "use strict";
 exports.y = function (x) { return 1; };
+exports.__esModule = true;
 
 
 //// [declarationEmitTypeAliasWithTypeParameters1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
index d5bf31bd755..52f696a9448 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
@@ -8,6 +8,7 @@ export const y = (x: Baa<number>) => 1
 //// [declarationEmitTypeAliasWithTypeParameters2.js]
 "use strict";
 exports.y = function (x) { return 1; };
+exports.__esModule = true;
 
 
 //// [declarationEmitTypeAliasWithTypeParameters2.d.ts]
diff --git a/tests/baselines/reference/declarationEmitUnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js
index bccf2337e08..686ed8dce2c 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport.js
@@ -7,3 +7,4 @@ export {Foo}
 "use strict";
 var Foo = SomeNonExistingName;
 exports.Foo = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js
index 08afa34f8c8..10b8b1b9886 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport2.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport2.js
@@ -7,5 +7,5 @@ export default Foo
 "use strict";
 var Foo = From;
 './Foo'; // Syntax error
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js
index 3157445fa36..5e03b2d9b51 100644
--- a/tests/baselines/reference/declarationMerging2.js
+++ b/tests/baselines/reference/declarationMerging2.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
index 7ef4369f975..d0e8504713d 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
@@ -22,3 +22,4 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
index 994178cbb79..3e24af5f427 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
@@ -20,3 +20,4 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
index 14ede865a2f..bf5e9e5dcfc 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
@@ -28,8 +28,8 @@ define(["require", "exports"], function (require, exports) {
     Foo = __decorate([
         decorator
     ], Foo);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -46,6 +46,6 @@ define(["require", "exports"], function (require, exports) {
     default_1 = __decorate([
         decorator
     ], default_1);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
index ecc04859234..fe62d15c27f 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
@@ -27,8 +27,8 @@ let Foo = class Foo {
 Foo = __decorate([
     decorator
 ], Foo);
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -43,5 +43,5 @@ let default_1 = class {
 default_1 = __decorate([
     decorator
 ], default_1);
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
index 47f9a524432..e6f4773df7d 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
@@ -36,8 +36,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     Foo = __decorate([
         decorator
     ], Foo);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -62,6 +62,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     default_1 = __decorate([
         decorator
     ], default_1);
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = default_1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index fc8dc1c5515..8c7f16c3743 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -25,6 +25,7 @@ class Wat {
 "use strict";
 // from #3108
 exports.test = 'abc';
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index cb253d43c16..8076c72e391 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -25,8 +25,8 @@ var Service = (function () {
     }
     return Service;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Service;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [component.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js
index 43cdaa79ab8..653bc911ed4 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.js
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js
@@ -38,3 +38,4 @@ __decorate([
     __metadata("design:type", Object)
 ], B.prototype, "x", void 0);
 exports.B = B;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
index be249800d57..9cbc514d932 100644
--- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
+++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
@@ -48,6 +48,7 @@ var SomeClass = (function () {
     return SomeClass;
 }());
 exports.SomeClass = SomeClass;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux1.js]
 "use strict";
 var SomeClass1 = (function () {
@@ -56,6 +57,7 @@ var SomeClass1 = (function () {
     return SomeClass1;
 }());
 exports.SomeClass1 = SomeClass1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux2.js]
 "use strict";
 var SomeClass2 = (function () {
@@ -64,6 +66,7 @@ var SomeClass2 = (function () {
     return SomeClass2;
 }());
 exports.SomeClass2 = SomeClass2;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -110,3 +113,4 @@ ClassA = __decorate([
     __metadata("design:paramtypes", [aux_1.SomeClass])
 ], ClassA);
 exports.ClassA = ClassA;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
index 2c14c9b5bda..91c3814774c 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
@@ -38,3 +38,4 @@ __decorate([
     __metadata("design:type", A)
 ], B.prototype, "x", void 0);
 exports.B = B;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index 258635a5f3a..e2cd357f14a 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -51,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index 104e449bc0c..19c8bafa4c1 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -51,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index 2925cad6afe..63177201f1d 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db = require("./db");
@@ -51,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db.db])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 33eb93f380f..1979adf9c82 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db"); // error no default export
@@ -52,3 +53,4 @@ MyClass = __decorate([
 ], MyClass);
 exports.MyClass = MyClass;
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index b99621fd7e2..f3f82342fad 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -32,8 +32,8 @@ var db = (function () {
     };
     return db;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -52,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 4970dca3201..34f63af38ea 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -32,8 +32,8 @@ var db = (function () {
     };
     return db;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -52,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 28d403044bb..4b0d77b9d2f 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -32,8 +32,8 @@ var db = (function () {
     };
     return db;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var db_1 = require("./db");
@@ -52,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index dd5cee66f8b..a587baf1d05 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
@@ -33,6 +33,7 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
 var database = require("./db");
@@ -51,3 +52,4 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [database.db])
 ], MyClass);
 exports.MyClass = MyClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index 4d9c2007ad0..6ec7a58da66 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -22,3 +22,4 @@ C = __decorate([
     dec
 ], C);
 exports.C = C;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
index dd6209b6d64..0e289d51c71 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -24,6 +24,7 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -58,3 +59,4 @@ C = __decorate([
     __param(0, _0_ts_2.foo)
 ], C);
 exports.C = C;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
index a1a3e331f36..518ddee0a81 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -26,6 +26,7 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -61,3 +62,4 @@ C = __decorate([
     __param(0, _0_2.foo)
 ], C);
 exports.C = C;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnImportEquals2.js b/tests/baselines/reference/decoratorOnImportEquals2.js
index 5e6b6b4a623..b506f474b0b 100644
--- a/tests/baselines/reference/decoratorOnImportEquals2.js
+++ b/tests/baselines/reference/decoratorOnImportEquals2.js
@@ -11,5 +11,6 @@ declare function dec<T>(target: T): T;
 
 //// [decoratorOnImportEquals2_0.js]
 "use strict";
+exports.__esModule = true;
 //// [decoratorOnImportEquals2_1.js]
 "use strict";
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index 66d100ad07d..1b603623776 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -24,8 +24,8 @@ import x from './a';
 })(function (require, exports) {
     "use strict";
     const x = new Promise((resolve, reject) => { resolve({}); });
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = x;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index 8499164f675..d57f4c7ad9e 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -15,8 +15,8 @@ import x from './a';
 //// [a.js]
 "use strict";
 const x = new Promise((resolve, reject) => { resolve({}); });
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = x;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js
index 770b685378d..d74cc416e28 100644
--- a/tests/baselines/reference/defaultExportWithOverloads01.js
+++ b/tests/baselines/reference/defaultExportWithOverloads01.js
@@ -13,5 +13,5 @@ function f() {
         args[_i] = arguments[_i];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js
index 24a37cad2c3..28b30b5989b 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.js
@@ -35,13 +35,13 @@ Entity.y;
 function Decl() {
     return 0;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
 var Decl;
 (function (Decl) {
     Decl.x = 10;
     Decl.y = 20;
 })(Decl = exports.Decl || (exports.Decl = {}));
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("m1");
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index f327c62e571..e686b58a4ca 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -32,8 +32,8 @@ var Decl = (function () {
     }
     return Decl;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("m1");
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js
index 4369392c6e9..d2662c1256f 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -32,8 +32,8 @@ var Decl = (function () {
     }
     return Decl;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("m1");
diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js
index 7c9bd88bc16..baade857296 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge04.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge04.js
@@ -17,8 +17,8 @@ export interface Foo {
 "use strict";
 function Foo() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
 var Foo;
 (function (Foo) {
 })(Foo || (Foo = {}));
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js
index fc0385254c0..214522a56c8 100644
--- a/tests/baselines/reference/defaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js
@@ -12,13 +12,13 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     class Foo {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     function foo() { }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
index 1290404099d..c31174a5acd 100644
--- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
@@ -11,10 +11,10 @@ export default function foo() {}
 "use strict";
 class Foo {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 function foo() { }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js
index 71aa347ce32..8eb92f872bb 100644
--- a/tests/baselines/reference/defaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js
@@ -20,8 +20,8 @@ export default function foo() {}
     "use strict";
     class Foo {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 (function (factory) {
@@ -35,6 +35,6 @@ export default function foo() {}
 })(function (require, exports) {
     "use strict";
     function foo() { }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js
index 8e12bb9bd2c..fd2f277c71a 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.js
+++ b/tests/baselines/reference/dependencyViaImportAlias.js
@@ -19,6 +19,7 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 //// [B.js]
 define(["require", "exports", "A"], function (require, exports, a) {
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js
index 707218b41e2..37eed711067 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations1.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js
@@ -11,3 +11,4 @@ exports.toString = (1).toString;
 {
     let { toFixed } = 1;
 }
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js
index 8da039fe98e..11e242da1a2 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations3.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
     {
         let { toFixed } = 1;
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js
index 94530d8d258..6c799d10803 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations5.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js
@@ -20,4 +20,5 @@ export let { toString } = 1;
     {
         let { toFixed } = 1;
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js
index b6baf850800..b1983c82d15 100644
--- a/tests/baselines/reference/downlevelLetConst13.js
+++ b/tests/baselines/reference/downlevelLetConst13.js
@@ -37,3 +37,4 @@ var M;
     M.bar7 = { a: 1 }.a;
     M.bar8 = { a: 1 }.a;
 })(M = exports.M || (exports.M = {}));
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index 734b01eaed7..c348443fb29 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -636,3 +636,4 @@ exports.tests = (function () {
     }, "Codepoint at index: 3 has control value: 8"));
     return testRunner;
 })();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js
index d6f5c26d628..3e89e88fd3c 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -77,4 +77,5 @@ define(["require", "exports"], function (require, exports) {
         }));
         return testRunner;
     })();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js
index ef39270c9d1..9fc3f440414 100644
--- a/tests/baselines/reference/dynamicModuleTypecheckError.js
+++ b/tests/baselines/reference/dynamicModuleTypecheckError.js
@@ -14,3 +14,4 @@ exports.x = 1;
 for (var i = 0; i < 30; i++) {
     exports.x = i * 1000; // should not be an error here
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js
index 94fa1f7e852..2fff5988d89 100644
--- a/tests/baselines/reference/elidingImportNames.js
+++ b/tests/baselines/reference/elidingImportNames.js
@@ -18,9 +18,11 @@ export var main = 10;
 //// [elidingImportNames_main.js]
 "use strict";
 exports.main = 10;
+exports.__esModule = true;
 //// [elidingImportNames_main1.js]
 "use strict";
 exports.main = 10;
+exports.__esModule = true;
 //// [elidingImportNames_test.js]
 "use strict";
 var a = require("./elidingImportNames_main"); // alias used in typeof
diff --git a/tests/baselines/reference/errorForConflictingExportEqualsValue.js b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
index 88762e7e846..58ab920d177 100644
--- a/tests/baselines/reference/errorForConflictingExportEqualsValue.js
+++ b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
@@ -6,3 +6,4 @@ export = {};
 //// [errorForConflictingExportEqualsValue.js]
 "use strict";
 module.exports = {};
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index 89fd0c47a7e..de92a5e40c3 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -27,8 +27,8 @@ function assert(value) {
     if (!value)
         throw new Error("Assertion failed!");
 }
-exports.__esModule = true;
 exports["default"] = assert;
+exports.__esModule = true;
 //// [es3defaultAliasQuoted_file1.js]
 "use strict";
 var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0");
diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js
index 6a301f9a2ac..72c954b02f2 100644
--- a/tests/baselines/reference/es5-commonjs.js
+++ b/tests/baselines/reference/es5-commonjs.js
@@ -24,5 +24,5 @@ var A = (function () {
     };
     return A;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = A;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs2.js b/tests/baselines/reference/es5-commonjs2.js
index 2c38edef6ae..ce15d3a5ce4 100644
--- a/tests/baselines/reference/es5-commonjs2.js
+++ b/tests/baselines/reference/es5-commonjs2.js
@@ -5,5 +5,5 @@ export default 1;
 
 //// [es5-commonjs2.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = 1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js
index 73c859bb778..93a0ed94a5c 100644
--- a/tests/baselines/reference/es5-commonjs5.js
+++ b/tests/baselines/reference/es5-commonjs5.js
@@ -10,5 +10,5 @@ export default function () {
 function default_1() {
     return "test";
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs6.js b/tests/baselines/reference/es5-commonjs6.js
index 87d2f7d62a6..33015271d7a 100644
--- a/tests/baselines/reference/es5-commonjs6.js
+++ b/tests/baselines/reference/es5-commonjs6.js
@@ -6,6 +6,6 @@ var __esModule = 1;
 
 //// [es5-commonjs6.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "test";
 var __esModule = 1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
index 71c4af8d559..5bb6f87e4e5 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
@@ -28,6 +28,7 @@ function foo() {
     });
 }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js
index 76333572abe..6f129f5e58d 100644
--- a/tests/baselines/reference/es5-umd2.js
+++ b/tests/baselines/reference/es5-umd2.js
@@ -34,4 +34,5 @@ export class A
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js
index 0689ef19da3..1291c739fcb 100644
--- a/tests/baselines/reference/es5-umd3.js
+++ b/tests/baselines/reference/es5-umd3.js
@@ -33,6 +33,6 @@ export default class A
         };
         return A;
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
index fc8acfb95ea..f6817129fb3 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
@@ -13,8 +13,8 @@ var C = (function () {
     C.prototype.method = function () { };
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
index 0f60a104a7e..5cf3405c437 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
@@ -13,8 +13,8 @@ var default_1 = (function () {
     default_1.prototype.method = function () { };
     return default_1;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
index 00af2676a0d..d28148d1416 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
@@ -25,10 +25,10 @@ var C = (function () {
     };
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 var after = new C();
 var t = C;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultExpression.js b/tests/baselines/reference/es5ExportDefaultExpression.js
index 0821543134c..6ebab2a4b0d 100644
--- a/tests/baselines/reference/es5ExportDefaultExpression.js
+++ b/tests/baselines/reference/es5ExportDefaultExpression.js
@@ -5,8 +5,8 @@ export default (1 + 2);
 
 //// [es5ExportDefaultExpression.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = (1 + 2);
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultExpression.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
index 55de6b62b83..1060607886a 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
@@ -6,8 +6,8 @@ export default function f() { }
 //// [es5ExportDefaultFunctionDeclaration.js]
 "use strict";
 function f() { }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
index e6007cc9147..13f9e014be6 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
@@ -6,8 +6,8 @@ export default function () { }
 //// [es5ExportDefaultFunctionDeclaration2.js]
 "use strict";
 function default_1() { }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
index 54a2658470e..47ed66880e6 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
@@ -14,9 +14,9 @@ var before = func();
 function func() {
     return func;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = func;
 var after = func();
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js
index b3840caf145..1102eab997d 100644
--- a/tests/baselines/reference/es5ExportDefaultIdentifier.js
+++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js
@@ -9,8 +9,8 @@ export default f;
 "use strict";
 function f() { }
 exports.f = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultIdentifier.d.ts]
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
index 7060153f0d0..02774139add 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
@@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
index e5f995fb5e0..4c58c0bd20f 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
@@ -22,3 +22,4 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
index 34ad74818b2..4479259a523 100644
--- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
@@ -22,3 +22,4 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js
index dc094122d9d..6f1d083ebe8 100644
--- a/tests/baselines/reference/es6-umd2.js
+++ b/tests/baselines/reference/es6-umd2.js
@@ -32,4 +32,5 @@ export class A
         }
     }
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js
index 73de2e7cce3..80d31b41695 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.js
+++ b/tests/baselines/reference/es6ExportAllInEs5.js
@@ -29,12 +29,14 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 __export(require("./server"));
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js
index f602f1ff609..98940523143 100644
--- a/tests/baselines/reference/es6ExportClauseInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseInEs5.js
@@ -32,6 +32,7 @@ var m;
 exports.instantiatedModule = m;
 var x = 10;
 exports.x = x;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
index 5add71a06f2..f1cb97ad0f6 100644
--- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
@@ -34,3 +34,4 @@ exports.bizz = bizz;
 exports.bizz = bizz += 1; // compiles to exports.bizz = bizz += 1
 exports.bizz = bizz -= 1; // similarly
 exports.bizz = ++bizz; // compiles to exports.bizz = ++bizz
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index ab9bd3d98c8..5891de57310 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -33,6 +33,7 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -43,6 +44,7 @@ var server_3 = require("./server");
 exports.instantiatedModule = server_3.m;
 var server_4 = require("./server");
 exports.x = server_4.x;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index 49a8a7e435a..c84c76839ee 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -304,3 +304,4 @@ __export(require("function"));
 __export(require("function-module"));
 __export(require("class"));
 __export(require("class-module"));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index 9de16453c6e..3148d9b028d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -15,8 +15,8 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var a = 10;
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [es6ImportDefaultBindingAmd_1.js]
 define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) {
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index dbc90cb80a3..6f4836a6680 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -18,12 +18,13 @@ var c = (function () {
     }
     return c;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = c;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
 exports.x = new server_1.default();
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
index 4bff2abf82d..703e0a7a7bb 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
@@ -27,8 +27,8 @@ var x1: number = m;
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {};
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
 "use strict";
 const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index fde7556edea..58d5399c99d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -23,8 +23,8 @@ var x: number = defaultBinding6;
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js]
 "use strict";
 var a = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
 "use strict";
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index 6131ff40624..5d2518bb774 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -23,8 +23,8 @@ export var x1: number = defaultBinding6;
 //// [server.js]
 "use strict";
 var a = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -39,6 +39,7 @@ var server_5 = require("./server");
 exports.x1 = server_5.default;
 var server_6 = require("./server");
 exports.x1 = server_6.default;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
index a0916932d4c..0556d872480 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
@@ -62,6 +62,7 @@ var x11 = (function () {
     return x11;
 }());
 exports.x11 = x11;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -75,6 +76,7 @@ var server_4 = require("./server");
 exports.x3 = new server_4.x11();
 var server_5 = require("./server");
 exports.x6 = new server_5.m();
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index b588c9516e9..f52c590f44e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -26,8 +26,8 @@ var a = (function () {
     }
     return a;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -42,6 +42,7 @@ var server_5 = require("./server");
 exports.x5 = new server_5.default();
 var server_6 = require("./server");
 exports.x6 = new server_6.default();
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
index c075c5c934f..c6887efba36 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
@@ -26,6 +26,7 @@ var x1: number = m;
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js]
 "use strict";
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
index aa89c8d4380..247c64c3e7f 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
@@ -28,8 +28,8 @@ define(["require", "exports"], function (require, exports) {
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = {};
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) {
@@ -40,6 +40,7 @@ define(["require", "exports", "server", "server", "server", "server", "server"],
     exports.x1 = server_3.a;
     exports.x1 = server_4.x;
     exports.x1 = server_5.m;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index 0a0e028b696..95c1485e5c1 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -12,8 +12,8 @@ var x: number = defaultBinding;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
 var a = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
 var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index 5f2cb4e97e0..fbd045e81de 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -13,13 +13,14 @@ export var x: number = defaultBinding;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var a = 10;
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     exports.x = server_1.default;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index 60bdc654842..8b430e2cf46 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -16,10 +16,12 @@ var a = (function () {
     return a;
 }());
 exports.a = a;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.a();
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 8752157eddd..09caf0db18a 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -17,13 +17,14 @@ define(["require", "exports"], function (require, exports) {
         }
         return a;
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     exports.x = new server_1.default();
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 9d11e154755..385e65f3f67 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -11,6 +11,7 @@ var x: number = nameSpaceBinding.a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
 var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index e16ebf99957..0b5670b18a9 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -11,10 +11,12 @@ export var x: number = nameSpaceBinding.a;
 //// [server.js]
 "use strict";
 exports.a = 10;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var nameSpaceBinding = require("./server");
 exports.x = nameSpaceBinding.a;
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index e686c3f33c9..e6daf77e4e9 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -19,8 +19,8 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould
 //// [es6ImportDefaultBindingMergeErrors_0.js]
 "use strict";
 var a = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingMergeErrors_1.js]
 "use strict";
 var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0");
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
index 5513ae565f2..a40dff3c317 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
@@ -11,5 +11,6 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0";
 //// [es6ImportDefaultBindingNoDefaultProperty_0.js]
 "use strict";
 exports.a = 10;
+exports.__esModule = true;
 //// [es6ImportDefaultBindingNoDefaultProperty_1.js]
 "use strict";
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index cc90d280914..6ea0812d40b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -14,13 +14,14 @@ export import defaultBinding2 from "server"; // non referenced
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var a = 10;
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     exports.x = server_1.default;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 8e109779f45..8ef828435f0 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -13,6 +13,7 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this
 //// [es6ImportNameSpaceImport_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNameSpaceImport_1.js]
 "use strict";
 const nameSpaceBinding = require("./es6ImportNameSpaceImport_0");
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
index 093e8385bae..0e795db4c01 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
@@ -14,6 +14,7 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.a = 10;
+    exports.__esModule = true;
 });
 //// [es6ImportNameSpaceImportAmd_1.js]
 define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) {
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index cf66c08331e..20b9d3af20b 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -18,10 +18,12 @@ var c = (function () {
 }());
 exports.c = c;
 ;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index 252d131f824..9e05e95244e 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -13,6 +13,7 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide
 //// [es6ImportNameSpaceImportInEs5_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNameSpaceImportInEs5_1.js]
 "use strict";
 var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0");
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
index 9bdd0318310..357f0f05e7f 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
@@ -18,6 +18,7 @@ var nameSpaceBinding3 = 10;
 //// [es6ImportNameSpaceImportMergeErrors_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNameSpaceImportMergeErrors_1.js]
 "use strict";
 var nameSpaceBinding3 = 10;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
index e21ab603f82..1663d7ec923 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
@@ -14,11 +14,13 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.a = 10;
+    exports.__esModule = true;
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) {
     "use strict";
     exports.x = nameSpaceBinding.a;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index 8dbdf7ce6f1..f60477a73cb 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -51,6 +51,7 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImport_1.js]
 "use strict";
 const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js
index 278e4ee07d2..33ea02fd94f 100644
--- a/tests/baselines/reference/es6ImportNamedImportAmd.js
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.js
@@ -52,6 +52,7 @@ define(["require", "exports"], function (require, exports) {
     exports.z1 = 10;
     exports.z2 = 10;
     exports.aaaa = 10;
+    exports.__esModule = true;
 });
 //// [es6ImportNamedImportAmd_1.js]
 define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, es6ImportNamedImportAmd_0_1, es6ImportNamedImportAmd_0_2, es6ImportNamedImportAmd_0_3, es6ImportNamedImportAmd_0_4, es6ImportNamedImportAmd_0_5, es6ImportNamedImportAmd_0_6, es6ImportNamedImportAmd_0_7, es6ImportNamedImportAmd_0_8, es6ImportNamedImportAmd_0_9) {
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js
index 7fdf620164b..f8fdf461644 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportNamedImportDts.js
@@ -132,6 +132,7 @@ var aaaa1 = (function () {
     return aaaa1;
 }());
 exports.aaaa1 = aaaa1;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -155,6 +156,7 @@ var server_8 = require("./server");
 exports.z111 = new server_8.z1();
 var server_9 = require("./server");
 exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index 3f3e4694758..85952247395 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -51,6 +51,7 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImportInEs5_1.js]
 "use strict";
 var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
index 38766d32cd9..0743f1658b4 100644
--- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
@@ -11,6 +11,7 @@ export = a;
 //// [es6ImportNamedImportInExportAssignment_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImportInExportAssignment_1.js]
 "use strict";
 const es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
index 002aa5a49ce..f3f76ff0184 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
@@ -26,6 +26,7 @@ exports.a = 10;
 exports.x = exports.a;
 exports.z = exports.a;
 exports.z1 = exports.a;
+exports.__esModule = true;
 //// [es6ImportNamedImportMergeErrors_1.js]
 "use strict";
 var x = 10;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
index 71159983b9a..a3bd672c6f3 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
@@ -13,5 +13,6 @@ import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
 "use strict";
 exports.a = 10;
 exports.x = exports.a;
+exports.__esModule = true;
 //// [es6ImportNamedImport_1.js]
 "use strict";
diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js
index 21ccb29a57b..7377f737e47 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js
@@ -50,6 +50,7 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var server_1 = require("./server");
@@ -73,6 +74,7 @@ var server_8 = require("./server");
 exports.z111 = server_8.z1;
 var server_9 = require("./server");
 exports.z2 = server_9.z2; // z2 shouldn't give redeclare error
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index 583a008f0ac..1bbab226ae8 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -36,10 +36,12 @@ var C2 = (function () {
     return C2;
 }());
 exports.C2 = C2;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 var server_1 = require("./server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 exports.cVal = new server_1.C();
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
index ea533a9a963..726efa849c2 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
@@ -17,11 +17,13 @@ var _b = 10;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.a = 10;
+    exports.__esModule = true;
 });
 //// [es6ImportWithoutFromClauseAmd_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.b = 10;
+    exports.__esModule = true;
 });
 //// [es6ImportWithoutFromClauseAmd_2.js]
 define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) {
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
index d0f7c9fbe65..9d844a8ca8f 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
@@ -10,6 +10,7 @@ import "es6ImportWithoutFromClauseInEs5_0";
 //// [es6ImportWithoutFromClauseInEs5_0.js]
 "use strict";
 exports.a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportWithoutFromClauseInEs5_1.js]
 "use strict";
 require("es6ImportWithoutFromClauseInEs5_0");
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
index 5ff5b62d8ec..b78466485f9 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
@@ -10,6 +10,7 @@ export import "server";
 //// [server.js]
 "use strict";
 exports.a = 10;
+exports.__esModule = true;
 //// [client.js]
 "use strict";
 require("server");
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
index 172ce2a8729..bd45a62e2f4 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
@@ -22,4 +22,5 @@ define(["require", "exports"], function (require, exports) {
         }
     }
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
index f932bb7072f..a7cf0599e54 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
@@ -21,3 +21,4 @@ class A {
     }
 }
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js
index 5f37f0f0220..b2a01bbb552 100644
--- a/tests/baselines/reference/exportAndImport-es3-amd.js
+++ b/tests/baselines/reference/exportAndImport-es3-amd.js
@@ -17,8 +17,8 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function f1() {
     }
-    exports.__esModule = true;
     exports["default"] = f1;
+    exports.__esModule = true;
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
@@ -26,6 +26,6 @@ define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     function f2() {
         m1_1["default"]();
     }
-    exports.__esModule = true;
     exports["default"] = f2;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js
index ee1f562258f..898261ef7fe 100644
--- a/tests/baselines/reference/exportAndImport-es3.js
+++ b/tests/baselines/reference/exportAndImport-es3.js
@@ -16,13 +16,13 @@ export default function f2() {
 "use strict";
 function f1() {
 }
-exports.__esModule = true;
 exports["default"] = f1;
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
 function f2() {
     m1_1["default"]();
 }
-exports.__esModule = true;
 exports["default"] = f2;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js
index 0e2cb890d2a..fcc918bb8ce 100644
--- a/tests/baselines/reference/exportAndImport-es5-amd.js
+++ b/tests/baselines/reference/exportAndImport-es5-amd.js
@@ -17,8 +17,8 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function f1() {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = f1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
@@ -26,6 +26,6 @@ define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     function f2() {
         m1_1.default();
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = f2;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js
index 1d2511735c7..fa1652c603e 100644
--- a/tests/baselines/reference/exportAndImport-es5.js
+++ b/tests/baselines/reference/exportAndImport-es5.js
@@ -16,13 +16,13 @@ export default function f2() {
 "use strict";
 function f1() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
 function f2() {
     m1_1.default();
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f2;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportArrayBindingPattern.js b/tests/baselines/reference/exportArrayBindingPattern.js
index 386419e5725..641500fa09d 100644
--- a/tests/baselines/reference/exportArrayBindingPattern.js
+++ b/tests/baselines/reference/exportArrayBindingPattern.js
@@ -9,3 +9,4 @@ export { a, b };
 var _a = [1, 2, 3], a = _a[0], b = _a[2];
 exports.a = a;
 exports.b = b;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js
index c9c3ffa80c4..a39a7aa04cd 100644
--- a/tests/baselines/reference/exportAssignDottedName.js
+++ b/tests/baselines/reference/exportAssignDottedName.js
@@ -16,6 +16,7 @@ function x() {
     return true;
 }
 exports.x = x;
+exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js
index a469e90b619..265d082ca35 100644
--- a/tests/baselines/reference/exportAssignImportedIdentifier.js
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.js
@@ -20,6 +20,7 @@ function x() {
     return true;
 }
 exports.x = x;
+exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
diff --git a/tests/baselines/reference/exportAssignmentWithExports.js b/tests/baselines/reference/exportAssignmentWithExports.js
index 8441b7b4320..0aea8ec80fc 100644
--- a/tests/baselines/reference/exportAssignmentWithExports.js
+++ b/tests/baselines/reference/exportAssignmentWithExports.js
@@ -16,3 +16,4 @@ var D = (function () {
     return D;
 }());
 module.exports = D;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
index 19f872bad27..9a03aaae595 100644
--- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
+++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
@@ -23,17 +23,21 @@ export { x as a, } from
 //// [t1.js]
 "use strict";
 exports.x = "x";
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.x = t1_1.x;
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 //// [t4.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
+exports.__esModule = true;
 //// [t5.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js
index 2dcef41d761..4ccdba88556 100644
--- a/tests/baselines/reference/exportDefaultProperty.js
+++ b/tests/baselines/reference/exportDefaultProperty.js
@@ -55,12 +55,12 @@ var A;
         B.b = 0;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
-exports.__esModule = true;
 exports["default"] = A.B;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = "foo".length;
+exports.__esModule = true;
 //// [index.js]
 "use strict";
 /// <reference path="declarations.d.ts" />
diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js
index 2b0a5dce526..b5d3e2c053b 100644
--- a/tests/baselines/reference/exportDefaultProperty2.js
+++ b/tests/baselines/reference/exportDefaultProperty2.js
@@ -25,8 +25,8 @@ var C = (function () {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C.B;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 var a_1 = require("./a");
diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js
index 8f785282080..6ca5b6411ff 100644
--- a/tests/baselines/reference/exportImport.js
+++ b/tests/baselines/reference/exportImport.js
@@ -38,6 +38,7 @@ define(["require", "exports", "./exporter"], function (require, exports, e) {
         return new e.w();
     }
     exports.w = w;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js
index 345d2a6885a..e84e661517b 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.js
+++ b/tests/baselines/reference/exportImportMultipleFiles.js
@@ -17,6 +17,7 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function add(a, b) { return a + b; }
     exports.add = add;
+    exports.__esModule = true;
 });
 //// [exportImportMultipleFiles_library.js]
 define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) {
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
index 401183a5ead..adcdeda7850 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
         return { name: 'value' };
     }
     exports.w = w;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
index d8dd17a562c..ba7f9380865 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
@@ -67,4 +67,5 @@ define(["require", "exports"], function (require, exports) {
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
index f986ef7f36b..bf30e45f1ca 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
@@ -66,3 +66,4 @@ exports.e1 = new D;
 exports.f1 = new D;
 exports.g1 = new D;
 exports.h1 = new D;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
index 796818c650c..1b26cfe3c1a 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
@@ -75,4 +75,5 @@ export let h1: D = new D;
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js
index b1e2e200634..a9ec4591c6c 100644
--- a/tests/baselines/reference/exportRedeclarationTypeAliases.js
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js
@@ -7,3 +7,4 @@ export function Foo(): any {}
 "use strict";
 function Foo() { }
 exports.Foo = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js
index 2bc77e079fb..e5fa8913ffd 100644
--- a/tests/baselines/reference/exportSameNameFuncVar.js
+++ b/tests/baselines/reference/exportSameNameFuncVar.js
@@ -10,4 +10,5 @@ define(["require", "exports"], function (require, exports) {
     function a() {
     }
     exports.a = a;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js
index ac79a9bf69d..b117972450e 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.js
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.js
@@ -19,6 +19,7 @@ function f() {
     return x;
 }
 exports.f = f;
+exports.__esModule = true;
 
 
 //// [b.d.ts]
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index bd4c112ff2e..2ef8560a38a 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -34,14 +34,15 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
     exports.y = 2;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = "hello";
     function foo() { }
     exports.foo = foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports"], function (require, exports) {
@@ -52,6 +53,7 @@ define(["require", "exports"], function (require, exports) {
     exports.y = y;
     var z = "z";
     exports.z = z;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t4.js]
 define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) {
@@ -62,6 +64,7 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export
     __export(t1_1);
     __export(t2_1);
     __export(t3_1);
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [main.js]
 define(["require", "exports", "./t4"], function (require, exports, t4_1) {
diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
index a2bc44720fb..460984a2b13 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -33,12 +33,13 @@ foo;
 "use strict";
 exports.x = 1;
 exports.y = 2;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 function foo() { }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 var x = "x";
@@ -47,6 +48,7 @@ var y = "y";
 exports.y = y;
 var z = "z";
 exports.z = z;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t4.js]
 "use strict";
 function __export(m) {
@@ -55,6 +57,7 @@ function __export(m) {
 __export(require("./t1"));
 __export(require("./t2"));
 __export(require("./t3"));
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
 var t4_1 = require("./t4");
diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js
index dc4d4c8b68e..21f2b4c2f09 100644
--- a/tests/baselines/reference/exportStarForValues5.js
+++ b/tests/baselines/reference/exportStarForValues5.js
@@ -15,4 +15,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js
index 39a152fdc89..d0c1f85582c 100644
--- a/tests/baselines/reference/exportStarForValues7.js
+++ b/tests/baselines/reference/exportStarForValues7.js
@@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports, file2_1) {
@@ -29,4 +30,5 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     }
     __export(file2_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js
index f8e7678a40c..cb3f66fbaf6 100644
--- a/tests/baselines/reference/exportStarForValues8.js
+++ b/tests/baselines/reference/exportStarForValues8.js
@@ -32,11 +32,13 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file4.js]
 define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) {
@@ -47,6 +49,7 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil
     __export(file2_1);
     __export(file3_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file5.js]
 define(["require", "exports", "file4"], function (require, exports, file4_1) {
@@ -56,4 +59,5 @@ define(["require", "exports", "file4"], function (require, exports, file4_1) {
     }
     __export(file4_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js
index e057e4d4027..fdcb0e5583a 100644
--- a/tests/baselines/reference/exportStarForValues9.js
+++ b/tests/baselines/reference/exportStarForValues9.js
@@ -28,6 +28,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     }
     __export(file2_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "file3"], function (require, exports, file3_1) {
@@ -37,4 +38,5 @@ define(["require", "exports", "file3"], function (require, exports, file3_1) {
     }
     __export(file3_1);
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index afb4d2f10c1..bb9867725b0 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -31,6 +31,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module2.js]
 // empty
 //// [exportStarFromEmptyModule_module3.js]
@@ -46,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module4.js]
 "use strict";
 var X = require("./exportStarFromEmptyModule_module3");
diff --git a/tests/baselines/reference/exportToString.js b/tests/baselines/reference/exportToString.js
index 190d1693c24..ee9482c655f 100644
--- a/tests/baselines/reference/exportToString.js
+++ b/tests/baselines/reference/exportToString.js
@@ -7,3 +7,4 @@ export { toString };
 "use strict";
 var toString = 0;
 exports.toString = toString;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js
index a49cd744441..d66cf543124 100644
--- a/tests/baselines/reference/exportVisibility.js
+++ b/tests/baselines/reference/exportVisibility.js
@@ -22,3 +22,4 @@ function test(foo) {
     return true;
 }
 exports.test = test;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
index 3e77c3c684b..357e7dc25f4 100644
--- a/tests/baselines/reference/exportedBlockScopedDeclarations.js
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -38,4 +38,5 @@ define(["require", "exports"], function (require, exports) {
     (function (NS1) {
         NS1.bar1 = NS1.bar1; // should be compile error
     })(NS1 || (NS1 = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js
index da472fc8790..11737e21e73 100644
--- a/tests/baselines/reference/exportedVariable1.js
+++ b/tests/baselines/reference/exportedVariable1.js
@@ -8,4 +8,5 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.foo = { name: "Bill" };
     var upper = exports.foo.name.toUpperCase();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js
index f2d78fe9a88..5e9d0f2edf2 100644
--- a/tests/baselines/reference/exportingContainingVisibleType.js
+++ b/tests/baselines/reference/exportingContainingVisibleType.js
@@ -27,4 +27,5 @@ define(["require", "exports"], function (require, exports) {
         return Foo;
     }());
     exports.x = 5;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js
index 9e04b3485d2..f6456368e33 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.js
+++ b/tests/baselines/reference/exportsAndImports1-amd.js
@@ -60,6 +60,7 @@ define(["require", "exports"], function (require, exports) {
     exports.M = M;
     var a = M.x;
     exports.a = a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
@@ -70,6 +71,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
@@ -80,4 +82,5 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js
index 3ac5aeb0dc5..968cd185378 100644
--- a/tests/baselines/reference/exportsAndImports1-es6.js
+++ b/tests/baselines/reference/exportsAndImports1-es6.js
@@ -56,6 +56,7 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -65,6 +66,7 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 const t1_1 = require("./t1");
@@ -74,3 +76,4 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js
index 46eda0656ad..a6f97be0677 100644
--- a/tests/baselines/reference/exportsAndImports1.js
+++ b/tests/baselines/reference/exportsAndImports1.js
@@ -59,6 +59,7 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -68,6 +69,7 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -77,3 +79,4 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js
index 18803de4004..d67dd92707d 100644
--- a/tests/baselines/reference/exportsAndImports2-amd.js
+++ b/tests/baselines/reference/exportsAndImports2-amd.js
@@ -18,16 +18,19 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = "x";
     exports.y = "y";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
     exports.y = t1_1.x;
     exports.x = t1_1.y;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
     exports.y = t1_1.x;
     exports.x = t1_1.y;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js
index 56639bdbecf..59ee55defd8 100644
--- a/tests/baselines/reference/exportsAndImports2-es6.js
+++ b/tests/baselines/reference/exportsAndImports2-es6.js
@@ -17,13 +17,16 @@ export { x as y, y as x };
 "use strict";
 exports.x = "x";
 exports.y = "y";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 const t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js
index 3790510979c..672d7161e74 100644
--- a/tests/baselines/reference/exportsAndImports2.js
+++ b/tests/baselines/reference/exportsAndImports2.js
@@ -17,13 +17,16 @@ export { x as y, y as x };
 "use strict";
 exports.x = "x";
 exports.y = "y";
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js
index cbf30735182..1f74addddec 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.js
+++ b/tests/baselines/reference/exportsAndImports3-amd.js
@@ -62,6 +62,7 @@ define(["require", "exports"], function (require, exports) {
     exports.M1 = M;
     exports.a = M.x;
     exports.a1 = exports.a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
@@ -72,6 +73,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
@@ -82,4 +84,5 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js
index 85daa3f0f5c..b4152cab778 100644
--- a/tests/baselines/reference/exportsAndImports3-es6.js
+++ b/tests/baselines/reference/exportsAndImports3-es6.js
@@ -58,6 +58,7 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -67,6 +68,7 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 const t1_1 = require("./t1");
@@ -76,3 +78,4 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js
index dbcd9486215..2bc4c828fe1 100644
--- a/tests/baselines/reference/exportsAndImports3.js
+++ b/tests/baselines/reference/exportsAndImports3.js
@@ -61,6 +61,7 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -70,6 +71,7 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 var t1_1 = require("./t1");
@@ -79,3 +81,4 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js
index 3ed3f9bf910..ddacb1eec94 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.js
+++ b/tests/baselines/reference/exportsAndImports4-amd.js
@@ -42,8 +42,8 @@ export { a, b, c, d, e1, e2, f1, f2 };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = "hello";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) {
@@ -65,4 +65,5 @@ define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], f
     exports.f2 = t1_4.default;
     t1_4.default;
     t1_4.default;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js
index 8a8d4f81225..5f0c37ab04f 100644
--- a/tests/baselines/reference/exportsAndImports4-es6.js
+++ b/tests/baselines/reference/exportsAndImports4-es6.js
@@ -41,8 +41,8 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 const a = require("./t1");
@@ -67,3 +67,4 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js
index 361d1305bda..6a78862e55e 100644
--- a/tests/baselines/reference/exportsAndImports4.js
+++ b/tests/baselines/reference/exportsAndImports4.js
@@ -41,8 +41,8 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 var a = require("./t1");
@@ -67,3 +67,4 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
index fb6946ce928..838a6ae9326 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
@@ -28,6 +28,7 @@ var set = {
 exports.set = set;
 var get = 10;
 exports.get = get;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 //// [t3.js]
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
index 219916b3047..4af17d71653 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
@@ -22,6 +22,7 @@ import { as } from "./t1";
 var as = 100;
 exports.return = as;
 exports.as = as;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 var as = require("./t1");
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
index d14eab3c251..7cdfbe79ebe 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
@@ -17,12 +17,12 @@ const { __, _, ___ } = R;
 //// [m1.js]
 "use strict";
 var R;
-exports.__esModule = true;
 exports["default"] = R = {
     "__": 20,
     "_": 10,
     "___": 30
 };
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
index 5d1dcbb9322..890e32937a1 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
@@ -16,11 +16,11 @@ const { __esmodule, __proto__ } = R;
 //// [m1.js]
 "use strict";
 var R;
-exports.__esModule = true;
 exports["default"] = R = {
     "__esmodule": true,
     "__proto__": {}
 };
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
index 477f870742d..3514652db65 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
@@ -17,12 +17,12 @@ const { ___, ___hello, _hi } = R;
 //// [m1.js]
 "use strict";
 var R;
-exports.__esModule = true;
 exports["default"] = R = {
     "___": 30,
     "___hello": 21,
     "_hi": 40
 };
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
index 22cd7c2e71a..25130664b74 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
@@ -64,6 +64,7 @@ function ___hello() {
     console.log("___hello");
 }
 exports.___hello = ___hello;
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index 2d1add18ae0..2e26d67db39 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -40,6 +40,7 @@ var Model = (function () {
     return Model;
 }());
 exports.Model = Model;
+exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -61,6 +62,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -82,6 +84,7 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
+exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_main.js]
 "use strict";
 var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js
index 47958ddd2ff..4d60625115b 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.js
+++ b/tests/baselines/reference/externalModuleAssignToVar.js
@@ -35,6 +35,7 @@ define(["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
+    exports.__esModule = true;
 });
 //// [externalModuleAssignToVar_core_require2.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index b50845024f4..646b4471859 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -54,6 +54,7 @@ for ((stuff[n]) of []) {}
 //// [f1.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 // all mutations below are illegal and should be fixed
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
index 5b0de7324ac..9c9861d7c28 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
@@ -23,6 +23,7 @@ file1.bar();
 function foo() { }
 exports.foo = foo;
 ;
+exports.__esModule = true;
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js]
 "use strict";
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js
index eb5171acd75..959a3ffffcf 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -18,4 +18,5 @@ define(["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
index 0c6f1c8034d..793f4ab6c06 100644
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
+++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
@@ -18,6 +18,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return c;
     }());
     exports.c = c;
+    exports.__esModule = true;
 });
 function foo() {
 }
diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js
index 8391823aa3a..3b1644e7ac1 100644
--- a/tests/baselines/reference/functionAndImportNameConflict.js
+++ b/tests/baselines/reference/functionAndImportNameConflict.js
@@ -14,8 +14,10 @@ export function f() {
 function f() {
 }
 exports.f = f;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 function f() {
 }
 exports.f = f;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.js b/tests/baselines/reference/functionLikeInParameterInitializer.js
index bf1d887b435..d794cded0f4 100644
--- a/tests/baselines/reference/functionLikeInParameterInitializer.js
+++ b/tests/baselines/reference/functionLikeInParameterInitializer.js
@@ -50,3 +50,4 @@ function baz3(func) {
     var foo = "in";
 }
 exports.baz3 = baz3;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js
index 594d2c3263c..426697dfa8d 100644
--- a/tests/baselines/reference/generatorES6InAMDModule.js
+++ b/tests/baselines/reference/generatorES6InAMDModule.js
@@ -10,4 +10,5 @@ define(["require", "exports"], function (require, exports) {
         yield;
     }
     exports.foo = foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js
index a17d9272c5b..1b008c90860 100644
--- a/tests/baselines/reference/genericClassesInModule2.js
+++ b/tests/baselines/reference/genericClassesInModule2.js
@@ -41,4 +41,5 @@ define(["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
index 4f3895a33b8..2cbb4485e31 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
@@ -14,4 +14,5 @@ define(["require", "exports"], function (require, exports) {
         foo(fn); // Invocation is necessary to repro (!)
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js
index c15868e20c4..9704fe5d148 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -59,4 +59,5 @@ define(["require", "exports"], function (require, exports) {
         return BuildResult;
     }());
     exports.BuildResult = BuildResult;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 56367ca9c5e..457158faee1 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) {
         return DbSet;
     }());
     exports.DbSet = DbSet;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
index 5498d3d1fad..0ed35307d2d 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -56,4 +56,5 @@ define(["require", "exports"], function (require, exports) {
         return ListItem;
     }(CollectionItem));
     exports.ListItem = ListItem;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
index 5c865321691..783ec2bf947 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
@@ -9,6 +9,7 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile3.js
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index 149a975d413..434835a59d3 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -1107,6 +1107,7 @@ define(["require", "exports"], function (require, exports) {
         ;
     })(eM = exports.eM || (exports.eM = {}));
     ;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index 75d6e68d4c5..c676d8caa62 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -19,6 +19,7 @@ var Greeter = (function () {
     return Greeter;
 }());
 exports.Greeter = Greeter;
+exports.__esModule = true;
 //// [importAsBaseClass_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index 47bf5a1b2a1..a33b758df7d 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -91,6 +91,7 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
+exports.__esModule = true;
 //// [importDecl_require1.js]
 "use strict";
 var d = (function () {
@@ -102,6 +103,7 @@ exports.d = d;
 var x;
 function foo() { return null; }
 exports.foo = foo;
+exports.__esModule = true;
 //// [importDecl_require2.js]
 "use strict";
 var d = (function () {
@@ -112,6 +114,7 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
+exports.__esModule = true;
 //// [importDecl_require3.js]
 "use strict";
 var d = (function () {
@@ -122,10 +125,12 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
+exports.__esModule = true;
 //// [importDecl_require4.js]
 "use strict";
 function foo2() { return null; }
 exports.foo2 = foo2;
+exports.__esModule = true;
 //// [importDecl_1.js]
 "use strict";
 ///<reference path='importDecl_require.ts'/>
@@ -169,6 +174,7 @@ var multiImport_m4 = require("./importDecl_require"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
+exports.__esModule = true;
 
 
 //// [importDecl_require.d.ts]
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
index c2cc0b8ea7a..ee4e8f1dc8c 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
@@ -19,8 +19,10 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [importDeclarationUsedAsTypeQuery_1.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [importDeclarationUsedAsTypeQuery_require.d.ts]
diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js
index fea4ee2db27..7f2c4ad4036 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -66,6 +66,7 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js
index 6054e147386..03a4e6393d7 100644
--- a/tests/baselines/reference/importHelpersAmd.js
+++ b/tests/baselines/reference/importHelpersAmd.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) {
@@ -37,4 +38,5 @@ define(["require", "exports", "tslib", "./a"], function (require, exports, tslib
         return B;
     }(a_1.A));
     exports.B = B;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js
index 429a71c1ab8..52e5aac62e0 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.js
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -66,6 +66,7 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 "use strict";
 var tslib_1 = require("tslib");
diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 29e43e191e8..2883a7aaa53 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -23,6 +23,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 "use strict";
 var tslib_1 = require("tslib");
 exports.x = React.createElement("span", tslib_1.__assign({}, o));
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __assign = (this && this.__assign) || Object.assign || function(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
index 53b4b326819..4747e017ff5 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -68,6 +68,7 @@ C = tslib_1.__decorate([
 var o = { a: 1 };
 var y = tslib_1.__assign({}, o);
 var x = tslib_1.__rest(y, []);
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js
index f84666ae198..efcd4827257 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -58,6 +58,7 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js
index 572115ba4bb..233b12208c1 100644
--- a/tests/baselines/reference/importHelpersOutFile.js
+++ b/tests/baselines/reference/importHelpersOutFile.js
@@ -29,6 +29,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) {
     "use strict";
@@ -40,6 +41,7 @@ define("b", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return B;
     }(a_1.A));
     exports.B = B;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) {
     "use strict";
@@ -51,4 +53,5 @@ define("c", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return C;
     }(a_2.A));
     exports.C = C;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 013999321f9..2d3713ffaf4 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) {
     }());
     C1.s1 = true;
     exports.C1 = C1;
+    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js
index b57df504993..e15a3337dfd 100644
--- a/tests/baselines/reference/importTsBeforeDTs.js
+++ b/tests/baselines/reference/importTsBeforeDTs.js
@@ -16,6 +16,7 @@ var z2 = foo.y + 10; // Should resolve
 //// [foo_0.js]
 "use strict";
 exports.y = 42;
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 var foo = require("./foo_0");
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index 4075719c9c5..de5ee2a22bd 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -19,6 +19,7 @@ var Super = (function () {
     return Super;
 }());
 exports.Super = Super;
+exports.__esModule = true;
 //// [importUsedInExtendsList1_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js
index 7118dd95bb8..807d684b5b1 100644
--- a/tests/baselines/reference/importWithTrailingSlash.js
+++ b/tests/baselines/reference/importWithTrailingSlash.js
@@ -22,12 +22,12 @@ aIndex.aIndex;
 
 //// [a.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = { a: 0 };
+exports.__esModule = true;
 //// [index.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = { aIndex: 0 };
+exports.__esModule = true;
 //// [test.js]
 "use strict";
 var _1 = require(".");
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
index d67c53c6349..423a3546d31 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
@@ -19,6 +19,7 @@ define(["require", "exports"], function (require, exports) {
         return Host;
     }());
     exports.Host = Host;
+    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports", "host"], function (require, exports, host) {
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js
index 4630de598cc..632483866be 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.js
+++ b/tests/baselines/reference/importsImplicitlyReadonly.js
@@ -26,6 +26,7 @@ a3.y = 1;
 exports.x = 1;
 var y = 1;
 exports.y = y;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 var a_1 = require("./a");
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
index 84f0989e987..7a530fdb1df 100644
--- a/tests/baselines/reference/inferenceLimit.js
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -79,3 +79,4 @@ class BrokenClass {
     }
 }
 exports.BrokenClass = BrokenClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js
index 540549aef52..da0be4c0e95 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.js
+++ b/tests/baselines/reference/instanceOfInExternalModules.js
@@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) {
         return Foo;
     }());
     exports.Foo = Foo;
+    exports.__esModule = true;
 });
 //// [instanceOfInExternalModules_1.js]
 define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) {
diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js
index 6726971d208..dde6b1632f1 100644
--- a/tests/baselines/reference/interfaceDeclaration5.js
+++ b/tests/baselines/reference/interfaceDeclaration5.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return C1;
     }());
     exports.C1 = C1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js
index 642300d9160..5fb3996134b 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -50,4 +50,5 @@ define(["require", "exports"], function (require, exports) {
         return Test;
     }());
     exports.Test = Test;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index aa274838529..20ce33035e6 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -41,6 +41,7 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
+exports.__esModule = true;
 
 
 //// [internalAliasClassInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
index c15ca69e13f..d9f47a05d9e 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
@@ -41,3 +41,4 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
index f881032fa1e..52a2e0b3fed 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
@@ -28,6 +28,7 @@ var x;
 exports.xc = x.c;
 exports.cProp = new exports.xc();
 var cReturnVal = exports.cProp.foo(10);
+exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
index ac5004a7606..640b533f151 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
@@ -28,6 +28,7 @@ var x;
 var xc = x.c;
 exports.cProp = new xc();
 var cReturnVal = exports.cProp.foo(10);
+exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
index 8e11f60dcc7..d3e9fdf8349 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     exports.b = a.weekend;
     exports.bVal = exports.b.Sunday;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
index 8ec0dcea815..99b9156c0c9 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
@@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.weekend;
     exports.bVal = b.Sunday;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
index be096720e5e..88765f267e6 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
@@ -23,6 +23,7 @@ define(["require", "exports"], function (require, exports) {
     exports.b = a.foo;
     exports.bVal = exports.b(10);
     exports.bVal2 = exports.b;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
index ec702b7e021..160b4047849 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
@@ -22,6 +22,7 @@ var a;
 var b = a.foo;
 exports.bVal = b(10);
 exports.bVal2 = b;
+exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 02181f04f8d..77dbbab235a 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -33,3 +33,4 @@ var c;
     c.x = new b.c();
 })(c = exports.c || (exports.c = {}));
 exports.d = new c.b.c();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
index 26915043496..05fe46f1eb5 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
@@ -25,6 +25,7 @@ var a;
 })(a = exports.a || (exports.a = {}));
 exports.b = a.b;
 exports.x = new exports.b.c();
+exports.__esModule = true;
 
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
index a8a1d9ee047..63f6b8c1422 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.b;
     exports.x = new b.c();
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
index 1d6cb8c07e9..4434670366c 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
@@ -10,6 +10,7 @@ export var x: b;
 
 //// [internalAliasInterfaceInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [internalAliasInterfaceInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
index fb666a9cad2..5645c76ed2a 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
@@ -11,6 +11,7 @@ export var x: b;
 //// [internalAliasInterfaceInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 1015e2a1d63..efbb156bed8 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) {
     (function (c) {
         c.x.foo();
     })(c = exports.c || (exports.c = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
index dac3821a30d..ac52f94db72 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
@@ -16,6 +16,7 @@ x.foo();
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x.foo();
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
index dc1029c6664..45af4536151 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -15,6 +15,7 @@ x.foo();
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js]
 "use strict";
 exports.x.foo();
+exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
index aa61fc77216..962e34c4a3e 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
@@ -22,3 +22,4 @@ var c;
     c.bVal = b;
 })(c = exports.c || (exports.c = {}));
 exports.z = c.b;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
index 5427dbf026f..732257b93e5 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
@@ -17,6 +17,7 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     exports.b = a.x;
     exports.bVal = exports.b;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
index 7c7c2cd327e..f0d02aa709c 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
@@ -16,6 +16,7 @@ var a;
 })(a = exports.a || (exports.a = {}));
 var b = a.x;
 exports.bVal = b;
+exports.__esModule = true;
 
 
 //// [internalAliasVarInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/intersectionTypeInference1.js b/tests/baselines/reference/intersectionTypeInference1.js
index f4ad4da608b..27a75a64be6 100644
--- a/tests/baselines/reference/intersectionTypeInference1.js
+++ b/tests/baselines/reference/intersectionTypeInference1.js
@@ -15,3 +15,4 @@ function alert(s) { }
 var parameterFn = function (props) { return alert(props.store); };
 var brokenFunction = function (f) { return function (o) { return o; }; };
 exports.Form3 = brokenFunction(parameterFn)({ store: "hello" });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index 80f47941e60..f9590d70dd3 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -40,3 +40,4 @@ var y = ns.value;
 var module_3 = require("module");
 exports.c1 = module_3.c1;
 exports.z = x;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/isolatedModulesSpecifiedModule.js b/tests/baselines/reference/isolatedModulesSpecifiedModule.js
index 89547811855..895c47e2504 100644
--- a/tests/baselines/reference/isolatedModulesSpecifiedModule.js
+++ b/tests/baselines/reference/isolatedModulesSpecifiedModule.js
@@ -3,3 +3,4 @@ export var x;
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js
index 89547811855..895c47e2504 100644
--- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js
+++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js
@@ -3,3 +3,4 @@ export var x;
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
index e1675ff7131..cbb97e43d72 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
@@ -46,6 +46,6 @@ define("_apply", ["require", "exports"], function (require, exports) {
         }
         return func.apply(thisArg, args);
     }
-    exports.__esModule = true;
     exports["default"] = apply;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js
index 1acead2801d..f47b1b52cc6 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.js
+++ b/tests/baselines/reference/jsxEmitWithAttributes.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 const Element_1 = require("./Element");
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
index 0a6402ca70c..a9a925c3e4f 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 const Element_1 = require("./Element");
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
index 82c8f6410e6..592675086b1 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
 const Element_1 = require("./Element");
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
index ffec40ff7b6..3ab40dee5eb 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
@@ -21,4 +21,5 @@ class AppComponent {
     }
 }
 exports.AppComponent = AppComponent;
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
index 23f6f44e0c7..12ea8b96602 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
@@ -21,4 +21,5 @@ class AppComponent {
     }
 }
 exports.AppComponent = AppComponent;
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
index 90bb675442a..e2fe0c52c90 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 let c;
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
index 0bc0c6e57c5..a9a718a4b2a 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 let c;
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index 80a77d35302..4d1cc513918 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -67,6 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
 const Element_1 = require("./Element");
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
index 6714b68a093..60c8ca80212 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
@@ -20,4 +20,5 @@ class AppComponent {
     }
 }
 exports.AppComponent = AppComponent;
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/mapOnTupleTypes01.js b/tests/baselines/reference/mapOnTupleTypes01.js
index cb1de5fdc61..731e0e2e70b 100644
--- a/tests/baselines/reference/mapOnTupleTypes01.js
+++ b/tests/baselines/reference/mapOnTupleTypes01.js
@@ -67,6 +67,7 @@ exports.g = numNumNumNumNum.map(function (n) { return n * n; });
 // Length 6
 var numNumNumNumNumNum = [1, 2, 3, 4, 5, 6];
 exports.h = numNumNumNumNum.map(function (n) { return n * n; });
+exports.__esModule = true;
 
 
 //// [mapOnTupleTypes01.d.ts]
diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js
index 97ffc9510db..0906c6df189 100644
--- a/tests/baselines/reference/mapOnTupleTypes02.js
+++ b/tests/baselines/reference/mapOnTupleTypes02.js
@@ -12,6 +12,7 @@ function increment(point) {
     return point.map(function (d) { return d + 1; });
 }
 exports.increment = increment;
+exports.__esModule = true;
 
 
 //// [mapOnTupleTypes02.d.ts]
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
index 00f913219a4..94f65168198 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
@@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) {
         return Promise;
     }());
     exports.Promise = Promise;
+    exports.__esModule = true;
 });
 //// [memberAccessMustUseModuleInstances_1.js]
 define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) {
diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js
index 4452165c3e6..17aeccbc769 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -35,6 +35,7 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 //// [b.js]
 var __extends = (this && this.__extends) || (function () {
@@ -59,4 +60,5 @@ define(["require", "exports", "./a"], function (require, exports, a_1) {
         return B;
     }(a_1.A));
     exports.B = B;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js
index 8a22a90bc2e..fa93f2f2143 100644
--- a/tests/baselines/reference/metadataOfEventAlias.js
+++ b/tests/baselines/reference/metadataOfEventAlias.js
@@ -36,3 +36,4 @@ __decorate([
     __metadata("design:type", Object)
 ], SomeClass.prototype, "event", void 0);
 exports.SomeClass = SomeClass;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js
index d9ab942cfc8..87e1fdd8f58 100644
--- a/tests/baselines/reference/missingFunctionImplementation.js
+++ b/tests/baselines/reference/missingFunctionImplementation.js
@@ -162,3 +162,4 @@ var N12;
     function m(a) { }
     N12.m = m;
 })(N12 || (N12 = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
index 069849ffb83..76138193938 100644
--- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
+++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
@@ -11,6 +11,7 @@ import {x} from "./a"
 //// [a.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 (function () { return 1; }());
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
index b75161da458..c6fb35e3737 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
@@ -17,6 +17,7 @@ fn(a); // Error: property 'x' is missing from 'a'
 //// [moduleAliasAsFunctionArgument_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [moduleAliasAsFunctionArgument_1.js]
 define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) {
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
index 8c497d63c42..0f884f26756 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
@@ -50,6 +50,7 @@ import "./x";
 //// [x0.js]
 "use strict";
 exports.a = 1;
+exports.__esModule = true;
 //// [x.js]
 "use strict";
 var N1;
@@ -59,9 +60,11 @@ var N1;
 //// [observable.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [test.js]
 "use strict";
 exports.b = 1;
+exports.__esModule = true;
 //// [main.js]
 "use strict";
 require("./x");
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js
index 99351642a18..4f1eb3bde6b 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.js
@@ -26,6 +26,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var x = [1];
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js
index 90e8373302e..03334d17cb8 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.js
@@ -27,6 +27,7 @@ var A = (function () {
 }());
 exports.A = A;
 ;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var x = [1];
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js
index caa080a558c..21be25c6373 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.js
@@ -30,6 +30,7 @@ var A = (function () {
 }());
 exports.A = A;
 ;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 //// [f3.js]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
index 8e0b7dad19d..d0b1592da39 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
@@ -35,6 +35,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -43,6 +44,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index 498df8ab90e..dfb71d81497 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -47,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -55,6 +56,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index 8d9e69c5076..312a56792b6 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -45,6 +45,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -53,6 +54,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
index 53095555815..690ec91226a 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
@@ -47,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -55,6 +56,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
index c3cba4c01f8..efb3fc04f9f 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -47,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -55,6 +56,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
index f5aff705eb4..228320ec9c6 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
@@ -47,6 +47,7 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
 var B = (function () {
@@ -55,6 +56,7 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 var f1_1 = require("./f1");
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
index 504c015bcb8..a55585e6ace 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
@@ -64,6 +64,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return Cls;
     }());
     exports.Cls = Cls;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) {
     "use strict";
@@ -84,6 +85,7 @@ define("m3", ["require", "exports"], function (require, exports) {
         return C2;
     }());
     exports.C2 = C2;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) {
     "use strict";
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
index 922bb61d952..26a04928440 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.js
+++ b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -51,6 +51,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -60,6 +61,7 @@ define("b", ["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
index 605a07e29e1..82858bcada0 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.js
+++ b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -56,6 +56,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -65,6 +66,7 @@ define("b", ["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 0a946f42be3..8bdbb647421 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -55,6 +55,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -64,6 +65,7 @@ define("b", ["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index a48bbb04631..82b8624c35c 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -56,6 +56,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -65,6 +66,7 @@ define("b", ["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 define("main", ["require", "exports", "D", "E"], function (require, exports) {
     "use strict";
diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js
index 6a7113c0368..8c396d4fcdd 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.js
+++ b/tests/baselines/reference/moduleCodeGenTest5.js
@@ -53,3 +53,4 @@ var E2;
     E2[E2["B"] = 0] = "B";
 })(E2 || (E2 = {}));
 var v = E2.B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js
index 64b82f82500..1af231a9a62 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.js
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js
@@ -76,3 +76,4 @@ var Utensils;
 (function (Utensils) {
     Utensils[Utensils["Spork"] = 3] = "Spork";
 })(Utensils = exports.Utensils || (exports.Utensils = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js
index a590e23f71e..8c18060d506 100644
--- a/tests/baselines/reference/moduleInTypePosition1.js
+++ b/tests/baselines/reference/moduleInTypePosition1.js
@@ -19,6 +19,7 @@ var Promise = (function () {
     return Promise;
 }());
 exports.Promise = Promise;
+exports.__esModule = true;
 //// [moduleInTypePosition1_1.js]
 "use strict";
 var x = function (w1) { };
diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js
index c18f11d24b3..3ed09d2cd7a 100644
--- a/tests/baselines/reference/moduleNoneErrors.js
+++ b/tests/baselines/reference/moduleNoneErrors.js
@@ -12,3 +12,4 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js
index c3512734f94..cb53b78f038 100644
--- a/tests/baselines/reference/modulePrologueAMD.js
+++ b/tests/baselines/reference/modulePrologueAMD.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return Foo;
     }());
     exports.Foo = Foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js
index 4a9594d254b..2f2cf9d9148 100644
--- a/tests/baselines/reference/modulePrologueCommonjs.js
+++ b/tests/baselines/reference/modulePrologueCommonjs.js
@@ -11,3 +11,4 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js
index 18edf1ef4af..7b39a9d12e3 100644
--- a/tests/baselines/reference/modulePrologueUmd.js
+++ b/tests/baselines/reference/modulePrologueUmd.js
@@ -20,4 +20,5 @@ export class Foo {}
         return Foo;
     }());
     exports.Foo = Foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js
index c73be6b6981..e3c323bba71 100644
--- a/tests/baselines/reference/moduleResolutionNoResolve.js
+++ b/tests/baselines/reference/moduleResolutionNoResolve.js
@@ -13,3 +13,4 @@ export var c = '';
 //// [b.js]
 "use strict";
 exports.c = '';
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js
index a17f108d872..554f8110994 100644
--- a/tests/baselines/reference/moduleResolutionNoTs.js
+++ b/tests/baselines/reference/moduleResolutionNoTs.js
@@ -23,11 +23,11 @@ import z2 from "./z";
 
 //// [x.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = 0;
+exports.__esModule = true;
 //// [y.jsx]
 "use strict";
-exports.__esModule = true;
 exports["default"] = 0;
+exports.__esModule = true;
 //// [user.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js
index 16d176872ca..1f241c1ed96 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions.js
@@ -27,8 +27,8 @@ import j from "./jquery.js"
 
 //// [a.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = 0;
+exports.__esModule = true;
 // No extension: '.ts' added 
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
index 177321c7d08..afd5ce5a578 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
@@ -12,7 +12,7 @@ import b from "./b";
 
 //// [index.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = 0;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js
index fbf97fa3ba0..f326ab9231a 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js
@@ -49,10 +49,12 @@ var MyClass = (function () {
     return MyClass;
 }());
 exports.MyClass = MyClass;
+exports.__esModule = true;
 //// [/src/library-b/index.js]
 "use strict";
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
+exports.__esModule = true;
 //// [/src/app.js]
 "use strict";
 var x;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
index a927a496a96..f88665c6808 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
@@ -19,12 +19,14 @@ x + x2;
 // See GH#10364. 
 "use strict";
 exports.x = 0;
+exports.__esModule = true;
 //// [/src/bin/shared2/abc.js]
 // When symlinked files are not in node_modules, realpath is not used.
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
 exports.x = 0;
+exports.__esModule = true;
 //// [/src/bin/app.js]
 "use strict";
 var abc_1 = require("./shared/abc");
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
index 312bcf4c174..7d778942524 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
@@ -28,10 +28,12 @@ var MyClass = (function () {
     return MyClass;
 }());
 exports.MyClass = MyClass;
+exports.__esModule = true;
 //// [/src/bin/library-b/index.js]
 "use strict";
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
+exports.__esModule = true;
 //// [/src/bin/app.js]
 "use strict";
 var x;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
index 4061a32b49f..0b50be0e5e4 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
@@ -13,12 +13,14 @@ export var foo = 42;
 //// [c.js]
 "use strict";
 exports.foo = 42;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 __export(require("./c"));
+exports.__esModule = true;
 //// [a.js]
 "use strict";
 function __export(m) {
@@ -26,3 +28,4 @@ function __export(m) {
 }
 __export(require("./b"));
 __export(require("./c"));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
index 208e90c69d8..7411123a872 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
@@ -25,6 +25,7 @@ var Animals;
 "use strict";
 var c_1 = require("./c");
 exports.Animals = c_1.Animals;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
 function __export(m) {
@@ -32,3 +33,4 @@ function __export(m) {
 }
 __export(require("./b"));
 __export(require("./c"));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js
index f987c0c652d..20a518e2511 100644
--- a/tests/baselines/reference/moduleScoping.js
+++ b/tests/baselines/reference/moduleScoping.js
@@ -31,6 +31,7 @@ var v4 = function () { return 5; };
 "use strict";
 exports.v3 = true;
 var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope
+exports.__esModule = true;
 //// [file4.js]
 "use strict";
 var file3 = require("./file3");
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index e15f8fc879c..a0e06a40da5 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -25,15 +25,13 @@ var foo = (function () {
     }
     return foo;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = foo;
 function bar() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = bar;
 var x = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = x;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index 0e9fed272cd..210fa21e803 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -19,12 +19,11 @@ Entity();
 "use strict";
 function foo() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = foo;
 function bar() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = bar;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js
index 748837baceb..436232c145e 100644
--- a/tests/baselines/reference/multipleDefaultExports03.js
+++ b/tests/baselines/reference/multipleDefaultExports03.js
@@ -13,12 +13,11 @@ var C = (function () {
     }
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 var C = (function () {
     function C() {
     }
     return C;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js
index 020f9b758bb..b2c37ec5f0e 100644
--- a/tests/baselines/reference/multipleDefaultExports04.js
+++ b/tests/baselines/reference/multipleDefaultExports04.js
@@ -10,9 +10,8 @@ export default function f() {
 "use strict";
 function f() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
 function f() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleExportDefault1.js b/tests/baselines/reference/multipleExportDefault1.js
index bec4fb48969..4817012ab75 100644
--- a/tests/baselines/reference/multipleExportDefault1.js
+++ b/tests/baselines/reference/multipleExportDefault1.js
@@ -12,9 +12,8 @@ export default {
 "use strict";
 function Foo() {
 }
-exports.__esModule = true;
 exports["default"] = Foo;
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault2.js b/tests/baselines/reference/multipleExportDefault2.js
index dc82500a1d9..e979b96fe71 100644
--- a/tests/baselines/reference/multipleExportDefault2.js
+++ b/tests/baselines/reference/multipleExportDefault2.js
@@ -9,10 +9,9 @@ export default function Foo() { }
 
 //// [multipleExportDefault2.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
 function Foo() { }
-exports.__esModule = true;
 exports["default"] = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault3.js b/tests/baselines/reference/multipleExportDefault3.js
index 5d7ad48e0ca..e889edc907a 100644
--- a/tests/baselines/reference/multipleExportDefault3.js
+++ b/tests/baselines/reference/multipleExportDefault3.js
@@ -9,7 +9,6 @@ export default class C { }
 
 //// [multipleExportDefault3.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
@@ -18,5 +17,5 @@ var C = (function () {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault4.js b/tests/baselines/reference/multipleExportDefault4.js
index 1199fa91c9c..d46cda4d8b3 100644
--- a/tests/baselines/reference/multipleExportDefault4.js
+++ b/tests/baselines/reference/multipleExportDefault4.js
@@ -12,9 +12,8 @@ var C = (function () {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C;
-exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault5.js b/tests/baselines/reference/multipleExportDefault5.js
index 7ae33aee9f4..5c10a1be95a 100644
--- a/tests/baselines/reference/multipleExportDefault5.js
+++ b/tests/baselines/reference/multipleExportDefault5.js
@@ -5,12 +5,11 @@ export default class C {}
 //// [multipleExportDefault5.js]
 "use strict";
 function bar() { }
-exports.__esModule = true;
 exports["default"] = bar;
 var C = (function () {
     function C() {
     }
     return C;
 }());
-exports.__esModule = true;
 exports["default"] = C;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault6.js b/tests/baselines/reference/multipleExportDefault6.js
index a8b93459e4e..3d990277993 100644
--- a/tests/baselines/reference/multipleExportDefault6.js
+++ b/tests/baselines/reference/multipleExportDefault6.js
@@ -9,11 +9,10 @@ export default {
 
 //// [multipleExportDefault6.js]
 "use strict";
-exports.__esModule = true;
 exports["default"] = {
     lol: 1
 };
-exports.__esModule = true;
 exports["default"] = {
     lol: 2
 };
+exports.__esModule = true;

From 4331de3338f4f5720544335b6c708b5e569f49a2 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Fri, 3 Feb 2017 11:55:34 -0800
Subject: [PATCH 080/127] Update baselines (2)

---
 tests/baselines/reference/nameDelimitedBySlashes.js          | 1 +
 tests/baselines/reference/nameWithFileExtension.js           | 1 +
 tests/baselines/reference/nameWithRelativePaths.js           | 2 ++
 .../baselines/reference/narrowingConstrainedTypeParameter.js | 1 +
 tests/baselines/reference/nestedLoops.js                     | 1 +
 ...rUsingImportExportModuleAugmentationInDeclarationFile2.js | 1 +
 ...rUsingImportExportModuleAugmentationInDeclarationFile3.js | 1 +
 .../reference/noImplicitAnyDestructuringInPrivateMethod.js   | 1 +
 tests/baselines/reference/noImplicitUseStrict_amd.js         | 1 +
 tests/baselines/reference/noImplicitUseStrict_commonjs.js    | 1 +
 tests/baselines/reference/noImplicitUseStrict_umd.js         | 1 +
 tests/baselines/reference/nodeResolution1.js                 | 1 +
 tests/baselines/reference/nodeResolution4.js                 | 1 +
 tests/baselines/reference/nonMergedOverloads.js              | 1 +
 tests/baselines/reference/outFilerootDirModuleNamesAmd.js    | 4 ++--
 tests/baselines/reference/outModuleConcatAmd.js              | 2 ++
 tests/baselines/reference/outModuleTripleSlashRefs.js        | 2 ++
 tests/baselines/reference/parser0_004152.js                  | 1 +
 tests/baselines/reference/parser509546.js                    | 1 +
 tests/baselines/reference/parser509546_1.js                  | 1 +
 tests/baselines/reference/parser509546_2.js                  | 1 +
 tests/baselines/reference/parser618973.js                    | 1 +
 tests/baselines/reference/parserArgumentList1.js             | 1 +
 tests/baselines/reference/parserClass1.js                    | 1 +
 tests/baselines/reference/parserClass2.js                    | 1 +
 tests/baselines/reference/parserExportAssignment7.js         | 1 +
 tests/baselines/reference/parserExportAssignment8.js         | 1 +
 .../baselines/reference/parserModifierOnStatementInBlock1.js | 1 +
 .../baselines/reference/parserModifierOnStatementInBlock3.js | 1 +
 .../reference/pathMappingBasedModuleResolution1_classic.js   | 1 +
 .../reference/pathMappingBasedModuleResolution1_node.js      | 1 +
 .../reference/pathMappingBasedModuleResolution2_classic.js   | 1 +
 .../reference/pathMappingBasedModuleResolution2_node.js      | 1 +
 .../reference/pathMappingBasedModuleResolution3_classic.js   | 3 +++
 .../reference/pathMappingBasedModuleResolution3_node.js      | 2 ++
 .../reference/pathMappingBasedModuleResolution4_classic.js   | 3 +++
 .../reference/pathMappingBasedModuleResolution4_node.js      | 2 ++
 .../reference/pathMappingBasedModuleResolution5_classic.js   | 4 ++++
 .../reference/pathMappingBasedModuleResolution5_node.js      | 3 +++
 .../reference/pathMappingBasedModuleResolution6_classic.js   | 1 +
 .../reference/pathMappingBasedModuleResolution6_node.js      | 1 +
 .../reference/pathMappingBasedModuleResolution7_classic.js   | 2 ++
 .../reference/pathMappingBasedModuleResolution7_node.js      | 2 ++
 .../pathMappingBasedModuleResolution_withExtension.js        | 2 ++
 tests/baselines/reference/prespecializedGenericMembers1.js   | 1 +
 tests/baselines/reference/privacyAccessorDeclFile.js         | 1 +
 .../baselines/reference/privacyCannotNameAccessorDeclFile.js | 3 +++
 .../baselines/reference/privacyCannotNameVarTypeDeclFile.js  | 3 +++
 .../reference/privacyCheckAnonymousFunctionParameter.js      | 1 +
 .../reference/privacyCheckAnonymousFunctionParameter2.js     | 1 +
 ...acyCheckOnTypeParameterReferenceInConstructorParameter.js | 1 +
 tests/baselines/reference/privacyCheckTypeOfFunction.js      | 1 +
 tests/baselines/reference/privacyClass.js                    | 1 +
 .../baselines/reference/privacyClassExtendsClauseDeclFile.js | 1 +
 .../reference/privacyClassImplementsClauseDeclFile.js        | 1 +
 .../privacyFunctionCannotNameParameterTypeDeclFile.js        | 3 +++
 .../reference/privacyFunctionCannotNameReturnTypeDeclFile.js | 3 +++
 .../baselines/reference/privacyFunctionParameterDeclFile.js  | 1 +
 .../baselines/reference/privacyFunctionReturnTypeDeclFile.js | 1 +
 tests/baselines/reference/privacyGetter.js                   | 1 +
 tests/baselines/reference/privacyGloFunc.js                  | 1 +
 tests/baselines/reference/privacyImport.js                   | 1 +
 tests/baselines/reference/privacyImportParseErrors.js        | 1 +
 tests/baselines/reference/privacyInterface.js                | 1 +
 .../privacyTopLevelAmbientExternalModuleImportWithExport.js  | 3 +++
 ...rivacyTopLevelAmbientExternalModuleImportWithoutExport.js | 3 +++
 .../privacyTopLevelInternalReferenceImportWithExport.js      | 1 +
 .../privacyTopLevelInternalReferenceImportWithoutExport.js   | 1 +
 tests/baselines/reference/privacyTypeParameterOfFunction.js  | 1 +
 .../reference/privacyTypeParameterOfFunctionDeclFile.js      | 1 +
 tests/baselines/reference/privacyTypeParametersOfClass.js    | 1 +
 .../reference/privacyTypeParametersOfClassDeclFile.js        | 1 +
 .../baselines/reference/privacyTypeParametersOfInterface.js  | 1 +
 .../reference/privacyTypeParametersOfInterfaceDeclFile.js    | 1 +
 tests/baselines/reference/privacyVar.js                      | 1 +
 tests/baselines/reference/privacyVarDeclFile.js              | 1 +
 tests/baselines/reference/privatePropertyUsingObjectType.js  | 1 +
 tests/baselines/reference/protoAsIndexInIndexExpression.js   | 1 +
 tests/baselines/reference/reExportDefaultExport.js           | 2 +-
 tests/baselines/reference/reExportUndefined2.js              | 1 +
 .../recursiveExportAssignmentAndFindAliasedType1.js          | 1 +
 .../recursiveExportAssignmentAndFindAliasedType2.js          | 1 +
 .../recursiveExportAssignmentAndFindAliasedType3.js          | 1 +
 .../recursiveExportAssignmentAndFindAliasedType4.js          | 1 +
 .../recursiveExportAssignmentAndFindAliasedType5.js          | 1 +
 .../recursiveExportAssignmentAndFindAliasedType6.js          | 1 +
 .../recursiveExportAssignmentAndFindAliasedType7.js          | 1 +
 .../baselines/reference/relativeNamesInClassicResolution.js  | 1 +
 .../baselines/reference/requireAsFunctionInExternalModule.js | 3 ++-
 tests/baselines/reference/scannerClass2.js                   | 1 +
 .../shorthandOfExportedEntity01_targetES2015_CommonJS.js     | 1 +
 .../shorthandOfExportedEntity02_targetES5_CommonJS.js        | 1 +
 .../reference/shorthandPropertyAssignmentInES6Module.js      | 1 +
 tests/baselines/reference/staticInstanceResolution3.js       | 1 +
 tests/baselines/reference/staticInstanceResolution5.js       | 1 +
 .../staticMethodWithTypeParameterExtendsClauseDeclFile.js    | 1 +
 tests/baselines/reference/topLevelExports.js                 | 1 +
 tests/baselines/reference/topLevelFileModule.js              | 1 +
 tests/baselines/reference/tsxAttributeResolution10.js        | 1 +
 tests/baselines/reference/tsxAttributeResolution9.js         | 1 +
 .../reference/tsxCorrectlyParseLessThanComparison1.js        | 1 +
 tests/baselines/reference/tsxDefaultImports.js               | 2 +-
 tests/baselines/reference/tsxDynamicTagName5.js              | 1 +
 tests/baselines/reference/tsxDynamicTagName7.js              | 1 +
 tests/baselines/reference/tsxDynamicTagName8.js              | 1 +
 tests/baselines/reference/tsxDynamicTagName9.js              | 1 +
 tests/baselines/reference/tsxElementResolution19.js          | 1 +
 tests/baselines/reference/tsxExternalModuleEmit1.js          | 2 ++
 ...bjectCreationExpressionWithUndefinedCallResolutionData.js | 1 +
 tests/baselines/reference/typeGuardsAsAssertions.js          | 1 +
 tests/baselines/reference/typeGuardsInExternalModule.js      | 1 +
 tests/baselines/reference/typeInferenceLiteralUnion.js       | 1 +
 tests/baselines/reference/typePredicateInLoop.js             | 1 +
 tests/baselines/reference/typeReferenceDirectives7.js        | 1 +
 tests/baselines/reference/typeReferenceDirectives8.js        | 2 ++
 tests/baselines/reference/typeReferenceDirectives9.js        | 2 ++
 tests/baselines/reference/typeofANonExportedType.js          | 1 +
 tests/baselines/reference/typeofAmbientExternalModules.js    | 1 +
 tests/baselines/reference/typeofAnExportedType.js            | 1 +
 tests/baselines/reference/typeofExternalModules.js           | 1 +
 tests/baselines/reference/typingsLookup4.js                  | 1 +
 tests/baselines/reference/umd-errors.js                      | 1 +
 tests/baselines/reference/unclosedExportClause01.js          | 5 +++++
 tests/baselines/reference/unclosedExportClause02.js          | 1 +
 tests/baselines/reference/unusedImports1.js                  | 1 +
 tests/baselines/reference/unusedImports11.js                 | 2 +-
 tests/baselines/reference/unusedImports12.js                 | 2 +-
 tests/baselines/reference/unusedImports13.js                 | 1 +
 tests/baselines/reference/unusedImports14.js                 | 1 +
 tests/baselines/reference/unusedImports15.js                 | 1 +
 tests/baselines/reference/unusedImports16.js                 | 1 +
 tests/baselines/reference/unusedImports2.js                  | 1 +
 tests/baselines/reference/unusedImports3.js                  | 1 +
 tests/baselines/reference/unusedImports4.js                  | 1 +
 tests/baselines/reference/unusedImports5.js                  | 1 +
 tests/baselines/reference/unusedImports6.js                  | 2 +-
 tests/baselines/reference/unusedImports7.js                  | 2 +-
 tests/baselines/reference/unusedImports8.js                  | 1 +
 tests/baselines/reference/unusedImports9.js                  | 1 +
 tests/baselines/reference/unusedLocalsAndObjectSpread2.js    | 1 +
 .../reference/unusedLocalsAndParametersOverloadSignatures.js | 1 +
 tests/baselines/reference/unusedVariablesinModules1.js       | 1 +
 tests/baselines/reference/useStrictLikePrologueString01.js   | 1 +
 tests/baselines/reference/varArgsOnConstructorTypes.js       | 1 +
 tests/baselines/reference/visibilityOfTypeParameters.js      | 1 +
 tests/baselines/reference/voidAsNonAmbiguousReturnType.js    | 1 +
 tests/baselines/reference/withExportDecl.js                  | 1 +
 tests/baselines/reference/withImportDecl.js                  | 1 +
 148 files changed, 186 insertions(+), 9 deletions(-)

diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js
index 93cf4e29d49..36b8e0e8d27 100644
--- a/tests/baselines/reference/nameDelimitedBySlashes.js
+++ b/tests/baselines/reference/nameDelimitedBySlashes.js
@@ -11,6 +11,7 @@ var x = foo.foo + 42;
 //// [foo_0.js]
 "use strict";
 exports.foo = 42;
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 var foo = require("./test/foo_0");
diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js
index 156d1b03a1a..86c384cdbdf 100644
--- a/tests/baselines/reference/nameWithFileExtension.js
+++ b/tests/baselines/reference/nameWithFileExtension.js
@@ -11,6 +11,7 @@ var x = foo.foo + 42;
 //// [foo_0.js]
 "use strict";
 exports.foo = 42;
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 var foo = require("./foo_0.js");
diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js
index d8b0eed43cf..57ff852ec35 100644
--- a/tests/baselines/reference/nameWithRelativePaths.js
+++ b/tests/baselines/reference/nameWithRelativePaths.js
@@ -26,12 +26,14 @@ if(foo2.M2.x){
 //// [foo_0.js]
 "use strict";
 exports.foo = 42;
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 function f() {
     return 42;
 }
 exports.f = f;
+exports.__esModule = true;
 //// [foo_2.js]
 "use strict";
 var M2;
diff --git a/tests/baselines/reference/narrowingConstrainedTypeParameter.js b/tests/baselines/reference/narrowingConstrainedTypeParameter.js
index 3107585d941..f148dc22ea1 100644
--- a/tests/baselines/reference/narrowingConstrainedTypeParameter.js
+++ b/tests/baselines/reference/narrowingConstrainedTypeParameter.js
@@ -30,3 +30,4 @@ function speak(pet, voice) {
     return voice(pet);
 }
 exports.speak = speak;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nestedLoops.js b/tests/baselines/reference/nestedLoops.js
index c29311c38de..f4aae6dc91c 100644
--- a/tests/baselines/reference/nestedLoops.js
+++ b/tests/baselines/reference/nestedLoops.js
@@ -45,3 +45,4 @@ var Test = (function () {
     return Test;
 }());
 exports.Test = Test;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
index b56988de44c..7c4e2185496 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
@@ -11,3 +11,4 @@ declare var a: number;
 //// [1.js]
 "use strict";
 exports.j = "hello"; // error
+exports.__esModule = true;
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
index 8c75af24034..ed001833594 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
@@ -12,3 +12,4 @@ export var j = "hello";  // error
 //// [1.js]
 "use strict";
 exports.j = "hello"; // error
+exports.__esModule = true;
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
index 2d7d930703c..85553b5265f 100644
--- a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
+++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
@@ -23,6 +23,7 @@ var Bar = (function () {
     return Bar;
 }());
 exports.Bar = Bar;
+exports.__esModule = true;
 
 
 //// [noImplicitAnyDestructuringInPrivateMethod.d.ts]
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.js b/tests/baselines/reference/noImplicitUseStrict_amd.js
index ac15f548c47..8b3e7628e4e 100644
--- a/tests/baselines/reference/noImplicitUseStrict_amd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.js
@@ -5,4 +5,5 @@ export var x = 0;
 //// [noImplicitUseStrict_amd.js]
 define(["require", "exports"], function (require, exports) {
     exports.x = 0;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.js b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
index 9c726938f04..30d507c8fc2 100644
--- a/tests/baselines/reference/noImplicitUseStrict_commonjs.js
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
@@ -4,3 +4,4 @@ export var x = 0;
 
 //// [noImplicitUseStrict_commonjs.js]
 exports.x = 0;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js
index eafb8246bf7..b48c5fde9a5 100644
--- a/tests/baselines/reference/noImplicitUseStrict_umd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.js
@@ -13,4 +13,5 @@ export var x = 0;
     }
 })(function (require, exports) {
     exports.x = 0;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/nodeResolution1.js b/tests/baselines/reference/nodeResolution1.js
index deda55cef0f..a48eb71c8bc 100644
--- a/tests/baselines/reference/nodeResolution1.js
+++ b/tests/baselines/reference/nodeResolution1.js
@@ -10,5 +10,6 @@ import y = require("./a");
 //// [a.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/nodeResolution4.js b/tests/baselines/reference/nodeResolution4.js
index 7678b7c1c5c..7aac08fe6d0 100644
--- a/tests/baselines/reference/nodeResolution4.js
+++ b/tests/baselines/reference/nodeResolution4.js
@@ -15,5 +15,6 @@ import y = require("./a");
 var x = 1;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/nonMergedOverloads.js b/tests/baselines/reference/nonMergedOverloads.js
index a577329f1cf..8183e02d0f2 100644
--- a/tests/baselines/reference/nonMergedOverloads.js
+++ b/tests/baselines/reference/nonMergedOverloads.js
@@ -11,3 +11,4 @@ var f = 10;
 function f() {
 }
 exports.f = f;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
index 5b99f76a5b9..47d356e3bf1 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
+++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
@@ -14,14 +14,14 @@ export default function foo() { new Foo(); }
 define("b", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
     function foo() { new a_1.default(); }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("a", ["require", "exports", "b"], function (require, exports, b_1) {
     "use strict";
     class Foo {
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = Foo;
     b_1.default();
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js
index b30cf93786c..0c2618e2a9e 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -27,6 +27,7 @@ define("ref/a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
     "use strict";
@@ -38,6 +39,7 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
         return B;
     }(a_1.A));
     exports.B = B;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //# sourceMappingURL=all.js.map
 
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js
index 33e970af54b..aee6038f988 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -56,6 +56,7 @@ define("ref/a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
     "use strict";
@@ -67,6 +68,7 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
         return B;
     }(a_1.A));
     exports.B = B;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //# sourceMappingURL=all.js.map
 
diff --git a/tests/baselines/reference/parser0_004152.js b/tests/baselines/reference/parser0_004152.js
index 333b64811c8..85a743c6faa 100644
--- a/tests/baselines/reference/parser0_004152.js
+++ b/tests/baselines/reference/parser0_004152.js
@@ -14,3 +14,4 @@ var Game = (function () {
     return Game;
 }());
 exports.Game = Game;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parser509546.js b/tests/baselines/reference/parser509546.js
index ceaf9b3572c..4b95b2719e6 100644
--- a/tests/baselines/reference/parser509546.js
+++ b/tests/baselines/reference/parser509546.js
@@ -12,3 +12,4 @@ var Logger = (function () {
     return Logger;
 }());
 exports.Logger = Logger;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parser509546_1.js b/tests/baselines/reference/parser509546_1.js
index 9d07172c509..2b3afe47ac9 100644
--- a/tests/baselines/reference/parser509546_1.js
+++ b/tests/baselines/reference/parser509546_1.js
@@ -12,3 +12,4 @@ var Logger = (function () {
     return Logger;
 }());
 exports.Logger = Logger;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parser509546_2.js b/tests/baselines/reference/parser509546_2.js
index b8822b52541..071c57efb87 100644
--- a/tests/baselines/reference/parser509546_2.js
+++ b/tests/baselines/reference/parser509546_2.js
@@ -14,3 +14,4 @@ var Logger = (function () {
     return Logger;
 }());
 exports.Logger = Logger;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parser618973.js b/tests/baselines/reference/parser618973.js
index df9b2e4433a..2898281f493 100644
--- a/tests/baselines/reference/parser618973.js
+++ b/tests/baselines/reference/parser618973.js
@@ -14,3 +14,4 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserArgumentList1.js b/tests/baselines/reference/parserArgumentList1.js
index 222b2c5ac89..167903245c1 100644
--- a/tests/baselines/reference/parserArgumentList1.js
+++ b/tests/baselines/reference/parserArgumentList1.js
@@ -13,3 +13,4 @@ function removeClass(node, className) {
     });
 }
 exports.removeClass = removeClass;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserClass1.js b/tests/baselines/reference/parserClass1.js
index 50d2fb179dc..97b8a7b0562 100644
--- a/tests/baselines/reference/parserClass1.js
+++ b/tests/baselines/reference/parserClass1.js
@@ -24,3 +24,4 @@ var NullLogger = (function () {
     return NullLogger;
 }());
 exports.NullLogger = NullLogger;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserClass2.js b/tests/baselines/reference/parserClass2.js
index c1d3b87e892..d1df19e6163 100644
--- a/tests/baselines/reference/parserClass2.js
+++ b/tests/baselines/reference/parserClass2.js
@@ -17,3 +17,4 @@ var LoggerAdapter = (function () {
     return LoggerAdapter;
 }());
 exports.LoggerAdapter = LoggerAdapter;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserExportAssignment7.js b/tests/baselines/reference/parserExportAssignment7.js
index dd6750bec32..8f9d4fe84d9 100644
--- a/tests/baselines/reference/parserExportAssignment7.js
+++ b/tests/baselines/reference/parserExportAssignment7.js
@@ -12,3 +12,4 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserExportAssignment8.js b/tests/baselines/reference/parserExportAssignment8.js
index 07ff257fb61..1334db7782a 100644
--- a/tests/baselines/reference/parserExportAssignment8.js
+++ b/tests/baselines/reference/parserExportAssignment8.js
@@ -12,3 +12,4 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.js b/tests/baselines/reference/parserModifierOnStatementInBlock1.js
index 352ee0cc511..e07e3ee9043 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock1.js
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.js
@@ -10,3 +10,4 @@ function foo() {
     export var x = this;
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.js b/tests/baselines/reference/parserModifierOnStatementInBlock3.js
index 9f2cdf6850f..8d4f29558c8 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock3.js
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.js
@@ -12,3 +12,4 @@ function foo() {
     }
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js
index 1a1bd387dce..58199832ee6 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js
@@ -6,4 +6,5 @@ export var x = 1;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js
index 5fcaa23b976..d6692582fed 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js
@@ -5,3 +5,4 @@ export var x = 1;
 //// [f1.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js
index 52dab845bb2..3e6e3a22d5c 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js
@@ -5,4 +5,5 @@ export var x = 1;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js
index 8c8b5c9a926..955fb4cf7ae 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js
@@ -4,3 +4,4 @@ export var x = 1;
 //// [file1.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
index 15867b085ea..9713cae56f5 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
@@ -23,16 +23,19 @@ export var y = 100;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.y = 100;
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) {
     "use strict";
     exports.x = file3_1.x + file4_1.y;
+    exports.__esModule = true;
 });
 //// [file1.js]
 // baseUrl set via command line
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
index cbff6087530..966f50202c0 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
@@ -22,11 +22,13 @@ export var y: number;
 //// [file3.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 var file3_1 = require("./file3"); // found with baseurl
 var file4_1 = require("file4"); // found with fallback
 exports.x = file3_1.x + file4_1.y;
+exports.__esModule = true;
 //// [file1.js]
 // baseUrl set via command line
 "use strict";
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
index c1de8cea6c9..25ca74cc848 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
@@ -20,16 +20,19 @@ export var y = 100;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.y = 100;
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) {
     "use strict";
     exports.x = file3_1.x + file4_1.y;
+    exports.__esModule = true;
 });
 //// [file1.js]
 define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) {
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
index c5a08d55d8b..8f8fe447550 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
@@ -19,11 +19,13 @@ export var y: number;
 //// [file3.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 var file3_1 = require("./file3"); // found with baseurl
 var file4_1 = require("file4"); // found with fallback
 exports.x = file3_1.x + file4_1.y;
+exports.__esModule = true;
 //// [file1.js]
 "use strict";
 var file2_1 = require("folder2/file2");
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
index 24297f85e35..9b9054390ed 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
@@ -29,21 +29,25 @@ export var z1 = 1;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.y = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.z = 1;
+    exports.__esModule = true;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.z1 = 1;
+    exports.__esModule = true;
 });
 //// [file1.js]
 define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) {
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
index 1958800f918..fdf2c8edbaf 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
@@ -28,12 +28,15 @@ export var z1 = 1;
 //// [file1.js]
 "use strict";
 exports.x = 1;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 exports.y = 1;
+exports.__esModule = true;
 //// [file4.js]
 "use strict";
 exports.z1 = 1;
+exports.__esModule = true;
 //// [file1.js]
 "use strict";
 var file1_1 = require("folder2/file1");
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
index 1e8f8807e2c..c871f804b05 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
@@ -15,6 +15,7 @@ export {x} from "../file2";
 define(["require", "exports", "../file2"], function (require, exports, file2_1) {
     "use strict";
     exports.x = file2_1.x;
+    exports.__esModule = true;
 });
 //// [file1.js]
 define(["require", "exports", "./project/file3"], function (require, exports, file3_1) {
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
index 6db3fecf83f..5ae4aa284c0 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
@@ -15,6 +15,7 @@ export {x} from "../file2";
 "use strict";
 var file2_1 = require("../file2");
 exports.x = file2_1.x;
+exports.__esModule = true;
 //// [file1.js]
 "use strict";
 var file3_1 = require("./project/file3");
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
index 5670f41be0f..3acc7ca8740 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
@@ -31,11 +31,13 @@ export let y: number;
 //// [module2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "module1", "templates/module2", "../file3"], function (require, exports, module1_1, module2_1, file3_1) {
     "use strict";
     exports.x = module1_1.a + module2_1.b + file3_1.x;
+    exports.__esModule = true;
 });
 //// [file1.js]
 define(["require", "exports", "./project/file2", "module3"], function (require, exports, file2_1, module3_1) {
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
index 3be48cfc85c..a9870d0cbc6 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
@@ -30,12 +30,14 @@ export let y: number;
 
 //// [module2.js]
 "use strict";
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 var module1_1 = require("module1");
 var module2_1 = require("templates/module2");
 var file3_1 = require("../file3");
 exports.x = module1_1.a + module2_1.b + file3_1.x;
+exports.__esModule = true;
 //// [file1.js]
 "use strict";
 var file2_1 = require("./project/file2");
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
index 06f6b50e4a0..55ffb41de13 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
@@ -16,9 +16,11 @@ import { bar } from "bar";
 "use strict";
 function foo() { }
 exports.foo = foo;
+exports.__esModule = true;
 //// [bar.js]
 "use strict";
 function bar() { }
 exports.bar = bar;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
diff --git a/tests/baselines/reference/prespecializedGenericMembers1.js b/tests/baselines/reference/prespecializedGenericMembers1.js
index dd6bd2a2dc6..cdfcaad8743 100644
--- a/tests/baselines/reference/prespecializedGenericMembers1.js
+++ b/tests/baselines/reference/prespecializedGenericMembers1.js
@@ -39,3 +39,4 @@ var catThing = {
     barry: cat
 };
 var catBag = new CatBag(catThing);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js
index 6fed8b8f082..a85eb6de60c 100644
--- a/tests/baselines/reference/privacyAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyAccessorDeclFile.js
@@ -2498,6 +2498,7 @@ var privateModule;
         return privateClassWithPrivateModuleSetAccessorTypes;
     }());
 })(privateModule || (privateModule = {}));
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [privacyAccessorDeclFile_GlobalFile.js]
 var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
index 4121dbdd51d..cbec9edb154 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
@@ -164,6 +164,7 @@ var SpecializedWidget;
     }
     SpecializedWidget.createWidget2 = createWidget2;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [privacyCannotNameAccessorDeclFile_exporter.js]
 "use strict";
 ///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
@@ -185,6 +186,7 @@ function createExportedWidget4() {
     return Widgets1.SpecializedGlobalWidget.createWidget4();
 }
 exports.createExportedWidget4 = createExportedWidget4;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [privacyCannotNameAccessorDeclFile_consumer.js]
 "use strict";
 var exporter = require("./privacyCannotNameAccessorDeclFile_exporter");
@@ -378,6 +380,7 @@ var privateClassWithPrivateModuleGetAccessorTypes = (function () {
     });
     return privateClassWithPrivateModuleGetAccessorTypes;
 }());
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts]
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
index c139b6279fd..7f3ef5512ae 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
@@ -128,6 +128,7 @@ var SpecializedWidget;
     }
     SpecializedWidget.createWidget2 = createWidget2;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
+exports.__esModule = true;
 //// [privacyCannotNameVarTypeDeclFile_exporter.js]
 "use strict";
 ///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
@@ -149,6 +150,7 @@ function createExportedWidget4() {
     return Widgets1.SpecializedGlobalWidget.createWidget4();
 }
 exports.createExportedWidget4 = createExportedWidget4;
+exports.__esModule = true;
 //// [privacyCannotNameVarTypeDeclFile_consumer.js]
 "use strict";
 var exporter = require("./privacyCannotNameVarTypeDeclFile_exporter");
@@ -206,6 +208,7 @@ privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.cre
 privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4();
 var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2();
 var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
+exports.__esModule = true;
 
 
 //// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts]
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
index 92be6f737cc..e150564b747 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
@@ -31,6 +31,7 @@ var Query;
         });
     }
 })(Query || (Query = {}));
+exports.__esModule = true;
 
 
 //// [privacyCheckAnonymousFunctionParameter.d.ts]
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
index 1da2ec03ed7..3dee88c4f71 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
             Q.foo(null);
         }
     })(Q || (Q = {}));
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
index 7d4db36ee99..faa22fe190f 100644
--- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
+++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
@@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js
index b810dafcca7..40cff7997a7 100644
--- a/tests/baselines/reference/privacyCheckTypeOfFunction.js
+++ b/tests/baselines/reference/privacyCheckTypeOfFunction.js
@@ -10,3 +10,4 @@ export var b = foo;
 function foo() {
 }
 exports.b = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js
index 4e79f019e5d..4b08cf22e4f 100644
--- a/tests/baselines/reference/privacyClass.js
+++ b/tests/baselines/reference/privacyClass.js
@@ -430,3 +430,4 @@ var glo_C12_public = (function (_super) {
     return glo_C12_public;
 }(glo_c_private));
 exports.glo_C12_public = glo_C12_public;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
index 3e5b20923df..0c500f0ed28 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -289,6 +289,7 @@ var publicClassExtendingFromPrivateModuleClass = (function (_super) {
     return publicClassExtendingFromPrivateModuleClass;
 }(privateModule.publicClassInPrivateModule));
 exports.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
+exports.__esModule = true;
 //// [privacyClassExtendsClauseDeclFile_GlobalFile.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
index 15de9a16674..595889593cd 100644
--- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
@@ -207,6 +207,7 @@ var publicClassImplementingFromPrivateModuleInterface = (function () {
     return publicClassImplementingFromPrivateModuleInterface;
 }());
 exports.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface;
+exports.__esModule = true;
 //// [privacyClassImplementsClauseDeclFile_GlobalFile.js]
 var publicModuleInGlobal;
 (function (publicModuleInGlobal) {
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
index d8bfef7060e..3304fbd1df3 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
@@ -184,6 +184,7 @@ var SpecializedWidget;
     }
     SpecializedWidget.createWidget2 = createWidget2;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
+exports.__esModule = true;
 //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js]
 "use strict";
 ///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
@@ -205,6 +206,7 @@ function createExportedWidget4() {
     return Widgets1.SpecializedGlobalWidget.createWidget4();
 }
 exports.createExportedWidget4 = createExportedWidget4;
+exports.__esModule = true;
 //// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js]
 "use strict";
 var exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter");
@@ -392,6 +394,7 @@ function privateFunctionWithPrivateModuleParameterTypes(param) {
 function privateFunctionWithPrivateModuleParameterTypes1(param) {
     if (param === void 0) { param = exporter.createExportedWidget4(); }
 }
+exports.__esModule = true;
 
 
 //// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts]
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
index 3b1ffb487ff..c354ed68321 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
@@ -191,6 +191,7 @@ var SpecializedWidget;
     }
     SpecializedWidget.createWidget2 = createWidget2;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
+exports.__esModule = true;
 //// [privacyFunctionReturnTypeDeclFile_exporter.js]
 "use strict";
 ///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
@@ -212,6 +213,7 @@ function createExportedWidget4() {
     return Widgets1.SpecializedGlobalWidget.createWidget4();
 }
 exports.createExportedWidget4 = createExportedWidget4;
+exports.__esModule = true;
 //// [privacyFunctionReturnTypeDeclFile_consumer.js]
 "use strict";
 var exporter = require("./privacyFunctionReturnTypeDeclFile_exporter");
@@ -349,6 +351,7 @@ function privateFunctionWithPrivateModuleReturnTypes() {
 function privateFunctionWithPrivateModuleReturnTypes1() {
     return exporter.createExportedWidget4();
 }
+exports.__esModule = true;
 
 
 //// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts]
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
index e8fff791a0e..c4968d84371 100644
--- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
@@ -1027,6 +1027,7 @@ var privateModule;
     function privateFunctionWithPrivateModuleParameterTypes(param) {
     }
 })(privateModule || (privateModule = {}));
+exports.__esModule = true;
 //// [privacyFunctionParameterDeclFile_GlobalFile.js]
 var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
index d4265b1c352..132c9e6a30c 100644
--- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
@@ -1819,6 +1819,7 @@ var privateModule;
         return new privateModule.publicClass();
     }
 })(privateModule || (privateModule = {}));
+exports.__esModule = true;
 //// [privacyFunctionReturnTypeDeclFile_GlobalFile.js]
 var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js
index 37d89442e62..fd8b8a3c684 100644
--- a/tests/baselines/reference/privacyGetter.js
+++ b/tests/baselines/reference/privacyGetter.js
@@ -504,4 +504,5 @@ define(["require", "exports"], function (require, exports) {
         });
         return C8_private;
     }());
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js
index 153fa57e3d3..8059f3da545 100644
--- a/tests/baselines/reference/privacyGloFunc.js
+++ b/tests/baselines/reference/privacyGloFunc.js
@@ -983,4 +983,5 @@ define(["require", "exports"], function (require, exports) {
         return new C5_private(); //error
     }
     exports.f12_public = f12_public;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js
index 2915b6e5f24..3dcb212af95 100644
--- a/tests/baselines/reference/privacyImport.js
+++ b/tests/baselines/reference/privacyImport.js
@@ -701,3 +701,4 @@ var m3;
         //import m2 = require("use_glo_M1_public");
     })(m4 || (m4 = {}));
 })(m3 = exports.m3 || (exports.m3 = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js
index b705bbe1170..b7cfd542470 100644
--- a/tests/baselines/reference/privacyImportParseErrors.js
+++ b/tests/baselines/reference/privacyImportParseErrors.js
@@ -575,3 +575,4 @@ var m3;
         var a = 10;
     })(m4 || (m4 = {}));
 })(m3 = exports.m3 || (exports.m3 = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js
index 59e10aca7ff..4b78192dc97 100644
--- a/tests/baselines/reference/privacyInterface.js
+++ b/tests/baselines/reference/privacyInterface.js
@@ -311,3 +311,4 @@ var C6_private = (function () {
     }
     return C6_private;
 }());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
index d8bf7c85d12..ae53d1bc51c 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
@@ -59,6 +59,7 @@ var c_public = (function () {
     return c_public;
 }());
 exports.c_public = c_public;
+exports.__esModule = true;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.js]
 "use strict";
 var c_public = (function () {
@@ -67,6 +68,7 @@ var c_public = (function () {
     return c_public;
 }());
 exports.c_public = c_public;
+exports.__esModule = true;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js]
 "use strict";
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
@@ -85,6 +87,7 @@ var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private()
 exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
 var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
 exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
+exports.__esModule = true;
 
 
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts]
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
index 7f44dbe6257..af8b2fd9eae 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
@@ -60,6 +60,7 @@ define(["require", "exports"], function (require, exports) {
         return c_public;
     }());
     exports.c_public = c_public;
+    exports.__esModule = true;
 });
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js]
 define(["require", "exports"], function (require, exports) {
@@ -70,6 +71,7 @@ define(["require", "exports"], function (require, exports) {
         return c_public;
     }());
     exports.c_public = c_public;
+    exports.__esModule = true;
 });
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js]
 define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleImportWithoutExport_require"], function (require, exports, im_private_mi_private, im_private_mu_private, im_private_mi_public) {
@@ -83,6 +85,7 @@ define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleIm
     exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
     var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
     exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
index a01f1ef611f..d26782ef2dd 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
@@ -198,4 +198,5 @@ define(["require", "exports"], function (require, exports) {
     var privateUse_im_public_mi_public = new exports.im_public_mi_public.c();
     exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c();
     var privateUse_im_public_mu_public;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
index 2554085b94b..402e30c17a7 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
@@ -199,4 +199,5 @@ define(["require", "exports"], function (require, exports) {
     var privateUse_im_private_mi_public = new im_private_mi_public.c();
     exports.publicUse_im_private_mi_public = new im_private_mi_public.c();
     var privateUse_im_private_mu_public;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js
index 84034362fac..71683805c05 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.js
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.js
@@ -244,3 +244,4 @@ function publicFunctionWithPublicTypeParametersWithoutExtends() {
 exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
 function privateFunctionWithPublicTypeParametersWithoutExtends() {
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
index 3eb6027b050..bc1be54d2e5 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
@@ -815,3 +815,4 @@ var privateModule;
     function privateFunctionWithPublicTypeParametersWithoutExtends() {
     }
 })(privateModule || (privateModule = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js
index 3d28e145b32..50fe3b8b456 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClass.js
+++ b/tests/baselines/reference/privacyTypeParametersOfClass.js
@@ -108,3 +108,4 @@ var privateClassWithPublicTypeParametersWithoutExtends = (function () {
     };
     return privateClassWithPublicTypeParametersWithoutExtends;
 }());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
index 3ccdec46d7c..6f012c1b34e 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
@@ -382,3 +382,4 @@ var privateModule;
         return privateClassWithPublicTypeParametersWithoutExtends;
     }());
 })(privateModule || (privateModule = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js
index a330ea76e13..e7fb531c773 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.js
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.js
@@ -82,3 +82,4 @@ var publicClassT = (function () {
     return publicClassT;
 }());
 exports.publicClassT = publicClassT;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
index 7c92ed701d9..d4929d9b329 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
@@ -264,3 +264,4 @@ var privateModule;
     }());
     privateModule.publicClassInPrivateModuleT = publicClassInPrivateModuleT;
 })(privateModule || (privateModule = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js
index 0d133743709..f5ed884807a 100644
--- a/tests/baselines/reference/privacyVar.js
+++ b/tests/baselines/reference/privacyVar.js
@@ -332,3 +332,4 @@ var glo_v21_private = new glo_C1_public();
 exports.glo_v22_public = new glo_C1_public();
 var glo_v23_private = new glo_C2_private();
 exports.glo_v24_public = new glo_C2_private(); // error
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js
index 102aeea58a4..ab62eccebc9 100644
--- a/tests/baselines/reference/privacyVarDeclFile.js
+++ b/tests/baselines/reference/privacyVarDeclFile.js
@@ -574,6 +574,7 @@ var privateModule;
     }());
     var privateVarWithPrivateModulePropertyTypes;
 })(privateModule || (privateModule = {}));
+exports.__esModule = true;
 //// [privacyVarDeclFile_GlobalFile.js]
 var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.js b/tests/baselines/reference/privatePropertyUsingObjectType.js
index 0c16d8bafff..2b058047aaa 100644
--- a/tests/baselines/reference/privatePropertyUsingObjectType.js
+++ b/tests/baselines/reference/privatePropertyUsingObjectType.js
@@ -18,4 +18,5 @@ define(["require", "exports"], function (require, exports) {
         return FilterManager;
     }());
     exports.FilterManager = FilterManager;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.js b/tests/baselines/reference/protoAsIndexInIndexExpression.js
index 2c9b0f7a7c7..7805cebbee3 100644
--- a/tests/baselines/reference/protoAsIndexInIndexExpression.js
+++ b/tests/baselines/reference/protoAsIndexInIndexExpression.js
@@ -21,6 +21,7 @@ class C {
 
 //// [protoAsIndexInIndexExpression_0.js]
 "use strict";
+exports.__esModule = true;
 //// [protoAsIndexInIndexExpression_1.js]
 ///<reference path='protoAsIndexInIndexExpression_0.ts'/>
 var EntityPrototype = undefined;
diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js
index da50a3a7115..fdf24fbeb16 100644
--- a/tests/baselines/reference/reExportDefaultExport.js
+++ b/tests/baselines/reference/reExportDefaultExport.js
@@ -18,9 +18,9 @@ foo();
 "use strict";
 function f() {
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
 exports.f = f;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
 var m1_1 = require("./m1");
diff --git a/tests/baselines/reference/reExportUndefined2.js b/tests/baselines/reference/reExportUndefined2.js
index 53b78599cbe..5054ea672c9 100644
--- a/tests/baselines/reference/reExportUndefined2.js
+++ b/tests/baselines/reference/reExportUndefined2.js
@@ -14,6 +14,7 @@ use(undefined);
 "use strict";
 var undefined;
 exports.undefined = undefined;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 var a_1 = require("./a");
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
index d759bc2f296..87ef9fe8671 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
@@ -29,4 +29,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
index 7704b38f68d..c38c38ea325 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
@@ -33,4 +33,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
index a46be3bdafc..178d8b3b3ee 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
@@ -37,4 +37,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
index 8ccd6ecf560..893c4ec990f 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
@@ -31,4 +31,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
index 4602ed554e5..39cb223d1a0 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
@@ -40,4 +40,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
index d3487519218..d8541df0c2c 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
@@ -49,4 +49,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
index 9a29c2bf949..01f818d5bb2 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
@@ -51,4 +51,5 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/relativeNamesInClassicResolution.js b/tests/baselines/reference/relativeNamesInClassicResolution.js
index a6c5a06ea3d..3d24d8428f5 100644
--- a/tests/baselines/reference/relativeNamesInClassicResolution.js
+++ b/tests/baselines/reference/relativeNamesInClassicResolution.js
@@ -15,4 +15,5 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/requireAsFunctionInExternalModule.js b/tests/baselines/reference/requireAsFunctionInExternalModule.js
index a8b14db3138..52b40608608 100644
--- a/tests/baselines/reference/requireAsFunctionInExternalModule.js
+++ b/tests/baselines/reference/requireAsFunctionInExternalModule.js
@@ -19,10 +19,10 @@ hello();
 //// [c.js]
 "use strict";
 function require(a) { }
-exports.__esModule = true;
 exports["default"] = require;
 function has(a) { return true; }
 exports.has = has;
+exports.__esModule = true;
 //// [m.js]
 "use strict";
 var c_1 = require("./c");
@@ -31,6 +31,7 @@ exports.hello = hello;
 if (c_1.has('ember-debug')) {
     c_1["default"]('ember-debug');
 }
+exports.__esModule = true;
 //// [m2.js]
 "use strict";
 var m_1 = require("./m");
diff --git a/tests/baselines/reference/scannerClass2.js b/tests/baselines/reference/scannerClass2.js
index 640f0952bb9..96dd8c0b283 100644
--- a/tests/baselines/reference/scannerClass2.js
+++ b/tests/baselines/reference/scannerClass2.js
@@ -17,3 +17,4 @@ var LoggerAdapter = (function () {
     return LoggerAdapter;
 }());
 exports.LoggerAdapter = LoggerAdapter;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js
index c1728d68e9b..2e90d3a4474 100644
--- a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js
+++ b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js
@@ -14,6 +14,7 @@ function foo() {
     const x = { test: exports.test };
 }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [shorthandOfExportedEntity01_targetES2015_CommonJS.d.ts]
diff --git a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js
index e89a413463e..09130120de4 100644
--- a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js
+++ b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js
@@ -14,6 +14,7 @@ function foo() {
     var x = { test: exports.test };
 }
 exports.foo = foo;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [shorthandOfExportedEntity02_targetES5_CommonJS.d.ts]
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
index fad9c37ea8f..be20fb287ab 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
+++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
@@ -18,6 +18,7 @@ use(foo);
 //// [existingModule.js]
 "use strict";
 exports.x = 1;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 const existingModule_1 = require("./existingModule");
diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js
index c480fd33285..f77980caf2f 100644
--- a/tests/baselines/reference/staticInstanceResolution3.js
+++ b/tests/baselines/reference/staticInstanceResolution3.js
@@ -23,6 +23,7 @@ var Promise = (function () {
     return Promise;
 }());
 exports.Promise = Promise;
+exports.__esModule = true;
 //// [staticInstanceResolution3_1.js]
 "use strict";
 ///<reference path='staticInstanceResolution3_0.ts'/>
diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js
index b3514e00aad..3ec32566658 100644
--- a/tests/baselines/reference/staticInstanceResolution5.js
+++ b/tests/baselines/reference/staticInstanceResolution5.js
@@ -28,6 +28,7 @@ define(["require", "exports"], function (require, exports) {
         return Promise;
     }());
     exports.Promise = Promise;
+    exports.__esModule = true;
 });
 //// [staticInstanceResolution5_1.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
index 9b8987659c5..e1694f4ed5f 100644
--- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
@@ -52,6 +52,7 @@ var publicClassWithWithPrivateTypeParameters = (function () {
     return publicClassWithWithPrivateTypeParameters;
 }());
 exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
+exports.__esModule = true;
 
 
 //// [staticMethodWithTypeParameterExtendsClauseDeclFile.d.ts]
diff --git a/tests/baselines/reference/topLevelExports.js b/tests/baselines/reference/topLevelExports.js
index bf274fcf558..8cb7a7cfe4e 100644
--- a/tests/baselines/reference/topLevelExports.js
+++ b/tests/baselines/reference/topLevelExports.js
@@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) {
     exports.foo = 3;
     function log(n) { return n; }
     void log(exports.foo).toString();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/topLevelFileModule.js b/tests/baselines/reference/topLevelFileModule.js
index c893a9b4675..b8ff23c13bd 100644
--- a/tests/baselines/reference/topLevelFileModule.js
+++ b/tests/baselines/reference/topLevelFileModule.js
@@ -14,6 +14,7 @@ var z = foo.x + fum.y;
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 var foo = require("./vs/foo_0");
diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js
index 798bbb4c7af..64f18cd24e0 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.js
+++ b/tests/baselines/reference/tsxAttributeResolution10.js
@@ -48,4 +48,5 @@ define(["require", "exports"], function (require, exports) {
     <MyComponent bar={true}/>;
     // Should be ok
     <MyComponent data-bar='hello'/>;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js
index cd6946636a6..2375e5e32ff 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.js
+++ b/tests/baselines/reference/tsxAttributeResolution9.js
@@ -40,4 +40,5 @@ define(["require", "exports"], function (require, exports) {
     exports.MyComponent = MyComponent;
     <MyComponent foo="bar"/>; // ok  
     <MyComponent foo={0}/>; // should be an error
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
index 8135af8731f..96f400740c3 100644
--- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
+++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
@@ -44,3 +44,4 @@ var ShortDetails = (function (_super) {
     return ShortDetails;
 }(React.Component));
 exports.ShortDetails = ShortDetails;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js
index 46a94dea92f..f9488552e6d 100644
--- a/tests/baselines/reference/tsxDefaultImports.js
+++ b/tests/baselines/reference/tsxDefaultImports.js
@@ -26,8 +26,8 @@ var SomeClass = (function () {
     return SomeClass;
 }());
 SomeClass.E = SomeEnum;
-exports.__esModule = true;
 exports["default"] = SomeClass;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 var a_1 = require("./a");
diff --git a/tests/baselines/reference/tsxDynamicTagName5.js b/tests/baselines/reference/tsxDynamicTagName5.js
index 00ecc955865..5c87d9a5eb9 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -45,3 +45,4 @@ var Text = (function (_super) {
     return Text;
 }(React.Component));
 exports.Text = Text;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxDynamicTagName7.js b/tests/baselines/reference/tsxDynamicTagName7.js
index 2e7802ea94f..8f1b47e2d10 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -46,3 +46,4 @@ var Text = (function (_super) {
     return Text;
 }(React.Component));
 exports.Text = Text;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxDynamicTagName8.js b/tests/baselines/reference/tsxDynamicTagName8.js
index 3b2e43fede7..ab57998ad3c 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -45,3 +45,4 @@ var Text = (function (_super) {
     return Text;
 }(React.Component));
 exports.Text = Text;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxDynamicTagName9.js b/tests/baselines/reference/tsxDynamicTagName9.js
index 1b13845dc18..90608ed48f1 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -45,3 +45,4 @@ var Text = (function (_super) {
     return Text;
 }(React.Component));
 exports.Text = Text;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
index f8c3f4b25be..95cb3555d30 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
         return MyClass;
     }());
     exports.MyClass = MyClass;
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "react", "./file1"], function (require, exports, React, file1_1) {
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js
index 5b27360d14c..e7135b49528 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -55,6 +55,7 @@ var Button = (function (_super) {
     return Button;
 }(React.Component));
 exports.Button = Button;
+exports.__esModule = true;
 //// [app.jsx]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -81,3 +82,4 @@ var App = (function (_super) {
     return App;
 }(React.Component));
 exports.App = App;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
index 5590dac249f..42ee2407403 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
@@ -18,6 +18,7 @@ function foo() {
     return new classes(null);
 }
 exports.foo = foo;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 var f = require("./file1");
diff --git a/tests/baselines/reference/typeGuardsAsAssertions.js b/tests/baselines/reference/typeGuardsAsAssertions.js
index 84fc996c3ab..955b0b573f0 100644
--- a/tests/baselines/reference/typeGuardsAsAssertions.js
+++ b/tests/baselines/reference/typeGuardsAsAssertions.js
@@ -227,3 +227,4 @@ function f6() {
     x = "";
     x.slice();
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeGuardsInExternalModule.js b/tests/baselines/reference/typeGuardsInExternalModule.js
index 76624440d24..2039b875cfa 100644
--- a/tests/baselines/reference/typeGuardsInExternalModule.js
+++ b/tests/baselines/reference/typeGuardsInExternalModule.js
@@ -45,3 +45,4 @@ if (typeof exports.var2 === "string") {
 else {
     strOrNum = exports.var2; // number | string
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeInferenceLiteralUnion.js b/tests/baselines/reference/typeInferenceLiteralUnion.js
index 07776d26061..9147b05a29e 100644
--- a/tests/baselines/reference/typeInferenceLiteralUnion.js
+++ b/tests/baselines/reference/typeInferenceLiteralUnion.js
@@ -57,3 +57,4 @@ function extent(array) {
 exports.extent = extent;
 var extentMixed;
 extentMixed = extent([new NumCoercible(10), 13, '12', true]);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typePredicateInLoop.js b/tests/baselines/reference/typePredicateInLoop.js
index 0a1e621cb50..15175a99b3d 100644
--- a/tests/baselines/reference/typePredicateInLoop.js
+++ b/tests/baselines/reference/typePredicateInLoop.js
@@ -36,3 +36,4 @@ function y(arg) {
     }
 }
 exports.y = y;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeReferenceDirectives7.js b/tests/baselines/reference/typeReferenceDirectives7.js
index 6a15180d3e7..485f48ae013 100644
--- a/tests/baselines/reference/typeReferenceDirectives7.js
+++ b/tests/baselines/reference/typeReferenceDirectives7.js
@@ -20,6 +20,7 @@ export let y = () => x
 "use strict";
 exports.$ = 1;
 exports.y = function () { return exports.x; };
+exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives8.js b/tests/baselines/reference/typeReferenceDirectives8.js
index cfa22c4228c..436b04d5ce3 100644
--- a/tests/baselines/reference/typeReferenceDirectives8.js
+++ b/tests/baselines/reference/typeReferenceDirectives8.js
@@ -18,10 +18,12 @@ export const bar = foo();
 "use strict";
 function foo() { return { x: 1 }; }
 exports.foo = foo;
+exports.__esModule = true;
 //// [mod2.js]
 "use strict";
 var mod1_1 = require("./mod1");
 exports.bar = mod1_1.foo();
+exports.__esModule = true;
 
 
 //// [mod1.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives9.js b/tests/baselines/reference/typeReferenceDirectives9.js
index 5fd17ea16d3..c4de6646675 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.js
+++ b/tests/baselines/reference/typeReferenceDirectives9.js
@@ -41,6 +41,7 @@ var Cls = (function () {
     return Cls;
 }());
 exports.Cls = Cls;
+exports.__esModule = true;
 //// [mod1.js]
 /// <reference types="lib" />
 "use strict";
@@ -53,6 +54,7 @@ require("./mod1");
 exports.cls = main_1.Cls;
 exports.foo = new main_1.Cls().foo();
 exports.bar = main_1.Cls.bar();
+exports.__esModule = true;
 
 
 //// [main.d.ts]
diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js
index 5c99948e9c9..a7528ade883 100644
--- a/tests/baselines/reference/typeofANonExportedType.js
+++ b/tests/baselines/reference/typeofANonExportedType.js
@@ -86,3 +86,4 @@ function foo() { }
     }());
     foo.C = C;
 })(foo || (foo = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js
index de158544d0d..621ec74ebc4 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.js
+++ b/tests/baselines/reference/typeofAmbientExternalModules.js
@@ -26,6 +26,7 @@ var C = (function () {
     return C;
 }());
 exports.C = C;
+exports.__esModule = true;
 //// [typeofAmbientExternalModules_1.js]
 "use strict";
 var D = (function () {
diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js
index 69602d3e4c3..ab40a7c91a0 100644
--- a/tests/baselines/reference/typeofAnExportedType.js
+++ b/tests/baselines/reference/typeofAnExportedType.js
@@ -89,3 +89,4 @@ exports.foo = foo;
     }());
     foo.C = C;
 })(foo = exports.foo || (exports.foo = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js
index 1c43d28be8b..9ec889e0676 100644
--- a/tests/baselines/reference/typeofExternalModules.js
+++ b/tests/baselines/reference/typeofExternalModules.js
@@ -24,6 +24,7 @@ var C = (function () {
     return C;
 }());
 exports.C = C;
+exports.__esModule = true;
 //// [typeofExternalModules_exportAssign.js]
 "use strict";
 var D = (function () {
diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js
index c11bc13c613..e466124a48d 100644
--- a/tests/baselines/reference/typingsLookup4.js
+++ b/tests/baselines/reference/typingsLookup4.js
@@ -28,6 +28,7 @@ j + k + l;
 //// [lquery.js]
 "use strict";
 exports.l = 2;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
 var jquery_1 = require("jquery");
diff --git a/tests/baselines/reference/umd-errors.js b/tests/baselines/reference/umd-errors.js
index 7423c81f9ed..a8b789294bd 100644
--- a/tests/baselines/reference/umd-errors.js
+++ b/tests/baselines/reference/umd-errors.js
@@ -34,3 +34,4 @@ export as namespace C2;
 
 //// [err5.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unclosedExportClause01.js b/tests/baselines/reference/unclosedExportClause01.js
index 1fe59e24a51..d83ed700a29 100644
--- a/tests/baselines/reference/unclosedExportClause01.js
+++ b/tests/baselines/reference/unclosedExportClause01.js
@@ -19,22 +19,27 @@ export { x as a, from "./t1"
 //// [t1.js]
 "use strict";
 exports.x = "x";
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.x = t1_1.x;
 exports.from = t1_1.from;
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.from = t1_1.from;
+exports.__esModule = true;
 //// [t4.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
 exports.from = t1_1.from;
+exports.__esModule = true;
 //// [t5.js]
 "use strict";
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
 exports.from = t1_1.from;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unclosedExportClause02.js b/tests/baselines/reference/unclosedExportClause02.js
index 188c8e9d18e..680ab9be46d 100644
--- a/tests/baselines/reference/unclosedExportClause02.js
+++ b/tests/baselines/reference/unclosedExportClause02.js
@@ -23,6 +23,7 @@ export { x as a, from
 //// [t1.js]
 "use strict";
 exports.x = "x";
+exports.__esModule = true;
 //// [t2.js]
 "use strict";
 "./t1";
diff --git a/tests/baselines/reference/unusedImports1.js b/tests/baselines/reference/unusedImports1.js
index afd6eb80843..33d4ab267f7 100644
--- a/tests/baselines/reference/unusedImports1.js
+++ b/tests/baselines/reference/unusedImports1.js
@@ -17,5 +17,6 @@ var Calculator = (function () {
     return Calculator;
 }());
 exports.Calculator = Calculator;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js
index 109c2e5a886..2597aed8670 100644
--- a/tests/baselines/reference/unusedImports11.js
+++ b/tests/baselines/reference/unusedImports11.js
@@ -26,8 +26,8 @@ var Member = (function () {
     return Member;
 }());
 exports.Member = Member;
-exports.__esModule = true;
 exports["default"] = Member;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
 var b_1 = require("./b");
diff --git a/tests/baselines/reference/unusedImports12.js b/tests/baselines/reference/unusedImports12.js
index ece9b105bc9..9ec3e8aa17a 100644
--- a/tests/baselines/reference/unusedImports12.js
+++ b/tests/baselines/reference/unusedImports12.js
@@ -21,7 +21,7 @@ var Member = (function () {
     return Member;
 }());
 exports.Member = Member;
-exports.__esModule = true;
 exports["default"] = Member;
+exports.__esModule = true;
 //// [a.js]
 "use strict";
diff --git a/tests/baselines/reference/unusedImports13.js b/tests/baselines/reference/unusedImports13.js
index 01e91abc14b..2db07a7f9cb 100644
--- a/tests/baselines/reference/unusedImports13.js
+++ b/tests/baselines/reference/unusedImports13.js
@@ -25,3 +25,4 @@ declare global {
 "use strict";
 var React = require("react");
 exports.FooComponent = <div></div>;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports14.js b/tests/baselines/reference/unusedImports14.js
index f3c51590e49..e85a5d33045 100644
--- a/tests/baselines/reference/unusedImports14.js
+++ b/tests/baselines/reference/unusedImports14.js
@@ -25,3 +25,4 @@ declare global {
 "use strict";
 var React = require("react");
 exports.FooComponent = React.createElement("div", null);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports15.js b/tests/baselines/reference/unusedImports15.js
index 01be756e0e5..faacbaf71c9 100644
--- a/tests/baselines/reference/unusedImports15.js
+++ b/tests/baselines/reference/unusedImports15.js
@@ -25,3 +25,4 @@ declare global {
 "use strict";
 var Element = require("react");
 exports.FooComponent = <div></div>;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports16.js b/tests/baselines/reference/unusedImports16.js
index 1ce802d869a..884770ab222 100644
--- a/tests/baselines/reference/unusedImports16.js
+++ b/tests/baselines/reference/unusedImports16.js
@@ -25,3 +25,4 @@ declare global {
 "use strict";
 var Element = require("react");
 exports.FooComponent = Element.createElement("div", null);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports2.js b/tests/baselines/reference/unusedImports2.js
index f8918db5ab1..a1477dbc323 100644
--- a/tests/baselines/reference/unusedImports2.js
+++ b/tests/baselines/reference/unusedImports2.js
@@ -29,6 +29,7 @@ exports.Calculator = Calculator;
 function test() {
 }
 exports.test = test;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 var file1_1 = require("./file1");
diff --git a/tests/baselines/reference/unusedImports3.js b/tests/baselines/reference/unusedImports3.js
index 5c0a3edf16b..7516825aa50 100644
--- a/tests/baselines/reference/unusedImports3.js
+++ b/tests/baselines/reference/unusedImports3.js
@@ -35,6 +35,7 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 var file1_1 = require("./file1");
diff --git a/tests/baselines/reference/unusedImports4.js b/tests/baselines/reference/unusedImports4.js
index e95938091ae..350fb3301ac 100644
--- a/tests/baselines/reference/unusedImports4.js
+++ b/tests/baselines/reference/unusedImports4.js
@@ -36,6 +36,7 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 var file1_1 = require("./file1");
diff --git a/tests/baselines/reference/unusedImports5.js b/tests/baselines/reference/unusedImports5.js
index cf92d01eb75..3861d2a9cff 100644
--- a/tests/baselines/reference/unusedImports5.js
+++ b/tests/baselines/reference/unusedImports5.js
@@ -36,6 +36,7 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 var file1_1 = require("./file1");
diff --git a/tests/baselines/reference/unusedImports6.js b/tests/baselines/reference/unusedImports6.js
index 2e203a62a1b..61d17fdf17f 100644
--- a/tests/baselines/reference/unusedImports6.js
+++ b/tests/baselines/reference/unusedImports6.js
@@ -35,7 +35,7 @@ function test() {
 exports.test = test;
 function test2() {
 }
-exports.__esModule = true;
 exports["default"] = test2;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
diff --git a/tests/baselines/reference/unusedImports7.js b/tests/baselines/reference/unusedImports7.js
index 67524fcd22a..2bee99f3ba4 100644
--- a/tests/baselines/reference/unusedImports7.js
+++ b/tests/baselines/reference/unusedImports7.js
@@ -33,7 +33,7 @@ function test() {
 exports.test = test;
 function test2() {
 }
-exports.__esModule = true;
 exports["default"] = test2;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
diff --git a/tests/baselines/reference/unusedImports8.js b/tests/baselines/reference/unusedImports8.js
index 2554472e6ce..b47ae034e37 100644
--- a/tests/baselines/reference/unusedImports8.js
+++ b/tests/baselines/reference/unusedImports8.js
@@ -36,6 +36,7 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
 var file1_1 = require("./file1");
diff --git a/tests/baselines/reference/unusedImports9.js b/tests/baselines/reference/unusedImports9.js
index cd19e167b19..8b83697fa55 100644
--- a/tests/baselines/reference/unusedImports9.js
+++ b/tests/baselines/reference/unusedImports9.js
@@ -32,5 +32,6 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
+exports.__esModule = true;
 //// [file2.js]
 "use strict";
diff --git a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js
index e6cd890abb7..a7121ec9d24 100644
--- a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js
+++ b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js
@@ -35,3 +35,4 @@ function foo() {
     var children = props.children, _a = props.active, rest = __rest(props, ["children", "active"]);
 }
 exports.asdf = 123;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js
index 221d49a0fdf..410620751fe 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js
@@ -43,3 +43,4 @@ function genericFunc(details, message) {
     return details + message;
 }
 exports.genericFunc = genericFunc;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedVariablesinModules1.js b/tests/baselines/reference/unusedVariablesinModules1.js
index 18622a32ba9..1320bb57448 100644
--- a/tests/baselines/reference/unusedVariablesinModules1.js
+++ b/tests/baselines/reference/unusedVariablesinModules1.js
@@ -9,3 +9,4 @@ export var y: string;
 //// [unusedVariablesinModules1.js]
 "use strict";
 var x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/useStrictLikePrologueString01.js b/tests/baselines/reference/useStrictLikePrologueString01.js
index 56df03abfe5..bf5e88ba46c 100644
--- a/tests/baselines/reference/useStrictLikePrologueString01.js
+++ b/tests/baselines/reference/useStrictLikePrologueString01.js
@@ -12,3 +12,4 @@ export function f() {
 function f() {
 }
 exports.f = f;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.js b/tests/baselines/reference/varArgsOnConstructorTypes.js
index c859b4f8260..fbadbc6ad31 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.js
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.js
@@ -56,4 +56,5 @@ define(["require", "exports"], function (require, exports) {
     exports.B = B;
     var reg;
     reg.register(B);
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/visibilityOfTypeParameters.js b/tests/baselines/reference/visibilityOfTypeParameters.js
index e9cd9f4deda..922324c9c60 100644
--- a/tests/baselines/reference/visibilityOfTypeParameters.js
+++ b/tests/baselines/reference/visibilityOfTypeParameters.js
@@ -17,6 +17,7 @@ var MyClass = (function () {
     return MyClass;
 }());
 exports.MyClass = MyClass;
+exports.__esModule = true;
 
 
 //// [visibilityOfTypeParameters.d.ts]
diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
index 7a31dcb97d0..5e5af215fb5 100644
--- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
+++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
@@ -17,6 +17,7 @@ function main() {
 "use strict";
 function mkdirSync(path, mode) { }
 exports.mkdirSync = mkdirSync;
+exports.__esModule = true;
 //// [voidAsNonAmbiguousReturnType_1.js]
 "use strict";
 ///<reference path='voidAsNonAmbiguousReturnType_0.ts'/>
diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js
index efb5454c261..49cac46d212 100644
--- a/tests/baselines/reference/withExportDecl.js
+++ b/tests/baselines/reference/withExportDecl.js
@@ -99,6 +99,7 @@ define(["require", "exports"], function (require, exports) {
     exports.eVar2 = 10;
     var eVar22;
     exports.eVar3 = 10;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js
index 92a90cb2177..d3fefee6c41 100644
--- a/tests/baselines/reference/withImportDecl.js
+++ b/tests/baselines/reference/withImportDecl.js
@@ -52,6 +52,7 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 //// [withImportDecl_1.js]
 define(["require", "exports", "withImportDecl_0"], function (require, exports, m3) {

From 7a539d0b85bbf5da197660f0ad4246820c4dbe59 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Fri, 3 Feb 2017 12:40:39 -0800
Subject: [PATCH 081/127] Identifier escaping/unescaping for unique names

---
 src/compiler/emitter.ts             | 20 ++++++++++----------
 src/compiler/factory.ts             |  5 ++---
 src/compiler/transformers/es2015.ts |  4 ++--
 src/compiler/transformers/ts.ts     |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 498f65ad366..700102a7069 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2565,7 +2565,7 @@ namespace ts {
                 // Node names generate unique names based on their original node
                 // and are cached based on that node's id.
                 const node = getNodeForGeneratedName(name);
-                return generateNameCached(node, getTextOfNode);
+                return generateNameCached(node);
             }
             else {
                 // Auto, Loop, and Unique names are cached based on their unique
@@ -2575,9 +2575,9 @@ namespace ts {
             }
         }
 
-        function generateNameCached(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+        function generateNameCached(node: Node) {
             const nodeId = getNodeId(node);
-            return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node, getTextOfNode)));
+            return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node)));
         }
 
         /**
@@ -2659,7 +2659,7 @@ namespace ts {
         /**
          * Generates a unique name for a ModuleDeclaration or EnumDeclaration.
          */
-        function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+        function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
             const name = getTextOfNode(node.name);
             // Use module/enum name itself if it is unique, otherwise make a unique variation
             return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
@@ -2689,9 +2689,9 @@ namespace ts {
             return makeUniqueName("class");
         }
 
-        function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) {
+        function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration) {
             if (isIdentifier(node.name)) {
-                return generateNameCached(node.name, getTextOfNode);
+                return generateNameCached(node.name);
             }
             return makeTempVariableName(TempFlags.Auto);
         }
@@ -2699,13 +2699,13 @@ namespace ts {
         /**
          * Generates a unique name from a node.
          */
-        function generateNameForNode(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string): string {
+        function generateNameForNode(node: Node): string {
             switch (node.kind) {
                 case SyntaxKind.Identifier:
                     return makeUniqueName(getTextOfNode(node));
                 case SyntaxKind.ModuleDeclaration:
                 case SyntaxKind.EnumDeclaration:
-                    return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node, getTextOfNode);
+                    return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node);
                 case SyntaxKind.ImportDeclaration:
                 case SyntaxKind.ExportDeclaration:
                     return generateNameForImportOrExportDeclaration(<ImportDeclaration | ExportDeclaration>node);
@@ -2718,7 +2718,7 @@ namespace ts {
                 case SyntaxKind.MethodDeclaration:
                 case SyntaxKind.GetAccessor:
                 case SyntaxKind.SetAccessor:
-                    return generateNameForMethodOrAccessor(<MethodDeclaration | AccessorDeclaration>node, getTextOfNode);
+                    return generateNameForMethodOrAccessor(<MethodDeclaration | AccessorDeclaration>node);
                 default:
                     return makeTempVariableName(TempFlags.Auto);
             }
@@ -2734,7 +2734,7 @@ namespace ts {
                 case GeneratedIdentifierKind.Loop:
                     return makeTempVariableName(TempFlags._i);
                 case GeneratedIdentifierKind.Unique:
-                    return makeUniqueName(name.text);
+                    return makeUniqueName(unescapeIdentifier(name.text));
             }
 
             Debug.fail("Unsupported GeneratedIdentifierKind.");
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index ec1e0dafb79..d5f3d920436 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -108,7 +108,7 @@ namespace ts {
 
     export function createIdentifier(text: string): Identifier {
         const node = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
-        node.text = text ? escapeIdentifier(text) : undefined;
+        node.text = escapeIdentifier(text);
         node.originalKeywordKind = text ? stringToToken(text) : SyntaxKind.Unknown;
         node.autoGenerateKind = GeneratedIdentifierKind.None;
         node.autoGenerateId = 0;
@@ -140,8 +140,7 @@ namespace ts {
 
     /** Create a unique name based on the supplied text. */
     export function createUniqueName(text: string): Identifier {
-        const name = createIdentifier("");
-        name.text = text;
+        const name = createIdentifier(text);
         name.autoGenerateKind = GeneratedIdentifierKind.Unique;
         name.autoGenerateId = nextAutoGenerateId;
         nextAutoGenerateId++;
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 6d0c9b3c5fa..e0fd435a90d 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -2251,7 +2251,7 @@ namespace ts {
             // we don't want to emit a temporary variable for the RHS, just use it directly.
             const counter = createLoopVariable();
             const rhsReference = expression.kind === SyntaxKind.Identifier
-                ? createUniqueName((<Identifier>expression).text)
+                ? createUniqueName(unescapeIdentifier((<Identifier>expression).text))
                 : createTempVariable(/*recordTempVariable*/ undefined);
             const elementAccess = createElementAccess(rhsReference, counter);
 
@@ -2872,7 +2872,7 @@ namespace ts {
             else {
                 loopParameters.push(createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name));
                 if (resolver.getNodeCheckFlags(decl) & NodeCheckFlags.NeedsLoopOutParameter) {
-                    const outParamName = createUniqueName("out_" + name.text);
+                    const outParamName = createUniqueName("out_" + unescapeIdentifier(name.text));
                     loopOutParameters.push({ originalName: name, outParamName });
                 }
             }
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index b18ab67381e..4ef3bd5c067 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -3119,7 +3119,7 @@ namespace ts {
         function getClassAliasIfNeeded(node: ClassDeclaration) {
             if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.ClassWithConstructorReference) {
                 enableSubstitutionForClassAliases();
-                const classAlias = createUniqueName(node.name && !isGeneratedIdentifier(node.name) ? node.name.text : "default");
+                const classAlias = createUniqueName(node.name && !isGeneratedIdentifier(node.name) ? unescapeIdentifier(node.name.text) : "default");
                 classAliases[getOriginalNodeId(node)] = classAlias;
                 hoistVariableDeclaration(classAlias);
                 return classAlias;

From bd98bc97bdf637d5b0c0cf2b90cb9139e3802d81 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Fri, 3 Feb 2017 14:12:50 -0800
Subject: [PATCH 082/127] Add factory functions for rest of NodeEdgeTraversal

---
 src/compiler/factory.ts   | 175 +++++++++++++++++++++--
 src/compiler/types.ts     |  14 +-
 src/compiler/utilities.ts |  13 ++
 src/compiler/visitor.ts   | 285 +++++++++++++++++---------------------
 4 files changed, 315 insertions(+), 172 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index d5f3d920436..4c7693dd846 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -187,6 +187,20 @@ namespace ts {
 
     // Names
 
+    export function createQualifiedName(left: EntityName, right: string | Identifier) {
+        const node = <QualifiedName>createSynthesizedNode(SyntaxKind.QualifiedName);
+        node.left = left;
+        node.right = asName(right);
+        return node;
+    }
+
+    export function updateQualifiedName(node: QualifiedName, left: EntityName, right: Identifier) {
+        return node.left !== left
+            || node.right !== right
+            ? updateNode(createQualifiedName(left, right), node)
+            : node;
+    }
+
     export function createComputedPropertyName(expression: Expression) {
         const node = <ComputedPropertyName>createSynthesizedNode(SyntaxKind.ComputedPropertyName);
         node.expression = expression;
@@ -502,6 +516,20 @@ namespace ts {
             : node;
     }
 
+    export function createTypeAssertion(type: TypeNode, expression: Expression) {
+        const node = <TypeAssertion>createSynthesizedNode(SyntaxKind.TypeAssertionExpression);
+        node.type = type;
+        node.expression = parenthesizePrefixOperand(expression);
+        return node;
+    }
+
+    export function updateTypeAssertion(node: TypeAssertion, type: TypeNode, expression: Expression) {
+        return node.type !== type
+            || node.expression !== expression
+            ? updateNode(createTypeAssertion(type, expression), node)
+            : node;
+    }
+
     export function createParen(expression: Expression) {
         const node = <ParenthesizedExpression>createSynthesizedNode(SyntaxKind.ParenthesizedExpression);
         node.expression = expression;
@@ -749,6 +777,32 @@ namespace ts {
             : node;
     }
 
+    export function createAsExpression(expression: Expression, type: TypeNode) {
+        const node = <AsExpression>createSynthesizedNode(SyntaxKind.AsExpression);
+        node.expression = expression;
+        node.type = type;
+        return node;
+    }
+
+    export function updateAsExpression(node: AsExpression, expression: Expression, type: TypeNode) {
+        return node.expression !== expression
+            || node.type !== type
+            ? updateNode(createAsExpression(expression, type), node)
+            : node;
+    }
+
+    export function createNonNullExpression(expression: Expression) {
+        const node = <NonNullExpression>createSynthesizedNode(SyntaxKind.NonNullExpression);
+        node.expression = parenthesizeForAccess(expression);
+        return node;
+    }
+
+    export function updateNonNullExpression(node: NonNullExpression, expression: Expression) {
+        return node.expression !== expression
+            ? updateNode(createNonNullExpression(expression), node)
+            : node;
+    }
+
     // Misc
 
     export function createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail) {
@@ -1040,18 +1094,6 @@ namespace ts {
             : node;
     }
 
-    export function createCaseBlock(clauses: CaseOrDefaultClause[]): CaseBlock {
-        const node = <CaseBlock>createSynthesizedNode(SyntaxKind.CaseBlock);
-        node.clauses = createNodeArray(clauses);
-        return node;
-    }
-
-    export function updateCaseBlock(node: CaseBlock, clauses: CaseOrDefaultClause[]) {
-        return node.clauses !== clauses
-            ? updateNode(createCaseBlock(clauses), node)
-            : node;
-    }
-
     export function createFunctionDeclaration(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) {
         const node = <FunctionDeclaration>createSynthesizedNode(SyntaxKind.FunctionDeclaration);
         node.decorators = asNodeArray(decorators);
@@ -1099,6 +1141,85 @@ namespace ts {
             : node;
     }
 
+    export function createEnumDeclaration(decorators: Decorator[], modifiers: Modifier[], name: string | Identifier, members: EnumMember[]) {
+        const node = <EnumDeclaration>createSynthesizedNode(SyntaxKind.EnumDeclaration);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.members = createNodeArray(members);
+        return node;
+    }
+
+    export function updateEnumDeclaration(node: EnumDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, members: EnumMember[]) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.members !== members
+            ? updateNode(createEnumDeclaration(decorators, modifiers, name, members), node)
+            : node;
+    }
+
+    export function createModuleDeclaration(decorators: Decorator[], modifiers: Modifier[], name: ModuleName, body: ModuleBody, flags?: NodeFlags) {
+        const node = <ModuleDeclaration>createSynthesizedNode(SyntaxKind.ModuleDeclaration);
+        node.flags |= flags;
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = name;
+        node.body = body;
+        return node;
+    }
+
+    export function updateModuleDeclaration(node: ModuleDeclaration, decorators: Decorator[], modifiers: Modifier[], name: ModuleName, body: ModuleBody) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.body !== body
+            ? updateNode(createModuleDeclaration(decorators, modifiers, name, body, node.flags), node)
+            : node;
+    }
+
+    export function createModuleBlock(statements: Statement[]) {
+        const node = <ModuleBlock>createSynthesizedNode(SyntaxKind.CaseBlock);
+        node.statements = createNodeArray(statements);
+        return node;
+    }
+
+    export function updateModuleBlock(node: ModuleBlock, statements: Statement[]) {
+        return node.statements !== statements
+            ? updateNode(createModuleBlock(statements), node)
+            : node;
+    }
+
+    export function createCaseBlock(clauses: CaseOrDefaultClause[]): CaseBlock {
+        const node = <CaseBlock>createSynthesizedNode(SyntaxKind.CaseBlock);
+        node.clauses = createNodeArray(clauses);
+        return node;
+    }
+
+    export function updateCaseBlock(node: CaseBlock, clauses: CaseOrDefaultClause[]) {
+        return node.clauses !== clauses
+            ? updateNode(createCaseBlock(clauses), node)
+            : node;
+    }
+
+    export function createImportEqualsDeclaration(decorators: Decorator[], modifiers: Modifier[], name: string | Identifier, moduleReference: ModuleReference) {
+        const node = <ImportEqualsDeclaration>createSynthesizedNode(SyntaxKind.ImportEqualsDeclaration);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.moduleReference = moduleReference;
+        return node;
+    }
+
+    export function updateImportEqualsDeclaration(node: ImportEqualsDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, moduleReference: ModuleReference) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.moduleReference !== moduleReference
+            ? updateNode(createImportEqualsDeclaration(decorators, modifiers, name, moduleReference), node)
+            : node;
+    }
+
     export function createImportDeclaration(decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier?: Expression): ImportDeclaration {
         const node = <ImportDeclaration>createSynthesizedNode(SyntaxKind.ImportDeclaration);
         node.decorators = asNodeArray(decorators);
@@ -1228,6 +1349,20 @@ namespace ts {
             : node;
     }
 
+    // Module references
+
+    export function createExternalModuleReference(expression: Expression) {
+        const node = <ExternalModuleReference>createSynthesizedNode(SyntaxKind.ExternalModuleReference);
+        node.expression = expression;
+        return node;
+    }
+
+    export function updateExternalModuleReference(node: ExternalModuleReference, expression: Expression) {
+        return node.expression !== expression
+            ? updateNode(createExternalModuleReference(expression), node)
+            : node;
+    }
+
     // JSX
 
     export function createJsxElement(openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement) {
@@ -1426,6 +1561,22 @@ namespace ts {
         return node;
     }
 
+    // Enum
+
+    export function createEnumMember(name: string | PropertyName, initializer?: Expression) {
+        const node = <EnumMember>createSynthesizedNode(SyntaxKind.EnumMember);
+        node.name = asName(name);
+        node.initializer = initializer && parenthesizeExpressionForList(initializer);
+        return node;
+    }
+
+    export function updateEnumMember(node: EnumMember, name: PropertyName, initializer: Expression | undefined) {
+        return node.name !== name
+            || node.initializer !== initializer
+            ? updateNode(createEnumMember(name, initializer), node)
+            : node;
+    }
+
     // Top-level nodes
 
     export function updateSourceFileNode(node: SourceFile, statements: Statement[]) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index ae678f429f1..49e744682bc 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1771,24 +1771,28 @@
         members: NodeArray<EnumMember>;
     }
 
-    export type ModuleBody = ModuleBlock | ModuleDeclaration;
-
     export type ModuleName = Identifier | StringLiteral;
 
+    export type ModuleBody = NamespaceBody | JSDocNamespaceBody;
+
     export interface ModuleDeclaration extends DeclarationStatement {
         kind: SyntaxKind.ModuleDeclaration;
         name: Identifier | StringLiteral;
-        body?: ModuleBlock | NamespaceDeclaration | JSDocNamespaceDeclaration | Identifier;
+        body?: ModuleBody | JSDocNamespaceDeclaration | Identifier;
     }
 
+    export type NamespaceBody = ModuleBlock | NamespaceDeclaration;
+
     export interface NamespaceDeclaration extends ModuleDeclaration {
         name: Identifier;
-        body: ModuleBlock | NamespaceDeclaration;
+        body: NamespaceBody;
     }
 
+    export type JSDocNamespaceBody = Identifier | JSDocNamespaceDeclaration;
+
     export interface JSDocNamespaceDeclaration extends ModuleDeclaration {
         name: Identifier;
-        body: JSDocNamespaceDeclaration | Identifier;
+        body: JSDocNamespaceBody;
     }
 
     export interface ModuleBlock extends Node, Statement {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 66efce4fef8..91cd6a89b8b 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -3887,6 +3887,19 @@ namespace ts {
     export function isModuleBody(node: Node): node is ModuleBody {
         const kind = node.kind;
         return kind === SyntaxKind.ModuleBlock
+            || kind === SyntaxKind.ModuleDeclaration
+            || kind === SyntaxKind.Identifier;
+    }
+
+    export function isNamespaceBody(node: Node): node is NamespaceBody {
+        const kind = node.kind;
+        return kind === SyntaxKind.ModuleBlock
+            || kind === SyntaxKind.ModuleDeclaration;
+    }
+
+    export function isJSDocNamespaceBody(node: Node): node is JSDocNamespaceBody {
+        const kind = node.kind;
+        return kind === SyntaxKind.Identifier
             || kind === SyntaxKind.ModuleDeclaration;
     }
 
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index b6e0adc1294..63c3726fc10 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -6,97 +6,6 @@
 namespace ts {
     export type VisitResult<T extends Node> = T | T[];
 
-    /**
-     * Describes an edge of a Node, used when traversing a syntax tree.
-     */
-    interface NodeEdge {
-        /** The property name for the edge. */
-        name: string;
-
-        /** Indicates that the result is optional. */
-        optional?: boolean;
-
-        /** A callback used to test whether a node is valid. */
-        test?: (node: Node) => node is Node;
-
-        /** A callback used to lift a NodeArrayNode into a valid node. */
-        lift?: (nodes: NodeArray<Node>) => Node;
-
-        /** A callback used to parenthesize a node to preserve the intended order of operations. */
-        parenthesize?: (value: Node, parentNode: Node) => Node;
-    };
-
-    /**
-     * Describes the shape of a Node.
-     */
-    type NodeTraversalPath = NodeEdge[];
-
-    /**
-     * This map contains information about the shape of each Node in "types.ts" pertaining to how
-     * each node should be traversed during a transformation.
-     *
-     * Each edge corresponds to a property in a Node subtype that should be traversed when visiting
-     * each child. The properties are assigned in the order in which traversal should occur.
-     *
-     * We only add entries for nodes that do not have a create/update pair defined in factory.ts
-     *
-     * NOTE: This needs to be kept up to date with changes to nodes in "types.ts". Currently, this
-     *       map is not comprehensive. Only node edges relevant to tree transformation are
-     *       currently defined. We may extend this to be more comprehensive, and eventually
-     *       supplant the existing `forEachChild` implementation if performance is not
-     *       significantly impacted.
-     */
-    function getNodeEdgeTraversal(kind: SyntaxKind): NodeTraversalPath {
-        switch (kind) {
-            case SyntaxKind.QualifiedName: return [
-                { name: "left", test: isEntityName },
-                { name: "right", test: isIdentifier }
-            ];
-            case SyntaxKind.Decorator: return [
-                { name: "expression", test: isLeftHandSideExpression }
-            ];
-            case SyntaxKind.TypeAssertionExpression: return [
-                { name: "type", test: isTypeNode },
-                { name: "expression", test: isUnaryExpression }
-            ];
-            case SyntaxKind.AsExpression: return [
-                { name: "expression", test: isExpression },
-                { name: "type", test: isTypeNode }
-            ];
-            case SyntaxKind.NonNullExpression: return [
-                { name: "expression", test: isLeftHandSideExpression }
-            ];
-            case SyntaxKind.EnumDeclaration: return [
-                { name: "decorators", test: isDecorator },
-                { name: "modifiers", test: isModifier },
-                { name: "name", test: isIdentifier },
-                { name: "members", test: isEnumMember }
-            ];
-            case SyntaxKind.ModuleDeclaration: return [
-                { name: "decorators", test: isDecorator },
-                { name: "modifiers", test: isModifier },
-                { name: "name", test: isModuleName },
-                { name: "body", test: isModuleBody }
-            ];
-            case SyntaxKind.ModuleBlock: return [
-                { name: "statements", test: isStatement }
-            ];
-            case SyntaxKind.ImportEqualsDeclaration: return [
-                { name: "decorators", test: isDecorator },
-                { name: "modifiers", test: isModifier },
-                { name: "name", test: isIdentifier },
-                { name: "moduleReference", test: isModuleReference }
-            ];
-            case SyntaxKind.ExternalModuleReference: return [
-                { name: "expression", test: isExpression, optional: true }
-            ];
-            case SyntaxKind.EnumMember: return [
-                { name: "name", test: isPropertyName },
-                { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList }
-            ];
-        }
-    }
-
     function reduceNode<T>(node: Node, f: (memo: T, node: Node) => T, initial: T) {
         return node ? f(initial, node) : initial;
     }
@@ -107,8 +16,7 @@ namespace ts {
 
     /**
      * Similar to `reduceLeft`, performs a reduction against each child of a node.
-     * NOTE: Unlike `forEachChild`, this does *not* visit every node. Only nodes added to the
-     *       `nodeEdgeTraversalMap` above will be visited.
+     * NOTE: Unlike `forEachChild`, this does *not* visit every node.
      *
      * @param node The node containing the children to reduce.
      * @param initial The initial value to supply to the reduction.
@@ -145,6 +53,11 @@ namespace ts {
                 break;
 
             // Names
+            case SyntaxKind.QualifiedName:
+                result = reduceNode((<QualifiedName>node).left, cbNode, result);
+                result = reduceNode((<QualifiedName>node).right, cbNode, result);
+                break;
+
             case SyntaxKind.ComputedPropertyName:
                 result = reduceNode((<ComputedPropertyName>node).expression, cbNode, result);
                 break;
@@ -252,6 +165,11 @@ namespace ts {
                 result = reduceNode((<TaggedTemplateExpression>node).template, cbNode, result);
                 break;
 
+            case SyntaxKind.TypeAssertionExpression:
+                result = reduceNode((<TypeAssertion>node).type, cbNode, result);
+                result = reduceNode((<TypeAssertion>node).expression, cbNode, result);
+                break;
+
             case SyntaxKind.FunctionExpression:
                 result = reduceNodes((<FunctionExpression>node).modifiers, cbNodes, result);
                 result = reduceNode((<FunctionExpression>node).name, cbNode, result);
@@ -314,6 +232,15 @@ namespace ts {
                 result = reduceNodes((<ExpressionWithTypeArguments>node).typeArguments, cbNodes, result);
                 break;
 
+            case SyntaxKind.AsExpression:
+                result = reduceNode((<AsExpression>node).expression, cbNode, result);
+                result = reduceNode((<AsExpression>node).type, cbNode, result);
+                break;
+
+            case SyntaxKind.NonNullExpression:
+                result = reduceNode((<NonNullExpression>node).expression, cbNode, result);
+                break;
+
             // Misc
             case SyntaxKind.TemplateSpan:
                 result = reduceNode((<TemplateSpan>node).expression, cbNode, result);
@@ -415,10 +342,35 @@ namespace ts {
                 result = reduceNodes((<ClassDeclaration>node).members, cbNodes, result);
                 break;
 
+            case SyntaxKind.EnumDeclaration:
+                result = reduceNodes((<EnumDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<EnumDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<EnumDeclaration>node).name, cbNode, result);
+                result = reduceNodes((<EnumDeclaration>node).members, cbNodes, result);
+                break;
+
+            case SyntaxKind.ModuleDeclaration:
+                result = reduceNodes((<ModuleDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<ModuleDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<ModuleDeclaration>node).name, cbNode, result);
+                result = reduceNode((<ModuleDeclaration>node).body, cbNode, result);
+                break;
+
+            case SyntaxKind.ModuleBlock:
+                result = reduceNodes((<ModuleBlock>node).statements, cbNodes, result);
+                break;
+
             case SyntaxKind.CaseBlock:
                 result = reduceNodes((<CaseBlock>node).clauses, cbNodes, result);
                 break;
 
+            case SyntaxKind.ImportEqualsDeclaration:
+                result = reduceNodes((<ImportEqualsDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<ImportEqualsDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<ImportEqualsDeclaration>node).name, cbNode, result);
+                result = reduceNode((<ImportEqualsDeclaration>node).moduleReference, cbNode, result);
+                break;
+
             case SyntaxKind.ImportDeclaration:
                 result = reduceNodes((<ImportDeclaration>node).decorators, cbNodes, result);
                 result = reduceNodes((<ImportDeclaration>node).modifiers, cbNodes, result);
@@ -459,6 +411,11 @@ namespace ts {
                 result = reduceNode((<ExportDeclaration>node).moduleSpecifier, cbNode, result);
                 break;
 
+            // Module references
+            case SyntaxKind.ExternalModuleReference:
+                result = reduceNode((<ExternalModuleReference>node).expression, cbNode, result);
+                break;
+
             // JSX
             case SyntaxKind.JsxElement:
                 result = reduceNode((<JsxElement>node).openingElement, cbNode, result);
@@ -519,30 +476,25 @@ namespace ts {
                 break;
 
             case SyntaxKind.SpreadAssignment:
-                result = reduceNode((node as SpreadAssignment).expression, cbNode, result);
+                result = reduceNode((<SpreadAssignment>node).expression, cbNode, result);
                 break;
 
+            // Enum
+            case SyntaxKind.EnumMember:
+                result = reduceNode((<EnumMember>node).name, cbNode, result);
+                result = reduceNode((<EnumMember>node).initializer, cbNode, result);
+
             // Top-level nodes
             case SyntaxKind.SourceFile:
                 result = reduceNodes((<SourceFile>node).statements, cbNodes, result);
                 break;
 
+            // Transformation nodes
             case SyntaxKind.PartiallyEmittedExpression:
                 result = reduceNode((<PartiallyEmittedExpression>node).expression, cbNode, result);
                 break;
 
             default:
-                const edgeTraversalPath = getNodeEdgeTraversal(kind);
-                if (edgeTraversalPath) {
-                    for (const edge of edgeTraversalPath) {
-                        const value = (<MapLike<any>>node)[edge.name];
-                        if (value !== undefined) {
-                            result = isArray(value)
-                                ? reduceNodes(<NodeArray<Node>>value, cbNodes, result)
-                                : cbNode(result, <Node>value);
-                        }
-                    }
-                }
                 break;
         }
 
@@ -556,11 +508,9 @@ namespace ts {
      * @param visitor The callback used to visit the Node.
      * @param test A callback to execute to verify the Node is valid.
      * @param optional An optional value indicating whether the Node is itself optional.
-     * @param lift An optional callback to execute to lift a NodeArrayNode into a valid Node.
+     * @param lift An optional callback to execute to lift a NodeArray into a valid Node.
      */
-    export function visitNode<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional?: boolean, lift?: (node: NodeArray<Node>) => T): T;
-    export function visitNode<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional: boolean, lift: (node: NodeArray<Node>) => T, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): T;
-    export function visitNode(node: Node, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional?: boolean, lift?: (node: Node[]) => Node, parenthesize?: (node: Node, parentNode: Node) => Node, parentNode?: Node): Node {
+    export function visitNode<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional?: boolean, lift?: (node: NodeArray<Node>) => T): T {
         if (node === undefined || visitor === undefined) {
             return node;
         }
@@ -586,13 +536,9 @@ namespace ts {
             visitedNode = visited;
         }
 
-        if (parenthesize !== undefined) {
-            visitedNode = parenthesize(visitedNode, parentNode);
-        }
-
         Debug.assertNode(visitedNode, test);
         aggregateTransformFlags(visitedNode);
-        return visitedNode;
+        return <T>visitedNode;
     }
 
     /**
@@ -604,14 +550,12 @@ namespace ts {
      * @param start An optional value indicating the starting offset at which to start visiting.
      * @param count An optional value indicating the maximum number of nodes to visit.
      */
-    export function visitNodes<T extends Node>(nodes: NodeArray<T>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start?: number, count?: number): NodeArray<T>;
-    export function visitNodes<T extends Node>(nodes: NodeArray<T>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start: number, count: number, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): NodeArray<T>;
-    export function visitNodes(nodes: NodeArray<Node>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start?: number, count?: number, parenthesize?: (node: Node, parentNode: Node) => Node, parentNode?: Node): NodeArray<Node> {
+    export function visitNodes<T extends Node>(nodes: NodeArray<T>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start?: number, count?: number): NodeArray<T> {
         if (nodes === undefined) {
             return undefined;
         }
 
-        let updated: NodeArray<Node>;
+        let updated: NodeArray<T>;
 
         // Ensure start and count have valid values
         const length = nodes.length;
@@ -627,7 +571,7 @@ namespace ts {
             // If we are not visiting all of the original nodes, we must always create a new array.
             // Since this is a fragment of a node array, we do not copy over the previous location
             // and will only copy over `hasTrailingComma` if we are including the last element.
-            updated = createNodeArray<Node>([], /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length);
+            updated = createNodeArray<T>([], /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length);
         }
 
         // Visit each original node.
@@ -644,21 +588,15 @@ namespace ts {
                 if (visited) {
                     if (isArray(visited)) {
                         for (let visitedNode of visited) {
-                            visitedNode = parenthesize
-                                ? parenthesize(visitedNode, parentNode)
-                                : visitedNode;
                             Debug.assertNode(visitedNode, test);
                             aggregateTransformFlags(visitedNode);
-                            updated.push(visitedNode);
+                            updated.push(<T>visitedNode);
                         }
                     }
                     else {
-                        const visitedNode = parenthesize
-                            ? parenthesize(visited, parentNode)
-                            : visited;
-                        Debug.assertNode(visitedNode, test);
-                        aggregateTransformFlags(visitedNode);
-                        updated.push(visitedNode);
+                        Debug.assertNode(visited, test);
+                        aggregateTransformFlags(visited);
+                        updated.push(<T>visited);
                     }
                 }
             }
@@ -747,6 +685,11 @@ namespace ts {
                 return node;
 
             // Names
+            case SyntaxKind.QualifiedName:
+                return updateQualifiedName(<QualifiedName>node,
+                    visitNode((<QualifiedName>node).left, visitor, isEntityName),
+                    visitNode((<QualifiedName>node).right, visitor, isIdentifier));
+
             case SyntaxKind.ComputedPropertyName:
                 return updateComputedPropertyName(<ComputedPropertyName>node,
                     visitNode((<ComputedPropertyName>node).expression, visitor, isExpression));
@@ -761,6 +704,10 @@ namespace ts {
                     visitNode((<ParameterDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
                     visitNode((<ParameterDeclaration>node).initializer, visitor, isExpression, /*optional*/ true));
 
+            case SyntaxKind.Decorator:
+                return updateDecorator(<Decorator>node,
+                    visitNode((<Decorator>node).expression, visitor, isExpression));
+
             // Type member
             case SyntaxKind.PropertyDeclaration:
                 return updateProperty(<PropertyDeclaration>node,
@@ -856,6 +803,11 @@ namespace ts {
                     visitNode((<TaggedTemplateExpression>node).tag, visitor, isExpression),
                     visitNode((<TaggedTemplateExpression>node).template, visitor, isTemplateLiteral));
 
+            case SyntaxKind.TypeAssertionExpression:
+                return updateTypeAssertion(<TypeAssertion>node,
+                    visitNode((<TypeAssertion>node).type, visitor, isTypeNode),
+                    visitNode((<TypeAssertion>node).expression, visitor, isExpression));
+
             case SyntaxKind.ParenthesizedExpression:
                 return updateParen(<ParenthesizedExpression>node,
                     visitNode((<ParenthesizedExpression>node).expression, visitor, isExpression));
@@ -938,6 +890,15 @@ namespace ts {
                     visitNodes((<ExpressionWithTypeArguments>node).typeArguments, visitor, isTypeNode),
                     visitNode((<ExpressionWithTypeArguments>node).expression, visitor, isExpression));
 
+            case SyntaxKind.AsExpression:
+                return updateAsExpression(<AsExpression>node,
+                    visitNode((<AsExpression>node).expression, visitor, isExpression),
+                    visitNode((<AsExpression>node).type, visitor, isTypeNode));
+
+            case SyntaxKind.NonNullExpression:
+                return updateNonNullExpression(<NonNullExpression>node,
+                    visitNode((<NonNullExpression>node).expression, visitor, isExpression));
+
             // Misc
             case SyntaxKind.TemplateSpan:
                 return updateTemplateSpan(<TemplateSpan>node,
@@ -1059,10 +1020,35 @@ namespace ts {
                     visitNodes((<ClassDeclaration>node).heritageClauses, visitor, isHeritageClause),
                     visitNodes((<ClassDeclaration>node).members, visitor, isClassElement));
 
+            case SyntaxKind.EnumDeclaration:
+                return updateEnumDeclaration(<EnumDeclaration>node,
+                    visitNodes((<EnumDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<EnumDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<EnumDeclaration>node).name, visitor, isIdentifier),
+                    visitNodes((<EnumDeclaration>node).members, visitor, isEnumMember));
+
+            case SyntaxKind.ModuleDeclaration:
+                return updateModuleDeclaration(<ModuleDeclaration>node,
+                    visitNodes((<ModuleDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<ModuleDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<ModuleDeclaration>node).name, visitor, isIdentifier),
+                    visitNode((<ModuleDeclaration>node).body, visitor, isModuleBody));
+
+            case SyntaxKind.ModuleBlock:
+                return updateModuleBlock(<ModuleBlock>node,
+                    visitNodes((<ModuleBlock>node).statements, visitor, isStatement));
+
             case SyntaxKind.CaseBlock:
                 return updateCaseBlock(<CaseBlock>node,
                     visitNodes((<CaseBlock>node).clauses, visitor, isCaseOrDefaultClause));
 
+            case SyntaxKind.ImportEqualsDeclaration:
+                return updateImportEqualsDeclaration(<ImportEqualsDeclaration>node,
+                    visitNodes((<ImportEqualsDeclaration>node).decorators, visitor, isDecorator),
+                    visitNodes((<ImportEqualsDeclaration>node).modifiers, visitor, isModifier),
+                    visitNode((<ImportEqualsDeclaration>node).name, visitor, isIdentifier),
+                    visitNode((<ImportEqualsDeclaration>node).moduleReference, visitor, isModuleReference));
+
             case SyntaxKind.ImportDeclaration:
                 return updateImportDeclaration(<ImportDeclaration>node,
                     visitNodes((<ImportDeclaration>node).decorators, visitor, isDecorator),
@@ -1110,6 +1096,11 @@ namespace ts {
                     visitNode((<ExportSpecifier>node).propertyName, visitor, isIdentifier, /*optional*/ true),
                     visitNode((<ExportSpecifier>node).name, visitor, isIdentifier));
 
+            // Module references
+            case SyntaxKind.ExternalModuleReference:
+                return updateExternalModuleReference(<ExternalModuleReference>node,
+                    visitNode((<ExternalModuleReference>node).expression, visitor, isExpression));
+
             // JSX
             case SyntaxKind.JsxElement:
                 return updateJsxElement(<JsxElement>node,
@@ -1175,10 +1166,16 @@ namespace ts {
                     visitNode((<ShorthandPropertyAssignment>node).objectAssignmentInitializer, visitor, isExpression));
 
             case SyntaxKind.SpreadAssignment:
-                return updateSpreadAssignment(node as SpreadAssignment,
-                    visitNode((node as SpreadAssignment).expression, visitor, isExpression));
+                return updateSpreadAssignment(<SpreadAssignment>node,
+                    visitNode((<SpreadAssignment>node).expression, visitor, isExpression));
 
-           // Top-level nodes
+            // Enum
+            case SyntaxKind.EnumMember:
+                return updateEnumMember(<EnumMember>node,
+                    visitNode((<EnumMember>node).name, visitor, isPropertyName),
+                    visitNode((<EnumMember>node).initializer, visitor, isExpression, /*optional*/ true));
+
+            // Top-level nodes
             case SyntaxKind.SourceFile:
                 return updateSourceFileNode(<SourceFile>node,
                     visitLexicalEnvironment((<SourceFile>node).statements, visitor, context));
@@ -1189,30 +1186,8 @@ namespace ts {
                     visitNode((<PartiallyEmittedExpression>node).expression, visitor, isExpression));
 
             default:
-                let updated: Node & MapLike<any>;
-                const edgeTraversalPath = getNodeEdgeTraversal(kind);
-                if (edgeTraversalPath) {
-                    for (const edge of edgeTraversalPath) {
-                        const value = <Node | NodeArray<Node>>(<Node & MapLike<any>>node)[edge.name];
-                        if (value !== undefined) {
-                            const visited = isArray(value)
-                                ? visitNodes(value, visitor, edge.test, 0, value.length, edge.parenthesize, node)
-                                : visitNode(value, visitor, edge.test, edge.optional, edge.lift, edge.parenthesize, node);
-                            if (updated !== undefined || visited !== value) {
-                                if (updated === undefined) {
-                                    updated = getMutableClone(node);
-                                }
-                                if (visited !== value) {
-                                    updated[edge.name] = visited;
-                                }
-                            }
-                        }
-                    }
-                }
-                return updated ? updateNode(updated, node) : node;
+                return node;
         }
-
-        // return node;
     }
 
     /**

From c0ac84fdbd36bcfd6b08ccaccbd04adf6b1becf7 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Fri, 3 Feb 2017 17:38:17 -0800
Subject: [PATCH 083/127] Give a better name for the boolean variable; emit
 __esmodule for export import

---
 src/compiler/transformers/module/module.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 68f49dba42c..ebd004337f9 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -45,7 +45,7 @@ namespace ts {
         let currentSourceFile: SourceFile; // The current file.
         let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file.
         let noSubstitution: boolean[]; // Set of nodes for which substitution rules should be ignored.
-        let shouldAppendUnderscoreUnderscoreEsModule: boolean;  // A boolean indicating whether "__esModule" should be emitted
+        let shouldAppendEsModuleMarker: boolean;  // A boolean indicating whether "__esModule" should be emitted
 
         return transformSourceFile;
 
@@ -63,7 +63,7 @@ namespace ts {
 
             currentSourceFile = node;
             currentModuleInfo = collectExternalModuleInfo(node, resolver, compilerOptions);
-            shouldAppendUnderscoreUnderscoreEsModule = false;
+            shouldAppendEsModuleMarker = false;
             moduleInfoMap[getOriginalNodeId(node)] = currentModuleInfo;
 
             // Perform the transformation.
@@ -90,7 +90,7 @@ namespace ts {
             addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
 
-            if (shouldAppendUnderscoreUnderscoreEsModule) {
+            if (shouldAppendEsModuleMarker) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
 
@@ -383,7 +383,7 @@ namespace ts {
             // Append the 'export =' statement if provided.
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
 
-            if (shouldAppendUnderscoreUnderscoreEsModule) {
+            if (shouldAppendEsModuleMarker) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
 
@@ -666,7 +666,7 @@ namespace ts {
             }
 
             const generatedName = getGeneratedNameForNode(node);
-            shouldAppendUnderscoreUnderscoreEsModule = true;
+            shouldAppendEsModuleMarker = true;
 
             if (node.exportClause) {
                 const statements: Statement[] = [];
@@ -833,9 +833,10 @@ namespace ts {
             let expressions: Expression[];
 
             const parseTreeNode = getParseTreeNode(node);
-            if (!shouldAppendUnderscoreUnderscoreEsModule) {
+            if (parseTreeNode && !shouldAppendEsModuleMarker) {
                 // class declaration get down-level transformed to be variable statement
-                shouldAppendUnderscoreUnderscoreEsModule = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration) && hasModifier(parseTreeNode, ModifierFlags.Export);
+                shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration)
+                    && hasModifier(parseTreeNode, ModifierFlags.Export);
             }
  
             if (hasModifier(node, ModifierFlags.Export)) {
@@ -1125,7 +1126,7 @@ namespace ts {
          * @param allowComments Whether to allow comments on the export.
          */
         function appendExportStatement(statements: Statement[] | undefined, exportName: Identifier, expression: Expression, location?: TextRange, allowComments?: boolean): Statement[] | undefined {
-            shouldAppendUnderscoreUnderscoreEsModule = true;
+            shouldAppendEsModuleMarker = true;
             statements = append(statements, createExportStatement(exportName, expression, location, allowComments));
             return statements;
         }

From 535a001cbb07e8be0c50941e895deb9b7cebcde4 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Fri, 3 Feb 2017 17:38:39 -0800
Subject: [PATCH 084/127] Update baselines (3)

---
 src/harness/unittests/compileOnSave.ts                         | 2 +-
 tests/baselines/reference/declFileForExportedImport.js         | 1 +
 tests/baselines/reference/externalModuleQualification.js       | 1 +
 ...rnalModuleReferenceOfImportDeclarationWithExportModifier.js | 1 +
 tests/baselines/reference/importDeclWithClassModifiers.js      | 1 +
 tests/baselines/reference/importDeclWithDeclareModifier.js     | 1 +
 tests/baselines/reference/importDeclWithExportModifier.js      | 1 +
 .../importDeclWithExportModifierAndExportAssignment.js         | 1 +
 tests/baselines/reference/project/baseline/amd/decl.js         | 1 +
 tests/baselines/reference/project/baseline/node/decl.js        | 1 +
 tests/baselines/reference/project/baseline2/amd/decl.js        | 1 +
 tests/baselines/reference/project/baseline2/node/decl.js       | 1 +
 tests/baselines/reference/project/declarationDir/amd/a.js      | 1 +
 .../reference/project/declarationDir/amd/subfolder/b.js        | 1 +
 .../reference/project/declarationDir/amd/subfolder/c.js        | 1 +
 tests/baselines/reference/project/declarationDir/node/a.js     | 1 +
 .../reference/project/declarationDir/node/subfolder/b.js       | 1 +
 .../reference/project/declarationDir/node/subfolder/c.js       | 1 +
 tests/baselines/reference/project/declarationDir2/amd/out/a.js | 1 +
 .../reference/project/declarationDir2/amd/out/subfolder/b.js   | 1 +
 .../reference/project/declarationDir2/amd/out/subfolder/c.js   | 1 +
 .../baselines/reference/project/declarationDir2/node/out/a.js  | 1 +
 .../reference/project/declarationDir2/node/out/subfolder/b.js  | 1 +
 .../reference/project/declarationDir2/node/out/subfolder/c.js  | 1 +
 tests/baselines/reference/project/declarationDir3/amd/out.js   | 3 +++
 .../reference/project/declarationsCascadingImports/amd/m4.js   | 1 +
 .../reference/project/declarationsCascadingImports/node/m4.js  | 1 +
 .../reference/project/declarationsGlobalImport/amd/glo_m4.js   | 1 +
 .../project/declarationsGlobalImport/amd/useModule.js          | 1 +
 .../reference/project/declarationsGlobalImport/node/glo_m4.js  | 1 +
 .../project/declarationsGlobalImport/node/useModule.js         | 1 +
 .../project/declarationsImportedInPrivate/amd/private_m4.js    | 1 +
 .../project/declarationsImportedInPrivate/node/private_m4.js   | 1 +
 .../declarationsImportedUseInFunction/amd/fncOnly_m4.js        | 1 +
 .../project/declarationsImportedUseInFunction/amd/useModule.js | 1 +
 .../declarationsImportedUseInFunction/node/fncOnly_m4.js       | 1 +
 .../declarationsImportedUseInFunction/node/useModule.js        | 1 +
 .../declarationsIndirectImportShouldResultInError/amd/m4.js    | 1 +
 .../declarationsIndirectImportShouldResultInError/amd/m5.js    | 1 +
 .../amd/useModule.js                                           | 1 +
 .../declarationsIndirectImportShouldResultInError/node/m4.js   | 1 +
 .../declarationsIndirectImportShouldResultInError/node/m5.js   | 1 +
 .../node/useModule.js                                          | 1 +
 .../project/declarationsMultipleTimesImport/amd/m4.js          | 1 +
 .../project/declarationsMultipleTimesImport/amd/useModule.js   | 1 +
 .../project/declarationsMultipleTimesImport/node/m4.js         | 1 +
 .../project/declarationsMultipleTimesImport/node/useModule.js  | 1 +
 .../project/declarationsMultipleTimesMultipleImport/amd/m4.js  | 1 +
 .../project/declarationsMultipleTimesMultipleImport/amd/m5.js  | 1 +
 .../declarationsMultipleTimesMultipleImport/amd/useModule.js   | 1 +
 .../project/declarationsMultipleTimesMultipleImport/node/m4.js | 1 +
 .../project/declarationsMultipleTimesMultipleImport/node/m5.js | 1 +
 .../declarationsMultipleTimesMultipleImport/node/useModule.js  | 1 +
 .../reference/project/declarationsSimpleImport/amd/m4.js       | 1 +
 .../project/declarationsSimpleImport/amd/useModule.js          | 1 +
 .../reference/project/declarationsSimpleImport/node/m4.js      | 1 +
 .../project/declarationsSimpleImport/node/useModule.js         | 1 +
 .../emitDecoratorMetadataCommonJSISolatedModules/amd/main.js   | 1 +
 .../emitDecoratorMetadataCommonJSISolatedModules/node/main.js  | 1 +
 .../amd/main.js                                                | 1 +
 .../node/main.js                                               | 1 +
 .../project/emitDecoratorMetadataSystemJS/amd/main.js          | 1 +
 .../project/emitDecoratorMetadataSystemJS/node/main.js         | 1 +
 .../emitDecoratorMetadataSystemJSISolatedModules/amd/main.js   | 1 +
 .../emitDecoratorMetadataSystemJSISolatedModules/node/main.js  | 1 +
 .../amd/main.js                                                | 1 +
 .../node/main.js                                               | 1 +
 .../mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js    | 1 +
 .../mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js   | 1 +
 .../amd/outdir/simple/ref/m2.js                                | 1 +
 .../node/outdir/simple/ref/m2.js                               | 1 +
 .../amd/bin/test.js                                            | 1 +
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/bin/outAndOutDirFile.js                                | 1 +
 .../amd/bin/outAndOutDirFile.js.map                            | 2 +-
 .../amd/diskFile1.js                                           | 1 +
 .../mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js | 1 +
 .../mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js   | 1 +
 .../node/diskFile1.js                                          | 1 +
 .../node/ref/m1.js                                             | 1 +
 .../mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js  | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/test.js     | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js  | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/test.js    | 1 +
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js  | 1 +
 .../amd/bin/test.js                                            | 3 +++
 .../amd/bin/test.js.map                                        | 2 +-
 .../project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js  | 1 +
 .../mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js        | 1 +
 .../project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js | 1 +
 .../mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js       | 1 +
 .../amd/outdir/simple/m1.js                                    | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/m1.js                                   | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js   | 1 +
 .../mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js     | 1 +
 .../mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js  | 1 +
 .../mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js    | 1 +
 .../amd/outdir/simple/ref/m1.js                                | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/ref/m1.js                               | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js    | 1 +
 .../mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js   | 1 +
 .../amd/outdir/simple/ref/m2.js                                | 1 +
 .../node/outdir/simple/ref/m2.js                               | 1 +
 .../amd/bin/test.js                                            | 1 +
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/bin/outAndOutDirFile.js                                | 1 +
 .../amd/bin/outAndOutDirFile.js.map                            | 2 +-
 .../amd/diskFile1.js                                           | 1 +
 .../mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js | 1 +
 .../mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js   | 1 +
 .../node/diskFile1.js                                          | 1 +
 .../node/ref/m1.js                                             | 1 +
 .../mapRootRelativePathModuleMultifolderNoOutdir/node/test.js  | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/test.js     | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js  | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/test.js    | 1 +
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js  | 1 +
 .../amd/bin/test.js                                            | 3 +++
 .../amd/bin/test.js.map                                        | 2 +-
 .../project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js  | 1 +
 .../mapRootRelativePathModuleSimpleNoOutdir/amd/test.js        | 1 +
 .../project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js | 1 +
 .../mapRootRelativePathModuleSimpleNoOutdir/node/test.js       | 1 +
 .../amd/outdir/simple/m1.js                                    | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/m1.js                                   | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js   | 1 +
 .../mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js     | 1 +
 .../mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js  | 1 +
 .../mapRootRelativePathModuleSubfolderNoOutdir/node/test.js    | 1 +
 .../amd/outdir/simple/ref/m1.js                                | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/ref/m1.js                               | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js     | 1 +
 .../project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js    | 1 +
 .../amd/outdir/simple/ref/m2.js                                | 1 +
 .../node/outdir/simple/ref/m2.js                               | 1 +
 .../maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js  | 1 +
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/bin/outAndOutDirFile.js                                | 1 +
 .../amd/bin/outAndOutDirFile.js.map                            | 2 +-
 .../maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js       | 1 +
 .../project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js  | 1 +
 .../project/maprootUrlModuleMultifolderNoOutdir/amd/test.js    | 1 +
 .../maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js      | 1 +
 .../project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js | 1 +
 .../project/maprootUrlModuleMultifolderNoOutdir/node/test.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/test.js     | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js  | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/test.js    | 1 +
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js  | 1 +
 .../amd/bin/test.js                                            | 3 +++
 .../amd/bin/test.js.map                                        | 2 +-
 .../reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js | 1 +
 .../project/maprootUrlModuleSimpleNoOutdir/amd/test.js         | 1 +
 .../project/maprootUrlModuleSimpleNoOutdir/node/m1.js          | 1 +
 .../project/maprootUrlModuleSimpleNoOutdir/node/test.js        | 1 +
 .../amd/outdir/simple/m1.js                                    | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/m1.js                                   | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js    | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js    | 1 +
 .../project/maprootUrlModuleSubfolderNoOutdir/amd/test.js      | 1 +
 .../project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js   | 1 +
 .../project/maprootUrlModuleSubfolderNoOutdir/node/test.js     | 1 +
 .../amd/outdir/simple/ref/m1.js                                | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/ref/m1.js                               | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/ref/m2.js                                              | 1 +
 .../node/ref/m2.js                                             | 1 +
 .../amd/outdir/simple/ref/m2.js                                | 1 +
 .../node/outdir/simple/ref/m2.js                               | 1 +
 .../amd/bin/test.js                                            | 1 +
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/bin/outAndOutDirFile.js                                | 1 +
 .../amd/bin/outAndOutDirFile.js.map                            | 2 +-
 .../amd/diskFile1.js                                           | 1 +
 .../amd/ref/m1.js                                              | 1 +
 .../amd/test.js                                                | 1 +
 .../node/diskFile1.js                                          | 1 +
 .../node/ref/m1.js                                             | 1 +
 .../node/test.js                                               | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/test.js     | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js  | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/test.js    | 1 +
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js  | 1 +
 .../amd/bin/test.js                                            | 3 +++
 .../amd/bin/test.js.map                                        | 2 +-
 .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js      | 1 +
 .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js    | 1 +
 .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js     | 1 +
 .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js   | 1 +
 .../amd/outdir/simple/m1.js                                    | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/m1.js                                   | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/ref/m1.js                                              | 1 +
 .../maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js | 1 +
 .../node/ref/m1.js                                             | 1 +
 .../node/test.js                                               | 1 +
 .../amd/outdir/simple/ref/m1.js                                | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/ref/m1.js                               | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 tests/baselines/reference/project/nonRelative/amd/decl.js      | 1 +
 tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js | 1 +
 tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js | 1 +
 tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js | 1 +
 tests/baselines/reference/project/nonRelative/node/decl.js     | 1 +
 .../baselines/reference/project/nonRelative/node/lib/bar/a.js  | 1 +
 .../baselines/reference/project/nonRelative/node/lib/foo/a.js  | 1 +
 .../baselines/reference/project/nonRelative/node/lib/foo/b.js  | 1 +
 .../reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js  | 1 +
 .../reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js | 1 +
 .../amd/outdir/simple/ref/m2.js                                | 1 +
 .../node/outdir/simple/ref/m2.js                               | 1 +
 .../project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js | 1 +
 .../amd/bin/outAndOutDirFile.js                                | 1 +
 .../project/outModuleMultifolderNoOutdir/amd/diskFile0.js      | 1 +
 .../project/outModuleMultifolderNoOutdir/amd/ref/m1.js         | 1 +
 .../reference/project/outModuleMultifolderNoOutdir/amd/test.js | 1 +
 .../project/outModuleMultifolderNoOutdir/node/diskFile0.js     | 1 +
 .../project/outModuleMultifolderNoOutdir/node/ref/m1.js        | 1 +
 .../project/outModuleMultifolderNoOutdir/node/test.js          | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/test.js     | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js  | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/test.js    | 1 +
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js  | 1 +
 .../outModuleMultifolderSpecifyOutputFile/amd/bin/test.js      | 3 +++
 .../reference/project/outModuleSimpleNoOutdir/amd/m1.js        | 1 +
 .../reference/project/outModuleSimpleNoOutdir/amd/test.js      | 1 +
 .../reference/project/outModuleSimpleNoOutdir/node/m1.js       | 1 +
 .../reference/project/outModuleSimpleNoOutdir/node/test.js     | 1 +
 .../amd/outdir/simple/m1.js                                    | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/m1.js                                   | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js   | 2 ++
 .../reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js | 1 +
 .../reference/project/outModuleSubfolderNoOutdir/amd/test.js   | 1 +
 .../project/outModuleSubfolderNoOutdir/node/ref/m1.js          | 1 +
 .../reference/project/outModuleSubfolderNoOutdir/node/test.js  | 1 +
 .../amd/outdir/simple/ref/m1.js                                | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/ref/m1.js                               | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../outModuleSubfolderSpecifyOutputFile/amd/bin/test.js        | 2 ++
 .../sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js | 1 +
 .../node/ref/m2.js                                             | 1 +
 .../amd/outdir/simple/ref/m2.js                                | 1 +
 .../node/outdir/simple/ref/m2.js                               | 1 +
 .../amd/bin/test.js                                            | 1 +
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/bin/outAndOutDirFile.js                                | 1 +
 .../amd/bin/outAndOutDirFile.js.map                            | 2 +-
 .../amd/diskFile1.js                                           | 1 +
 .../amd/ref/m1.js                                              | 1 +
 .../amd/test.js                                                | 1 +
 .../node/diskFile1.js                                          | 1 +
 .../node/ref/m1.js                                             | 1 +
 .../node/test.js                                               | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/test.js     | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js  | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/test.js    | 1 +
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js  | 1 +
 .../amd/bin/test.js                                            | 3 +++
 .../amd/bin/test.js.map                                        | 2 +-
 .../sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js       | 1 +
 .../sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js     | 1 +
 .../sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js      | 1 +
 .../sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js    | 1 +
 .../amd/outdir/simple/m1.js                                    | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/m1.js                                   | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/ref/m1.js                                              | 1 +
 .../sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js  | 1 +
 .../node/ref/m1.js                                             | 1 +
 .../sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js | 1 +
 .../amd/outdir/simple/ref/m1.js                                | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/ref/m1.js                               | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js | 1 +
 .../node/ref/m2.js                                             | 1 +
 .../amd/outdir/simple/ref/m2.js                                | 1 +
 .../node/outdir/simple/ref/m2.js                               | 1 +
 .../amd/bin/test.js                                            | 1 +
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/bin/outAndOutDirFile.js                                | 1 +
 .../amd/bin/outAndOutDirFile.js.map                            | 2 +-
 .../amd/diskFile1.js                                           | 1 +
 .../amd/ref/m1.js                                              | 1 +
 .../amd/test.js                                                | 1 +
 .../node/diskFile1.js                                          | 1 +
 .../node/ref/m1.js                                             | 1 +
 .../node/test.js                                               | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/test.js     | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js  | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/test.js    | 1 +
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js  | 1 +
 .../amd/bin/test.js                                            | 3 +++
 .../amd/bin/test.js.map                                        | 2 +-
 .../sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js       | 1 +
 .../sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js     | 1 +
 .../sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js      | 1 +
 .../sourceRootRelativePathModuleSimpleNoOutdir/node/test.js    | 1 +
 .../amd/outdir/simple/m1.js                                    | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/m1.js                                   | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/ref/m1.js                                              | 1 +
 .../sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js  | 1 +
 .../node/ref/m1.js                                             | 1 +
 .../sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js | 1 +
 .../amd/outdir/simple/ref/m1.js                                | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/ref/m1.js                               | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js      | 1 +
 .../project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js     | 1 +
 .../amd/outdir/simple/ref/m2.js                                | 1 +
 .../node/outdir/simple/ref/m2.js                               | 1 +
 .../sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js   | 1 +
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/bin/outAndOutDirFile.js                                | 1 +
 .../amd/bin/outAndOutDirFile.js.map                            | 2 +-
 .../sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js        | 1 +
 .../project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js   | 1 +
 .../project/sourcemapModuleMultifolderNoOutdir/amd/test.js     | 1 +
 .../sourcemapModuleMultifolderNoOutdir/node/diskFile1.js       | 1 +
 .../project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js  | 1 +
 .../project/sourcemapModuleMultifolderNoOutdir/node/test.js    | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/test.js     | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js  | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/test.js    | 1 +
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js  | 1 +
 .../amd/bin/test.js                                            | 3 +++
 .../amd/bin/test.js.map                                        | 2 +-
 .../reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js  | 1 +
 .../project/sourcemapModuleSimpleNoOutdir/amd/test.js          | 1 +
 .../reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js | 1 +
 .../project/sourcemapModuleSimpleNoOutdir/node/test.js         | 1 +
 .../amd/outdir/simple/m1.js                                    | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/m1.js                                   | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js     | 2 ++
 .../sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map | 2 +-
 .../project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js     | 1 +
 .../project/sourcemapModuleSubfolderNoOutdir/amd/test.js       | 1 +
 .../project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js    | 1 +
 .../project/sourcemapModuleSubfolderNoOutdir/node/test.js      | 1 +
 .../amd/outdir/simple/ref/m1.js                                | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/ref/m1.js                               | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js  | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js  | 1 +
 .../project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js | 1 +
 .../amd/outdir/simple/ref/m2.js                                | 1 +
 .../node/outdir/simple/ref/m2.js                               | 1 +
 .../amd/bin/test.js                                            | 1 +
 .../amd/bin/test.js.map                                        | 2 +-
 .../amd/bin/outAndOutDirFile.js                                | 1 +
 .../amd/bin/outAndOutDirFile.js.map                            | 2 +-
 .../sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js    | 1 +
 .../sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js       | 1 +
 .../project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js | 1 +
 .../sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js   | 1 +
 .../sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js      | 1 +
 .../sourcerootUrlModuleMultifolderNoOutdir/node/test.js        | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js   | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder/test.js     | 1 +
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js  | 1 +
 .../node/outdir/simple/outputdir_module_multifolder/test.js    | 1 +
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js  | 1 +
 .../amd/bin/test.js                                            | 3 +++
 .../amd/bin/test.js.map                                        | 2 +-
 .../project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js        | 1 +
 .../project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js      | 1 +
 .../project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js       | 1 +
 .../project/sourcerootUrlModuleSimpleNoOutdir/node/test.js     | 1 +
 .../amd/outdir/simple/m1.js                                    | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/m1.js                                   | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js | 1 +
 .../project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js   | 1 +
 .../sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js        | 1 +
 .../project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js  | 1 +
 .../amd/outdir/simple/ref/m1.js                                | 1 +
 .../amd/outdir/simple/test.js                                  | 1 +
 .../node/outdir/simple/ref/m1.js                               | 1 +
 .../node/outdir/simple/test.js                                 | 1 +
 .../amd/bin/test.js                                            | 2 ++
 .../amd/bin/test.js.map                                        | 2 +-
 .../project/visibilityOfTypeUsedAcrossModules/amd/fs.js        | 1 +
 .../project/visibilityOfTypeUsedAcrossModules/node/fs.js       | 1 +
 tests/baselines/reference/sourceMapValidationImport.js         | 1 +
 tests/baselines/reference/topLevelLambda4.js                   | 1 +
 .../Transpile with emit decorators and emit metadata.js        | 1 +
 453 files changed, 491 insertions(+), 41 deletions(-)

diff --git a/src/harness/unittests/compileOnSave.ts b/src/harness/unittests/compileOnSave.ts
index c8deb9e7554..706fc45b6da 100644
--- a/src/harness/unittests/compileOnSave.ts
+++ b/src/harness/unittests/compileOnSave.ts
@@ -520,7 +520,7 @@ namespace ts.projectSystem {
 
             const expectedEmittedFileName = "/a/b/f1.js";
             assert.isTrue(host.fileExists(expectedEmittedFileName));
-            assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
+            assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\nexports.__esModule = true;\r\n`);
         });
 
         it("shoud not emit js files in external projects", () => {
diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js
index 8e07b99c8af..0bb2c7dfe55 100644
--- a/tests/baselines/reference/declFileForExportedImport.js
+++ b/tests/baselines/reference/declFileForExportedImport.js
@@ -21,6 +21,7 @@ exports.a = require("./declFileForExportedImport_0");
 var y = exports.a.x;
 exports.b = exports.a;
 var z = exports.b.x;
+exports.__esModule = true;
 
 
 //// [declFileForExportedImport_0.d.ts]
diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js
index 26255ac3fcd..353af42a408 100644
--- a/tests/baselines/reference/externalModuleQualification.js
+++ b/tests/baselines/reference/externalModuleQualification.js
@@ -28,3 +28,4 @@ var NavigateAction = (function () {
     };
     return NavigateAction;
 }());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
index 8a25c3711b2..e0e5eaf7bac 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
@@ -14,6 +14,7 @@ define(["require", "exports"], function (require, exports) {
     function foo() { }
     exports.foo = foo;
     ;
+    exports.__esModule = true;
 });
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js]
 define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExportModifier_0"], function (require, exports, file1) {
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js
index 0af92b1976a..98e322fb619 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.js
+++ b/tests/baselines/reference/importDeclWithClassModifiers.js
@@ -16,4 +16,5 @@ define(["require", "exports"], function (require, exports) {
     exports.b = x.c;
     exports.c = x.c;
     var b;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js
index 7c3d3782934..05c40739a82 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifier.js
+++ b/tests/baselines/reference/importDeclWithDeclareModifier.js
@@ -11,3 +11,4 @@ var b: a;
 "use strict";
 exports.a = x.c;
 var b;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js
index c04bf542b58..c23fae40749 100644
--- a/tests/baselines/reference/importDeclWithExportModifier.js
+++ b/tests/baselines/reference/importDeclWithExportModifier.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.a = x.c;
     var b;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
index da41309d56b..a4102cbfff4 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
@@ -9,3 +9,4 @@ export = x;
 //// [importDeclWithExportModifierAndExportAssignment.js]
 "use strict";
 exports.a = x.c;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js
index 2586bbb23bd..a8a506f23c3 100644
--- a/tests/baselines/reference/project/baseline/amd/decl.js
+++ b/tests/baselines/reference/project/baseline/amd/decl.js
@@ -5,4 +5,5 @@ define(["require", "exports"], function (require, exports) {
         return { x: x, y: y };
     }
     exports.point = point;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline/node/decl.js b/tests/baselines/reference/project/baseline/node/decl.js
index f6c19174e54..998ffaa5592 100644
--- a/tests/baselines/reference/project/baseline/node/decl.js
+++ b/tests/baselines/reference/project/baseline/node/decl.js
@@ -4,3 +4,4 @@ function point(x, y) {
     return { x: x, y: y };
 }
 exports.point = point;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js
index 2586bbb23bd..a8a506f23c3 100644
--- a/tests/baselines/reference/project/baseline2/amd/decl.js
+++ b/tests/baselines/reference/project/baseline2/amd/decl.js
@@ -5,4 +5,5 @@ define(["require", "exports"], function (require, exports) {
         return { x: x, y: y };
     }
     exports.point = point;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline2/node/decl.js b/tests/baselines/reference/project/baseline2/node/decl.js
index f6c19174e54..998ffaa5592 100644
--- a/tests/baselines/reference/project/baseline2/node/decl.js
+++ b/tests/baselines/reference/project/baseline2/node/decl.js
@@ -4,3 +4,4 @@ function point(x, y) {
     return { x: x, y: y };
 }
 exports.point = point;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js
index 331c004bd67..30c63965136 100644
--- a/tests/baselines/reference/project/declarationDir/amd/a.js
+++ b/tests/baselines/reference/project/declarationDir/amd/a.js
@@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
index e2cdda8530b..14c0c78edb8 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
@@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
index 212511f2bf5..b62647beae0 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
@@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js
index 35f5adf27f0..7480c269a05 100644
--- a/tests/baselines/reference/project/declarationDir/node/a.js
+++ b/tests/baselines/reference/project/declarationDir/node/a.js
@@ -5,3 +5,4 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
index 7b46df97ac3..3c9a75de66e 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
@@ -5,3 +5,4 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
index 65238579edc..6f1ce11cdc6 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
@@ -5,3 +5,4 @@ var C = (function () {
     return C;
 }());
 exports.C = C;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
index 331c004bd67..30c63965136 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
@@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
index e2cdda8530b..14c0c78edb8 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
@@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
index 212511f2bf5..b62647beae0 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
@@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js
index 35f5adf27f0..7480c269a05 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/a.js
@@ -5,3 +5,4 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
index 7b46df97ac3..3c9a75de66e 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
@@ -5,3 +5,4 @@ var B = (function () {
     return B;
 }());
 exports.B = B;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
index 65238579edc..6f1ce11cdc6 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
@@ -5,3 +5,4 @@ var C = (function () {
     return C;
 }());
 exports.C = C;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js
index 6c49867c908..d190c7a5767 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/out.js
+++ b/tests/baselines/reference/project/declarationDir3/amd/out.js
@@ -6,6 +6,7 @@ define("subfolder/b", ["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
+    exports.__esModule = true;
 });
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -15,6 +16,7 @@ define("a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
+    exports.__esModule = true;
 });
 define("subfolder/c", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -24,4 +26,5 @@ define("subfolder/c", ["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
index bb607f4b5b0..6b4aa7eeda6 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
@@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
index 52ecf390373..e89a132497c 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
@@ -10,3 +10,4 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
index bb607f4b5b0..6b4aa7eeda6 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
@@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
index b9390ddc239..44111609dca 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
@@ -3,4 +3,5 @@ define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) {
     exports.useGlo_m4_x4 = glo_m4.x;
     exports.useGlo_m4_d4 = glo_m4.d;
     exports.useGlo_m4_f4 = glo_m4.foo();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
index 52ecf390373..e89a132497c 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
@@ -10,3 +10,4 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
index d9219f20148..b3ee7499e44 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
@@ -3,3 +3,4 @@ var glo_m4 = require("glo_m4");
 exports.useGlo_m4_x4 = glo_m4.x;
 exports.useGlo_m4_d4 = glo_m4.d;
 exports.useGlo_m4_f4 = glo_m4.foo();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
index bb607f4b5b0..6b4aa7eeda6 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
@@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
index 52ecf390373..e89a132497c 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
@@ -10,3 +10,4 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
index bb607f4b5b0..6b4aa7eeda6 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
@@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
index 7485d0fb229..b3dc7cc82f2 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
@@ -1,4 +1,5 @@
 define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) {
     "use strict";
     exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
index 52ecf390373..e89a132497c 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
@@ -10,3 +10,4 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
index 095acfb7fc9..8d74ebb2b6e 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
@@ -1,3 +1,4 @@
 "use strict";
 var fncOnly_m4 = require("fncOnly_m4");
 exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
index bb607f4b5b0..6b4aa7eeda6 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
@@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
index 9e8ba0f7ade..6f282e26147 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
@@ -4,4 +4,5 @@ define(["require", "exports", "m4"], function (require, exports, m4) {
         return new m4.d();
     }
     exports.foo2 = foo2;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
index db9e68fbed9..e9c49cd4ddc 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
@@ -6,4 +6,5 @@ define(["require", "exports", "m5"], function (require, exports, m5) {
         return m5.foo2();
     }
     exports.n = n;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
index 52ecf390373..e89a132497c 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
@@ -10,3 +10,4 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
index a7e34c60fe3..fd0ae21091e 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
@@ -4,3 +4,4 @@ function foo2() {
     return new m4.d();
 }
 exports.foo2 = foo2;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
index 2bde79432f7..f06725c1068 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
@@ -7,3 +7,4 @@ function n() {
     return m5.foo2();
 }
 exports.n = n;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
index bb607f4b5b0..6b4aa7eeda6 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
@@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
index 0ec3a0d8331..8af4110011c 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
@@ -15,4 +15,5 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi
     exports.useMultiImport_m4_x4 = multiImport_m4.x;
     exports.useMultiImport_m4_d4 = multiImport_m4.d;
     exports.useMultiImport_m4_f4 = multiImport_m4.foo();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
index 52ecf390373..e89a132497c 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
@@ -10,3 +10,4 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
index 64b9438d96e..fc6900da8d5 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
@@ -17,3 +17,4 @@ var multiImport_m4 = require("m4"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
index bb607f4b5b0..6b4aa7eeda6 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
@@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
index 9e8ba0f7ade..6f282e26147 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
@@ -4,4 +4,5 @@ define(["require", "exports", "m4"], function (require, exports, m4) {
         return new m4.d();
     }
     exports.foo2 = foo2;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
index cc2eecd2208..7221b9e2e8f 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
@@ -13,4 +13,5 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
         var f3 = m4.foo();
     })(m1 = exports.m1 || (exports.m1 = {}));
     exports.d = m5.foo2();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
index 52ecf390373..e89a132497c 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
@@ -10,3 +10,4 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
index a7e34c60fe3..fd0ae21091e 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
@@ -4,3 +4,4 @@ function foo2() {
     return new m4.d();
 }
 exports.foo2 = foo2;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
index b4132f79b1f..7e7a43ce145 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
@@ -15,3 +15,4 @@ var m1;
 // Do not emit unused import
 var m5 = require("m5");
 exports.d = m5.foo2();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
index bb607f4b5b0..6b4aa7eeda6 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
@@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
index 634a988c1b8..1c8e3a5a308 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
@@ -12,4 +12,5 @@ define(["require", "exports", "m4"], function (require, exports, m4) {
         var d3 = m4.d;
         var f3 = m4.foo();
     })(m1 = exports.m1 || (exports.m1 = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
index 52ecf390373..e89a132497c 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
@@ -10,3 +10,4 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
index 40df471507c..ea2836708d2 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
@@ -12,3 +12,4 @@ var m1;
     var d3 = m4.d;
     var f3 = m4.foo();
 })(m1 = exports.m1 || (exports.m1 = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
index 8b73fc550cf..eddb9c577a6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
index 3c1d2cd6da6..cbcf36973fd 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -21,3 +21,4 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
index 8b73fc550cf..eddb9c577a6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
index 3c1d2cd6da6..cbcf36973fd 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -21,3 +21,4 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
index 8b73fc550cf..eddb9c577a6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
index 3c1d2cd6da6..cbcf36973fd 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -21,3 +21,4 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
index 8b73fc550cf..eddb9c577a6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
index 3c1d2cd6da6..cbcf36973fd 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -21,3 +21,4 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
index 8b73fc550cf..eddb9c577a6 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
index 3c1d2cd6da6..cbcf36973fd 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -21,3 +21,4 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 2ccb7d6f77a..2ef457654e2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index b991eda4382..b12b9bfe9bb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 2ccb7d6f77a..2ef457654e2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index b991eda4382..b12b9bfe9bb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 3dd9960df14..225b233f3e1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index dce282ee37f..e9248099943 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index ccf78301cb1..ee9fb6673be 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 1316ec74659..9d5330f5c81 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index d77e78e3751..62dc8a8d83f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index b663057aeff..2d386326fcd 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index 550fa7b9564..944360ae9cc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index 76a761b602d..e7e1070403f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index 7ad78d4877d..bd73b1912c2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index 033b046cfe0..aff7400b20f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index b663057aeff..2d386326fcd 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 550fa7b9564..944360ae9cc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index d77e78e3751..62dc8a8d83f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 7ad78d4877d..bd73b1912c2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 033b046cfe0..aff7400b20f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 76a761b602d..e7e1070403f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 29bc22bd61c..4b75cfaa754 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
@@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d9151baabe4..d65b73465ef 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index 3017cac2b88..dd98ae30d59 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index 81972e29958..c8ece24eda3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index efdf4bd9a30..27d3a9788c4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index 5bc656a7470..058f9c4c3a5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 3017cac2b88..dd98ae30d59 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 81972e29958..c8ece24eda3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index efdf4bd9a30..27d3a9788c4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 5bc656a7470..058f9c4c3a5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d3a752a0ee4..00530261d76 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a910ecda80e..a30b607676c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 13158547401..1d0559224b8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index cc32d33f88f..cb628091e33 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 80d76037a7f..99859780314 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index 69051eba247..541d8dc4c26 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 13158547401..1d0559224b8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index cc32d33f88f..cb628091e33 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 80d76037a7f..99859780314 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 69051eba247..541d8dc4c26 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index d20feb624ba..0f5938617e2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a3532b9e4ce..173790ea042 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index d0a6c1f583f..30cf48ae0ef 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index b5c226692a0..f7a19e1fa14 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 961737d6acf..744aff01a08 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index d078a80e31c..edf0e169c56 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 043adb3dd6f..3f4ebdb1911 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index d8fff48f73e..b2efc9bf3d4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index b40b056b6d9..f1ed00eb139 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index bb9e992d471..95830bd2c25 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index bbbb972580d..9cdad10a966 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 7ecd677009d..2df791f04e8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index b40eb0dad12..1d1c53b36cf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index 338d724fe93..a889d6f19b3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 112ae7e7062..83cb52c7f14 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 2786dcd54f3..9ef0d252f05 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 4d721e1be5d..f50e1837a86 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 6c23883b7ab..1222f92a7d2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index a654db8e087..edafd9055b2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index a1d86ff1857..3cfb1b4c030 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 76f1ae7fa80..4e054f32699 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index a98ecd6f1c3..931971b3f84 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 01c28031d8a..44a6d536eed 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
@@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index ae1d6457599..b4f33f056d6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index 826510699a7..8151fed382b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
index f6ab0afdc94..fe1308aca7e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
index 123e89b6c81..b1a971bd89f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
index d96b6cae463..e4c81cdfc8e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 415eb731ee6..df8c82915fb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 88661b25d1d..f361c1c0917 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 4c96696726b..7479c4aebee 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 2e487817c4e..7e4f77c1c69 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 1e43585f281..37af60df3ea 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 3542da2fe04..5721a33f4a5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index d7fc22ee9b3..29a43275b49 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index a9c2e2c5462..62ec7868d70 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index 4423220831b..debe15abde9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
index 291a3630b3e..461809c985f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 447f2cb756d..09f9886020e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index bd2c181d29e..5eab5555cbe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index b4b9b2dc7e0..81956eb2903 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index c162eaa3671..fd86ae84059 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 23442cdbfa6..708517a1d95 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 3096c610237..a7416c83297 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 70911579465..d1d1f0269e8 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index e4c76ba72e2..c55d9770436 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 70911579465..d1d1f0269e8 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index e4c76ba72e2..c55d9770436 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b1f7d5f7329..62e49557aab 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index eececdeabfd..7618a616fa3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 2cf202bd871..5df712534f6 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 4bdde308824..6a226fbc86c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 1e006b165b9..587eac86010 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 2141ed5cbb8..746d401dc82 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
index 149e213901a..e1237d92b8e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 2e93a073415..cfa86d8b53f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 651782fa421..e3725479646 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
index 99135b7b275..4737d2e579b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 2141ed5cbb8..746d401dc82 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 149e213901a..e1237d92b8e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1e006b165b9..587eac86010 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 651782fa421..e3725479646 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 99135b7b275..4737d2e579b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 2e93a073415..cfa86d8b53f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 99da107dfa8..058227b1276 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
@@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 6b934e00e04..f80ee7e3208 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
index b85ad9ab5b1..44d9d5ddc28 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
index c3300bc7998..b4651a0d0dd 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
index 9e79b0167c6..5c9cea260f4 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
index 29b6fee1d66..693783c4c10 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index b85ad9ab5b1..44d9d5ddc28 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c3300bc7998..b4651a0d0dd 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 9e79b0167c6..5c9cea260f4 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 29b6fee1d66..693783c4c10 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 4b21632bd6c..16cec87f1e7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 5396cab1d7c..c7b114195f2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index c3d36f22356..1556b5c5d2f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
index 5ec4a043557..ad7acefc91b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 8fe6d174601..73def0e2583 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
index 0b258a0b620..bb09d33c72b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index c3d36f22356..1556b5c5d2f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 5ec4a043557..ad7acefc91b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 8fe6d174601..73def0e2583 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 0b258a0b620..bb09d33c72b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index a58fc69531f..cf6d4730e19 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 308dbbfaa67..d1ea7163910 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 70911579465..d1d1f0269e8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index e4c76ba72e2..c55d9770436 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 70911579465..d1d1f0269e8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index e4c76ba72e2..c55d9770436 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b1f7d5f7329..62e49557aab 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 26353fdf396..33f8f550fbd 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 2cf202bd871..5df712534f6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index ec57587014d..a60954292ba 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 1e006b165b9..587eac86010 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 2141ed5cbb8..746d401dc82 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index 149e213901a..e1237d92b8e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 2e93a073415..cfa86d8b53f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 651782fa421..e3725479646 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 99135b7b275..4737d2e579b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 2141ed5cbb8..746d401dc82 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 149e213901a..e1237d92b8e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1e006b165b9..587eac86010 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 651782fa421..e3725479646 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 99135b7b275..4737d2e579b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 2e93a073415..cfa86d8b53f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 99da107dfa8..058227b1276 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
@@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index c4facdba936..9ca8e953224 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index b85ad9ab5b1..44d9d5ddc28 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
index c3300bc7998..b4651a0d0dd 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 9e79b0167c6..5c9cea260f4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
index 29b6fee1d66..693783c4c10 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index b85ad9ab5b1..44d9d5ddc28 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c3300bc7998..b4651a0d0dd 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 9e79b0167c6..5c9cea260f4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 29b6fee1d66..693783c4c10 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 4b21632bd6c..16cec87f1e7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 64c90d05e88..714b2137400 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index c3d36f22356..1556b5c5d2f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index 5ec4a043557..ad7acefc91b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 8fe6d174601..73def0e2583 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
index 0b258a0b620..bb09d33c72b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index c3d36f22356..1556b5c5d2f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 5ec4a043557..ad7acefc91b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 8fe6d174601..73def0e2583 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 0b258a0b620..bb09d33c72b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index a58fc69531f..cf6d4730e19 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 6d26d850e19..a2fff6d9c90 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nonRelative/amd/decl.js b/tests/baselines/reference/project/nonRelative/amd/decl.js
index f2dbc101a52..90d387773d3 100644
--- a/tests/baselines/reference/project/nonRelative/amd/decl.js
+++ b/tests/baselines/reference/project/nonRelative/amd/decl.js
@@ -4,4 +4,5 @@ define(["require", "exports"], function (require, exports) {
         return "success";
     }
     exports.call = call;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
index a8619f88260..4731ff335a3 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
@@ -2,4 +2,5 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function hello() { }
     exports.hello = hello;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
index a8619f88260..4731ff335a3 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
@@ -2,4 +2,5 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function hello() { }
     exports.hello = hello;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
index a8619f88260..4731ff335a3 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
@@ -2,4 +2,5 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function hello() { }
     exports.hello = hello;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/node/decl.js b/tests/baselines/reference/project/nonRelative/node/decl.js
index e2d4b03d1c1..9bb5f2ac6ed 100644
--- a/tests/baselines/reference/project/nonRelative/node/decl.js
+++ b/tests/baselines/reference/project/nonRelative/node/decl.js
@@ -3,3 +3,4 @@ function call() {
     return "success";
 }
 exports.call = call;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
index 182e381bcde..819723f9833 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
@@ -1,3 +1,4 @@
 "use strict";
 function hello() { }
 exports.hello = hello;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
index 182e381bcde..819723f9833 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
@@ -1,3 +1,4 @@
 "use strict";
 function hello() { }
 exports.hello = hello;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
index 182e381bcde..819723f9833 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
@@ -1,3 +1,4 @@
 "use strict";
 function hello() { }
 exports.hello = hello;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
index 125abe99f0e..e7791f9f3f5 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
index 9fdf5b0ad0f..90648dbecec 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
@@ -11,3 +11,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 125abe99f0e..e7791f9f3f5 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 9fdf5b0ad0f..90648dbecec 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -11,3 +11,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 7898180c050..bc27e650743 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 7898180c050..bc27e650743 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
index 125abe99f0e..e7791f9f3f5 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
index 34936dca125..a56e5f0ea0b 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
index ddda2e19133..87b3e0b6856 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
@@ -14,4 +14,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
index 9fdf5b0ad0f..90648dbecec 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
@@ -11,3 +11,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
index 5854acba9e2..a355a990939 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
@@ -11,3 +11,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
index 77e6fbe68c1..313682ec06c 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
@@ -15,3 +15,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 34936dca125..a56e5f0ea0b 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index ddda2e19133..87b3e0b6856 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -14,4 +14,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 125abe99f0e..e7791f9f3f5 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 5854acba9e2..a355a990939 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -11,3 +11,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 77e6fbe68c1..313682ec06c 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -15,3 +15,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 9fdf5b0ad0f..90648dbecec 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -11,3 +11,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index ea6ae0a3cd7..5c65bc4968b 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
@@ -44,4 +46,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
index 34936dca125..a56e5f0ea0b 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
index cd107bb32f2..39ac64cda82 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
@@ -13,4 +13,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
index 5854acba9e2..a355a990939 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
@@ -11,3 +11,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
index 912480b74ce..e12a028abc0 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
@@ -13,3 +13,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 34936dca125..a56e5f0ea0b 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index cd107bb32f2..39ac64cda82 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,4 +13,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 5854acba9e2..a355a990939 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -11,3 +11,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 912480b74ce..e12a028abc0 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,3 +13,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 04f9d32831e..4c036fa59a1 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
@@ -28,4 +29,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
index 34936dca125..a56e5f0ea0b 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
index 67c8fedf898..865896d2602 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
@@ -13,4 +13,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
index 5854acba9e2..a355a990939 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
@@ -11,3 +11,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
index 0dea10818b9..8d4d683ff7c 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
@@ -13,3 +13,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 34936dca125..a56e5f0ea0b 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 67c8fedf898..865896d2602 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,4 +13,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 5854acba9e2..a355a990939 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -11,3 +11,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 0dea10818b9..8d4d683ff7c 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,3 +13,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 05ee275fc15..7c40db25bb7 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
@@ -28,4 +29,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 25cfe0fccb5..b89b17f8f86 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 650c9d1e5d5..57114f145bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index de21b030c35..5273d0854a9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 6113c44d85d..132d98cd87f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index efa0bc948ed..a2caf4c4d27 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index 84731dff566..15438b46b38 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index efa0bc948ed..a2caf4c4d27 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 84731dff566..15438b46b38 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 37064fb583b..9a2242a8aaa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
@@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index baeea1e93dc..bd89a9514f2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index c4b7f56d76a..b1cc860a987 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index fea4b619aa2..456acd3a256 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c4b7f56d76a..b1cc860a987 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index fea4b619aa2..456acd3a256 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d650b20ae5f..7545a7d7481 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index aa0c2ca28b2..8718a3a9350 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index 0ad51aeb02e..601d3a94662 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index ebd5fdb3b3f..074abf07716 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 0ad51aeb02e..601d3a94662 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index ebd5fdb3b3f..074abf07716 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index f55492f4b49..5f9a96e405e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 27b41a837a9..af3b647fcab 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 25cfe0fccb5..b89b17f8f86 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 9a9586bd20d..5378b914fc7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index de21b030c35..5273d0854a9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 16e3437b61c..cd6b23ddc0f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index efa0bc948ed..a2caf4c4d27 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 84731dff566..15438b46b38 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index efa0bc948ed..a2caf4c4d27 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 84731dff566..15438b46b38 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 37064fb583b..9a2242a8aaa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
@@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 4d37f7bfbf5..66fd3cfe867 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
index c4b7f56d76a..b1cc860a987 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
index fea4b619aa2..456acd3a256 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c4b7f56d76a..b1cc860a987 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index fea4b619aa2..456acd3a256 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d650b20ae5f..7545a7d7481 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 7e83d4cd269..a5dcbdc600a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index 0ad51aeb02e..601d3a94662 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
index ebd5fdb3b3f..074abf07716 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 0ad51aeb02e..601d3a94662 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index ebd5fdb3b3f..074abf07716 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index f55492f4b49..5f9a96e405e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 223d2cfdad3..d9e63184a83 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 25cfe0fccb5..b89b17f8f86 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index dce282ee37f..e9248099943 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index de21b030c35..5273d0854a9 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 1316ec74659..9d5330f5c81 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
index efa0bc948ed..a2caf4c4d27 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
index 84731dff566..15438b46b38 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index efa0bc948ed..a2caf4c4d27 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 84731dff566..15438b46b38 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 37064fb583b..9a2242a8aaa 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
@@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d9151baabe4..d65b73465ef 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
index c4b7f56d76a..b1cc860a987 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
index fea4b619aa2..456acd3a256 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c4b7f56d76a..b1cc860a987 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index fea4b619aa2..456acd3a256 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d650b20ae5f..7545a7d7481 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a910ecda80e..a30b607676c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
index 0ad51aeb02e..601d3a94662 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
index ebd5fdb3b3f..074abf07716 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 0ad51aeb02e..601d3a94662 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index ebd5fdb3b3f..074abf07716 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index f55492f4b49..5f9a96e405e 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a3532b9e4ce..173790ea042 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 25cfe0fccb5..b89b17f8f86 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 26353fdf396..33f8f550fbd 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index de21b030c35..5273d0854a9 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index ec57587014d..a60954292ba 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index efa0bc948ed..a2caf4c4d27 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 84731dff566..15438b46b38 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index efa0bc948ed..a2caf4c4d27 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 41f4a4e2521..1f9e7b86170 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 84731dff566..15438b46b38 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -15,4 +15,5 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index eae1115846a..1ce56f5da03 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -11,4 +11,5 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 37064fb583b..9a2242a8aaa 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
+    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
@@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index c4facdba936..9ca8e953224 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
index c4b7f56d76a..b1cc860a987 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
index fea4b619aa2..456acd3a256 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c4b7f56d76a..b1cc860a987 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index fea4b619aa2..456acd3a256 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index d650b20ae5f..7545a7d7481 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 64c90d05e88..714b2137400 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index 0ad51aeb02e..601d3a94662 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
index ebd5fdb3b3f..074abf07716 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index bb59c6fbd90..f42866a6613 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 0ad51aeb02e..601d3a94662 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 121a089af23..3eb09997f4f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -11,4 +11,5 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
+exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index ebd5fdb3b3f..074abf07716 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -13,4 +13,5 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
+exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index f55492f4b49..5f9a96e405e 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
+    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
@@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 6d26d850e19..a2fff6d9c90 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
index a40f7b2f9cd..d80da6d9e1b 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
@@ -15,4 +15,5 @@ define(["require", "exports"], function (require, exports) {
         return RM;
     }());
     exports.RM = RM;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
index c537ef54352..a07a323df50 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
@@ -14,3 +14,4 @@ var RM = (function () {
     return RM;
 }());
 exports.RM = RM;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js
index d9a75d96848..8dc10349c90 100644
--- a/tests/baselines/reference/sourceMapValidationImport.js
+++ b/tests/baselines/reference/sourceMapValidationImport.js
@@ -23,4 +23,5 @@ var a = m.c;
 exports.b = m.c;
 var x = new a();
 var y = new exports.b();
+exports.__esModule = true;
 //# sourceMappingURL=sourceMapValidationImport.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/topLevelLambda4.js b/tests/baselines/reference/topLevelLambda4.js
index 81d3c4a1e4f..7cfdf180063 100644
--- a/tests/baselines/reference/topLevelLambda4.js
+++ b/tests/baselines/reference/topLevelLambda4.js
@@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     var _this = this;
     exports.x = function () { return _this.window; };
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
index b6b17292c12..54ceb0250e1 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
@@ -16,4 +16,5 @@ MyClass = __decorate([
 ], MyClass);
 exports.MyClass = MyClass;
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=file.js.map
\ No newline at end of file

From 9a65a6642315d014c8a132a068f80ceaf71b7ac7 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Sat, 4 Feb 2017 22:46:38 -0800
Subject: [PATCH 085/127] Fix linter error

---
 src/compiler/visitor.ts   |  2 +-
 src/services/transform.ts | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 src/services/transform.ts

diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 63c3726fc10..fd2b0314dda 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -587,7 +587,7 @@ namespace ts {
                 }
                 if (visited) {
                     if (isArray(visited)) {
-                        for (let visitedNode of visited) {
+                        for (const visitedNode of visited) {
                             Debug.assertNode(visitedNode, test);
                             aggregateTransformFlags(visitedNode);
                             updated.push(<T>visitedNode);
diff --git a/src/services/transform.ts b/src/services/transform.ts
new file mode 100644
index 00000000000..c9107eea853
--- /dev/null
+++ b/src/services/transform.ts
@@ -0,0 +1,29 @@
+/// <reference path="..\compiler\transformer.ts"/>
+/// <reference path="transpile.ts"/>
+namespace ts {
+    /**
+     * Transform one or more source files using the supplied transformers.
+     * @param source A `SourceFile` or an array of `SourceFiles`.
+     * @param transformers An array of `Transformer` callbacks used to process the transformation.
+     */
+    export function transform(source: SourceFile | SourceFile[], transformers: Transformer[]) {
+        const diagnostics: Diagnostic[] = [];
+        const compilerOptions: CompilerOptions = {};
+        const sourceFiles = isArray(source) ? source : [source];
+        const fileMap = arrayToMap(sourceFiles, sourceFile => sourceFile.fileName);
+        const emitHost: EmitHost = {
+            getCompilerOptions: () => compilerOptions,
+            getCanonicalFileName: fileName => fileName,
+            getCommonSourceDirectory: () => "",
+            getCurrentDirectory: () => "",
+            getNewLine: () => "\n",
+            getSourceFile: fileName => fileMap.get(fileName),
+            getSourceFileByPath: fileName => fileMap.get(fileName),
+            getSourceFiles: () => sourceFiles,
+            isSourceFileFromExternalLibrary: () => false,
+            isEmitBlocked: () => false,
+            writeFile: () => Debug.fail("'writeFile()' is not supported during transformation.")
+        };
+        return transformFiles(/*resolver*/ undefined, emitHost, sourceFiles, transformers);
+    }
+}
\ No newline at end of file

From b830dea36267bd763a9461b6955f798dd5e0429e Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 5 Feb 2017 13:20:10 -0800
Subject: [PATCH 086/127] Clean up SymbolFlags, introduce CheckFlags in
 TransientSymbol

---
 src/compiler/checker.ts           | 137 +++++++++++++-----------------
 src/compiler/types.ts             |  76 +++++++++--------
 src/services/findAllReferences.ts |   2 +-
 src/services/symbolDisplay.ts     |   2 +-
 4 files changed, 102 insertions(+), 115 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b5306771dd7..a0878b47ebb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -60,9 +60,9 @@ namespace ts {
 
         const emitResolver = createResolver();
 
-        const undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined");
+        const undefinedSymbol = createSymbol(SymbolFlags.Property, "undefined");
         undefinedSymbol.declarations = [];
-        const argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments");
+        const argumentsSymbol = createSymbol(SymbolFlags.Property, "arguments");
 
         const checker: TypeChecker = {
             getNodeCount: () => sum(host.getSourceFiles(), "nodeCount"),
@@ -131,8 +131,8 @@ namespace ts {
         const indexedAccessTypes = createMap<IndexedAccessType>();
         const evolvingArrayTypes: EvolvingArrayType[] = [];
 
-        const unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown");
-        const resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__");
+        const unknownSymbol = createSymbol(SymbolFlags.Property, "unknown");
+        const resolvingSymbol = createSymbol(0, "__resolving__");
 
         const anyType = createIntrinsicType(TypeFlags.Any, "any");
         const autoType = createIntrinsicType(TypeFlags.Any, "any");
@@ -154,7 +154,7 @@ namespace ts {
 
         const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
-        const emptyTypeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral | SymbolFlags.Transient, "__type");
+        const emptyTypeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
         emptyTypeLiteralSymbol.members = createMap<Symbol>();
         const emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
@@ -416,9 +416,11 @@ namespace ts {
             diagnostics.add(diagnostic);
         }
 
-        function createSymbol(flags: SymbolFlags, name: string): Symbol {
+        function createSymbol(flags: SymbolFlags, name: string) {
             symbolCount++;
-            return new Symbol(flags, name);
+            const symbol = <TransientSymbol>(new Symbol(flags | SymbolFlags.Transient, name));
+            symbol.checkFlags = 0;
+            return symbol;
         }
 
         function getExcludedSymbolFlags(flags: SymbolFlags): SymbolFlags {
@@ -451,7 +453,7 @@ namespace ts {
         }
 
         function cloneSymbol(symbol: Symbol): Symbol {
-            const result = createSymbol(symbol.flags | SymbolFlags.Merged, symbol.name);
+            const result = createSymbol(symbol.flags, symbol.name);
             result.declarations = symbol.declarations.slice(0);
             result.parent = symbol.parent;
             if (symbol.valueDeclaration) result.valueDeclaration = symbol.valueDeclaration;
@@ -508,7 +510,7 @@ namespace ts {
                     target.set(id, sourceSymbol);
                 }
                 else {
-                    if (!(targetSymbol.flags & SymbolFlags.Merged)) {
+                    if (!(targetSymbol.flags & SymbolFlags.Transient)) {
                         targetSymbol = cloneSymbol(targetSymbol);
                         target.set(id, targetSymbol);
                     }
@@ -545,7 +547,7 @@ namespace ts {
                 if (mainModule.flags & SymbolFlags.Namespace) {
                     // if module symbol has already been merged - it is safe to use it.
                     // otherwise clone it
-                    mainModule = mainModule.flags & SymbolFlags.Merged ? mainModule : cloneSymbol(mainModule);
+                    mainModule = mainModule.flags & SymbolFlags.Transient ? mainModule : cloneSymbol(mainModule);
                     mergeSymbol(mainModule, moduleAugmentation.symbol);
                 }
                 else {
@@ -586,6 +588,10 @@ namespace ts {
             return type.flags & TypeFlags.Object ? (<ObjectType>type).objectFlags : 0;
         }
 
+        function getCheckFlags(symbol: Symbol): CheckFlags {
+            return symbol.flags & SymbolFlags.Transient ? (<TransientSymbol>symbol).checkFlags : 0;
+        }
+
         function isGlobalSourceFile(node: Node) {
             return node.kind === SyntaxKind.SourceFile && !isExternalOrCommonJsModule(<SourceFile>node);
         }
@@ -594,7 +600,7 @@ namespace ts {
             if (meaning) {
                 const symbol = symbols.get(name);
                 if (symbol) {
-                    Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
+                    Debug.assert((getCheckFlags(symbol) & CheckFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
                     if (symbol.flags & meaning) {
                         return symbol;
                     }
@@ -1426,7 +1432,7 @@ namespace ts {
             else {
                 Debug.fail("Unknown entity name kind.");
             }
-            Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
+            Debug.assert((getCheckFlags(symbol) & CheckFlags.Instantiated) === 0, "Should never get an instantiated symbol here.");
             return (symbol.flags & meaning) || dontResolveAlias ? symbol : resolveAlias(symbol);
         }
 
@@ -1670,23 +1676,7 @@ namespace ts {
         }
 
         function symbolIsValue(symbol: Symbol): boolean {
-            // If it is an instantiated symbol, then it is a value if the symbol it is an
-            // instantiation of is a value.
-            if (symbol.flags & SymbolFlags.Instantiated) {
-                return symbolIsValue(getSymbolLinks(symbol).target);
-            }
-
-            // If the symbol has the value flag, it is trivially a value.
-            if (symbol.flags & SymbolFlags.Value) {
-                return true;
-            }
-
-            // If it is an alias, then it is a value if the symbol it resolves to is a value.
-            if (symbol.flags & SymbolFlags.Alias) {
-                return (resolveAlias(symbol).flags & SymbolFlags.Value) !== 0;
-            }
-
-            return false;
+            return !!(symbol.flags & SymbolFlags.Value || symbol.flags & SymbolFlags.Alias && resolveAlias(symbol).flags & SymbolFlags.Value);
         }
 
         function findConstructorDeclaration(node: ClassLikeDeclaration): ConstructorDeclaration {
@@ -2238,7 +2228,7 @@ namespace ts {
                     if (parentSymbol) {
                         // Write type arguments of instantiated class/interface here
                         if (flags & SymbolFormatFlags.WriteTypeParametersOrArguments) {
-                            if (symbol.flags & SymbolFlags.Instantiated) {
+                            if (getCheckFlags(symbol) & CheckFlags.Instantiated) {
                                 buildDisplayForTypeArgumentsAndDelimiters(getTypeParametersOfClassOrInterface(parentSymbol),
                                     (<TransientSymbol>symbol).mapper, writer, enclosingDeclaration);
                             }
@@ -3411,8 +3401,8 @@ namespace ts {
                 }
 
                 const text = getTextOfPropertyName(name);
-                const flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0);
-                const symbol = <TransientSymbol>createSymbol(flags, text);
+                const flags = SymbolFlags.Property | (e.initializer ? SymbolFlags.Optional : 0);
+                const symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType, reportErrors);
                 symbol.bindingElement = e;
                 members.set(symbol.name, symbol);
@@ -3721,7 +3711,7 @@ namespace ts {
         }
 
         function getTypeOfSymbol(symbol: Symbol): Type {
-            if (symbol.flags & SymbolFlags.Instantiated) {
+            if (getCheckFlags(symbol) & CheckFlags.Instantiated) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
             if (symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property)) {
@@ -4519,7 +4509,7 @@ namespace ts {
                                 s = cloneSignature(signature);
                                 if (forEach(unionSignatures, sig => sig.thisParameter)) {
                                     const thisType = getUnionType(map(unionSignatures, sig => getTypeOfSymbol(sig.thisParameter) || anyType), /*subtypeReduction*/ true);
-                                    s.thisParameter = createTransientSymbol(signature.thisParameter, thisType);
+                                    s.thisParameter = createSymbolWithType(signature.thisParameter, thisType);
                                 }
                                 // Clear resolved return type we possibly got from cloneSignature
                                 s.resolvedReturnType = undefined;
@@ -4716,9 +4706,9 @@ namespace ts {
                     const propName = (<LiteralType>t).text;
                     const modifiersProp = getPropertyOfType(modifiersType, propName);
                     const isOptional = templateOptional || !!(modifiersProp && modifiersProp.flags & SymbolFlags.Optional);
-                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | (isOptional ? SymbolFlags.Optional : 0), propName);
+                    const prop = createSymbol(SymbolFlags.Property | (isOptional ? SymbolFlags.Optional : 0), propName);
+                    prop.checkFlags = templateReadonly || modifiersProp && isReadonlySymbol(modifiersProp) ? CheckFlags.Readonly : 0;
                     prop.type = propType;
-                    prop.isReadonly = templateReadonly || modifiersProp && isReadonlySymbol(modifiersProp);
                     if (propertySymbol) {
                         prop.mappedTypeOrigin = propertySymbol;
                     }
@@ -4954,8 +4944,7 @@ namespace ts {
             let props: Symbol[];
             // Flags we want to propagate to the result if they exist in all source symbols
             let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None;
-            let isReadonly = false;
-            let isPartial = false;
+            let checkFlags = CheckFlags.SyntheticProperty;
             for (const current of types) {
                 const type = getApparentType(current);
                 if (type !== unknownType) {
@@ -4969,25 +4958,23 @@ namespace ts {
                             props.push(prop);
                         }
                         if (isReadonlySymbol(prop)) {
-                            isReadonly = true;
+                            checkFlags |= CheckFlags.Readonly;
                         }
-
                     }
                     else if (containingType.flags & TypeFlags.Union) {
-                        isPartial = true;
+                        checkFlags |= CheckFlags.Partial;
                     }
                 }
             }
             if (!props) {
                 return undefined;
             }
-            if (props.length === 1 && !isPartial) {
+            if (props.length === 1 && !(checkFlags & CheckFlags.Partial)) {
                 return props[0];
             }
             const propTypes: Type[] = [];
             const declarations: Declaration[] = [];
             let commonType: Type = undefined;
-            let hasNonUniformType = false;
             for (const prop of props) {
                 if (prop.declarations) {
                     addRange(declarations, prop.declarations);
@@ -4997,16 +4984,14 @@ namespace ts {
                     commonType = type;
                 }
                 else if (type !== commonType) {
-                    hasNonUniformType = true;
+                    checkFlags |= CheckFlags.HasNonUniformType;
                 }
                 propTypes.push(type);
             }
-            const result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | commonFlags, name);
+            const result = createSymbol(SymbolFlags.Property | commonFlags, name);
+            result.checkFlags = checkFlags;
             result.containingType = containingType;
-            result.hasNonUniformType = hasNonUniformType;
-            result.isPartial = isPartial;
             result.declarations = declarations;
-            result.isReadonly = isReadonly;
             result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
@@ -5031,7 +5016,7 @@ namespace ts {
         function getPropertyOfUnionOrIntersectionType(type: UnionOrIntersectionType, name: string): Symbol {
             const property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
-            return property && !(property.flags & SymbolFlags.SyntheticProperty && (<TransientSymbol>property).isPartial) ? property : undefined;
+            return property && !(getCheckFlags(property) & CheckFlags.Partial) ? property : undefined;
         }
 
         /**
@@ -5835,7 +5820,7 @@ namespace ts {
             for (let i = 0; i < arity; i++) {
                 const typeParameter = <TypeParameter>createType(TypeFlags.TypeParameter);
                 typeParameters.push(typeParameter);
-                const property = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "" + i);
+                const property = createSymbol(SymbolFlags.Property, "" + i);
                 property.type = typeParameter;
                 properties.push(property);
             }
@@ -6419,13 +6404,13 @@ namespace ts {
                     const rightType = getTypeOfSymbol(rightProp);
                     if (maybeTypeOfKind(rightType, TypeFlags.Undefined) || rightProp.flags & SymbolFlags.Optional) {
                         const declarations: Declaration[] = concatenate(leftProp.declarations, rightProp.declarations);
-                        const flags = SymbolFlags.Property | SymbolFlags.Transient | (leftProp.flags & SymbolFlags.Optional);
-                        const result = <TransientSymbol>createSymbol(flags, leftProp.name);
+                        const flags = SymbolFlags.Property | (leftProp.flags & SymbolFlags.Optional);
+                        const result = createSymbol(flags, leftProp.name);
+                        result.checkFlags = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp) ? CheckFlags.Readonly : 0;
                         result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, TypeFacts.NEUndefined)]);
                         result.leftSpread = leftProp;
                         result.rightSpread = rightProp;
                         result.declarations = declarations;
-                        result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
                         members.set(leftProp.name, result);
                     }
                 }
@@ -6752,7 +6737,7 @@ namespace ts {
         }
 
         function instantiateSymbol(symbol: Symbol, mapper: TypeMapper): Symbol {
-            if (symbol.flags & SymbolFlags.Instantiated) {
+            if (getCheckFlags(symbol) & CheckFlags.Instantiated) {
                 const links = getSymbolLinks(symbol);
                 // If symbol being instantiated is itself a instantiation, fetch the original target and combine the
                 // type mappers. This ensures that original type identities are properly preserved and that aliases
@@ -6760,10 +6745,10 @@ namespace ts {
                 symbol = links.target;
                 mapper = combineTypeMappers(links.mapper, mapper);
             }
-
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            const result = <TransientSymbol>createSymbol(SymbolFlags.Instantiated | SymbolFlags.Transient | symbol.flags, symbol.name);
+            const result = createSymbol(symbol.flags, symbol.name);
+            result.checkFlags = CheckFlags.Instantiated;
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -6771,7 +6756,6 @@ namespace ts {
             if (symbol.valueDeclaration) {
                 result.valueDeclaration = symbol.valueDeclaration;
             }
-
             return result;
         }
 
@@ -8561,8 +8545,8 @@ namespace ts {
                 getSignaturesOfType(type, SignatureKind.Construct).length === 0;
         }
 
-        function createTransientSymbol(source: Symbol, type: Type) {
-            const symbol = <TransientSymbol>createSymbol(source.flags | SymbolFlags.Transient, source.name);
+        function createSymbolWithType(source: Symbol, type: Type) {
+            const symbol = createSymbol(source.flags, source.name);
             symbol.declarations = source.declarations;
             symbol.parent = source.parent;
             symbol.type = type;
@@ -8578,7 +8562,7 @@ namespace ts {
             for (const property of getPropertiesOfObjectType(type)) {
                 const original = getTypeOfSymbol(property);
                 const updated = f(original);
-                members.set(property.name, updated === original ? property : createTransientSymbol(property, updated));
+                members.set(property.name, updated === original ? property : createSymbolWithType(property, updated));
             };
             return members;
         }
@@ -8816,10 +8800,10 @@ namespace ts {
                 if (!inferredPropType) {
                     return undefined;
                 }
-                const inferredProp = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | prop.flags & optionalMask, prop.name);
+                const inferredProp = createSymbol(SymbolFlags.Property | prop.flags & optionalMask, prop.name);
+                inferredProp.checkFlags = readonlyMask && isReadonlySymbol(prop) ? CheckFlags.Readonly : 0;
                 inferredProp.declarations = prop.declarations;
                 inferredProp.type = inferredPropType;
-                inferredProp.isReadonly = readonlyMask && isReadonlySymbol(prop);
                 members.set(prop.name, inferredProp);
             }
             if (indexInfo) {
@@ -9301,9 +9285,9 @@ namespace ts {
         function isDiscriminantProperty(type: Type, name: string) {
             if (type && type.flags & TypeFlags.Union) {
                 const prop = getUnionOrIntersectionProperty(<UnionType>type, name);
-                if (prop && prop.flags & SymbolFlags.SyntheticProperty) {
+                if (prop && getCheckFlags(prop) & CheckFlags.SyntheticProperty) {
                     if ((<TransientSymbol>prop).isDiscriminantProperty === undefined) {
-                        (<TransientSymbol>prop).isDiscriminantProperty = (<TransientSymbol>prop).hasNonUniformType && isLiteralType(getTypeOfSymbol(prop));
+                        (<TransientSymbol>prop).isDiscriminantProperty = (<TransientSymbol>prop).checkFlags & CheckFlags.HasNonUniformType && isLiteralType(getTypeOfSymbol(prop));
                     }
                     return (<TransientSymbol>prop).isDiscriminantProperty;
                 }
@@ -11760,7 +11744,7 @@ namespace ts {
                     }
 
                     typeFlags |= type.flags;
-                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
+                    const prop = createSymbol(SymbolFlags.Property | member.flags, member.name);
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
@@ -12533,9 +12517,8 @@ namespace ts {
                 noUnusedIdentifiers &&
                 (prop.flags & SymbolFlags.ClassMember) &&
                 prop.valueDeclaration && (getModifierFlags(prop.valueDeclaration) & ModifierFlags.Private)) {
-                if (prop.flags & SymbolFlags.Instantiated) {
+                if (getCheckFlags(prop) & CheckFlags.Instantiated) {
                     getSymbolLinks(prop).target.isReferenced = true;
-
                 }
                 else {
                     prop.isReferenced = true;
@@ -14099,7 +14082,7 @@ namespace ts {
                 const parameter = signature.thisParameter;
                 if (!parameter || parameter.valueDeclaration && !(<ParameterDeclaration>parameter.valueDeclaration).type) {
                     if (!parameter) {
-                        signature.thisParameter = createTransientSymbol(context.thisParameter, undefined);
+                        signature.thisParameter = createSymbolWithType(context.thisParameter, undefined);
                     }
                     assignTypeToParameterAndFixTypeParameters(signature.thisParameter, getTypeOfSymbol(context.thisParameter), mapper);
                 }
@@ -14541,11 +14524,11 @@ namespace ts {
             // Get accessors without matching set accessors
             // Enum members
             // Unions and intersections of the above (unions and intersections eagerly set isReadonly on creation)
-            return symbol.isReadonly ||
-                symbol.flags & SymbolFlags.Property && (getDeclarationModifierFlagsFromSymbol(symbol) & ModifierFlags.Readonly) !== 0 ||
-                symbol.flags & SymbolFlags.Variable && (getDeclarationNodeFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0 ||
+            return !!(getCheckFlags(symbol) & CheckFlags.Readonly ||
+                symbol.flags & SymbolFlags.Property && getDeclarationModifierFlagsFromSymbol(symbol) & ModifierFlags.Readonly ||
+                symbol.flags & SymbolFlags.Variable && getDeclarationNodeFlagsFromSymbol(symbol) & NodeFlags.Const ||
                 symbol.flags & SymbolFlags.Accessor && !(symbol.flags & SymbolFlags.SetAccessor) ||
-                (symbol.flags & SymbolFlags.EnumMember) !== 0;
+                symbol.flags & SymbolFlags.EnumMember);
         }
 
         function isReferenceToReadonlyEntity(expr: Expression, symbol: Symbol): boolean {
@@ -18551,7 +18534,7 @@ namespace ts {
         function getTargetSymbol(s: Symbol) {
             // if symbol is instantiated its flags are not copied from the 'target'
             // so we'll need to get back original 'target' symbol to work with correct set of flags
-            return s.flags & SymbolFlags.Instantiated ? getSymbolLinks(s).target : s;
+            return getCheckFlags(s) & CheckFlags.Instantiated ? (<TransientSymbol>s).target : s;
         }
 
         function getClassLikeDeclarationOfSymbol(symbol: Symbol): Declaration {
@@ -19129,7 +19112,7 @@ namespace ts {
                         // We can detect if augmentation was applied using following rules:
                         // - augmentation for a global scope is always applied
                         // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module).
-                        const checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & SymbolFlags.Merged);
+                        const checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & SymbolFlags.Transient);
                         if (checkBody && node.body) {
                             // body of ambient external module is always a module block
                             for (const statement of (<ModuleBlock>node.body).statements) {
@@ -19208,7 +19191,7 @@ namespace ts {
                         // this is done it two steps
                         // 1. quick check - if symbol for node is not merged - this is local symbol to this augmentation - report error
                         // 2. main check - report error if value declaration of the parent symbol is module augmentation)
-                        let reportError = !(symbol.flags & SymbolFlags.Merged);
+                        let reportError = !(symbol.flags & SymbolFlags.Transient);
                         if (!reportError) {
                             // symbol should not originate in augmentation
                             reportError = isExternalModuleAugmentation(symbol.parent.declarations[0]);
@@ -20310,7 +20293,7 @@ namespace ts {
         }
 
         function getRootSymbols(symbol: Symbol): Symbol[] {
-            if (symbol.flags & SymbolFlags.SyntheticProperty) {
+            if (getCheckFlags(symbol) & CheckFlags.SyntheticProperty) {
                 const symbols: Symbol[] = [];
                 const name = symbol.name;
                 forEach(getSymbolLinks(symbol).containingType.types, t => {
@@ -21061,7 +21044,7 @@ namespace ts {
 
         function createThenableType() {
             // build the thenable type that is used to verify against a non-promise "thenable" operand to `await`.
-            const thenPropertySymbol = createSymbol(SymbolFlags.Transient | SymbolFlags.Property, "then");
+            const thenPropertySymbol = createSymbol(SymbolFlags.Property, "then");
             getSymbolLinks(thenPropertySymbol).type = globalFunctionType;
 
             const thenableType = <ResolvedType>createObjectType(ObjectFlags.Anonymous);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 8660e6138cd..6912931be65 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2600,37 +2600,34 @@
 
     export const enum SymbolFlags {
         None                    = 0,
-        FunctionScopedVariable  = 0x00000001,  // Variable (var) or parameter
-        BlockScopedVariable     = 0x00000002,  // A block-scoped variable (let or const)
-        Property                = 0x00000004,  // Property or enum member
-        EnumMember              = 0x00000008,  // Enum member
-        Function                = 0x00000010,  // Function
-        Class                   = 0x00000020,  // Class
-        Interface               = 0x00000040,  // Interface
-        ConstEnum               = 0x00000080,  // Const enum
-        RegularEnum             = 0x00000100,  // Enum
-        ValueModule             = 0x00000200,  // Instantiated module
-        NamespaceModule         = 0x00000400,  // Uninstantiated module
-        TypeLiteral             = 0x00000800,  // Type Literal or mapped type
-        ObjectLiteral           = 0x00001000,  // Object Literal
-        Method                  = 0x00002000,  // Method
-        Constructor             = 0x00004000,  // Constructor
-        GetAccessor             = 0x00008000,  // Get accessor
-        SetAccessor             = 0x00010000,  // Set accessor
-        Signature               = 0x00020000,  // Call, construct, or index signature
-        TypeParameter           = 0x00040000,  // Type parameter
-        TypeAlias               = 0x00080000,  // Type alias
-        ExportValue             = 0x00100000,  // Exported value marker (see comment in declareModuleMember in binder)
-        ExportType              = 0x00200000,  // Exported type marker (see comment in declareModuleMember in binder)
-        ExportNamespace         = 0x00400000,  // Exported namespace marker (see comment in declareModuleMember in binder)
-        Alias                   = 0x00800000,  // An alias for another symbol (see comment in isAliasSymbolDeclaration in checker)
-        Instantiated            = 0x01000000,  // Instantiated symbol
-        Merged                  = 0x02000000,  // Merged symbol (created during program binding)
-        Transient               = 0x04000000,  // Transient symbol (created during type check)
-        Prototype               = 0x08000000,  // Prototype property (no source representation)
-        SyntheticProperty       = 0x10000000,  // Property in union or intersection type
-        Optional                = 0x20000000,  // Optional property
-        ExportStar              = 0x40000000,  // Export * declaration
+        FunctionScopedVariable  = 1 << 0,   // Variable (var) or parameter
+        BlockScopedVariable     = 1 << 1,   // A block-scoped variable (let or const)
+        Property                = 1 << 2,   // Property or enum member
+        EnumMember              = 1 << 3,   // Enum member
+        Function                = 1 << 4,   // Function
+        Class                   = 1 << 5,   // Class
+        Interface               = 1 << 6,   // Interface
+        ConstEnum               = 1 << 7,   // Const enum
+        RegularEnum             = 1 << 8,   // Enum
+        ValueModule             = 1 << 9,   // Instantiated module
+        NamespaceModule         = 1 << 10,  // Uninstantiated module
+        TypeLiteral             = 1 << 11,  // Type Literal or mapped type
+        ObjectLiteral           = 1 << 12,  // Object Literal
+        Method                  = 1 << 13,  // Method
+        Constructor             = 1 << 14,  // Constructor
+        GetAccessor             = 1 << 15,  // Get accessor
+        SetAccessor             = 1 << 16,  // Set accessor
+        Signature               = 1 << 17,  // Call, construct, or index signature
+        TypeParameter           = 1 << 18,  // Type parameter
+        TypeAlias               = 1 << 19,  // Type alias
+        ExportValue             = 1 << 20,  // Exported value marker (see comment in declareModuleMember in binder)
+        ExportType              = 1 << 21,  // Exported type marker (see comment in declareModuleMember in binder)
+        ExportNamespace         = 1 << 22,  // Exported namespace marker (see comment in declareModuleMember in binder)
+        Alias                   = 1 << 23,  // An alias for another symbol (see comment in isAliasSymbolDeclaration in checker)
+        Prototype               = 1 << 24,  // Prototype property (no source representation)
+        ExportStar              = 1 << 25,  // Export * declaration
+        Optional                = 1 << 26,  // Optional property
+        Transient               = 1 << 27,  // Transient symbol (created during type check)
 
         Enum = RegularEnum | ConstEnum,
         Variable = FunctionScopedVariable | BlockScopedVariable,
@@ -2690,11 +2687,9 @@
         name: string;                           // Name of symbol
         declarations?: Declaration[];           // Declarations associated with this symbol
         valueDeclaration?: Declaration;         // First value declaration of the symbol
-
         members?: SymbolTable;                  // Class, interface or literal instance members
         exports?: SymbolTable;                  // Module exports
         globalExports?: SymbolTable;            // Conditional global UMD exports
-        /* @internal */ isReadonly?: boolean;   // readonly? (set only for intersections and unions)
         /* @internal */ id?: number;            // Unique id (used to look up SymbolLinks)
         /* @internal */ mergeId?: number;       // Merge id (used to look up merged symbol)
         /* @internal */ parent?: Symbol;        // Parent symbol
@@ -2719,8 +2714,6 @@
         leftSpread?: Symbol;                // Left source for synthetic spread property
         rightSpread?: Symbol;               // Right source for synthetic spread property
         mappedTypeOrigin?: Symbol;          // For a property on a mapped type, points back to the orignal 'T' from 'keyof T'.
-        hasNonUniformType?: boolean;        // True if constituents have non-uniform types
-        isPartial?: boolean;                // True if syntheric property of union type occurs in some but not all constituents
         isDiscriminantProperty?: boolean;   // True if discriminant synthetic property
         resolvedExports?: SymbolTable;      // Resolved exports of module
         exportsChecked?: boolean;           // True if exports of external module have been checked
@@ -2730,7 +2723,18 @@
     }
 
     /* @internal */
-    export interface TransientSymbol extends Symbol, SymbolLinks { }
+    export const enum CheckFlags {
+        Instantiated      = 1 << 0,         // Instantiated symbol
+        SyntheticProperty = 1 << 1,         // Property in union or intersection type
+        Readonly          = 1 << 2,         // Readonly transient symbol
+        Partial           = 1 << 3,         // Property present in some but not all constituents
+        HasNonUniformType = 1 << 4,         // Constituents have non-uniform types
+    }
+
+    /* @internal */
+    export interface TransientSymbol extends Symbol, SymbolLinks {
+        checkFlags: CheckFlags;
+    }
 
     export type SymbolTable = Map<Symbol>;
 
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index 28474839cf3..cbdaff830ce 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -277,7 +277,7 @@ namespace ts.FindAllReferences {
 
         // if this symbol is visible from its parent container, e.g. exported, then bail out
         // if symbol correspond to the union property - bail out
-        if (symbol.parent || (symbol.flags & SymbolFlags.SyntheticProperty)) {
+        if (symbol.parent || (symbol.flags & SymbolFlags.Transient && (<TransientSymbol>symbol).checkFlags & CheckFlags.SyntheticProperty)) {
             return undefined;
         }
 
diff --git a/src/services/symbolDisplay.ts b/src/services/symbolDisplay.ts
index b32bd8f331d..58c83de8509 100644
--- a/src/services/symbolDisplay.ts
+++ b/src/services/symbolDisplay.ts
@@ -51,7 +51,7 @@ namespace ts.SymbolDisplay {
         if (flags & SymbolFlags.Constructor) return ScriptElementKind.constructorImplementationElement;
 
         if (flags & SymbolFlags.Property) {
-            if (flags & SymbolFlags.SyntheticProperty) {
+            if (flags & SymbolFlags.Transient && (<TransientSymbol>symbol).checkFlags & CheckFlags.SyntheticProperty) {
                 // If union property is result of union of non method (property/accessors/variables), it is labeled as property
                 const unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => {
                     const rootSymbolFlags = rootSymbol.getFlags();

From 914150f2f19583b40be46663628e9bbe3c66b2f4 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Sun, 5 Feb 2017 15:18:27 -0800
Subject: [PATCH 087/127] Widen special JS property declarations to match
 regular property declarations

---
 src/compiler/checker.ts                       | 40 ++++++++++++-------
 .../jsFileClassPropertyType.errors.txt        | 17 ++++++++
 .../jsFileClassPropertyType2.errors.txt       | 18 +++++++++
 .../reference/multipleDeclarations.types      |  2 +-
 ...naturesUseJSDocForOptionalParameters.types | 30 +++++++-------
 .../cases/compiler/jsFileClassPropertyType.ts | 13 ++++++
 .../compiler/jsFileClassPropertyType2.ts      | 14 +++++++
 .../getJavaScriptSyntacticDiagnostics24.ts    |  2 +-
 8 files changed, 104 insertions(+), 32 deletions(-)
 create mode 100644 tests/baselines/reference/jsFileClassPropertyType.errors.txt
 create mode 100644 tests/baselines/reference/jsFileClassPropertyType2.errors.txt
 create mode 100644 tests/cases/compiler/jsFileClassPropertyType.ts
 create mode 100644 tests/cases/compiler/jsFileClassPropertyType2.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b5306771dd7..10c5f5422e3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3254,7 +3254,7 @@ namespace ts {
                 type;
         }
 
-        function getTypeForVariableLikeDeclarationFromJSDocComment(declaration: VariableLikeDeclaration) {
+        function getTypeForDeclarationFromJSDocComment(declaration: Node ) {
             const jsdocType = getJSDocType(declaration);
             if (jsdocType) {
                 return getTypeFromTypeNode(jsdocType);
@@ -3282,7 +3282,7 @@ namespace ts {
                 // If this is a variable in a JavaScript file, then use the JSDoc type (if it has
                 // one as its type), otherwise fallback to the below standard TS codepaths to
                 // try to figure it out.
-                const type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration);
+                const type = getTypeForDeclarationFromJSDocComment(declaration);
                 if (type && type !== unknownType) {
                     return type;
                 }
@@ -3377,6 +3377,27 @@ namespace ts {
             return undefined;
         }
 
+        // Return the inferred type for a variable, parameter, or property declaration
+        function getWidenedTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type {
+            const expression = declaration.kind === SyntaxKind.BinaryExpression ? <BinaryExpression>declaration :
+                declaration.kind === SyntaxKind.PropertyAccessExpression ? <BinaryExpression>getAncestor(declaration, SyntaxKind.BinaryExpression) :
+                undefined;
+
+            if (!expression) {
+                return unknownType;
+            }
+
+            if (expression.flags & NodeFlags.JavaScriptFile) {
+                // If there is a JSDoc type, use it
+                const type = getTypeForDeclarationFromJSDocComment(expression.parent);
+                if (type && type !== unknownType) {
+                    return getWidenedType(type);
+                }
+            }
+
+            return getWidenedType(getWidenedLiteralType(checkExpressionCached(expression.right)));
+        }
+
         // Return the type implied by a binding pattern element. This is the type of the initializer of the element if
         // one is present. Otherwise, if the element is itself a binding pattern, it is the type implied by the binding
         // pattern. Otherwise, it is the type any.
@@ -3531,18 +3552,7 @@ namespace ts {
                 // * className.prototype.method = expr
                 if (declaration.kind === SyntaxKind.BinaryExpression ||
                     declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {
-                    // Use JS Doc type if present on parent expression statement
-                    if (declaration.flags & NodeFlags.JavaScriptFile) {
-                        const jsdocType = getJSDocType(declaration.parent);
-                        if (jsdocType) {
-                            return links.type = getTypeFromTypeNode(jsdocType);
-                        }
-                    }
-                    const declaredTypes = map(symbol.declarations,
-                        decl => decl.kind === SyntaxKind.BinaryExpression ?
-                            checkExpressionCached((<BinaryExpression>decl).right) :
-                            checkExpressionCached((<BinaryExpression>decl.parent).right));
-                    type = getUnionType(declaredTypes, /*subtypeReduction*/ true);
+                    type = getUnionType(map(symbol.declarations, getWidenedTypeForJSSpecialPropertyDeclaration), /*subtypeReduction*/ true);
                 }
                 else {
                     type = getWidenedTypeForVariableLikeDeclaration(<VariableLikeDeclaration>declaration, /*reportErrors*/ true);
@@ -3585,7 +3595,7 @@ namespace ts {
                 const setter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.SetAccessor);
 
                 if (getter && getter.flags & NodeFlags.JavaScriptFile) {
-                    const jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
+                    const jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                     if (jsDocType) {
                         return links.type = jsDocType;
                     }
diff --git a/tests/baselines/reference/jsFileClassPropertyType.errors.txt b/tests/baselines/reference/jsFileClassPropertyType.errors.txt
new file mode 100644
index 00000000000..f3767175710
--- /dev/null
+++ b/tests/baselines/reference/jsFileClassPropertyType.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/compiler/bar.ts(2,1): error TS2322: Type '"string"' is not assignable to type 'number'.
+
+
+==== tests/cases/compiler/foo.js (0 errors) ====
+    
+    class C {
+      constructor () {
+          this.p = 0;
+      }
+    }
+    
+==== tests/cases/compiler/bar.ts (1 errors) ====
+    
+    (new C()).p = "string";
+    ~~~~~~~~~~~
+!!! error TS2322: Type '"string"' is not assignable to type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileClassPropertyType2.errors.txt b/tests/baselines/reference/jsFileClassPropertyType2.errors.txt
new file mode 100644
index 00000000000..d0d138f7f48
--- /dev/null
+++ b/tests/baselines/reference/jsFileClassPropertyType2.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/compiler/bar.ts(2,18): error TS2345: Argument of type '"string"' is not assignable to parameter of type 'number'.
+
+
+==== tests/cases/compiler/foo.js (0 errors) ====
+    
+    class C {
+        constructor() {
+          /** @type {number[]}*/
+          this.p = [];
+      }
+    }
+    
+==== tests/cases/compiler/bar.ts (1 errors) ====
+    
+    (new C()).p.push("string");
+                     ~~~~~~~~
+!!! error TS2345: Argument of type '"string"' is not assignable to parameter of type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/multipleDeclarations.types b/tests/baselines/reference/multipleDeclarations.types
index 195bdc2ad0d..c11bd13dffe 100644
--- a/tests/baselines/reference/multipleDeclarations.types
+++ b/tests/baselines/reference/multipleDeclarations.types
@@ -21,7 +21,7 @@ C.prototype.m = function() {
     this.nothing();
 >this.nothing() : any
 >this.nothing : any
->this : { m: () => void; }
+>this : { m: any; }
 >nothing : any
 }
 class X {
diff --git a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types
index f8822397306..99bf5e15fa7 100644
--- a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types
+++ b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types
@@ -15,39 +15,39 @@ function MyClass() {
  * @returns {MyClass}
  */
 MyClass.prototype.optionalParam = function(required, notRequired) {
->MyClass.prototype.optionalParam = function(required, notRequired) {    return this;} : (required: string, notRequired?: string) => { prop: null; optionalParam: any; }
+>MyClass.prototype.optionalParam = function(required, notRequired) {    return this;} : (required: string, notRequired?: string) => { prop: any; optionalParam: any; }
 >MyClass.prototype.optionalParam : any
 >MyClass.prototype : any
 >MyClass : () => void
 >prototype : any
 >optionalParam : any
->function(required, notRequired) {    return this;} : (required: string, notRequired?: string) => { prop: null; optionalParam: any; }
+>function(required, notRequired) {    return this;} : (required: string, notRequired?: string) => { prop: any; optionalParam: any; }
 >required : string
 >notRequired : string
 
     return this;
->this : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
+>this : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
 
 };
 let pInst = new MyClass();
->pInst : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
->new MyClass() : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
+>pInst : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
+>new MyClass() : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
 >MyClass : () => void
 
 let c1 = pInst.optionalParam('hello')
->c1 : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
->pInst.optionalParam('hello') : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
->pInst.optionalParam : (required: string, notRequired?: string) => { prop: null; optionalParam: any; }
->pInst : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
->optionalParam : (required: string, notRequired?: string) => { prop: null; optionalParam: any; }
+>c1 : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
+>pInst.optionalParam('hello') : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
+>pInst.optionalParam : (required: string, notRequired?: string) => { prop: any; optionalParam: any; }
+>pInst : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
+>optionalParam : (required: string, notRequired?: string) => { prop: any; optionalParam: any; }
 >'hello' : "hello"
 
 let c2 = pInst.optionalParam('hello', null)
->c2 : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
->pInst.optionalParam('hello', null) : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
->pInst.optionalParam : (required: string, notRequired?: string) => { prop: null; optionalParam: any; }
->pInst : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
->optionalParam : (required: string, notRequired?: string) => { prop: null; optionalParam: any; }
+>c2 : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
+>pInst.optionalParam('hello', null) : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
+>pInst.optionalParam : (required: string, notRequired?: string) => { prop: any; optionalParam: any; }
+>pInst : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; }
+>optionalParam : (required: string, notRequired?: string) => { prop: any; optionalParam: any; }
 >'hello' : "hello"
 >null : null
 
diff --git a/tests/cases/compiler/jsFileClassPropertyType.ts b/tests/cases/compiler/jsFileClassPropertyType.ts
new file mode 100644
index 00000000000..53540096721
--- /dev/null
+++ b/tests/cases/compiler/jsFileClassPropertyType.ts
@@ -0,0 +1,13 @@
+// @allowJs: true
+// @noEmit: true
+
+// @filename: foo.js
+class C {
+  constructor () {
+      this.p = 0;
+  }
+}
+
+// @filename: bar.ts
+
+(new C()).p = "string";
diff --git a/tests/cases/compiler/jsFileClassPropertyType2.ts b/tests/cases/compiler/jsFileClassPropertyType2.ts
new file mode 100644
index 00000000000..82c36f53147
--- /dev/null
+++ b/tests/cases/compiler/jsFileClassPropertyType2.ts
@@ -0,0 +1,14 @@
+// @allowJs: true
+// @noEmit: true
+
+// @filename: foo.js
+class C {
+    constructor() {
+      /** @type {number[]}*/
+      this.p = [];
+  }
+}
+
+// @filename: bar.ts
+
+(new C()).p.push("string");
diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics24.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics24.ts
index d93ec4c1914..59be947e3a1 100644
--- a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics24.ts
+++ b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics24.ts
@@ -12,4 +12,4 @@
 //// let x = new Person(100);
 //// x.canVote/**/;
 
-verify.quickInfoAt("", "(property) Person.canVote: true | 23");
+verify.quickInfoAt("", "(property) Person.canVote: number | boolean");

From a34834cb52c9ef9c19715b68256c3c10496b999f Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 6 Feb 2017 11:08:29 -0800
Subject: [PATCH 088/127] Error when users define "__esModule"

---
 src/compiler/checker.ts                       | 20 ++++++++++++++++++
 src/compiler/diagnosticMessages.json          |  4 ++++
 src/compiler/transformers/module/module.ts    |  2 +-
 .../reference/es5-commonjs3.errors.txt        | 10 +++++++++
 tests/baselines/reference/es5-commonjs3.js    |  1 +
 .../reference/es5-commonjs4.errors.txt        | 21 +++++++++++++++++++
 tests/baselines/reference/es5-commonjs4.js    |  1 +
 7 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/es5-commonjs3.errors.txt
 create mode 100644 tests/baselines/reference/es5-commonjs4.errors.txt

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7c8a0b7337f..eb78885ea5e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -21909,6 +21909,10 @@ namespace ts {
                 }
             }
 
+            if (hasModifier(node.parent.parent, ModifierFlags.Export) && compilerOptions.module !== ModuleKind.ES2015) {
+                checkESModuleMarker(node.name);
+            }
+
             const checkLetConstNames = (isLet(node) || isConst(node));
 
             // 1. LexicalDeclaration : LetOrConst BindingList ;
@@ -21921,6 +21925,22 @@ namespace ts {
             return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
         }
 
+        function checkESModuleMarker(name: Identifier | BindingPattern): boolean {
+            if (name.kind === SyntaxKind.Identifier) {
+                if (unescapeIdentifier(name.text) === "__esModule") {
+                    return grammarErrorOnNode(name, Diagnostics.Identifier_expected_esModule_is_reserved_as_a_marker_for_transpiled_ES2015_module);
+                }
+            }
+            else {
+                const elements = (<BindingPattern>name).elements;
+                for (const element of elements) {
+                    if (!isOmittedExpression(element)) {
+                        return checkESModuleMarker(element.name);
+                    }
+                }
+            }
+        }
+
         function checkGrammarNameInLetOrConstDeclarations(name: Identifier | BindingPattern): boolean {
             if (name.kind === SyntaxKind.Identifier) {
                 if ((<Identifier>name).originalKeywordKind === SyntaxKind.LetKeyword) {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 43a9cce4de6..50a91761e80 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -671,6 +671,10 @@
         "category": "Error",
         "code": 1215
     },
+    "Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.": {
+        "category": "Error",
+        "code": 1216
+    },
     "Export assignment is not supported when '--module' flag is 'system'.": {
         "category": "Error",
         "code": 1218
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index ebd004337f9..7c506be4d58 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -835,7 +835,7 @@ namespace ts {
             const parseTreeNode = getParseTreeNode(node);
             if (parseTreeNode && !shouldAppendEsModuleMarker) {
                 // class declaration get down-level transformed to be variable statement
-                shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration)
+                shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement ||parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration)
                     && hasModifier(parseTreeNode, ModifierFlags.Export);
             }
  
diff --git a/tests/baselines/reference/es5-commonjs3.errors.txt b/tests/baselines/reference/es5-commonjs3.errors.txt
new file mode 100644
index 00000000000..51c5d2cd44d
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs3.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.
+
+
+==== tests/cases/compiler/es5-commonjs3.ts (1 errors) ====
+    
+    export default "test";
+    export var __esModule = 1;
+               ~~~~~~~~~~
+!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-commonjs3.js b/tests/baselines/reference/es5-commonjs3.js
index b2c1c5d6890..5fc9462b955 100644
--- a/tests/baselines/reference/es5-commonjs3.js
+++ b/tests/baselines/reference/es5-commonjs3.js
@@ -8,3 +8,4 @@ export var __esModule = 1;
 "use strict";
 exports.default = "test";
 exports.__esModule = 1;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs4.errors.txt b/tests/baselines/reference/es5-commonjs4.errors.txt
new file mode 100644
index 00000000000..6a047378bac
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs4.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.
+
+
+==== tests/cases/compiler/es5-commonjs4.ts (1 errors) ====
+    
+    export default class A
+    {
+        constructor ()
+        {
+    
+        }
+    
+        public B()
+        {
+            return 42;
+        }
+    }
+    export var __esModule = 1;
+               ~~~~~~~~~~
+!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js
index b67c771df3c..bf28e064500 100644
--- a/tests/baselines/reference/es5-commonjs4.js
+++ b/tests/baselines/reference/es5-commonjs4.js
@@ -27,3 +27,4 @@ var A = (function () {
 }());
 exports.default = A;
 exports.__esModule = 1;
+Object.defineProperty(exports, "__esModule", { value: true });

From 444a55f96f610b20a535865e6a948bdefc3bd509 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 6 Feb 2017 11:08:51 -0800
Subject: [PATCH 089/127] Update sourcemap

---
 .../commonSourceDirectory_dts.sourcemap.txt   |  3 +-
 .../jsxFactoryIdentifier.sourcemap.txt        |  3 +-
 ...FactoryIdentifierAsParameter.sourcemap.txt |  2 +
 ...dentifierWithAbsentParameter.sourcemap.txt |  2 +
 .../jsxFactoryQualifiedName.sourcemap.txt     |  3 +-
 ...QualifiedNameResolutionError.sourcemap.txt |  2 +
 .../reference/outModuleConcatAmd.js.map       |  2 +-
 .../outModuleConcatAmd.sourcemap.txt          | 40 ++++++++++---------
 .../reference/outModuleTripleSlashRefs.js.map |  2 +-
 .../outModuleTripleSlashRefs.sourcemap.txt    | 40 ++++++++++---------
 .../sourceMapValidationImport.sourcemap.txt   |  3 +-
 11 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
index 90603ae3652..ccbbc89465d 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
+++ b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
@@ -24,7 +24,7 @@ sourceFile:index.ts
 4 >         ^^^
 5 >            ^
 6 >             ^
-7 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+7 >              ^^^^^^^^^^^^^->
 1 >
   >export const 
 2 >
@@ -39,4 +39,5 @@ sourceFile:index.ts
 5 >Emitted(3, 14) Source(2, 19) + SourceIndex(0)
 6 >Emitted(3, 15) Source(2, 20) + SourceIndex(0)
 ---
+>>>exports.__esModule = true;
 >>>//# sourceMappingURL=/app/myMapRoot/index.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
index a4ddc8c050b..26e68d04f1d 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
@@ -333,13 +333,14 @@ sourceFile:Element.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
 2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
index c7867fc54e0..68f39e67ddd 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
@@ -75,6 +75,7 @@ sourceFile:test.tsx
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
@@ -84,4 +85,5 @@ sourceFile:test.tsx
 1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
 2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
index f1ebaf49870..b1b8db46eaa 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
@@ -69,6 +69,7 @@ sourceFile:test.tsx
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render() {
@@ -78,4 +79,5 @@ sourceFile:test.tsx
 1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
 2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
index 98517620c73..c075bc5e839 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
@@ -333,13 +333,14 @@ sourceFile:Element.ts
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
 2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
index 2616efcf63b..0e8d7ec51f3 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
@@ -75,6 +75,7 @@ sourceFile:test.tsx
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
@@ -84,4 +85,5 @@ sourceFile:test.tsx
 1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
 2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map
index a95ca740a61..fa822fc1825 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js.map
+++ b/tests/baselines/reference/outModuleConcatAmd.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
index a8a11fcadc0..c2d000629a5 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -68,6 +68,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
+3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    A
 1->Emitted(18, 5) Source(2, 14) + SourceIndex(0)
@@ -77,29 +78,30 @@ sourceFile:tests/cases/compiler/ref/a.ts
 emittedFile:all.js
 sourceFile:tests/cases/compiler/b.ts
 -------------------------------------------------------------------
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
 >>>    "use strict";
 >>>    var B = (function (_super) {
-1 >^^^^
+1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >import {A} from "./ref/a";
+1->import {A} from "./ref/a";
   >
-1 >Emitted(22, 5) Source(2, 1) + SourceIndex(1)
+1->Emitted(23, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(23, 9) Source(2, 24) + SourceIndex(1)
-2 >Emitted(23, 30) Source(2, 25) + SourceIndex(1)
+1->Emitted(24, 9) Source(2, 24) + SourceIndex(1)
+2 >Emitted(24, 30) Source(2, 25) + SourceIndex(1)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(24, 9) Source(2, 1) + SourceIndex(1)
+1 >Emitted(25, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -108,16 +110,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(26, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(26, 10) Source(2, 29) + SourceIndex(1)
+1->Emitted(27, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(27, 10) Source(2, 29) + SourceIndex(1)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(27, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(27, 17) Source(2, 29) + SourceIndex(1)
+1->Emitted(28, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(28, 17) Source(2, 29) + SourceIndex(1)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -133,20 +135,22 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(28, 5) Source(2, 28) + SourceIndex(1)
-2 >Emitted(28, 6) Source(2, 29) + SourceIndex(1)
-3 >Emitted(28, 6) Source(2, 1) + SourceIndex(1)
-4 >Emitted(28, 7) Source(2, 24) + SourceIndex(1)
-5 >Emitted(28, 12) Source(2, 25) + SourceIndex(1)
-6 >Emitted(28, 15) Source(2, 29) + SourceIndex(1)
+1 >Emitted(29, 5) Source(2, 28) + SourceIndex(1)
+2 >Emitted(29, 6) Source(2, 29) + SourceIndex(1)
+3 >Emitted(29, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(29, 7) Source(2, 24) + SourceIndex(1)
+5 >Emitted(29, 12) Source(2, 25) + SourceIndex(1)
+6 >Emitted(29, 15) Source(2, 29) + SourceIndex(1)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
+3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    B
-1->Emitted(29, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(29, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(30, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(30, 19) Source(2, 15) + SourceIndex(1)
 ---
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
index e91088c249c..a55c177680d 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
index f2076c34482..5f71c12c2a3 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -142,6 +142,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
+3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    A
 1->Emitted(25, 5) Source(3, 14) + SourceIndex(1)
@@ -151,29 +152,30 @@ sourceFile:tests/cases/compiler/ref/a.ts
 emittedFile:all.js
 sourceFile:tests/cases/compiler/b.ts
 -------------------------------------------------------------------
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
 >>>    "use strict";
 >>>    var B = (function (_super) {
-1 >^^^^
+1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >import {A} from "./ref/a";
+1->import {A} from "./ref/a";
   >
-1 >Emitted(29, 5) Source(2, 1) + SourceIndex(2)
+1->Emitted(30, 5) Source(2, 1) + SourceIndex(2)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(30, 9) Source(2, 24) + SourceIndex(2)
-2 >Emitted(30, 30) Source(2, 25) + SourceIndex(2)
+1->Emitted(31, 9) Source(2, 24) + SourceIndex(2)
+2 >Emitted(31, 30) Source(2, 25) + SourceIndex(2)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(31, 9) Source(2, 1) + SourceIndex(2)
+1 >Emitted(32, 9) Source(2, 1) + SourceIndex(2)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -182,16 +184,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(33, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(33, 10) Source(2, 29) + SourceIndex(2)
+1->Emitted(34, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(34, 10) Source(2, 29) + SourceIndex(2)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(34, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(34, 17) Source(2, 29) + SourceIndex(2)
+1->Emitted(35, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(35, 17) Source(2, 29) + SourceIndex(2)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -207,20 +209,22 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(35, 5) Source(2, 28) + SourceIndex(2)
-2 >Emitted(35, 6) Source(2, 29) + SourceIndex(2)
-3 >Emitted(35, 6) Source(2, 1) + SourceIndex(2)
-4 >Emitted(35, 7) Source(2, 24) + SourceIndex(2)
-5 >Emitted(35, 12) Source(2, 25) + SourceIndex(2)
-6 >Emitted(35, 15) Source(2, 29) + SourceIndex(2)
+1 >Emitted(36, 5) Source(2, 28) + SourceIndex(2)
+2 >Emitted(36, 6) Source(2, 29) + SourceIndex(2)
+3 >Emitted(36, 6) Source(2, 1) + SourceIndex(2)
+4 >Emitted(36, 7) Source(2, 24) + SourceIndex(2)
+5 >Emitted(36, 12) Source(2, 25) + SourceIndex(2)
+6 >Emitted(36, 15) Source(2, 29) + SourceIndex(2)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
+3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    B
-1->Emitted(36, 5) Source(2, 14) + SourceIndex(2)
-2 >Emitted(36, 19) Source(2, 15) + SourceIndex(2)
+1->Emitted(37, 5) Source(2, 14) + SourceIndex(2)
+2 >Emitted(37, 19) Source(2, 15) + SourceIndex(2)
 ---
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
index 15e68b22c90..235557adfba 100644
--- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
@@ -228,7 +228,7 @@ sourceFile:sourceMapValidationImport.ts
 6 >            ^^^^^^^^^
 7 >                     ^^
 8 >                       ^
-9 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+9 >                        ^^^->
 1->
   >
 2 >var 
@@ -247,4 +247,5 @@ sourceFile:sourceMapValidationImport.ts
 7 >Emitted(14, 24) Source(8, 16) + SourceIndex(0)
 8 >Emitted(14, 25) Source(8, 17) + SourceIndex(0)
 ---
+>>>exports.__esModule = true;
 >>>//# sourceMappingURL=sourceMapValidationImport.js.map
\ No newline at end of file

From 11cac43c34be1f5ef33326810126e4a15b77b402 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 6 Feb 2017 11:10:51 -0800
Subject: [PATCH 090/127] Fix linting

---
 src/compiler/transformers/module/module.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 7c506be4d58..5e2bb3edd69 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -835,10 +835,10 @@ namespace ts {
             const parseTreeNode = getParseTreeNode(node);
             if (parseTreeNode && !shouldAppendEsModuleMarker) {
                 // class declaration get down-level transformed to be variable statement
-                shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement ||parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration)
+                shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration)
                     && hasModifier(parseTreeNode, ModifierFlags.Export);
             }
- 
+
             if (hasModifier(node, ModifierFlags.Export)) {
                 let modifiers: NodeArray<Modifier>;
 

From 82a3feaadcfc1c5dedfdb982f8b817d78a2ba4e1 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Sun, 5 Feb 2017 15:18:27 -0800
Subject: [PATCH 091/127] Treat function paramters in a .js file with no JSDoc
 as optional

---
 src/compiler/checker.ts                       |  6 +++-
 ...jsFileFunctionParametersAsOptional.symbols | 22 +++++++++++++
 .../jsFileFunctionParametersAsOptional.types  | 32 +++++++++++++++++++
 ...leFunctionParametersAsOptional2.errors.txt | 28 ++++++++++++++++
 .../jsFileFunctionParametersAsOptional.ts     | 12 +++++++
 .../jsFileFunctionParametersAsOptional2.ts    | 18 +++++++++++
 6 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/jsFileFunctionParametersAsOptional.symbols
 create mode 100644 tests/baselines/reference/jsFileFunctionParametersAsOptional.types
 create mode 100644 tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt
 create mode 100644 tests/cases/compiler/jsFileFunctionParametersAsOptional.ts
 create mode 100644 tests/cases/compiler/jsFileFunctionParametersAsOptional2.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b5306771dd7..6b49b0bdb93 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5226,6 +5226,7 @@ namespace ts {
                 let hasThisParameter: boolean;
                 const iife = getImmediatelyInvokedFunctionExpression(declaration);
                 const isJSConstructSignature = isJSDocConstructSignature(declaration);
+                const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration);
 
                 // If this is a JSDoc construct signature, then skip the first parameter in the
                 // parameter list.  The first parameter represents the return type of the construct
@@ -5251,10 +5252,13 @@ namespace ts {
                         hasLiteralTypes = true;
                     }
 
+                    const isUntypedParamInJSFile = isUntypedSignatureInJSFile && !param.type && !getJSDocParameterTags(param);
+
                     // Record a new minimum argument count if this is not an optional parameter
                     const isOptionalParameter = param.initializer || param.questionToken || param.dotDotDotToken ||
                         iife && parameters.length > iife.arguments.length && !param.type ||
-                        isJSDocOptionalParameter(param);
+                        isJSDocOptionalParameter(param) ||
+                        isUntypedParamInJSFile;
                     if (!isOptionalParameter) {
                         minArgumentCount = parameters.length;
                     }
diff --git a/tests/baselines/reference/jsFileFunctionParametersAsOptional.symbols b/tests/baselines/reference/jsFileFunctionParametersAsOptional.symbols
new file mode 100644
index 00000000000..040b910f378
--- /dev/null
+++ b/tests/baselines/reference/jsFileFunctionParametersAsOptional.symbols
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/foo.js ===
+
+function f(a, b, c) { }
+>f : Symbol(f, Decl(foo.js, 0, 0))
+>a : Symbol(a, Decl(foo.js, 1, 11))
+>b : Symbol(b, Decl(foo.js, 1, 13))
+>c : Symbol(c, Decl(foo.js, 1, 16))
+
+
+=== tests/cases/compiler/bar.ts ===
+f();
+>f : Symbol(f, Decl(foo.js, 0, 0))
+
+f(1);
+>f : Symbol(f, Decl(foo.js, 0, 0))
+
+f(1, 2);
+>f : Symbol(f, Decl(foo.js, 0, 0))
+
+f(1, 2, 3);
+>f : Symbol(f, Decl(foo.js, 0, 0))
+
diff --git a/tests/baselines/reference/jsFileFunctionParametersAsOptional.types b/tests/baselines/reference/jsFileFunctionParametersAsOptional.types
new file mode 100644
index 00000000000..d6d8f9b04a4
--- /dev/null
+++ b/tests/baselines/reference/jsFileFunctionParametersAsOptional.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/foo.js ===
+
+function f(a, b, c) { }
+>f : (a: any, b: any, c: any) => void
+>a : any
+>b : any
+>c : any
+
+
+=== tests/cases/compiler/bar.ts ===
+f();
+>f() : void
+>f : (a: any, b: any, c: any) => void
+
+f(1);
+>f(1) : void
+>f : (a: any, b: any, c: any) => void
+>1 : 1
+
+f(1, 2);
+>f(1, 2) : void
+>f : (a: any, b: any, c: any) => void
+>1 : 1
+>2 : 2
+
+f(1, 2, 3);
+>f(1, 2, 3) : void
+>f : (a: any, b: any, c: any) => void
+>1 : 1
+>2 : 2
+>3 : 3
+
diff --git a/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt b/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt
new file mode 100644
index 00000000000..26ada935eea
--- /dev/null
+++ b/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt
@@ -0,0 +1,28 @@
+tests/cases/compiler/bar.ts(1,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/bar.ts(2,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/bar.ts(3,1): error TS2346: Supplied parameters do not match any signature of call target.
+
+
+==== tests/cases/compiler/foo.js (0 errors) ====
+    
+    /**
+     * @param a
+     * @param b
+     * @param c
+     */
+    function f(a, b, c) { }
+    
+    
+==== tests/cases/compiler/bar.ts (3 errors) ====
+    f(); // Error
+    ~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    f(1); // Error
+    ~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    f(1, 2); // Error
+    ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    
+    f(1, 2, 3); // OK
+    
\ No newline at end of file
diff --git a/tests/cases/compiler/jsFileFunctionParametersAsOptional.ts b/tests/cases/compiler/jsFileFunctionParametersAsOptional.ts
new file mode 100644
index 00000000000..f2673f310b8
--- /dev/null
+++ b/tests/cases/compiler/jsFileFunctionParametersAsOptional.ts
@@ -0,0 +1,12 @@
+// @allowJs: true
+// @noEmit: true
+
+// @filename: foo.js
+function f(a, b, c) { }
+
+
+// @filename: bar.ts
+f();
+f(1);
+f(1, 2);
+f(1, 2, 3);
diff --git a/tests/cases/compiler/jsFileFunctionParametersAsOptional2.ts b/tests/cases/compiler/jsFileFunctionParametersAsOptional2.ts
new file mode 100644
index 00000000000..01aebb29713
--- /dev/null
+++ b/tests/cases/compiler/jsFileFunctionParametersAsOptional2.ts
@@ -0,0 +1,18 @@
+// @allowJs: true
+// @noEmit: true
+
+// @filename: foo.js
+/**
+ * @param a
+ * @param b
+ * @param c
+ */
+function f(a, b, c) { }
+
+
+// @filename: bar.ts
+f(); // Error
+f(1); // Error
+f(1, 2); // Error
+
+f(1, 2, 3); // OK

From eedc2619dbf343dd9e269eb75afb026e6464f449 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 6 Feb 2017 15:28:54 -0800
Subject: [PATCH 092/127] Minor PR feedback

---
 src/compiler/factory.ts | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 4c7693dd846..d5d8482a0ba 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1766,8 +1766,6 @@ namespace ts {
 
     // Utilities
 
-    function asName(name: string): Identifier;
-    function asName(name: Identifier): Identifier;
     function asName(name: string | Identifier): Identifier;
     function asName(name: string | BindingName): BindingName;
     function asName(name: string | PropertyName): PropertyName;
@@ -1811,8 +1809,6 @@ namespace ts {
     /**
      * Associates a node with the current transformation, initializing
      * various transient transformation properties.
-     *
-     * @param node The node.
      */
     /* @internal */
     export function getOrCreateEmitNode(node: Node) {
@@ -1845,8 +1841,6 @@ namespace ts {
 
     /**
      * Gets flags that control emit behavior of a node.
-     *
-     * @param node The node.
      */
     export function getEmitFlags(node: Node) {
         const emitNode = node.emitNode;
@@ -1855,9 +1849,6 @@ namespace ts {
 
     /**
      * Sets flags that control emit behavior of a node.
-     *
-     * @param node The node.
-     * @param emitFlags The NodeEmitFlags for the node.
      */
     export function setEmitFlags<T extends Node>(node: T, emitFlags: EmitFlags) {
         getOrCreateEmitNode(node).flags = emitFlags;
@@ -1866,8 +1857,6 @@ namespace ts {
 
     /**
      * Gets a custom text range to use when emitting source maps.
-     *
-     * @param node The node.
      */
     export function getSourceMapRange(node: Node) {
         const emitNode = node.emitNode;
@@ -1876,9 +1865,6 @@ namespace ts {
 
     /**
      * Sets a custom text range to use when emitting source maps.
-     *
-     * @param node The node.
-     * @param range The text range.
      */
     export function setSourceMapRange<T extends Node>(node: T, range: TextRange) {
         getOrCreateEmitNode(node).sourceMapRange = range;
@@ -1887,9 +1873,6 @@ namespace ts {
 
     /**
      * Gets the TextRange to use for source maps for a token of a node.
-     *
-     * @param node The node.
-     * @param token The token.
      */
     export function getTokenSourceMapRange(node: Node, token: SyntaxKind) {
         const emitNode = node.emitNode;
@@ -1899,10 +1882,6 @@ namespace ts {
 
     /**
      * Sets the TextRange to use for source maps for a token of a node.
-     *
-     * @param node The node.
-     * @param token The token.
-     * @param range The text range.
      */
     export function setTokenSourceMapRange<T extends Node>(node: T, token: SyntaxKind, range: TextRange) {
         const emitNode = getOrCreateEmitNode(node);
@@ -1913,8 +1892,6 @@ namespace ts {
 
     /**
      * Gets a custom text range to use when emitting comments.
-     *
-     * @param node The node.
      */
     export function getCommentRange(node: Node) {
         const emitNode = node.emitNode;

From c28edc31c05319157d3371a92a9bf3ced6543b87 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 6 Feb 2017 15:53:00 -0800
Subject: [PATCH 093/127] Error on forward references for property initializers

The error only appears when a property initializer references another
property before its definition. References to outer variables, etc are
still allowed.
---
 src/compiler/checker.ts | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b5306771dd7..4423b574e31 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -641,7 +641,7 @@ namespace ts {
                 }
                 // declaration is after usage
                 // can be legal if usage is deferred (i.e. inside function or in initializer of instance property)
-                if (isUsedInFunctionOrNonStaticProperty(usage)) {
+                if (isUsedInFunctionOrInstanceProperty(usage)) {
                     return true;
                 }
                 const sourceFiles = host.getSourceFiles();
@@ -668,10 +668,12 @@ namespace ts {
             }
 
 
-            // declaration is after usage
-            // can be legal if usage is deferred (i.e. inside function or in initializer of instance property)
+            // declaration is after usage, but it can still be legal if usage is deferred:
+            // 1. inside a function
+            // 2. inside an instance property initializer, a reference to a non-instance property
             const container = getEnclosingBlockScopeContainer(declaration);
-            return isUsedInFunctionOrNonStaticProperty(usage, container);
+            const isInstanceProperty = declaration.kind === SyntaxKind.PropertyDeclaration && !(getModifierFlags(declaration) & ModifierFlags.Static);
+            return isUsedInFunctionOrInstanceProperty(usage, isInstanceProperty, container);
 
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration: VariableDeclaration, usage: Node): boolean {
                 const container = getEnclosingBlockScopeContainer(declaration);
@@ -700,7 +702,7 @@ namespace ts {
                 return false;
             }
 
-            function isUsedInFunctionOrNonStaticProperty(usage: Node, container?: Node): boolean {
+            function isUsedInFunctionOrInstanceProperty(usage: Node, isDeclarationInstanceProperty?: boolean, container?: Node): boolean {
                 let current = usage;
                 while (current) {
                     if (current === container) {
@@ -711,13 +713,13 @@ namespace ts {
                         return true;
                     }
 
-                    const initializerOfNonStaticProperty = current.parent &&
+                    const initializerOfInstanceProperty = current.parent &&
                         current.parent.kind === SyntaxKind.PropertyDeclaration &&
                         (getModifierFlags(current.parent) & ModifierFlags.Static) === 0 &&
                         (<PropertyDeclaration>current.parent).initializer === current;
 
-                    if (initializerOfNonStaticProperty) {
-                        return true;
+                    if (initializerOfInstanceProperty) {
+                        return !isDeclarationInstanceProperty;
                     }
 
                     current = current.parent;
@@ -986,10 +988,10 @@ namespace ts {
                 //              interface bar {}
                 //          }
                 //      const foo/*1*/: foo/*2*/.bar;
-                // The foo at /*1*/ and /*2*/ will share same symbol with two meaning
-                // block - scope variable and namespace module. However, only when we
+                // The foo at /*1*/ and /*2*/ will share same symbol with two meanings:
+                // block-scoped variable and namespace module. However, only when we
                 // try to resolve name in /*1*/ which is used in variable position,
-                // we want to check for block- scoped
+                // we want to check for block-scoped
                 if (meaning & SymbolFlags.BlockScopedVariable) {
                     const exportOrLocalSymbol = getExportSymbolOfValueSymbolIfExported(result);
                     if (exportOrLocalSymbol.flags & SymbolFlags.BlockScopedVariable) {
@@ -1013,7 +1015,7 @@ namespace ts {
                 return false;
             }
 
-            const container = getThisContainer(errorLocation, /* includeArrowFunctions */ true);
+            const container = getThisContainer(errorLocation, /*includeArrowFunctions*/ true);
             let location = container;
             while (location) {
                 if (isClassLike(location.parent)) {
@@ -12543,6 +12545,16 @@ namespace ts {
             }
         }
 
+        function isInPropertyInitializer(node: Node): boolean {
+            while (node) {
+                if (node.parent && node.parent.kind === SyntaxKind.PropertyDeclaration && (node.parent as PropertyDeclaration).initializer === node) {
+                    return true;
+                }
+                node = node.parent;
+            }
+            return false;
+        }
+
         function checkPropertyAccessExpressionOrQualifiedName(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, right: Identifier) {
             const type = checkNonNullExpression(left);
             if (isTypeAny(type) || type === silentNeverType) {
@@ -12565,6 +12577,11 @@ namespace ts {
                 }
                 return unknownType;
             }
+            if (prop.valueDeclaration &&
+                isInPropertyInitializer(node) &&
+                !isBlockScopedNameDeclaredBeforeUse(prop.valueDeclaration, right)) {
+                error(right, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, right.text);
+            }
 
             markPropertyAsReferenced(prop);
 

From 669ecab631aa50939e531a3c6df0706125e813fd Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 6 Feb 2017 16:05:40 -0800
Subject: [PATCH 094/127] Test property initialiser forward reference errors

---
 .../forwardRefInClassProperties.errors.txt    | 27 ++++++++++++++++
 .../reference/forwardRefInClassProperties.js  | 31 +++++++++++++++++++
 .../compiler/forwardRefInClassProperties.ts   | 14 +++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 tests/baselines/reference/forwardRefInClassProperties.errors.txt
 create mode 100644 tests/baselines/reference/forwardRefInClassProperties.js
 create mode 100644 tests/cases/compiler/forwardRefInClassProperties.ts

diff --git a/tests/baselines/reference/forwardRefInClassProperties.errors.txt b/tests/baselines/reference/forwardRefInClassProperties.errors.txt
new file mode 100644
index 00000000000..dcf153076ed
--- /dev/null
+++ b/tests/baselines/reference/forwardRefInClassProperties.errors.txt
@@ -0,0 +1,27 @@
+tests/cases/compiler/forwardRefInClassProperties.ts(3,15): error TS2448: Block-scoped variable '_a' used before its declaration.
+tests/cases/compiler/forwardRefInClassProperties.ts(6,22): error TS2448: Block-scoped variable '_A' used before its declaration.
+tests/cases/compiler/forwardRefInClassProperties.ts(11,17): error TS2448: Block-scoped variable 'b' used before its declaration.
+
+
+==== tests/cases/compiler/forwardRefInClassProperties.ts (3 errors) ====
+    class Test
+    {
+        _b = this._a; // undefined, no error/warning
+                  ~~
+!!! error TS2448: Block-scoped variable '_a' used before its declaration.
+        _a = 3;
+    
+        static _B = Test._A; // undefined, no error/warning
+                         ~~
+!!! error TS2448: Block-scoped variable '_A' used before its declaration.
+        static _A = 3;
+    
+        method()
+        {
+            let a = b; // Block-scoped variable 'b' used before its declaration
+                    ~
+!!! error TS2448: Block-scoped variable 'b' used before its declaration.
+            let b = 3;
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/forwardRefInClassProperties.js b/tests/baselines/reference/forwardRefInClassProperties.js
new file mode 100644
index 00000000000..1dc455729ab
--- /dev/null
+++ b/tests/baselines/reference/forwardRefInClassProperties.js
@@ -0,0 +1,31 @@
+//// [forwardRefInClassProperties.ts]
+class Test
+{
+    _b = this._a; // undefined, no error/warning
+    _a = 3;
+
+    static _B = Test._A; // undefined, no error/warning
+    static _A = 3;
+
+    method()
+    {
+        let a = b; // Block-scoped variable 'b' used before its declaration
+        let b = 3;
+    }
+}
+
+
+//// [forwardRefInClassProperties.js]
+var Test = (function () {
+    function Test() {
+        this._b = this._a; // undefined, no error/warning
+        this._a = 3;
+    }
+    Test.prototype.method = function () {
+        var a = b; // Block-scoped variable 'b' used before its declaration
+        var b = 3;
+    };
+    return Test;
+}());
+Test._B = Test._A; // undefined, no error/warning
+Test._A = 3;
diff --git a/tests/cases/compiler/forwardRefInClassProperties.ts b/tests/cases/compiler/forwardRefInClassProperties.ts
new file mode 100644
index 00000000000..80819b1a175
--- /dev/null
+++ b/tests/cases/compiler/forwardRefInClassProperties.ts
@@ -0,0 +1,14 @@
+class Test
+{
+    _b = this._a; // undefined, no error/warning
+    _a = 3;
+
+    static _B = Test._A; // undefined, no error/warning
+    static _A = 3;
+
+    method()
+    {
+        let a = b; // Block-scoped variable 'b' used before its declaration
+        let b = 3;
+    }
+}

From 188e9df9b55d15b003852632c14425ffe92823e5 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 6 Feb 2017 18:13:17 -0800
Subject: [PATCH 095/127] Emit missing trailing comment of an element in node
 list

---
 src/compiler/comments.ts |  6 ++++++
 src/compiler/emitter.ts  | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
index 200158c2f5c..8e17bf2d91b 100644
--- a/src/compiler/comments.ts
+++ b/src/compiler/comments.ts
@@ -9,6 +9,7 @@ namespace ts {
         emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
         emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void): void;
         emitTrailingCommentsOfPosition(pos: number): void;
+        emitLeadingComments(pos: number, isEmittedNode: boolean): void;
     }
 
     export function createCommentWriter(printerOptions: PrinterOptions, emitPos: ((pos: number) => void) | undefined): CommentWriter {
@@ -32,6 +33,7 @@ namespace ts {
             emitNodeWithComments,
             emitBodyWithDetachedComments,
             emitTrailingCommentsOfPosition,
+            emitLeadingComments,
         };
 
         function emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) {
@@ -167,6 +169,10 @@ namespace ts {
         }
 
         function emitLeadingComments(pos: number, isEmittedNode: boolean) {
+            if (disabled) {
+                return;
+            }
+
             hasWrittenComment = false;
 
             if (isEmittedNode) {
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 498f65ad366..d3e46f0827d 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -211,6 +211,7 @@ namespace ts {
             emitNodeWithComments,
             emitBodyWithDetachedComments,
             emitTrailingCommentsOfPosition,
+            emitLeadingComments,
         } = comments;
 
         let currentSourceFile: SourceFile;
@@ -2228,6 +2229,15 @@ namespace ts {
 
                     // Write the delimiter if this is not the first node.
                     if (previousSibling) {
+                        // i.e
+                        //      function commentedParameters(
+                        //          /* Parameter a */
+                        //          a
+                        //          /* End of parameter a */ -> this comment doesn't consider to be trailing comment of parameter "a" due to newline
+                        //          ,
+                        if (emitLeadingComments && delimiter && previousSibling.end !== parentNode.end) {
+                            emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement);
+                        }
                         write(delimiter);
 
                         // Write either a line terminator or whitespace to separate the elements.
@@ -2274,6 +2284,20 @@ namespace ts {
                     write(",");
                 }
 
+
+                // Emit any trailing comment of the last element in the list
+                // i.e
+                //       var array = [...
+                //          2
+                //          /* end of element 2 */
+                //       ];
+                if (previousSibling && delimiter && previousSibling.end !== parentNode.end) {
+                    emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement);
+                    if (hasTrailingComma) {
+                        emitLeadingComments(previousSibling.end,  /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement);
+                    }
+                }
+
                 // Decrease the indent, if requested.
                 if (format & ListFormat.Indented) {
                     decreaseIndent();

From 7fd404dbbc20611bca81f8cde3a07c91e69ee13f Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Mon, 6 Feb 2017 18:14:08 -0800
Subject: [PATCH 096/127] Add tests and update baselines

---
 .../reference/arrowFunctionErrorSpan.js       |  4 +++-
 .../reference/commentOnArrayElement1.js       | 17 ++++++++++++++++
 .../reference/commentOnArrayElement1.symbols  | 10 ++++++++++
 .../reference/commentOnArrayElement1.types    | 15 ++++++++++++++
 .../reference/commentOnArrayElement2.js       | 15 ++++++++++++++
 .../reference/commentOnArrayElement2.symbols  |  9 +++++++++
 .../reference/commentOnArrayElement2.types    | 14 +++++++++++++
 .../reference/commentOnArrayElement3.js       | 19 ++++++++++++++++++
 .../reference/commentOnArrayElement3.symbols  | 11 ++++++++++
 .../reference/commentOnArrayElement3.types    | 18 +++++++++++++++++
 .../reference/commentOnParameter1.js          | 20 +++++++++++++++++++
 .../reference/commentOnParameter1.symbols     | 16 +++++++++++++++
 .../reference/commentOnParameter1.types       | 16 +++++++++++++++
 .../reference/commentOnParameter2.js          | 18 +++++++++++++++++
 .../reference/commentOnParameter2.symbols     | 15 ++++++++++++++
 .../reference/commentOnParameter2.types       | 15 ++++++++++++++
 .../reference/commentOnParameter3.js          |  9 +++++++++
 .../reference/commentOnParameter3.symbols     | 12 +++++++++++
 .../reference/commentOnParameter3.types       | 12 +++++++++++
 .../cases/compiler/commentOnArrayElement1.ts  |  7 +++++++
 .../cases/compiler/commentOnArrayElement2.ts  |  6 ++++++
 .../cases/compiler/commentOnArrayElement3.ts  |  8 ++++++++
 tests/cases/compiler/commentOnParameter1.ts   |  9 +++++++++
 tests/cases/compiler/commentOnParameter2.ts   |  8 ++++++++
 tests/cases/compiler/commentOnParameter3.ts   |  5 +++++
 25 files changed, 307 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/commentOnArrayElement1.js
 create mode 100644 tests/baselines/reference/commentOnArrayElement1.symbols
 create mode 100644 tests/baselines/reference/commentOnArrayElement1.types
 create mode 100644 tests/baselines/reference/commentOnArrayElement2.js
 create mode 100644 tests/baselines/reference/commentOnArrayElement2.symbols
 create mode 100644 tests/baselines/reference/commentOnArrayElement2.types
 create mode 100644 tests/baselines/reference/commentOnArrayElement3.js
 create mode 100644 tests/baselines/reference/commentOnArrayElement3.symbols
 create mode 100644 tests/baselines/reference/commentOnArrayElement3.types
 create mode 100644 tests/baselines/reference/commentOnParameter1.js
 create mode 100644 tests/baselines/reference/commentOnParameter1.symbols
 create mode 100644 tests/baselines/reference/commentOnParameter1.types
 create mode 100644 tests/baselines/reference/commentOnParameter2.js
 create mode 100644 tests/baselines/reference/commentOnParameter2.symbols
 create mode 100644 tests/baselines/reference/commentOnParameter2.types
 create mode 100644 tests/baselines/reference/commentOnParameter3.js
 create mode 100644 tests/baselines/reference/commentOnParameter3.symbols
 create mode 100644 tests/baselines/reference/commentOnParameter3.types
 create mode 100644 tests/cases/compiler/commentOnArrayElement1.ts
 create mode 100644 tests/cases/compiler/commentOnArrayElement2.ts
 create mode 100644 tests/cases/compiler/commentOnArrayElement3.ts
 create mode 100644 tests/cases/compiler/commentOnParameter1.ts
 create mode 100644 tests/cases/compiler/commentOnParameter2.ts
 create mode 100644 tests/cases/compiler/commentOnParameter3.ts

diff --git a/tests/baselines/reference/arrowFunctionErrorSpan.js b/tests/baselines/reference/arrowFunctionErrorSpan.js
index 2557113e89b..ca1f966f517 100644
--- a/tests/baselines/reference/arrowFunctionErrorSpan.js
+++ b/tests/baselines/reference/arrowFunctionErrorSpan.js
@@ -83,7 +83,9 @@ f(// comment 1
 // comment 2
 function () {
     // comment 4
-});
+}
+// comment 5
+);
 // body is not a block
 f(function (_) { return 1 +
     2; });
diff --git a/tests/baselines/reference/commentOnArrayElement1.js b/tests/baselines/reference/commentOnArrayElement1.js
new file mode 100644
index 00000000000..960df336dbb
--- /dev/null
+++ b/tests/baselines/reference/commentOnArrayElement1.js
@@ -0,0 +1,17 @@
+//// [commentOnArrayElement1.ts]
+var array = [
+    /* element 1*/
+    1
+    /* end of element 1 */,
+    2
+    /* end of element 2 */
+];
+
+//// [commentOnArrayElement1.js]
+var array = [
+    /* element 1*/
+    1
+    /* end of element 1 */ ,
+    2
+    /* end of element 2 */
+];
diff --git a/tests/baselines/reference/commentOnArrayElement1.symbols b/tests/baselines/reference/commentOnArrayElement1.symbols
new file mode 100644
index 00000000000..a504aec5c32
--- /dev/null
+++ b/tests/baselines/reference/commentOnArrayElement1.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/commentOnArrayElement1.ts ===
+var array = [
+>array : Symbol(array, Decl(commentOnArrayElement1.ts, 0, 3))
+
+    /* element 1*/
+    1
+    /* end of element 1 */,
+    2
+    /* end of element 2 */
+];
diff --git a/tests/baselines/reference/commentOnArrayElement1.types b/tests/baselines/reference/commentOnArrayElement1.types
new file mode 100644
index 00000000000..f6b541ec300
--- /dev/null
+++ b/tests/baselines/reference/commentOnArrayElement1.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/commentOnArrayElement1.ts ===
+var array = [
+>array : number[]
+>[    /* element 1*/    1    /* end of element 1 */,    2    /* end of element 2 */] : number[]
+
+    /* element 1*/
+    1
+>1 : 1
+
+    /* end of element 1 */,
+    2
+>2 : 2
+
+    /* end of element 2 */
+];
diff --git a/tests/baselines/reference/commentOnArrayElement2.js b/tests/baselines/reference/commentOnArrayElement2.js
new file mode 100644
index 00000000000..1c146caed65
--- /dev/null
+++ b/tests/baselines/reference/commentOnArrayElement2.js
@@ -0,0 +1,15 @@
+//// [commentOnArrayElement2.ts]
+var array = [
+    /* element 1*/
+    1 /* end of element 1 */,
+    2
+    /* end of element 2 */
+];
+
+//// [commentOnArrayElement2.js]
+var array = [
+    /* element 1*/
+    1 /* end of element 1 */,
+    2
+    /* end of element 2 */
+];
diff --git a/tests/baselines/reference/commentOnArrayElement2.symbols b/tests/baselines/reference/commentOnArrayElement2.symbols
new file mode 100644
index 00000000000..7a6c231664b
--- /dev/null
+++ b/tests/baselines/reference/commentOnArrayElement2.symbols
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/commentOnArrayElement2.ts ===
+var array = [
+>array : Symbol(array, Decl(commentOnArrayElement2.ts, 0, 3))
+
+    /* element 1*/
+    1 /* end of element 1 */,
+    2
+    /* end of element 2 */
+];
diff --git a/tests/baselines/reference/commentOnArrayElement2.types b/tests/baselines/reference/commentOnArrayElement2.types
new file mode 100644
index 00000000000..85647da74e0
--- /dev/null
+++ b/tests/baselines/reference/commentOnArrayElement2.types
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/commentOnArrayElement2.ts ===
+var array = [
+>array : number[]
+>[    /* element 1*/    1 /* end of element 1 */,    2    /* end of element 2 */] : number[]
+
+    /* element 1*/
+    1 /* end of element 1 */,
+>1 : 1
+
+    2
+>2 : 2
+
+    /* end of element 2 */
+];
diff --git a/tests/baselines/reference/commentOnArrayElement3.js b/tests/baselines/reference/commentOnArrayElement3.js
new file mode 100644
index 00000000000..e31f8adf26a
--- /dev/null
+++ b/tests/baselines/reference/commentOnArrayElement3.js
@@ -0,0 +1,19 @@
+//// [commentOnArrayElement3.ts]
+var array = [
+    /* element 1*/
+    1
+    /* end of element 1 */,
+    2
+    /* end of element 2 */, ,
+    /* extra comment */
+];
+
+//// [commentOnArrayElement3.js]
+var array = [
+    /* element 1*/
+    1
+    /* end of element 1 */ ,
+    2
+    /* end of element 2 */ ,
+    ,
+];
diff --git a/tests/baselines/reference/commentOnArrayElement3.symbols b/tests/baselines/reference/commentOnArrayElement3.symbols
new file mode 100644
index 00000000000..a1c61f7155a
--- /dev/null
+++ b/tests/baselines/reference/commentOnArrayElement3.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/commentOnArrayElement3.ts ===
+var array = [
+>array : Symbol(array, Decl(commentOnArrayElement3.ts, 0, 3))
+
+    /* element 1*/
+    1
+    /* end of element 1 */,
+    2
+    /* end of element 2 */, ,
+    /* extra comment */
+];
diff --git a/tests/baselines/reference/commentOnArrayElement3.types b/tests/baselines/reference/commentOnArrayElement3.types
new file mode 100644
index 00000000000..cd75c5a8db9
--- /dev/null
+++ b/tests/baselines/reference/commentOnArrayElement3.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/commentOnArrayElement3.ts ===
+var array = [
+>array : number[]
+>[    /* element 1*/    1    /* end of element 1 */,    2    /* end of element 2 */, ,    /* extra comment */] : number[]
+
+    /* element 1*/
+    1
+>1 : 1
+
+    /* end of element 1 */,
+    2
+>2 : 2
+
+    /* end of element 2 */, ,
+> : undefined
+
+    /* extra comment */
+];
diff --git a/tests/baselines/reference/commentOnParameter1.js b/tests/baselines/reference/commentOnParameter1.js
new file mode 100644
index 00000000000..10ae2af1264
--- /dev/null
+++ b/tests/baselines/reference/commentOnParameter1.js
@@ -0,0 +1,20 @@
+//// [commentOnParameter1.ts]
+function commentedParameters(
+/* Parameter a */
+a
+/* End of parameter a */
+/* Parameter b */
+,
+b
+/* End of parameter b */
+){}
+
+//// [commentOnParameter1.js]
+function commentedParameters(
+    /* Parameter a */
+    a
+    /* End of parameter a */
+    /* Parameter b */
+    , b
+    /* End of parameter b */
+) { }
diff --git a/tests/baselines/reference/commentOnParameter1.symbols b/tests/baselines/reference/commentOnParameter1.symbols
new file mode 100644
index 00000000000..13d91ac7abb
--- /dev/null
+++ b/tests/baselines/reference/commentOnParameter1.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/commentOnParameter1.ts ===
+function commentedParameters(
+>commentedParameters : Symbol(commentedParameters, Decl(commentOnParameter1.ts, 0, 0))
+
+/* Parameter a */
+a
+>a : Symbol(a, Decl(commentOnParameter1.ts, 0, 29))
+
+/* End of parameter a */
+/* Parameter b */
+,
+b
+>b : Symbol(b, Decl(commentOnParameter1.ts, 5, 1))
+
+/* End of parameter b */
+){}
diff --git a/tests/baselines/reference/commentOnParameter1.types b/tests/baselines/reference/commentOnParameter1.types
new file mode 100644
index 00000000000..2a98a9a3f6f
--- /dev/null
+++ b/tests/baselines/reference/commentOnParameter1.types
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/commentOnParameter1.ts ===
+function commentedParameters(
+>commentedParameters : (a: any, b: any) => void
+
+/* Parameter a */
+a
+>a : any
+
+/* End of parameter a */
+/* Parameter b */
+,
+b
+>b : any
+
+/* End of parameter b */
+){}
diff --git a/tests/baselines/reference/commentOnParameter2.js b/tests/baselines/reference/commentOnParameter2.js
new file mode 100644
index 00000000000..d0c024a6b3b
--- /dev/null
+++ b/tests/baselines/reference/commentOnParameter2.js
@@ -0,0 +1,18 @@
+//// [commentOnParameter2.ts]
+function commentedParameters(
+/* Parameter a */
+a /* End of parameter a */
+/* Parameter b */
+,
+b
+/* End of parameter b */
+){}
+
+//// [commentOnParameter2.js]
+function commentedParameters(
+    /* Parameter a */
+    a /* End of parameter a */
+    /* Parameter b */
+    , b
+    /* End of parameter b */
+) { }
diff --git a/tests/baselines/reference/commentOnParameter2.symbols b/tests/baselines/reference/commentOnParameter2.symbols
new file mode 100644
index 00000000000..5a6e904ed0b
--- /dev/null
+++ b/tests/baselines/reference/commentOnParameter2.symbols
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/commentOnParameter2.ts ===
+function commentedParameters(
+>commentedParameters : Symbol(commentedParameters, Decl(commentOnParameter2.ts, 0, 0))
+
+/* Parameter a */
+a /* End of parameter a */
+>a : Symbol(a, Decl(commentOnParameter2.ts, 0, 29))
+
+/* Parameter b */
+,
+b
+>b : Symbol(b, Decl(commentOnParameter2.ts, 4, 1))
+
+/* End of parameter b */
+){}
diff --git a/tests/baselines/reference/commentOnParameter2.types b/tests/baselines/reference/commentOnParameter2.types
new file mode 100644
index 00000000000..2d4c14db809
--- /dev/null
+++ b/tests/baselines/reference/commentOnParameter2.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/commentOnParameter2.ts ===
+function commentedParameters(
+>commentedParameters : (a: any, b: any) => void
+
+/* Parameter a */
+a /* End of parameter a */
+>a : any
+
+/* Parameter b */
+,
+b
+>b : any
+
+/* End of parameter b */
+){}
diff --git a/tests/baselines/reference/commentOnParameter3.js b/tests/baselines/reference/commentOnParameter3.js
new file mode 100644
index 00000000000..56172af473c
--- /dev/null
+++ b/tests/baselines/reference/commentOnParameter3.js
@@ -0,0 +1,9 @@
+//// [commentOnParameter3.ts]
+function commentedParameters(
+a /* parameter a */, 
+b /* parameter b */,
+/* extra comment */
+) { }
+
+//// [commentOnParameter3.js]
+function commentedParameters(a /* parameter a */, b /* parameter b */) { }
diff --git a/tests/baselines/reference/commentOnParameter3.symbols b/tests/baselines/reference/commentOnParameter3.symbols
new file mode 100644
index 00000000000..4dda5f6d0e8
--- /dev/null
+++ b/tests/baselines/reference/commentOnParameter3.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/commentOnParameter3.ts ===
+function commentedParameters(
+>commentedParameters : Symbol(commentedParameters, Decl(commentOnParameter3.ts, 0, 0))
+
+a /* parameter a */, 
+>a : Symbol(a, Decl(commentOnParameter3.ts, 0, 29))
+
+b /* parameter b */,
+>b : Symbol(b, Decl(commentOnParameter3.ts, 1, 20))
+
+/* extra comment */
+) { }
diff --git a/tests/baselines/reference/commentOnParameter3.types b/tests/baselines/reference/commentOnParameter3.types
new file mode 100644
index 00000000000..f5b23dbceb3
--- /dev/null
+++ b/tests/baselines/reference/commentOnParameter3.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/commentOnParameter3.ts ===
+function commentedParameters(
+>commentedParameters : (a: any, b: any) => void
+
+a /* parameter a */, 
+>a : any
+
+b /* parameter b */,
+>b : any
+
+/* extra comment */
+) { }
diff --git a/tests/cases/compiler/commentOnArrayElement1.ts b/tests/cases/compiler/commentOnArrayElement1.ts
new file mode 100644
index 00000000000..3dc4ce29bf1
--- /dev/null
+++ b/tests/cases/compiler/commentOnArrayElement1.ts
@@ -0,0 +1,7 @@
+var array = [
+    /* element 1*/
+    1
+    /* end of element 1 */,
+    2
+    /* end of element 2 */
+];
\ No newline at end of file
diff --git a/tests/cases/compiler/commentOnArrayElement2.ts b/tests/cases/compiler/commentOnArrayElement2.ts
new file mode 100644
index 00000000000..80c7f8fb1a7
--- /dev/null
+++ b/tests/cases/compiler/commentOnArrayElement2.ts
@@ -0,0 +1,6 @@
+var array = [
+    /* element 1*/
+    1 /* end of element 1 */,
+    2
+    /* end of element 2 */
+];
\ No newline at end of file
diff --git a/tests/cases/compiler/commentOnArrayElement3.ts b/tests/cases/compiler/commentOnArrayElement3.ts
new file mode 100644
index 00000000000..26de853f3e9
--- /dev/null
+++ b/tests/cases/compiler/commentOnArrayElement3.ts
@@ -0,0 +1,8 @@
+var array = [
+    /* element 1*/
+    1
+    /* end of element 1 */,
+    2
+    /* end of element 2 */, ,
+    /* extra comment */
+];
\ No newline at end of file
diff --git a/tests/cases/compiler/commentOnParameter1.ts b/tests/cases/compiler/commentOnParameter1.ts
new file mode 100644
index 00000000000..6a17c90950c
--- /dev/null
+++ b/tests/cases/compiler/commentOnParameter1.ts
@@ -0,0 +1,9 @@
+function commentedParameters(
+/* Parameter a */
+a
+/* End of parameter a */
+/* Parameter b */
+,
+b
+/* End of parameter b */
+){}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentOnParameter2.ts b/tests/cases/compiler/commentOnParameter2.ts
new file mode 100644
index 00000000000..2722eab554b
--- /dev/null
+++ b/tests/cases/compiler/commentOnParameter2.ts
@@ -0,0 +1,8 @@
+function commentedParameters(
+/* Parameter a */
+a /* End of parameter a */
+/* Parameter b */
+,
+b
+/* End of parameter b */
+){}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentOnParameter3.ts b/tests/cases/compiler/commentOnParameter3.ts
new file mode 100644
index 00000000000..57eda10f338
--- /dev/null
+++ b/tests/cases/compiler/commentOnParameter3.ts
@@ -0,0 +1,5 @@
+function commentedParameters(
+a /* parameter a */, 
+b /* parameter b */,
+/* extra comment */
+) { }
\ No newline at end of file

From 41f6c5ef6b758e65b10e62e72198fb6857dede8e Mon Sep 17 00:00:00 2001
From: Yui T <yuisu@microsoft.com>
Date: Mon, 6 Feb 2017 20:07:58 -0800
Subject: [PATCH 097/127] Only report an error in non ambient context and with
 no noEmit flag

---
 src/compiler/checker.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index eb78885ea5e..1564f0c7f69 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -21909,7 +21909,8 @@ namespace ts {
                 }
             }
 
-            if (hasModifier(node.parent.parent, ModifierFlags.Export) && compilerOptions.module !== ModuleKind.ES2015) {
+            if (compilerOptions.module !== ModuleKind.ES2015 && !compilerOptions.noEmit &&
+                !isInAmbientContext(node.parent.parent) && hasModifier(node.parent.parent, ModifierFlags.Export)) {
                 checkESModuleMarker(node.name);
             }
 

From d7371043c4d7d1b1c6cb4a3bda25177c30925c3d Mon Sep 17 00:00:00 2001
From: Yui T <yuisu@microsoft.com>
Date: Mon, 6 Feb 2017 20:08:13 -0800
Subject: [PATCH 098/127] Add test and baseline

---
 tests/baselines/reference/es5-commonjs7.symbols | 6 ++++++
 tests/baselines/reference/es5-commonjs7.types   | 6 ++++++
 tests/baselines/reference/es5-commonjs8.symbols | 6 ++++++
 tests/baselines/reference/es5-commonjs8.types   | 7 +++++++
 tests/cases/compiler/es5-commonjs7.ts           | 8 ++++++++
 tests/cases/compiler/es5-commonjs8.ts           | 8 ++++++++
 6 files changed, 41 insertions(+)
 create mode 100644 tests/baselines/reference/es5-commonjs7.symbols
 create mode 100644 tests/baselines/reference/es5-commonjs7.types
 create mode 100644 tests/baselines/reference/es5-commonjs8.symbols
 create mode 100644 tests/baselines/reference/es5-commonjs8.types
 create mode 100644 tests/cases/compiler/es5-commonjs7.ts
 create mode 100644 tests/cases/compiler/es5-commonjs8.ts

diff --git a/tests/baselines/reference/es5-commonjs7.symbols b/tests/baselines/reference/es5-commonjs7.symbols
new file mode 100644
index 00000000000..14c4cc71376
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs7.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/test.d.ts ===
+
+export default "test";
+export var __esModule;
+>__esModule : Symbol(__esModule, Decl(test.d.ts, 2, 10))
+
diff --git a/tests/baselines/reference/es5-commonjs7.types b/tests/baselines/reference/es5-commonjs7.types
new file mode 100644
index 00000000000..e2236a61c7b
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs7.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/test.d.ts ===
+
+export default "test";
+export var __esModule;
+>__esModule : any
+
diff --git a/tests/baselines/reference/es5-commonjs8.symbols b/tests/baselines/reference/es5-commonjs8.symbols
new file mode 100644
index 00000000000..93041cc8b7f
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs8.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/es5-commonjs8.ts ===
+
+export default "test";
+export var __esModule = 1;
+>__esModule : Symbol(__esModule, Decl(es5-commonjs8.ts, 2, 10))
+
diff --git a/tests/baselines/reference/es5-commonjs8.types b/tests/baselines/reference/es5-commonjs8.types
new file mode 100644
index 00000000000..be206bf5162
--- /dev/null
+++ b/tests/baselines/reference/es5-commonjs8.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/es5-commonjs8.ts ===
+
+export default "test";
+export var __esModule = 1;
+>__esModule : number
+>1 : 1
+
diff --git a/tests/cases/compiler/es5-commonjs7.ts b/tests/cases/compiler/es5-commonjs7.ts
new file mode 100644
index 00000000000..384feb22638
--- /dev/null
+++ b/tests/cases/compiler/es5-commonjs7.ts
@@ -0,0 +1,8 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+// @filename: test.d.ts
+export default "test";
+export var __esModule;
diff --git a/tests/cases/compiler/es5-commonjs8.ts b/tests/cases/compiler/es5-commonjs8.ts
new file mode 100644
index 00000000000..6926115497c
--- /dev/null
+++ b/tests/cases/compiler/es5-commonjs8.ts
@@ -0,0 +1,8 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+// @noEmit: true
+
+export default "test";
+export var __esModule = 1;

From b6c97de24e30220994c8591b510df780fe123191 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Tue, 7 Feb 2017 07:18:49 -0800
Subject: [PATCH 099/127] Address code review: update error message

---
 src/compiler/checker.ts                            | 2 +-
 src/compiler/diagnosticMessages.json               | 2 +-
 tests/baselines/reference/es5-commonjs3.errors.txt | 4 ++--
 tests/baselines/reference/es5-commonjs4.errors.txt | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1564f0c7f69..22e70aaaa93 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -21929,7 +21929,7 @@ namespace ts {
         function checkESModuleMarker(name: Identifier | BindingPattern): boolean {
             if (name.kind === SyntaxKind.Identifier) {
                 if (unescapeIdentifier(name.text) === "__esModule") {
-                    return grammarErrorOnNode(name, Diagnostics.Identifier_expected_esModule_is_reserved_as_a_marker_for_transpiled_ES2015_module);
+                    return grammarErrorOnNode(name, Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
                 }
             }
             else {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 50a91761e80..3e2118f67b7 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -671,7 +671,7 @@
         "category": "Error",
         "code": 1215
     },
-    "Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.": {
+    "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.": {
         "category": "Error",
         "code": 1216
     },
diff --git a/tests/baselines/reference/es5-commonjs3.errors.txt b/tests/baselines/reference/es5-commonjs3.errors.txt
index 51c5d2cd44d..fddabf56fac 100644
--- a/tests/baselines/reference/es5-commonjs3.errors.txt
+++ b/tests/baselines/reference/es5-commonjs3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.
+tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.
 
 
 ==== tests/cases/compiler/es5-commonjs3.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected.
     export default "test";
     export var __esModule = 1;
                ~~~~~~~~~~
-!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.
+!!! error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-commonjs4.errors.txt b/tests/baselines/reference/es5-commonjs4.errors.txt
index 6a047378bac..9a901728cfb 100644
--- a/tests/baselines/reference/es5-commonjs4.errors.txt
+++ b/tests/baselines/reference/es5-commonjs4.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.
+tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.
 
 
 ==== tests/cases/compiler/es5-commonjs4.ts (1 errors) ====
@@ -17,5 +17,5 @@ tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected.
     }
     export var __esModule = 1;
                ~~~~~~~~~~
-!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.
+!!! error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.
     
\ No newline at end of file

From e03509affa543c39e24bbbffcd60b3249b18c301 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 7 Feb 2017 09:47:10 -0800
Subject: [PATCH 100/127] No subtype reduction in includeFalsyTypes

It's not really needed and caused #13826.
---
 src/compiler/checker.ts                       |  2 +-
 .../reference/optionalParameterRetainsNull.js | 14 +++++++++
 .../optionalParameterRetainsNull.symbols      | 25 +++++++++++++++
 .../optionalParameterRetainsNull.types        | 31 +++++++++++++++++++
 .../compiler/optionalParameterRetainsNull.ts  |  7 +++++
 5 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/optionalParameterRetainsNull.js
 create mode 100644 tests/baselines/reference/optionalParameterRetainsNull.symbols
 create mode 100644 tests/baselines/reference/optionalParameterRetainsNull.types
 create mode 100644 tests/cases/compiler/optionalParameterRetainsNull.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 4423b574e31..383aea994cd 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8540,7 +8540,7 @@ namespace ts {
             if (flags & TypeFlags.Void) types.push(voidType);
             if (flags & TypeFlags.Undefined) types.push(undefinedType);
             if (flags & TypeFlags.Null) types.push(nullType);
-            return getUnionType(types, /*subtypeReduction*/ true);
+            return getUnionType(types);
         }
 
         function removeDefinitelyFalsyTypes(type: Type): Type {
diff --git a/tests/baselines/reference/optionalParameterRetainsNull.js b/tests/baselines/reference/optionalParameterRetainsNull.js
new file mode 100644
index 00000000000..b8fb2c12350
--- /dev/null
+++ b/tests/baselines/reference/optionalParameterRetainsNull.js
@@ -0,0 +1,14 @@
+//// [optionalParameterRetainsNull.ts]
+interface Bar {  bar: number; foo: object | null;  }
+
+let a = {
+  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined
+
+
+//// [optionalParameterRetainsNull.js]
+var a = {
+    test: function (a, b) { }
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined
diff --git a/tests/baselines/reference/optionalParameterRetainsNull.symbols b/tests/baselines/reference/optionalParameterRetainsNull.symbols
new file mode 100644
index 00000000000..95786c1bdca
--- /dev/null
+++ b/tests/baselines/reference/optionalParameterRetainsNull.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/optionalParameterRetainsNull.ts ===
+interface Bar {  bar: number; foo: object | null;  }
+>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0))
+>bar : Symbol(Bar.bar, Decl(optionalParameterRetainsNull.ts, 0, 15))
+>foo : Symbol(Bar.foo, Decl(optionalParameterRetainsNull.ts, 0, 29))
+
+let a = {
+>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 2, 3))
+
+  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
+>test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9))
+>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7))
+>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0))
+>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 3, 29))
+>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7))
+>b : Symbol(b, Decl(optionalParameterRetainsNull.ts, 3, 34))
+>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0))
+>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7))
+
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined
+>a.test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9))
+>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 2, 3))
+>test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9))
+
diff --git a/tests/baselines/reference/optionalParameterRetainsNull.types b/tests/baselines/reference/optionalParameterRetainsNull.types
new file mode 100644
index 00000000000..30b7d61f76c
--- /dev/null
+++ b/tests/baselines/reference/optionalParameterRetainsNull.types
@@ -0,0 +1,31 @@
+=== tests/cases/compiler/optionalParameterRetainsNull.ts ===
+interface Bar {  bar: number; foo: object | null;  }
+>Bar : Bar
+>bar : number
+>foo : object | null
+>null : null
+
+let a = {
+>a : { test<K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined): void; }
+>{  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }} : { test<K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined): void; }
+
+  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
+>test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
+>K : K
+>Bar : Bar
+>a : K
+>K : K
+>b : Bar[K] | null | undefined
+>Bar : Bar
+>K : K
+>null : null
+
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined
+>a.test("bar", null) : void
+>a.test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
+>a : { test<K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined): void; }
+>test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
+>"bar" : "bar"
+>null : null
+
diff --git a/tests/cases/compiler/optionalParameterRetainsNull.ts b/tests/cases/compiler/optionalParameterRetainsNull.ts
new file mode 100644
index 00000000000..a3b50a82d2c
--- /dev/null
+++ b/tests/cases/compiler/optionalParameterRetainsNull.ts
@@ -0,0 +1,7 @@
+// @strictNullChecks: true
+interface Bar {  bar: number; foo: object | null;  }
+
+let a = {
+  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
+};
+a.test("bar", null); // ok, null is assignable to number | null | undefined

From a7728f8fa133513200e2e5f6136810e463b1aa4f Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 7 Feb 2017 11:24:05 -0800
Subject: [PATCH 101/127] Clean up extraneous file

---
 src/services/transform.ts | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 src/services/transform.ts

diff --git a/src/services/transform.ts b/src/services/transform.ts
deleted file mode 100644
index c9107eea853..00000000000
--- a/src/services/transform.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/// <reference path="..\compiler\transformer.ts"/>
-/// <reference path="transpile.ts"/>
-namespace ts {
-    /**
-     * Transform one or more source files using the supplied transformers.
-     * @param source A `SourceFile` or an array of `SourceFiles`.
-     * @param transformers An array of `Transformer` callbacks used to process the transformation.
-     */
-    export function transform(source: SourceFile | SourceFile[], transformers: Transformer[]) {
-        const diagnostics: Diagnostic[] = [];
-        const compilerOptions: CompilerOptions = {};
-        const sourceFiles = isArray(source) ? source : [source];
-        const fileMap = arrayToMap(sourceFiles, sourceFile => sourceFile.fileName);
-        const emitHost: EmitHost = {
-            getCompilerOptions: () => compilerOptions,
-            getCanonicalFileName: fileName => fileName,
-            getCommonSourceDirectory: () => "",
-            getCurrentDirectory: () => "",
-            getNewLine: () => "\n",
-            getSourceFile: fileName => fileMap.get(fileName),
-            getSourceFileByPath: fileName => fileMap.get(fileName),
-            getSourceFiles: () => sourceFiles,
-            isSourceFileFromExternalLibrary: () => false,
-            isEmitBlocked: () => false,
-            writeFile: () => Debug.fail("'writeFile()' is not supported during transformation.")
-        };
-        return transformFiles(/*resolver*/ undefined, emitHost, sourceFiles, transformers);
-    }
-}
\ No newline at end of file

From 80eae169ee2d2b114ed25f9af275923f5e4c511f Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Tue, 7 Feb 2017 11:56:44 -0800
Subject: [PATCH 102/127] Emit leading comment before brace token

---
 src/compiler/emitter.ts                       |  2 ++
 .../reference/amdImportAsPrimaryExpression.js |  1 +
 tests/baselines/reference/argsInScope.js      |  1 +
 .../reference/commentLeadingCloseBrace.js     | 24 +++++++++++++
 .../commentLeadingCloseBrace.symbols          | 21 ++++++++++++
 .../reference/commentLeadingCloseBrace.types  | 30 ++++++++++++++++
 .../commonJSImportAsPrimaryExpression.js      |  1 +
 .../reference/duplicateLocalVariable1.js      |  1 +
 .../jsFileCompilationLetBeingRenamed.js       |  1 +
 .../narrowExceptionVariableInCatchClause.js   |  1 +
 tests/baselines/reference/noCatchBlock.js     |  2 ++
 tests/baselines/reference/noCatchBlock.js.map |  2 +-
 .../reference/noCatchBlock.sourcemap.txt      | 34 ++++++++++++++-----
 tests/baselines/reference/objectRestForOf.js  |  1 +
 .../baselines/reference/parserRealSource14.js |  1 +
 tests/baselines/reference/recursiveReturns.js |  1 +
 .../reference/sourceMap-SkippedNode.js        |  2 ++
 .../reference/sourceMap-SkippedNode.js.map    |  2 +-
 .../sourceMap-SkippedNode.sourcemap.txt       | 34 ++++++++++++++-----
 .../compiler/commentLeadingCloseBrace.ts      | 11 ++++++
 20 files changed, 155 insertions(+), 18 deletions(-)
 create mode 100644 tests/baselines/reference/commentLeadingCloseBrace.js
 create mode 100644 tests/baselines/reference/commentLeadingCloseBrace.symbols
 create mode 100644 tests/baselines/reference/commentLeadingCloseBrace.types
 create mode 100644 tests/cases/compiler/commentLeadingCloseBrace.ts

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index d3e46f0827d..7adac106e8c 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1347,6 +1347,8 @@ namespace ts {
             else {
                 writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
                 emitBlockStatements(node);
+                // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted
+                emitLeadingComments(node.statements.end, /*isEmittedNode*/true);
                 writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
             }
         }
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js
index 3c2e9c041fa..25f390c0b32 100644
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js
@@ -26,5 +26,6 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
     if (foo.E1.A === 0) {
+    // Should cause runtime import - interesting optimization possibility, as gets inlined to 0.
     }
 });
diff --git a/tests/baselines/reference/argsInScope.js b/tests/baselines/reference/argsInScope.js
index 90906426d24..27405a47d87 100644
--- a/tests/baselines/reference/argsInScope.js
+++ b/tests/baselines/reference/argsInScope.js
@@ -17,6 +17,7 @@ var C = (function () {
     }
     C.prototype.P = function (ii, j, k) {
         for (var i = 0; i < arguments.length; i++) {
+        // WScript.Echo("param: " + arguments[i]);
         }
     };
     return C;
diff --git a/tests/baselines/reference/commentLeadingCloseBrace.js b/tests/baselines/reference/commentLeadingCloseBrace.js
new file mode 100644
index 00000000000..9fc696219e1
--- /dev/null
+++ b/tests/baselines/reference/commentLeadingCloseBrace.js
@@ -0,0 +1,24 @@
+//// [commentLeadingCloseBrace.ts]
+declare function commentedParameters(...args): any;
+
+function ifelse() {
+    if (commentedParameters(1, 2)) {
+        /*comment1*/
+        commentedParameters(3, 4);
+        /*comment2*/
+    } else {
+        commentedParameters(5, 6);
+    }
+}
+
+//// [commentLeadingCloseBrace.js]
+function ifelse() {
+    if (commentedParameters(1, 2)) {
+        /*comment1*/
+        commentedParameters(3, 4);
+    /*comment2*/
+    }
+    else {
+        commentedParameters(5, 6);
+    }
+}
diff --git a/tests/baselines/reference/commentLeadingCloseBrace.symbols b/tests/baselines/reference/commentLeadingCloseBrace.symbols
new file mode 100644
index 00000000000..72dcfb1e047
--- /dev/null
+++ b/tests/baselines/reference/commentLeadingCloseBrace.symbols
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/commentLeadingCloseBrace.ts ===
+declare function commentedParameters(...args): any;
+>commentedParameters : Symbol(commentedParameters, Decl(commentLeadingCloseBrace.ts, 0, 0))
+>args : Symbol(args, Decl(commentLeadingCloseBrace.ts, 0, 37))
+
+function ifelse() {
+>ifelse : Symbol(ifelse, Decl(commentLeadingCloseBrace.ts, 0, 51))
+
+    if (commentedParameters(1, 2)) {
+>commentedParameters : Symbol(commentedParameters, Decl(commentLeadingCloseBrace.ts, 0, 0))
+
+        /*comment1*/
+        commentedParameters(3, 4);
+>commentedParameters : Symbol(commentedParameters, Decl(commentLeadingCloseBrace.ts, 0, 0))
+
+        /*comment2*/
+    } else {
+        commentedParameters(5, 6);
+>commentedParameters : Symbol(commentedParameters, Decl(commentLeadingCloseBrace.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/commentLeadingCloseBrace.types b/tests/baselines/reference/commentLeadingCloseBrace.types
new file mode 100644
index 00000000000..444320737a6
--- /dev/null
+++ b/tests/baselines/reference/commentLeadingCloseBrace.types
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/commentLeadingCloseBrace.ts ===
+declare function commentedParameters(...args): any;
+>commentedParameters : (...args: any[]) => any
+>args : any[]
+
+function ifelse() {
+>ifelse : () => void
+
+    if (commentedParameters(1, 2)) {
+>commentedParameters(1, 2) : any
+>commentedParameters : (...args: any[]) => any
+>1 : 1
+>2 : 2
+
+        /*comment1*/
+        commentedParameters(3, 4);
+>commentedParameters(3, 4) : any
+>commentedParameters : (...args: any[]) => any
+>3 : 3
+>4 : 4
+
+        /*comment2*/
+    } else {
+        commentedParameters(5, 6);
+>commentedParameters(5, 6) : any
+>commentedParameters : (...args: any[]) => any
+>5 : 5
+>6 : 6
+    }
+}
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index b8cf42ea762..1eb7b5ff214 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -27,4 +27,5 @@ exports.C1 = C1;
 "use strict";
 var foo = require("./foo_0");
 if (foo.C1.s1) {
+// Should cause runtime import
 }
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index 734b01eaed7..432830d85b6 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -391,6 +391,7 @@ var TestRunner = (function () {
                     }
                 }
                 if (testResult === false) {
+                //console.log(e.message);
                 }
             }
             if ((testcase.errorMessageRegEx !== undefined) && !exception) {
diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
index c9e16f35981..bb2aa10dc95 100644
--- a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
+++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
@@ -9,5 +9,6 @@ function foo(a) {
 //// [out.js]
 function foo(a) {
     for (var a_1 = 0; a_1 < 10; a_1++) {
+    // do something
     }
 }
diff --git a/tests/baselines/reference/narrowExceptionVariableInCatchClause.js b/tests/baselines/reference/narrowExceptionVariableInCatchClause.js
index 5808ed76826..18344df5994 100644
--- a/tests/baselines/reference/narrowExceptionVariableInCatchClause.js
+++ b/tests/baselines/reference/narrowExceptionVariableInCatchClause.js
@@ -27,6 +27,7 @@ function tryCatch() {
 //// [narrowExceptionVariableInCatchClause.js]
 function tryCatch() {
     try {
+    // do stuff...
     }
     catch (err) {
         if (isFooError(err)) {
diff --git a/tests/baselines/reference/noCatchBlock.js b/tests/baselines/reference/noCatchBlock.js
index 7b0404c3cad..158ac1257f3 100644
--- a/tests/baselines/reference/noCatchBlock.js
+++ b/tests/baselines/reference/noCatchBlock.js
@@ -8,7 +8,9 @@ try {
 
 //// [noCatchBlock.js]
 try {
+// ...
 }
 finally {
+// N.B. No 'catch' block
 }
 //# sourceMappingURL=noCatchBlock.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.js.map b/tests/baselines/reference/noCatchBlock.js.map
index 149a2167f46..ddac2894e0b 100644
--- a/tests/baselines/reference/noCatchBlock.js.map
+++ b/tests/baselines/reference/noCatchBlock.js.map
@@ -1,2 +1,2 @@
 //// [noCatchBlock.js.map]
-{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAI,CAAC;AAEL,CAAC;QAAS,CAAC;AAEX,CAAC"}
\ No newline at end of file
+{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAI,CAAC;AACJ,MAAM;AACP,CAAC;QAAS,CAAC;AACV,wBAAwB;AACzB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.sourcemap.txt b/tests/baselines/reference/noCatchBlock.sourcemap.txt
index 18cb0d5a479..a75c119ca9f 100644
--- a/tests/baselines/reference/noCatchBlock.sourcemap.txt
+++ b/tests/baselines/reference/noCatchBlock.sourcemap.txt
@@ -12,6 +12,7 @@ sourceFile:noCatchBlock.ts
 1 >
 2 >^^^^
 3 >    ^
+4 >     ^^->
 1 >
   >
 2 >try 
@@ -20,34 +21,51 @@ sourceFile:noCatchBlock.ts
 2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
 3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
 ---
+>>>// ...
+1->
+2 >^^^^^^
+1->
+  > 
+2 >// ...
+1->Emitted(2, 1) Source(3, 2) + SourceIndex(0)
+2 >Emitted(2, 7) Source(3, 8) + SourceIndex(0)
+---
 >>>}
 1 >
 2 >^
 3 > ^^^^^^^^^->
 1 >
-  > // ...
   >
 2 >}
-1 >Emitted(2, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(2, 2) Source(4, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(3, 2) Source(4, 2) + SourceIndex(0)
 ---
 >>>finally {
 1->^^^^^^^^
 2 >        ^
+3 >         ^^^^^^^^^^^^^^^^->
 1-> finally 
 2 >        {
-1->Emitted(3, 9) Source(4, 11) + SourceIndex(0)
-2 >Emitted(3, 10) Source(4, 12) + SourceIndex(0)
+1->Emitted(4, 9) Source(4, 11) + SourceIndex(0)
+2 >Emitted(4, 10) Source(4, 12) + SourceIndex(0)
+---
+>>>// N.B. No 'catch' block
+1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+  > 
+2 >// N.B. No 'catch' block
+1->Emitted(5, 1) Source(5, 2) + SourceIndex(0)
+2 >Emitted(5, 25) Source(5, 26) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  > // N.B. No 'catch' block
   >
 2 >}
-1 >Emitted(4, 1) Source(6, 1) + SourceIndex(0)
-2 >Emitted(4, 2) Source(6, 2) + SourceIndex(0)
+1 >Emitted(6, 1) Source(6, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(6, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=noCatchBlock.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index f8a88fe2868..5f0399b2df2 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -37,4 +37,5 @@ for (let _b of array) {
 }
 for (const norest of array.map(a => (Object.assign({}, a, { x: 'a string' })))) {
     [norest.x, norest.y];
+// x is now a string. who knows why.
 }
diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js
index 907efc6f26a..4e4e23e81c3 100644
--- a/tests/baselines/reference/parserRealSource14.js
+++ b/tests/baselines/reference/parserRealSource14.js
@@ -1011,6 +1011,7 @@ var TypeScript;
                         ctx.path.push(cur);
                     }
                     else {
+                    //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");
                     }
                 }
                 // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually
diff --git a/tests/baselines/reference/recursiveReturns.js b/tests/baselines/reference/recursiveReturns.js
index 18c9ed4dd7c..56762a9ad2d 100644
--- a/tests/baselines/reference/recursiveReturns.js
+++ b/tests/baselines/reference/recursiveReturns.js
@@ -23,6 +23,7 @@ function R1() {
 function R2() { R2(); }
 function R3(n) {
     if (n == 0) {
+    //return;
     }
     else {
         R3(n--);
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js b/tests/baselines/reference/sourceMap-SkippedNode.js
index 656b5a244e9..daac27cf49f 100644
--- a/tests/baselines/reference/sourceMap-SkippedNode.js
+++ b/tests/baselines/reference/sourceMap-SkippedNode.js
@@ -7,7 +7,9 @@ try {
 
 //// [sourceMap-SkippedNode.js]
 try {
+// ...
 }
 finally {
+// N.B. No 'catch' block
 }
 //# sourceMappingURL=sourceMap-SkippedNode.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js.map b/tests/baselines/reference/sourceMap-SkippedNode.js.map
index 77340424640..b86b3905a73 100644
--- a/tests/baselines/reference/sourceMap-SkippedNode.js.map
+++ b/tests/baselines/reference/sourceMap-SkippedNode.js.map
@@ -1,2 +1,2 @@
 //// [sourceMap-SkippedNode.js.map]
-{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;AAEL,CAAC;QAAS,CAAC;AAEX,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;AACL,MAAM;AACN,CAAC;QAAS,CAAC;AACX,wBAAwB;AACxB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
index f68320a531f..b48a5f09f4a 100644
--- a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
@@ -12,6 +12,7 @@ sourceFile:sourceMap-SkippedNode.ts
 1 >
 2 >^^^^
 3 >    ^
+4 >     ^^->
 1 >
 2 >try 
 3 >    {
@@ -19,34 +20,51 @@ sourceFile:sourceMap-SkippedNode.ts
 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0)
 ---
+>>>// ...
+1->
+2 >^^^^^^
+1->
+  >
+2 >// ...
+1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+---
 >>>}
 1 >
 2 >^
 3 > ^^^^^^^^^->
 1 >
-  >// ...
   >
 2 >}
-1 >Emitted(2, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(2, 2) Source(3, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 2) Source(3, 2) + SourceIndex(0)
 ---
 >>>finally {
 1->^^^^^^^^
 2 >        ^
+3 >         ^^^^^^^^^^^^^^^^->
 1-> finally 
 2 >        {
-1->Emitted(3, 9) Source(3, 11) + SourceIndex(0)
-2 >Emitted(3, 10) Source(3, 12) + SourceIndex(0)
+1->Emitted(4, 9) Source(3, 11) + SourceIndex(0)
+2 >Emitted(4, 10) Source(3, 12) + SourceIndex(0)
+---
+>>>// N.B. No 'catch' block
+1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+  >
+2 >// N.B. No 'catch' block
+1->Emitted(5, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 25) Source(4, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  >// N.B. No 'catch' block
   >
 2 >}
-1 >Emitted(4, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(4, 2) Source(5, 2) + SourceIndex(0)
+1 >Emitted(6, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(5, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMap-SkippedNode.js.map
\ No newline at end of file
diff --git a/tests/cases/compiler/commentLeadingCloseBrace.ts b/tests/cases/compiler/commentLeadingCloseBrace.ts
new file mode 100644
index 00000000000..bdf7a604a9b
--- /dev/null
+++ b/tests/cases/compiler/commentLeadingCloseBrace.ts
@@ -0,0 +1,11 @@
+declare function commentedParameters(...args): any;
+
+function ifelse() {
+    if (commentedParameters(1, 2)) {
+        /*comment1*/
+        commentedParameters(3, 4);
+        /*comment2*/
+    } else {
+        commentedParameters(5, 6);
+    }
+}
\ No newline at end of file

From bc6860428cb7f7338750ee8e77d6f405da28ec6c Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Tue, 7 Feb 2017 14:05:18 -0800
Subject: [PATCH 103/127] Always emit "__esModule" unless there is export =

---
 src/compiler/transformers/module/module.ts | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index a995df8f752..cdd3380b3b7 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -45,7 +45,6 @@ namespace ts {
         let currentSourceFile: SourceFile; // The current file.
         let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file.
         let noSubstitution: boolean[]; // Set of nodes for which substitution rules should be ignored.
-        let shouldAppendEsModuleMarker: boolean;  // A boolean indicating whether "__esModule" should be emitted
 
         return transformSourceFile;
 
@@ -63,7 +62,6 @@ namespace ts {
 
             currentSourceFile = node;
             currentModuleInfo = collectExternalModuleInfo(node, resolver, compilerOptions);
-            shouldAppendEsModuleMarker = false;
             moduleInfoMap[getOriginalNodeId(node)] = currentModuleInfo;
 
             // Perform the transformation.
@@ -90,7 +88,7 @@ namespace ts {
             addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
 
-            if (shouldAppendEsModuleMarker) {
+            if (!currentModuleInfo.exportEquals) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
 
@@ -387,7 +385,7 @@ namespace ts {
             // Append the 'export =' statement if provided.
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
 
-            if (shouldAppendEsModuleMarker) {
+            if (!currentModuleInfo.exportEquals) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
 
@@ -674,7 +672,6 @@ namespace ts {
             }
 
             const generatedName = getGeneratedNameForNode(node);
-            shouldAppendEsModuleMarker = true;
 
             if (node.exportClause) {
                 const statements: Statement[] = [];
@@ -850,13 +847,6 @@ namespace ts {
             let variables: VariableDeclaration[];
             let expressions: Expression[];
 
-            const parseTreeNode = getParseTreeNode(node);
-            if (parseTreeNode && !shouldAppendEsModuleMarker) {
-                // class declaration get down-level transformed to be variable statement
-                shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration)
-                    && hasModifier(parseTreeNode, ModifierFlags.Export);
-            }
-
             if (hasModifier(node, ModifierFlags.Export)) {
                 let modifiers: NodeArray<Modifier>;
 
@@ -1146,7 +1136,6 @@ namespace ts {
          * @param allowComments Whether to allow comments on the export.
          */
         function appendExportStatement(statements: Statement[] | undefined, exportName: Identifier, expression: Expression, location?: TextRange, allowComments?: boolean): Statement[] | undefined {
-            shouldAppendEsModuleMarker = true;
             statements = append(statements, createExportStatement(exportName, expression, location, allowComments));
             return statements;
         }

From 6621096d5f20fda66699d2c779f9368000bfa0b3 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Tue, 7 Feb 2017 14:22:55 -0800
Subject: [PATCH 104/127] Update baselines

---
 tests/baselines/reference/APISample_transform.js             | 1 +
 tests/baselines/reference/APISample_watcher.js               | 1 +
 tests/baselines/reference/ExportAssignment7.js               | 1 -
 tests/baselines/reference/ExportAssignment8.js               | 1 -
 ...ModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js | 2 ++
 tests/baselines/reference/aliasAssignments.js                | 1 +
 tests/baselines/reference/aliasOnMergedModuleInterface.js    | 1 +
 tests/baselines/reference/aliasUsageInAccessorsOfClass.js    | 1 +
 tests/baselines/reference/aliasUsageInArray.js               | 1 +
 tests/baselines/reference/aliasUsageInFunctionExpression.js  | 1 +
 tests/baselines/reference/aliasUsageInGenericFunction.js     | 1 +
 tests/baselines/reference/aliasUsageInIndexerOfClass.js      | 1 +
 tests/baselines/reference/aliasUsageInObjectLiteral.js       | 1 +
 tests/baselines/reference/aliasUsageInOrExpression.js        | 1 +
 .../reference/aliasUsageInTypeArgumentOfExtendsClause.js     | 1 +
 tests/baselines/reference/aliasUsageInVarAssignment.js       | 1 +
 ...aliasWithInterfaceExportAssignmentUsedInVarInitializer.js | 2 ++
 tests/baselines/reference/allowSyntheticDefaultImports10.js  | 1 +
 tests/baselines/reference/allowSyntheticDefaultImports9.js   | 1 +
 tests/baselines/reference/ambientDeclarationsExternal.js     | 1 +
 tests/baselines/reference/ambientDeclarationsPatterns.js     | 1 +
 .../ambientExternalModuleInsideNonAmbientExternalModule.js   | 1 +
 tests/baselines/reference/ambientExternalModuleMerging.js    | 1 +
 .../ambientExternalModuleWithInternalImportDeclaration.js    | 1 +
 .../ambientExternalModuleWithoutInternalImportDeclaration.js | 1 +
 .../reference/ambientInsideNonAmbientExternalModule.js       | 1 +
 tests/baselines/reference/ambientNameRestrictions.js         | 1 +
 tests/baselines/reference/ambientShorthand.js                | 1 +
 tests/baselines/reference/ambientShorthand_duplicate.js      | 1 +
 tests/baselines/reference/ambientShorthand_merging.js        | 1 +
 tests/baselines/reference/ambientShorthand_reExport.js       | 1 +
 tests/baselines/reference/amdDependencyComment1.js           | 1 +
 tests/baselines/reference/amdDependencyComment2.js           | 1 +
 tests/baselines/reference/amdDependencyCommentName1.js       | 1 +
 tests/baselines/reference/amdDependencyCommentName2.js       | 1 +
 tests/baselines/reference/amdDependencyCommentName3.js       | 1 +
 tests/baselines/reference/amdDependencyCommentName4.js       | 1 +
 tests/baselines/reference/amdImportAsPrimaryExpression.js    | 2 ++
 tests/baselines/reference/amdImportNotAsPrimaryExpression.js | 1 +
 tests/baselines/reference/asOperator4.js                     | 1 +
 tests/baselines/reference/asyncAwaitIsolatedModules_es5.js   | 1 +
 tests/baselines/reference/asyncImportedPromise_es5.js        | 1 +
 tests/baselines/reference/asyncImportedPromise_es6.js        | 1 +
 tests/baselines/reference/augmentExportEquals1.js            | 2 ++
 tests/baselines/reference/augmentExportEquals1_1.js          | 2 ++
 tests/baselines/reference/augmentExportEquals2.js            | 2 ++
 tests/baselines/reference/augmentExportEquals2_1.js          | 2 ++
 tests/baselines/reference/augmentExportEquals3.js            | 2 ++
 tests/baselines/reference/augmentExportEquals3_1.js          | 2 ++
 tests/baselines/reference/augmentExportEquals4.js            | 2 ++
 tests/baselines/reference/augmentExportEquals4_1.js          | 2 ++
 tests/baselines/reference/augmentExportEquals5.js            | 2 ++
 tests/baselines/reference/augmentExportEquals6.js            | 2 ++
 tests/baselines/reference/augmentExportEquals6_1.js          | 2 ++
 tests/baselines/reference/badExternalModuleReference.js      | 1 +
 tests/baselines/reference/bangInModuleName.js                | 1 +
 tests/baselines/reference/cachedModuleResolution1.js         | 2 ++
 tests/baselines/reference/cachedModuleResolution2.js         | 2 ++
 tests/baselines/reference/cachedModuleResolution3.js         | 2 ++
 tests/baselines/reference/cachedModuleResolution4.js         | 2 ++
 tests/baselines/reference/cachedModuleResolution5.js         | 2 ++
 tests/baselines/reference/cachedModuleResolution6.js         | 2 ++
 tests/baselines/reference/cachedModuleResolution7.js         | 2 ++
 tests/baselines/reference/cachedModuleResolution8.js         | 2 ++
 tests/baselines/reference/cachedModuleResolution9.js         | 2 ++
 tests/baselines/reference/chainedImportAlias.js              | 2 ++
 tests/baselines/reference/circularReference.js               | 2 ++
 .../reference/collisionExportsRequireAndAmbientClass.js      | 1 +
 .../reference/collisionExportsRequireAndAmbientEnum.js       | 1 +
 .../reference/collisionExportsRequireAndAmbientFunction.js   | 1 +
 .../reference/collisionExportsRequireAndAmbientVar.js        | 1 +
 tests/baselines/reference/collisionExportsRequireAndEnum.js  | 1 +
 .../collisionExportsRequireAndInternalModuleAlias.js         | 1 +
 tests/baselines/reference/commentOnExportEnumDeclaration.js  | 1 +
 tests/baselines/reference/commentOnImportStatement1.js       | 1 +
 tests/baselines/reference/commentOnImportStatement2.js       | 1 +
 tests/baselines/reference/commentOnImportStatement3.js       | 1 +
 tests/baselines/reference/commentsDottedModuleName.js        | 1 +
 tests/baselines/reference/commentsExternalModules.js         | 2 ++
 tests/baselines/reference/commentsExternalModules2.js        | 1 +
 tests/baselines/reference/commentsExternalModules3.js        | 1 +
 tests/baselines/reference/commentsMultiModuleMultiFile.js    | 2 ++
 .../baselines/reference/commonJSImportAsPrimaryExpression.js | 1 +
 .../reference/commonJSImportNotAsPrimaryExpression.js        | 1 +
 tests/baselines/reference/commonSourceDirectory.js           | 1 +
 .../baselines/reference/commonSourceDirectory.sourcemap.txt  | 3 ++-
 tests/baselines/reference/commonjsSafeImport.js              | 1 +
 tests/baselines/reference/constDeclarations-access5.js       | 1 +
 tests/baselines/reference/constEnumExternalModule.js         | 2 ++
 tests/baselines/reference/controlFlowBinaryOrExpression.js   | 1 +
 tests/baselines/reference/copyrightWithNewLine1.js           | 1 +
 tests/baselines/reference/copyrightWithoutNewLine1.js        | 1 +
 tests/baselines/reference/declFileCallSignatures.js          | 1 +
 tests/baselines/reference/declFileConstructSignatures.js     | 1 +
 .../reference/declFileExportAssignmentOfGenericInterface.js  | 1 +
 tests/baselines/reference/declFileExportImportChain.js       | 2 ++
 tests/baselines/reference/declFileExportImportChain2.js      | 1 +
 tests/baselines/reference/declFileIndexSignatures.js         | 1 +
 .../baselines/reference/declarationEmitIndexTypeNotFound.js  | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias1.js  | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias2.js  | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias3.js  | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias5.js  | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias6.js  | 1 +
 .../baselines/reference/declarationEmitInferedTypeAlias7.js  | 1 +
 tests/baselines/reference/declarationEmitInvalidExport.js    | 1 +
 tests/baselines/reference/declarationEmitNameConflicts.js    | 1 +
 .../reference/declarationEmitNameConflictsWithAlias.js       | 1 +
 .../reference/declarationEmitTypeAliasWithTypeParameters5.js | 1 +
 tests/baselines/reference/declarationMerging2.js             | 1 +
 .../reference/decoratorInstantiateModulesInFunctionBodies.js | 1 +
 tests/baselines/reference/decoratorMetadata.js               | 1 +
 tests/baselines/reference/decoratorOnImportEquals2.js        | 1 +
 .../baselines/reference/defaultExportInAwaitExpression01.js  | 1 +
 .../baselines/reference/defaultExportInAwaitExpression02.js  | 1 +
 tests/baselines/reference/defaultExportsCannotMerge01.js     | 1 +
 tests/baselines/reference/defaultExportsCannotMerge02.js     | 1 +
 tests/baselines/reference/defaultExportsCannotMerge03.js     | 1 +
 .../reference/destructuringInVariableDeclarations2.js        | 1 +
 .../reference/destructuringInVariableDeclarations4.js        | 1 +
 .../reference/destructuringInVariableDeclarations6.js        | 1 +
 tests/baselines/reference/duplicateStringNamedProperty1.js   | 1 +
 tests/baselines/reference/duplicateSymbolsExportMatching.js  | 1 +
 tests/baselines/reference/elidingImportNames.js              | 1 +
 tests/baselines/reference/emptyModuleName.js                 | 1 +
 tests/baselines/reference/enumFromExternalModule.js          | 2 ++
 .../reference/errorForConflictingExportEqualsValue.js        | 1 -
 tests/baselines/reference/errorsOnImportedSymbol.js          | 2 ++
 tests/baselines/reference/es3defaultAliasIsQuoted.js         | 1 +
 tests/baselines/reference/es5ModuleInternalNamedImports.js   | 1 +
 tests/baselines/reference/es6ImportDefaultBindingAmd.js      | 1 +
 .../es6ImportDefaultBindingFollowedWithNamedImport.js        | 1 +
 .../es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js  | 1 +
 .../es6ImportDefaultBindingFollowedWithNamedImportInEs5.js   | 1 +
 ...ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js | 1 +
 ...6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js | 1 +
 tests/baselines/reference/es6ImportDefaultBindingInEs5.js    | 1 +
 .../reference/es6ImportDefaultBindingMergeErrors.js          | 1 +
 .../reference/es6ImportDefaultBindingNoDefaultProperty.js    | 1 +
 tests/baselines/reference/es6ImportNameSpaceImport.js        | 1 +
 tests/baselines/reference/es6ImportNameSpaceImportAmd.js     | 1 +
 tests/baselines/reference/es6ImportNameSpaceImportInEs5.js   | 1 +
 .../reference/es6ImportNameSpaceImportMergeErrors.js         | 1 +
 .../reference/es6ImportNameSpaceImportNoNamedExports.js      | 1 +
 tests/baselines/reference/es6ImportNamedImport.js            | 1 +
 tests/baselines/reference/es6ImportNamedImportAmd.js         | 1 +
 tests/baselines/reference/es6ImportNamedImportInEs5.js       | 1 +
 .../es6ImportNamedImportInIndirectExportAssignment.js        | 1 +
 tests/baselines/reference/es6ImportNamedImportMergeErrors.js | 1 +
 .../reference/es6ImportNamedImportNoExportMember.js          | 1 +
 .../reference/es6ImportNamedImportNoNamedExports.js          | 1 +
 tests/baselines/reference/es6ImportWithoutFromClauseAmd.js   | 1 +
 tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js | 1 +
 .../reference/es6ImportWithoutFromClauseWithExport.js        | 1 +
 tests/baselines/reference/exportAssignClassAndModule.js      | 1 +
 tests/baselines/reference/exportAssignImportedIdentifier.js  | 1 +
 tests/baselines/reference/exportAssignTypes.js               | 1 +
 .../reference/exportAssignedTypeAsTypeAnnotation.js          | 2 ++
 tests/baselines/reference/exportAssignmentClass.js           | 1 +
 .../reference/exportAssignmentConstrainedGenericType.js      | 1 +
 tests/baselines/reference/exportAssignmentEnum.js            | 1 +
 tests/baselines/reference/exportAssignmentFunction.js        | 1 +
 tests/baselines/reference/exportAssignmentGenericType.js     | 1 +
 tests/baselines/reference/exportAssignmentInterface.js       | 2 ++
 tests/baselines/reference/exportAssignmentInternalModule.js  | 1 +
 tests/baselines/reference/exportAssignmentMergedInterface.js | 2 ++
 tests/baselines/reference/exportAssignmentMergedModule.js    | 1 +
 .../reference/exportAssignmentOfDeclaredExternalModule.js    | 2 ++
 tests/baselines/reference/exportAssignmentOfGenericType1.js  | 1 +
 tests/baselines/reference/exportAssignmentTopLevelClodule.js | 1 +
 .../baselines/reference/exportAssignmentTopLevelEnumdule.js  | 1 +
 tests/baselines/reference/exportAssignmentTopLevelFundule.js | 1 +
 .../reference/exportAssignmentTopLevelIdentifier.js          | 1 +
 tests/baselines/reference/exportAssignmentVariable.js        | 1 +
 tests/baselines/reference/exportAssignmentWithExports.js     | 1 -
 .../exportDeclarationWithModuleSpecifierNameOnNextLine1.js   | 1 +
 tests/baselines/reference/exportDeclareClass1.js             | 1 +
 tests/baselines/reference/exportDeclaredModule.js            | 1 +
 tests/baselines/reference/exportDefaultProperty.js           | 1 +
 tests/baselines/reference/exportDefaultProperty2.js          | 1 +
 tests/baselines/reference/exportEqualCallable.js             | 1 +
 tests/baselines/reference/exportEqualErrorType.js            | 1 +
 tests/baselines/reference/exportEqualMemberMissing.js        | 1 +
 tests/baselines/reference/exportEqualsDefaultProperty.js     | 1 +
 tests/baselines/reference/exportEqualsProperty.js            | 1 +
 tests/baselines/reference/exportEqualsProperty2.js           | 1 +
 tests/baselines/reference/exportImport.js                    | 1 +
 tests/baselines/reference/exportImportMultipleFiles.js       | 2 ++
 .../reference/exportImportNonInstantiatedModule2.js          | 2 ++
 .../reference/exportSpecifierReferencingOuterDeclaration2.js | 1 +
 .../reference/exportSpecifierReferencingOuterDeclaration4.js | 1 +
 tests/baselines/reference/exportStar-amd.js                  | 1 +
 tests/baselines/reference/exportStar.js                      | 1 +
 tests/baselines/reference/exportStarForValues.js             | 2 ++
 tests/baselines/reference/exportStarForValues2.js            | 3 +++
 tests/baselines/reference/exportStarForValues3.js            | 5 +++++
 tests/baselines/reference/exportStarForValues4.js            | 3 +++
 tests/baselines/reference/exportStarForValues5.js            | 1 +
 tests/baselines/reference/exportStarForValues7.js            | 1 +
 tests/baselines/reference/exportStarForValues8.js            | 1 +
 tests/baselines/reference/exportStarForValues9.js            | 1 +
 tests/baselines/reference/exportStarFromEmptyModule.js       | 1 +
 .../exportedInterfaceInaccessibleInCallbackInModule.js       | 1 +
 .../exportsAndImportsWithContextualKeywordNames01.js         | 3 +++
 .../exportsAndImportsWithContextualKeywordNames02.js         | 3 +++
 .../baselines/reference/exportsAndImportsWithUnderscores1.js | 1 +
 .../baselines/reference/exportsAndImportsWithUnderscores2.js | 1 +
 .../baselines/reference/exportsAndImportsWithUnderscores3.js | 1 +
 .../baselines/reference/exportsAndImportsWithUnderscores4.js | 1 +
 tests/baselines/reference/extendClassExpressionFromModule.js | 1 +
 .../reference/extendingClassFromAliasAndUsageInIndexer.js    | 1 +
 tests/baselines/reference/externalModuleAssignToVar.js       | 1 +
 .../reference/externalModuleExportingGenericClass.js         | 1 +
 tests/baselines/reference/externalModuleImmutableBindings.js | 1 +
 ...alModuleReferenceOfImportDeclarationWithExportModifier.js | 1 +
 ...ternalModuleRefernceResolutionOrderInImportDeclaration.js | 1 +
 tests/baselines/reference/externalModuleResolution.js        | 1 +
 tests/baselines/reference/externalModuleResolution2.js       | 1 +
 .../reference/externalModuleWithoutCompilerFlag1.js          | 1 +
 tests/baselines/reference/genericArrayExtenstions.js         | 1 +
 .../reference/genericRecursiveImplicitConstructorErrors1.js  | 1 +
 tests/baselines/reference/genericTypeWithMultipleBases1.js   | 1 +
 tests/baselines/reference/genericTypeWithMultipleBases2.js   | 1 +
 .../reference/getEmitOutputWithEmitterErrors2.baseline       | 1 +
 .../reference/globalAugmentationModuleResolution.js          | 1 +
 .../importAliasAnExternalModuleInsideAnInternalModule.js     | 2 ++
 tests/baselines/reference/importAsBaseClass.js               | 1 +
 .../importDeclRefereingExternalModuleWithNoResolve.js        | 1 +
 tests/baselines/reference/importHelpersInAmbientContext.js   | 1 +
 tests/baselines/reference/importHelpersInIsolatedModules.js  | 1 +
 tests/baselines/reference/importImportOnlyModule.js          | 2 ++
 tests/baselines/reference/importInsideModule.js              | 1 +
 tests/baselines/reference/importNonExternalModule.js         | 1 +
 tests/baselines/reference/importNonStringLiteral.js          | 1 +
 tests/baselines/reference/importTsBeforeDTs.js               | 1 +
 tests/baselines/reference/importUsedInExtendsList1.js        | 1 +
 tests/baselines/reference/importWithTrailingSlash.js         | 2 ++
 .../baselines/reference/importWithTrailingSlash_noResolve.js | 1 +
 tests/baselines/reference/import_reference-exported-alias.js | 1 +
 tests/baselines/reference/import_reference-to-type-alias.js  | 2 ++
 ...ed-require-when-referenecing-aliased-type-throug-array.js | 1 +
 .../import_var-referencing-an-imported-module-alias.js       | 1 +
 tests/baselines/reference/importedAliasesInTypePositions.js  | 2 ++
 tests/baselines/reference/importedModuleClassNameClash.js    | 1 +
 tests/baselines/reference/importsImplicitlyReadonly.js       | 1 +
 tests/baselines/reference/inferenceLimit.js                  | 1 +
 tests/baselines/reference/instanceOfInExternalModules.js     | 1 +
 tests/baselines/reference/interfaceContextualType.js         | 1 +
 tests/baselines/reference/interfaceDeclaration3.js           | 1 +
 .../internalAliasClassInsideLocalModuleWithoutExport.js      | 1 +
 .../internalAliasEnumInsideLocalModuleWithExport.js          | 1 +
 .../internalAliasEnumInsideLocalModuleWithoutExport.js       | 1 +
 ...rnalAliasEnumInsideLocalModuleWithoutExportAccessError.js | 1 +
 .../internalAliasFunctionInsideLocalModuleWithExport.js      | 1 +
 .../internalAliasFunctionInsideLocalModuleWithoutExport.js   | 1 +
 ...AliasFunctionInsideLocalModuleWithoutExportAccessError.js | 1 +
 ...ernalAliasInitializedModuleInsideLocalModuleWithExport.js | 1 +
 ...alAliasInitializedModuleInsideLocalModuleWithoutExport.js | 1 +
 .../internalAliasInterfaceInsideLocalModuleWithExport.js     | 1 +
 .../internalAliasInterfaceInsideLocalModuleWithoutExport.js  | 1 +
 ...liasInterfaceInsideLocalModuleWithoutExportAccessError.js | 1 +
 ...nalAliasUninitializedModuleInsideLocalModuleWithExport.js | 1 +
 ...AliasUninitializedModuleInsideLocalModuleWithoutExport.js | 1 +
 .../reference/internalAliasVarInsideLocalModuleWithExport.js | 1 +
 .../internalAliasVarInsideLocalModuleWithoutExport.js        | 1 +
 tests/baselines/reference/isolatedModulesPlainFile-AMD.js    | 1 +
 .../baselines/reference/isolatedModulesPlainFile-CommonJS.js | 1 +
 tests/baselines/reference/isolatedModulesPlainFile-UMD.js    | 1 +
 tests/baselines/reference/jsxEmitWithAttributes.js           | 1 +
 tests/baselines/reference/jsxFactoryAndReactNamespace.js     | 1 +
 tests/baselines/reference/jsxFactoryIdentifier.js            | 1 +
 tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt | 3 ++-
 .../reference/jsxFactoryNotIdentifierOrQualifiedName.js      | 1 +
 .../reference/jsxFactoryNotIdentifierOrQualifiedName2.js     | 1 +
 tests/baselines/reference/jsxFactoryQualifiedName.js         | 1 +
 .../reference/jsxFactoryQualifiedName.sourcemap.txt          | 3 ++-
 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js  | 1 +
 tests/baselines/reference/jsxImportInAttribute.js            | 1 +
 tests/baselines/reference/jsxViaImport.2.js                  | 1 +
 tests/baselines/reference/jsxViaImport.js                    | 1 +
 tests/baselines/reference/keepImportsInDts1.js               | 1 +
 tests/baselines/reference/keepImportsInDts2.js               | 2 ++
 tests/baselines/reference/keepImportsInDts3.js               | 2 ++
 tests/baselines/reference/keepImportsInDts4.js               | 2 ++
 tests/baselines/reference/localAliasExportAssignment.js      | 1 +
 .../reference/memberAccessMustUseModuleInstances.js          | 1 +
 tests/baselines/reference/mergeWithImportedNamespace.js      | 2 ++
 tests/baselines/reference/mergeWithImportedType.js           | 2 ++
 tests/baselines/reference/mergedDeclarations7.js             | 1 +
 tests/baselines/reference/mergedModuleDeclarationCodeGen.js  | 1 +
 tests/baselines/reference/metadataOfEventAlias.js            | 1 +
 tests/baselines/reference/missingFunctionImplementation2.js  | 2 ++
 .../baselines/reference/missingSemicolonInModuleSpecifier.js | 1 +
 tests/baselines/reference/moduleAliasAsFunctionArgument.js   | 1 +
 .../moduleAugmentationCollidingNamesInAugmentation1.js       | 4 ++++
 .../reference/moduleAugmentationDeclarationEmit1.js          | 3 +++
 .../reference/moduleAugmentationDeclarationEmit2.js          | 3 +++
 .../reference/moduleAugmentationDisallowedExtensions.js      | 2 ++
 .../reference/moduleAugmentationExtendAmbientModule1.js      | 2 ++
 .../reference/moduleAugmentationExtendAmbientModule2.js      | 2 ++
 .../reference/moduleAugmentationExtendFileModule1.js         | 3 +++
 .../reference/moduleAugmentationExtendFileModule2.js         | 3 +++
 tests/baselines/reference/moduleAugmentationGlobal1.js       | 1 +
 tests/baselines/reference/moduleAugmentationGlobal2.js       | 1 +
 tests/baselines/reference/moduleAugmentationGlobal3.js       | 2 ++
 tests/baselines/reference/moduleAugmentationGlobal4.js       | 3 +++
 tests/baselines/reference/moduleAugmentationGlobal5.js       | 1 +
 tests/baselines/reference/moduleAugmentationGlobal8.js       | 1 +
 tests/baselines/reference/moduleAugmentationGlobal8_1.js     | 1 +
 .../reference/moduleAugmentationImportsAndExports1.js        | 2 ++
 .../reference/moduleAugmentationImportsAndExports2.js        | 2 ++
 .../reference/moduleAugmentationImportsAndExports3.js        | 2 ++
 .../reference/moduleAugmentationImportsAndExports4.js        | 2 ++
 .../reference/moduleAugmentationImportsAndExports5.js        | 2 ++
 .../reference/moduleAugmentationImportsAndExports6.js        | 2 ++
 .../reference/moduleAugmentationInAmbientModule1.js          | 1 +
 .../reference/moduleAugmentationInAmbientModule2.js          | 1 +
 .../reference/moduleAugmentationInAmbientModule3.js          | 1 +
 .../reference/moduleAugmentationInAmbientModule4.js          | 1 +
 .../reference/moduleAugmentationInAmbientModule5.js          | 1 +
 tests/baselines/reference/moduleAugmentationInDependency.js  | 1 +
 tests/baselines/reference/moduleAugmentationInDependency2.js | 2 ++
 tests/baselines/reference/moduleAugmentationNoNewNames.js    | 3 +++
 .../baselines/reference/moduleAugmentationsBundledOutput1.js | 3 +++
 tests/baselines/reference/moduleAugmentationsImports1.js     | 2 ++
 tests/baselines/reference/moduleAugmentationsImports2.js     | 3 +++
 tests/baselines/reference/moduleAugmentationsImports3.js     | 2 ++
 tests/baselines/reference/moduleAugmentationsImports4.js     | 1 +
 tests/baselines/reference/moduleCodegenTest4.js              | 1 +
 tests/baselines/reference/moduleExports1.js                  | 1 +
 .../reference/moduleImportedForTypeArgumentPosition.js       | 2 ++
 tests/baselines/reference/moduleInTypePosition1.js           | 1 +
 tests/baselines/reference/moduleMergeConstructor.js          | 1 +
 tests/baselines/reference/moduleResolutionNoResolve.js       | 1 +
 tests/baselines/reference/moduleResolutionNoTs.js            | 1 +
 tests/baselines/reference/moduleResolutionWithExtensions.js  | 3 +++
 .../reference/moduleResolutionWithExtensions_notSupported.js | 1 +
 .../moduleResolutionWithExtensions_notSupported2.js          | 1 +
 .../moduleResolutionWithExtensions_notSupported3.js          | 1 +
 .../reference/moduleResolutionWithExtensions_preferTs.js     | 1 +
 .../reference/moduleResolutionWithExtensions_unexpected.js   | 1 +
 .../reference/moduleResolutionWithExtensions_unexpected2.js  | 1 +
 .../moduleResolutionWithExtensions_withAmbientPresent.js     | 1 +
 tests/baselines/reference/moduleResolutionWithSymlinks.js    | 1 +
 .../moduleResolutionWithSymlinks_notInNodeModules.js         | 1 +
 .../reference/moduleResolutionWithSymlinks_withOutDir.js     | 1 +
 .../reference/moduleSameValueDuplicateExportedBindings2.js   | 1 +
 tests/baselines/reference/moduleScoping.js                   | 1 +
 tests/baselines/reference/multiImportExport.js               | 2 ++
 tests/baselines/reference/multipleDefaultExports01.js        | 1 +
 tests/baselines/reference/multipleDefaultExports02.js        | 1 +
 tests/baselines/reference/multipleExports.js                 | 1 +
 tests/baselines/reference/nameDelimitedBySlashes.js          | 1 +
 tests/baselines/reference/nameWithFileExtension.js           | 1 +
 tests/baselines/reference/nameWithRelativePaths.js           | 2 ++
 tests/baselines/reference/nodeResolution1.js                 | 1 +
 tests/baselines/reference/nodeResolution2.js                 | 1 +
 tests/baselines/reference/nodeResolution3.js                 | 1 +
 tests/baselines/reference/nodeResolution4.js                 | 1 +
 tests/baselines/reference/nodeResolution5.js                 | 1 +
 tests/baselines/reference/nodeResolution6.js                 | 1 +
 tests/baselines/reference/nodeResolution7.js                 | 1 +
 tests/baselines/reference/nodeResolution8.js                 | 1 +
 tests/baselines/reference/nounusedTypeParameterConstraint.js | 2 ++
 tests/baselines/reference/objectIndexer.js                   | 1 +
 tests/baselines/reference/overloadModifiersMustAgree.js      | 1 +
 tests/baselines/reference/parserEnum1.js                     | 1 +
 tests/baselines/reference/parserEnum2.js                     | 1 +
 tests/baselines/reference/parserEnum3.js                     | 1 +
 tests/baselines/reference/parserEnum4.js                     | 1 +
 tests/baselines/reference/parserExportAssignment7.js         | 1 -
 tests/baselines/reference/parserExportAssignment8.js         | 1 -
 tests/baselines/reference/parserInterfaceDeclaration6.js     | 1 +
 tests/baselines/reference/parserInterfaceDeclaration7.js     | 1 +
 tests/baselines/reference/parserModule1.js                   | 1 +
 .../reference/pathMappingBasedModuleResolution3_classic.js   | 1 +
 .../reference/pathMappingBasedModuleResolution3_node.js      | 1 +
 .../reference/pathMappingBasedModuleResolution4_classic.js   | 1 +
 .../reference/pathMappingBasedModuleResolution4_node.js      | 1 +
 .../reference/pathMappingBasedModuleResolution5_classic.js   | 1 +
 .../reference/pathMappingBasedModuleResolution5_node.js      | 1 +
 .../reference/pathMappingBasedModuleResolution6_classic.js   | 1 +
 .../reference/pathMappingBasedModuleResolution6_node.js      | 1 +
 .../reference/pathMappingBasedModuleResolution7_classic.js   | 1 +
 .../reference/pathMappingBasedModuleResolution7_node.js      | 1 +
 .../pathMappingBasedModuleResolution_withExtension.js        | 1 +
 ...appingBasedModuleResolution_withExtension_failedLookup.js | 1 +
 ...privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js | 1 +
 ...ivacyCheckExternalModuleExportAssignmentOfGenericClass.js | 1 +
 .../reference/privacyInterfaceExtendsClauseDeclFile.js       | 1 +
 .../privacyLocalInternalReferenceImportWithExport.js         | 1 +
 .../privacyLocalInternalReferenceImportWithoutExport.js      | 1 +
 tests/baselines/reference/project/baseline/amd/emit.js       | 1 +
 tests/baselines/reference/project/baseline/node/emit.js      | 1 +
 tests/baselines/reference/project/baseline2/amd/dont_emit.js | 1 +
 .../baselines/reference/project/baseline2/node/dont_emit.js  | 1 +
 .../reference/project/baseline3/amd/nestedModule.js          | 1 +
 .../reference/project/baseline3/node/nestedModule.js         | 1 +
 .../project/declarationsImportedInPrivate/amd/useModule.js   | 1 +
 .../project/declarationsImportedInPrivate/node/useModule.js  | 1 +
 .../project/nodeModulesImportHigher/amd/importHigher/root.js | 1 +
 .../nodeModulesImportHigher/node/importHigher/root.js        | 1 +
 .../amd/maxDepthExceeded/built/root.js                       | 1 +
 .../node/maxDepthExceeded/built/root.js                      | 1 +
 .../amd/maxDepthIncreased/root.js                            | 1 +
 .../node/maxDepthIncreased/root.js                           | 1 +
 tests/baselines/reference/project/nonRelative/amd/consume.js | 1 +
 .../baselines/reference/project/nonRelative/node/consume.js  | 1 +
 .../visibilityOfTypeUsedAcrossModules/amd/commands.js        | 1 +
 .../project/visibilityOfTypeUsedAcrossModules/amd/server.js  | 1 +
 .../visibilityOfTypeUsedAcrossModules/node/commands.js       | 1 +
 .../project/visibilityOfTypeUsedAcrossModules/node/server.js | 1 +
 .../reference/propertyIdentityWithPrivacyMismatch.js         | 1 +
 tests/baselines/reference/reExportDefaultExport.js           | 1 +
 tests/baselines/reference/reExportGlobalDeclaration1.js      | 1 +
 tests/baselines/reference/reExportGlobalDeclaration2.js      | 1 +
 tests/baselines/reference/reExportGlobalDeclaration3.js      | 1 +
 tests/baselines/reference/reExportGlobalDeclaration4.js      | 1 +
 tests/baselines/reference/reExportUndefined1.js              | 1 +
 tests/baselines/reference/reExportUndefined2.js              | 1 +
 tests/baselines/reference/reactNamespaceImportPresevation.js | 1 +
 tests/baselines/reference/recursiveMods.js                   | 1 +
 tests/baselines/reference/reexportClassDefinition.js         | 1 +
 .../baselines/reference/relativeNamesInClassicResolution.js  | 1 +
 tests/baselines/reference/relativePathMustResolve.js         | 1 +
 tests/baselines/reference/relativePathToDeclarationFile.js   | 1 +
 .../baselines/reference/requireAsFunctionInExternalModule.js | 1 +
 tests/baselines/reference/requireEmitSemicolon.js            | 2 ++
 tests/baselines/reference/requireOfAnEmptyFile1.js           | 1 +
 tests/baselines/reference/reservedWords2.js                  | 1 +
 tests/baselines/reference/reuseInnerModuleMember.js          | 2 ++
 tests/baselines/reference/scannerEnum1.js                    | 1 +
 tests/baselines/reference/shebangBeforeReferences.js         | 1 +
 tests/baselines/reference/shorthand-property-es6-amd.js      | 1 +
 .../reference/shorthandPropertyAssignmentInES6Module.js      | 1 +
 tests/baselines/reference/staticInstanceResolution3.js       | 1 +
 tests/baselines/reference/staticInstanceResolution5.js       | 1 +
 .../strictModeReservedWordInImportEqualDeclaration.js        | 1 +
 tests/baselines/reference/topLevelAmbientModule.js           | 1 +
 tests/baselines/reference/topLevelFileModule.js              | 1 +
 tests/baselines/reference/topLevelFileModuleMissing.js       | 1 +
 .../baselines/reference/topLevelModuleDeclarationAndFile.js  | 1 +
 .../baselines/reference/transformNestedGeneratorsWithTry.js  | 1 +
 ...serialize metadata when transpile with CommonJS option.js | 1 +
 .../transpile/Does not generate semantic diagnostics.js      | 1 +
 .../transpile/Generates expected syntactic diagnostics.js    | 1 +
 .../baselines/reference/transpile/Generates module output.js | 1 +
 .../Generates no diagnostics for missing file references.js  | 1 +
 .../Generates no diagnostics for missing module imports.js   | 1 +
 .../transpile/Generates no diagnostics with valid inputs.js  | 1 +
 .../transpile/No extra errors for file without extension.js  | 1 +
 .../reference/transpile/Rename dependencies - AMD.js         | 1 +
 .../reference/transpile/Rename dependencies - UMD.js         | 1 +
 ...rror when compiler-options module-kind is out-of-range.js | 1 +
 ...or when compiler-options target-script is out-of-range.js | 1 +
 .../reference/transpile/Support options with lib values.js   | 1 +
 .../reference/transpile/Support options with types values.js | 1 +
 .../reference/transpile/Supports backslashes in file name.js | 1 +
 .../reference/transpile/Supports setting allowJs.js          | 1 +
 .../Supports setting allowSyntheticDefaultImports.js         | 1 +
 .../transpile/Supports setting allowUnreachableCode.js       | 1 +
 .../transpile/Supports setting allowUnusedLabels.js          | 1 +
 .../reference/transpile/Supports setting alwaysStrict.js     | 1 +
 .../reference/transpile/Supports setting baseUrl.js          | 1 +
 .../reference/transpile/Supports setting charset.js          | 1 +
 .../reference/transpile/Supports setting declaration.js      | 1 +
 .../reference/transpile/Supports setting declarationDir.js   | 1 +
 .../reference/transpile/Supports setting emitBOM.js          | 1 +
 .../transpile/Supports setting emitDecoratorMetadata.js      | 1 +
 .../transpile/Supports setting experimentalDecorators.js     | 1 +
 .../Supports setting forceConsistentCasingInFileNames.js     | 1 +
 .../reference/transpile/Supports setting isolatedModules.js  | 1 +
 tests/baselines/reference/transpile/Supports setting jsx.js  | 1 +
 .../reference/transpile/Supports setting jsxFactory.js       | 1 +
 tests/baselines/reference/transpile/Supports setting lib.js  | 1 +
 .../baselines/reference/transpile/Supports setting locale.js | 1 +
 .../baselines/reference/transpile/Supports setting module.js | 1 +
 .../reference/transpile/Supports setting moduleResolution.js | 1 +
 .../reference/transpile/Supports setting newLine.js          | 1 +
 .../baselines/reference/transpile/Supports setting noEmit.js | 1 +
 .../reference/transpile/Supports setting noEmitHelpers.js    | 1 +
 .../reference/transpile/Supports setting noEmitOnError.js    | 1 +
 .../transpile/Supports setting noErrorTruncation.js          | 1 +
 .../transpile/Supports setting noFallthroughCasesInSwitch.js | 1 +
 .../reference/transpile/Supports setting noImplicitAny.js    | 1 +
 .../transpile/Supports setting noImplicitReturns.js          | 1 +
 .../reference/transpile/Supports setting noImplicitThis.js   | 1 +
 .../transpile/Supports setting noImplicitUseStrict.js        | 1 +
 .../baselines/reference/transpile/Supports setting noLib.js  | 1 +
 .../reference/transpile/Supports setting noResolve.js        | 1 +
 tests/baselines/reference/transpile/Supports setting out.js  | 1 +
 .../baselines/reference/transpile/Supports setting outDir.js | 1 +
 .../reference/transpile/Supports setting outFile.js          | 1 +
 .../baselines/reference/transpile/Supports setting paths.js  | 1 +
 .../transpile/Supports setting preserveConstEnums.js         | 1 +
 .../reference/transpile/Supports setting reactNamespace.js   | 1 +
 .../reference/transpile/Supports setting removeComments.js   | 1 +
 .../reference/transpile/Supports setting rootDir.js          | 1 +
 .../reference/transpile/Supports setting rootDirs.js         | 1 +
 .../transpile/Supports setting skipDefaultLibCheck.js        | 1 +
 .../reference/transpile/Supports setting skipLibCheck.js     | 1 +
 .../reference/transpile/Supports setting strictNullChecks.js | 1 +
 .../reference/transpile/Supports setting stripInternal.js    | 1 +
 .../Supports setting suppressExcessPropertyErrors.js         | 1 +
 .../Supports setting suppressImplicitAnyIndexErrors.js       | 1 +
 .../reference/transpile/Supports setting typeRoots.js        | 1 +
 .../baselines/reference/transpile/Supports setting types.js  | 1 +
 .../reference/transpile/Supports urls in file name.js        | 1 +
 .../reference/transpile/Uses correct newLine character.js    | 1 +
 tests/baselines/reference/transpile/transpile .js files.js   | 1 +
 .../transpile/transpile file as tsx if jsx is specified.js   | 1 +
 tests/baselines/reference/tsxDefaultImports.js               | 1 +
 tests/baselines/reference/tsxElementResolution17.js          | 1 +
 tests/baselines/reference/tsxElementResolution19.js          | 1 +
 tests/baselines/reference/tsxExternalModuleEmit2.js          | 1 +
 tests/baselines/reference/tsxPreserveEmit1.js                | 1 +
 tests/baselines/reference/tsxPreserveEmit3.js                | 1 +
 tests/baselines/reference/tsxReactEmit5.js                   | 1 +
 tests/baselines/reference/tsxStatelessFunctionComponents2.js | 1 +
 tests/baselines/reference/tsxStatelessFunctionComponents3.js | 1 +
 tests/baselines/reference/tsxUnionTypeComponent1.js          | 1 +
 tests/baselines/reference/tsxUnionTypeComponent2.js          | 1 +
 tests/baselines/reference/typeAliasDeclarationEmit.js        | 1 +
 tests/baselines/reference/typeAliasDeclarationEmit2.js       | 1 +
 ...bjectCreationExpressionWithUndefinedCallResolutionData.js | 1 +
 .../typeParameterCompatibilityAccrossDeclarations.js         | 1 +
 tests/baselines/reference/typeReferenceDirectives10.js       | 1 +
 tests/baselines/reference/typeReferenceDirectives13.js       | 1 +
 tests/baselines/reference/typeReferenceDirectives5.js        | 1 +
 tests/baselines/reference/typeReferenceDirectives9.js        | 1 +
 tests/baselines/reference/typeResolution.js                  | 1 +
 tests/baselines/reference/typeResolution.sourcemap.txt       | 1 +
 .../reference/typeRootsFromMultipleNodeModulesDirectories.js | 1 +
 .../reference/typeRootsFromNodeModulesInParentDirectory.js   | 1 +
 tests/baselines/reference/typeUsedAsValueError2.js           | 3 +++
 tests/baselines/reference/typeofAmbientExternalModules.js    | 1 +
 tests/baselines/reference/typeofExternalModules.js           | 1 +
 .../reference/typesOnlyExternalModuleStillHasInstance.js     | 2 ++
 tests/baselines/reference/typingsLookup4.js                  | 1 +
 tests/baselines/reference/typingsLookupAmd.js                | 1 +
 tests/baselines/reference/umd-augmentation-1.js              | 1 +
 tests/baselines/reference/umd-augmentation-3.js              | 1 +
 tests/baselines/reference/umd3.js                            | 1 +
 tests/baselines/reference/umd4.js                            | 1 +
 tests/baselines/reference/umd5.js                            | 1 +
 tests/baselines/reference/umd8.js                            | 1 +
 tests/baselines/reference/umdDependencyComment2.js           | 1 +
 tests/baselines/reference/umdDependencyCommentName1.js       | 1 +
 tests/baselines/reference/umdDependencyCommentName2.js       | 1 +
 tests/baselines/reference/umdGlobalConflict.js               | 1 +
 tests/baselines/reference/unclosedExportClause02.js          | 4 ++++
 tests/baselines/reference/undeclaredModuleError.js           | 1 +
 tests/baselines/reference/untypedModuleImport.js             | 3 +++
 tests/baselines/reference/untypedModuleImport_allowJs.js     | 1 +
 .../baselines/reference/untypedModuleImport_noImplicitAny.js | 1 +
 .../reference/untypedModuleImport_noLocalImports.js          | 1 +
 tests/baselines/reference/untypedModuleImport_vsAmbient.js   | 1 +
 .../reference/untypedModuleImport_withAugmentation.js        | 1 +
 .../reference/untypedModuleImport_withAugmentation2.js       | 1 +
 tests/baselines/reference/unusedImportDeclaration.js         | 1 +
 tests/baselines/reference/unusedImports1.js                  | 1 +
 tests/baselines/reference/unusedImports11.js                 | 1 +
 tests/baselines/reference/unusedImports12.js                 | 1 +
 tests/baselines/reference/unusedImports2.js                  | 1 +
 tests/baselines/reference/unusedImports3.js                  | 1 +
 tests/baselines/reference/unusedImports4.js                  | 1 +
 tests/baselines/reference/unusedImports5.js                  | 1 +
 tests/baselines/reference/unusedImports6.js                  | 1 +
 tests/baselines/reference/unusedImports7.js                  | 1 +
 tests/baselines/reference/unusedImports8.js                  | 1 +
 tests/baselines/reference/unusedImports9.js                  | 1 +
 tests/baselines/reference/unusedLocalsAndParameters.js       | 1 +
 .../baselines/reference/unusedLocalsAndParametersDeferred.js | 1 +
 .../reference/unusedLocalsAndParametersTypeAliases.js        | 1 +
 .../reference/unusedLocalsAndParametersTypeAliases2.js       | 1 +
 .../baselines/reference/visibilityOfCrossModuleTypeUsage.js  | 3 +++
 tests/baselines/reference/voidAsNonAmbiguousReturnType.js    | 1 +
 tests/baselines/reference/withImportDecl.js                  | 1 +
 578 files changed, 686 insertions(+), 9 deletions(-)

diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index b0783d42a06..1156d643354 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -27,3 +27,4 @@ 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;
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index cb7fc3a4c5c..d877071a228 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -189,3 +189,4 @@ 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;
diff --git a/tests/baselines/reference/ExportAssignment7.js b/tests/baselines/reference/ExportAssignment7.js
index 66cb5909075..461631e0e7d 100644
--- a/tests/baselines/reference/ExportAssignment7.js
+++ b/tests/baselines/reference/ExportAssignment7.js
@@ -12,4 +12,3 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/ExportAssignment8.js b/tests/baselines/reference/ExportAssignment8.js
index 8e29d7914fd..d0963008012 100644
--- a/tests/baselines/reference/ExportAssignment8.js
+++ b/tests/baselines/reference/ExportAssignment8.js
@@ -12,4 +12,3 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
index 03a504a888a..8fa171ed05a 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
@@ -42,6 +42,7 @@ var A;
     })(Utils = A.Utils || (A.Utils = {}));
     A.Origin = { x: 0, y: 0 };
 })(A = exports.A || (exports.A = {}));
+exports.__esModule = true;
 //// [part2.js]
 "use strict";
 var A;
@@ -60,3 +61,4 @@ var A;
         Utils.Plane = Plane;
     })(Utils = A.Utils || (A.Utils = {}));
 })(A = exports.A || (exports.A = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js
index 7a69de02cfe..84e20daa7c7 100644
--- a/tests/baselines/reference/aliasAssignments.js
+++ b/tests/baselines/reference/aliasAssignments.js
@@ -29,3 +29,4 @@ var x = moduleA;
 x = 1; // Should be error
 var y = 1;
 y = moduleA; // should be error
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js
index ee9562e7b77..8fbeaf78d95 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.js
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.js
@@ -27,3 +27,4 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
 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;
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
index 0b05a0c3c63..03888704e70 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -76,3 +76,4 @@ var C2 = (function () {
     });
     return C2;
 }());
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js
index 5e864df3d0f..5be50e00f30 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -57,3 +57,4 @@ exports.__esModule = true;
 var moduleA = require("./aliasUsageInArray_moduleA");
 var xs = [moduleA];
 var xs2 = [moduleA];
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js
index d84253f7992..0f15ecda6ac 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -56,3 +56,4 @@ exports.__esModule = true;
 var moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 var f = function (x) { return x; };
 f = function (x) { return moduleA; };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index 53e702ba227..8c61ddeefb8 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -63,3 +63,4 @@ function foo(x) {
 }
 var r = foo({ a: moduleA });
 var r2 = foo({ a: null });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index 0a53d6605dd..acd4dd1f533 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -71,3 +71,4 @@ var N2 = (function () {
     }
     return N2;
 }());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index f9202b02067..10dcc50083c 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -58,3 +58,4 @@ var moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 var a = { x: moduleA };
 var b = { x: moduleA };
 var c = { y: { z: moduleA } };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index a40d3679b63..07dea7ea22d 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -64,3 +64,4 @@ var d2 = i || moduleA;
 var d2 = moduleA || i;
 var e = null || { x: moduleA };
 var f = null ? { x: moduleA } : null;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index de566b4dd53..509797bd260 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -82,3 +82,4 @@ var D = (function (_super) {
     }
     return D;
 }(C));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index dbee5562266..e5c7af13078 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -55,3 +55,4 @@ exports.__esModule = true;
 "use strict";
 var i;
 var m = i;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
index 8304be3a036..9cc8372a0bb 100644
--- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
+++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
@@ -12,6 +12,8 @@ var d = b.q3;
 
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_0.js]
 "use strict";
+exports.__esModule = true;
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.js]
 "use strict";
 var d = b.q3;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.js b/tests/baselines/reference/allowSyntheticDefaultImports10.js
index 396cd75b574..09e80cc799f 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports10.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports10.js
@@ -15,3 +15,4 @@ Foo.default.default.foo();
 var Foo = require("./b");
 Foo["default"].bar();
 Foo["default"]["default"].foo();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.js b/tests/baselines/reference/allowSyntheticDefaultImports9.js
index 15810ccaaf7..a455f0e7570 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports9.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports9.js
@@ -15,3 +15,4 @@ Foo.foo();
 var b_1 = require("./b");
 b_1["default"].bar();
 b_1["default"].foo();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js
index b92993128ab..7f8741d3baf 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.js
+++ b/tests/baselines/reference/ambientDeclarationsExternal.js
@@ -32,3 +32,4 @@ var n: number;
 var imp3 = require("equ2");
 var n = imp3.x;
 var n;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js
index 143f26550e9..fac34990e5e 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.js
+++ b/tests/baselines/reference/ambientDeclarationsPatterns.js
@@ -42,3 +42,4 @@ 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;
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
index bb0d3a907ae..401af4b5214 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
@@ -4,4 +4,5 @@ export declare module "M" { }
 //// [ambientExternalModuleInsideNonAmbientExternalModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.js b/tests/baselines/reference/ambientExternalModuleMerging.js
index 217d7cb90c1..0dddb3a307c 100644
--- a/tests/baselines/reference/ambientExternalModuleMerging.js
+++ b/tests/baselines/reference/ambientExternalModuleMerging.js
@@ -22,5 +22,6 @@ define(["require", "exports", "M"], function (require, exports, M) {
     // Should be strings
     var x = M.x;
     var y = M.y;
+    exports.__esModule = true;
 });
 //// [ambientExternalModuleMerging_declare.js]
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
index c91adaff864..537c765a482 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
@@ -23,4 +23,5 @@ var c = new A();
 define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
     var c = new A();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
index 4c70a338bc3..692c5707332 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
@@ -22,4 +22,5 @@ var c = new A();
 define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
     var c = new A();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js
index 0e2d08ae07b..689cd6a1242 100644
--- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js
+++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js
@@ -8,4 +8,5 @@ export declare module M { }
 //// [ambientInsideNonAmbientExternalModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/ambientNameRestrictions.js b/tests/baselines/reference/ambientNameRestrictions.js
index cd4fbf29371..b35f1241b2d 100644
--- a/tests/baselines/reference/ambientNameRestrictions.js
+++ b/tests/baselines/reference/ambientNameRestrictions.js
@@ -6,3 +6,4 @@ export declare namespace Foo {
 
 //// [ambientNameRestrictions.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js
index 109264fc91b..5dd15c8e0ef 100644
--- a/tests/baselines/reference/ambientShorthand.js
+++ b/tests/baselines/reference/ambientShorthand.js
@@ -20,3 +20,4 @@ var jquery_1 = require("jquery");
 var baz = require("fs");
 var boom = require("jquery");
 jquery_1["default"](jquery_1.bar, baz, boom);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientShorthand_duplicate.js b/tests/baselines/reference/ambientShorthand_duplicate.js
index d99eb3d27dc..08d03c83ed0 100644
--- a/tests/baselines/reference/ambientShorthand_duplicate.js
+++ b/tests/baselines/reference/ambientShorthand_duplicate.js
@@ -14,3 +14,4 @@ import foo from "foo";
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientShorthand_merging.js b/tests/baselines/reference/ambientShorthand_merging.js
index f0aaefc6366..15714a48997 100644
--- a/tests/baselines/reference/ambientShorthand_merging.js
+++ b/tests/baselines/reference/ambientShorthand_merging.js
@@ -16,3 +16,4 @@ import foo, {bar} from "foo";
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
index 0d9a14c0f15..6818cca28d3 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -34,3 +34,4 @@ var reExportX_1 = require("./reExportX");
 var $ = require("./reExportAll");
 // '$' is not callable, it is an object.
 reExportX_1.x($);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/amdDependencyComment1.js b/tests/baselines/reference/amdDependencyComment1.js
index 2c0bdd551fa..1c5594ea7c3 100644
--- a/tests/baselines/reference/amdDependencyComment1.js
+++ b/tests/baselines/reference/amdDependencyComment1.js
@@ -9,3 +9,4 @@ m1.f();
 "use strict";
 var m1 = require("m2");
 m1.f();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js
index 6867b03f606..db87e4e9422 100644
--- a/tests/baselines/reference/amdDependencyComment2.js
+++ b/tests/baselines/reference/amdDependencyComment2.js
@@ -9,4 +9,5 @@ m1.f();
 define(["require", "exports", "m2", "bar"], function (require, exports, m1) {
     "use strict";
     m1.f();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js
index 19024a09f3c..e886d4b1579 100644
--- a/tests/baselines/reference/amdDependencyCommentName1.js
+++ b/tests/baselines/reference/amdDependencyCommentName1.js
@@ -9,3 +9,4 @@ m1.f();
 "use strict";
 var m1 = require("m2");
 m1.f();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js
index d60207e2bec..bb2fc9a2389 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.js
+++ b/tests/baselines/reference/amdDependencyCommentName2.js
@@ -9,4 +9,5 @@ m1.f();
 define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) {
     "use strict";
     m1.f();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js
index 1792c0c2aa0..dafbe2463f9 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.js
+++ b/tests/baselines/reference/amdDependencyCommentName3.js
@@ -13,4 +13,5 @@ m1.f();
 define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) {
     "use strict";
     m1.f();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
index 52b10100365..d82eab0d12f 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.js
+++ b/tests/baselines/reference/amdDependencyCommentName4.js
@@ -31,4 +31,5 @@ define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule
     aliasedModule2_1.p1;
     aliasedModule3_1["default"];
     ns;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js
index 3c2e9c041fa..b1275322069 100644
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js
@@ -21,10 +21,12 @@ 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", "./foo_0"], function (require, exports, foo) {
     "use strict";
     if (foo.E1.A === 0) {
     }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index 781142b4061..7f75124dba7 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
@@ -58,4 +58,5 @@ define(["require", "exports"], function (require, exports) {
     var y = false;
     var z;
     var e = 0;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js
index 672d311a702..b19fa3ca14c 100644
--- a/tests/baselines/reference/asOperator4.js
+++ b/tests/baselines/reference/asOperator4.js
@@ -23,3 +23,4 @@ var foo_1 = require("./foo");
 // These should emit identically
 foo_1.foo;
 foo_1.foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
index 49404267009..06b9fd14682 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
@@ -190,3 +190,4 @@ var M;
     }
     M.f1 = f1;
 })(M || (M = {}));
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index ceabda58899..25a771ffbfb 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -78,3 +78,4 @@ var Test = (function () {
     };
     return Test;
 }());
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js
index 923af2e55cd..b3fa2c4b491 100644
--- a/tests/baselines/reference/asyncImportedPromise_es6.js
+++ b/tests/baselines/reference/asyncImportedPromise_es6.js
@@ -30,3 +30,4 @@ class Test {
         return __awaiter(this, void 0, void 0, function* () { return; });
     }
 }
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js
index 98322c01a34..ef176ac90da 100644
--- a/tests/baselines/reference/augmentExportEquals1.js
+++ b/tests/baselines/reference/augmentExportEquals1.js
@@ -28,9 +28,11 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
     var a; // should not work
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js
index 08f032ff33f..1e094701f79 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.js
+++ b/tests/baselines/reference/augmentExportEquals1_1.js
@@ -25,9 +25,11 @@ let a: x.A; // should not work
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
     var a; // should not work
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js
index fc373173e3c..fe55906b657 100644
--- a/tests/baselines/reference/augmentExportEquals2.js
+++ b/tests/baselines/reference/augmentExportEquals2.js
@@ -27,9 +27,11 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
     var a; // should not work
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js
index 9046157bb26..5b80ef1d512 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.js
+++ b/tests/baselines/reference/augmentExportEquals2_1.js
@@ -25,9 +25,11 @@ let a: x.A; // should not work
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
     var a; // should not work
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js
index 94cb0f8ce95..3e12c9968d2 100644
--- a/tests/baselines/reference/augmentExportEquals3.js
+++ b/tests/baselines/reference/augmentExportEquals3.js
@@ -37,10 +37,12 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
     x.b = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
     var a;
     var b = x.b;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js
index fc6b7b1cec3..9fd08cb8f7f 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.js
+++ b/tests/baselines/reference/augmentExportEquals3_1.js
@@ -31,10 +31,12 @@ let b = x.b;
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
     x.b = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
     var a;
     var b = x.b;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js
index ff0cbd44e0b..1a83e86f3fc 100644
--- a/tests/baselines/reference/augmentExportEquals4.js
+++ b/tests/baselines/reference/augmentExportEquals4.js
@@ -41,10 +41,12 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
     x.b = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
     var a;
     var b = x.b;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js
index b4ba932d44b..e039e7dcda6 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.js
+++ b/tests/baselines/reference/augmentExportEquals4_1.js
@@ -32,10 +32,12 @@ let b = x.b;
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
     x.b = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
     var a;
     var b = x.b;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js
index 49b6c3fed56..ee26ddda90e 100644
--- a/tests/baselines/reference/augmentExportEquals5.js
+++ b/tests/baselines/reference/augmentExportEquals5.js
@@ -85,10 +85,12 @@ const y = x.id;
 //// [augmentation.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports", "./augmentation"], function (require, exports) {
     "use strict";
     var x;
     var y = x.id;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js
index 3f9cbbb0af8..2db5bc66e3c 100644
--- a/tests/baselines/reference/augmentExportEquals6.js
+++ b/tests/baselines/reference/augmentExportEquals6.js
@@ -53,6 +53,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
     x.B.b = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
@@ -60,4 +61,5 @@ define(["require", "exports", "./file1", "./file2"], function (require, exports,
     var a;
     var b = a.a;
     var c = x.B.b;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals6_1.js b/tests/baselines/reference/augmentExportEquals6_1.js
index c7c560183cc..6ba35346109 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.js
+++ b/tests/baselines/reference/augmentExportEquals6_1.js
@@ -29,10 +29,12 @@ let b = a.a;
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
     var a;
     var b = a.a;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/badExternalModuleReference.js b/tests/baselines/reference/badExternalModuleReference.js
index 4f9e1aae507..c1608b4c57e 100644
--- a/tests/baselines/reference/badExternalModuleReference.js
+++ b/tests/baselines/reference/badExternalModuleReference.js
@@ -9,4 +9,5 @@ export declare var a: {
 //// [badExternalModuleReference.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/bangInModuleName.js b/tests/baselines/reference/bangInModuleName.js
index 2fe13e00cf0..f58827e1ae5 100644
--- a/tests/baselines/reference/bangInModuleName.js
+++ b/tests/baselines/reference/bangInModuleName.js
@@ -21,4 +21,5 @@ import * as http from 'intern/dojo/node!http';
 /// <reference path="a.d.ts"/>
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/cachedModuleResolution1.js b/tests/baselines/reference/cachedModuleResolution1.js
index 9071b60d6c1..d93133cca40 100644
--- a/tests/baselines/reference/cachedModuleResolution1.js
+++ b/tests/baselines/reference/cachedModuleResolution1.js
@@ -12,5 +12,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution2.js b/tests/baselines/reference/cachedModuleResolution2.js
index 7c84a92abaf..c5c3357f65a 100644
--- a/tests/baselines/reference/cachedModuleResolution2.js
+++ b/tests/baselines/reference/cachedModuleResolution2.js
@@ -13,5 +13,7 @@ import {x} from "foo";
 
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution3.js b/tests/baselines/reference/cachedModuleResolution3.js
index 032c1afee0e..d476eafd2e8 100644
--- a/tests/baselines/reference/cachedModuleResolution3.js
+++ b/tests/baselines/reference/cachedModuleResolution3.js
@@ -12,5 +12,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution4.js b/tests/baselines/reference/cachedModuleResolution4.js
index 6089de9706b..4cc656d73d3 100644
--- a/tests/baselines/reference/cachedModuleResolution4.js
+++ b/tests/baselines/reference/cachedModuleResolution4.js
@@ -13,5 +13,7 @@ import {x} from "foo";
 
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution5.js b/tests/baselines/reference/cachedModuleResolution5.js
index 33561e8eae2..35fad11d90e 100644
--- a/tests/baselines/reference/cachedModuleResolution5.js
+++ b/tests/baselines/reference/cachedModuleResolution5.js
@@ -12,5 +12,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution6.js b/tests/baselines/reference/cachedModuleResolution6.js
index f21f491a921..1e6803b115c 100644
--- a/tests/baselines/reference/cachedModuleResolution6.js
+++ b/tests/baselines/reference/cachedModuleResolution6.js
@@ -9,5 +9,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution7.js b/tests/baselines/reference/cachedModuleResolution7.js
index 8b86dcd55af..044eefff73a 100644
--- a/tests/baselines/reference/cachedModuleResolution7.js
+++ b/tests/baselines/reference/cachedModuleResolution7.js
@@ -10,5 +10,7 @@ import {x} from "foo";
 
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution8.js b/tests/baselines/reference/cachedModuleResolution8.js
index 1c00b171f21..fe89a8f288f 100644
--- a/tests/baselines/reference/cachedModuleResolution8.js
+++ b/tests/baselines/reference/cachedModuleResolution8.js
@@ -9,5 +9,7 @@ import {x} from "foo";
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/cachedModuleResolution9.js b/tests/baselines/reference/cachedModuleResolution9.js
index 32f8848736c..c27ababcb95 100644
--- a/tests/baselines/reference/cachedModuleResolution9.js
+++ b/tests/baselines/reference/cachedModuleResolution9.js
@@ -11,5 +11,7 @@ import {x} from "foo";
 
 //// [lib.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js
index a6113d5f241..3af2cc7a5f9 100644
--- a/tests/baselines/reference/chainedImportAlias.js
+++ b/tests/baselines/reference/chainedImportAlias.js
@@ -18,8 +18,10 @@ var m;
     function foo() { }
     m.foo = foo;
 })(m = exports.m || (exports.m = {}));
+exports.__esModule = true;
 //// [chainedImportAlias_file1.js]
 "use strict";
 var x = require("./chainedImportAlias_file0");
 var y = x;
 y.m.foo();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js
index 193b3e1da07..8d3419f1db6 100644
--- a/tests/baselines/reference/circularReference.js
+++ b/tests/baselines/reference/circularReference.js
@@ -48,6 +48,7 @@ var M1;
     }());
     M1.C1 = C1;
 })(M1 = exports.M1 || (exports.M1 = {}));
+exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
@@ -66,3 +67,4 @@ var M1;
     }());
     M1.C1 = C1;
 })(M1 = exports.M1 || (exports.M1 = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
index 3083e9c586b..cbe0104ebce 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
@@ -43,6 +43,7 @@ define(["require", "exports"], function (require, exports) {
     var m2;
     (function (m2) {
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientClass_globalFile.js]
 var m4;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
index 7f0f76381a3..b931a6210cf 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
@@ -66,6 +66,7 @@ define(["require", "exports"], function (require, exports) {
     var m2;
     (function (m2) {
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientEnum_globalFile.js]
 var m4;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
index 37b1a724c28..5d462fb1ce2 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
@@ -20,4 +20,5 @@ define(["require", "exports"], function (require, exports) {
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
index 1e63364a396..a75732a65ba 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
@@ -33,6 +33,7 @@ define(["require", "exports"], function (require, exports) {
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientVar_globalFile.js]
 var m4;
diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js
index 47d127e8a67..d6fb21ba60a 100644
--- a/tests/baselines/reference/collisionExportsRequireAndEnum.js
+++ b/tests/baselines/reference/collisionExportsRequireAndEnum.js
@@ -99,6 +99,7 @@ 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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
index 1842e415d88..7ac6ba06ed6 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
@@ -52,4 +52,5 @@ define(["require", "exports"], function (require, exports) {
         new m2.exports();
         new m2.require();
     })(m2 || (m2 = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/commentOnExportEnumDeclaration.js b/tests/baselines/reference/commentOnExportEnumDeclaration.js
index 61307b95b1c..33ea3d7fcfb 100644
--- a/tests/baselines/reference/commentOnExportEnumDeclaration.js
+++ b/tests/baselines/reference/commentOnExportEnumDeclaration.js
@@ -17,3 +17,4 @@ var Color;
     Color[Color["g"] = 1] = "g";
     Color[Color["b"] = 2] = "b";
 })(Color = exports.Color || (exports.Color = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/commentOnImportStatement1.js b/tests/baselines/reference/commentOnImportStatement1.js
index d9506e00724..a9d68d299ce 100644
--- a/tests/baselines/reference/commentOnImportStatement1.js
+++ b/tests/baselines/reference/commentOnImportStatement1.js
@@ -8,4 +8,5 @@ import foo = require('./foo');
 /* Copyright */
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/commentOnImportStatement2.js b/tests/baselines/reference/commentOnImportStatement2.js
index e7550582dfe..5156fcdd0d1 100644
--- a/tests/baselines/reference/commentOnImportStatement2.js
+++ b/tests/baselines/reference/commentOnImportStatement2.js
@@ -4,3 +4,4 @@ import foo = require('./foo');
 
 //// [commentOnImportStatement2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/commentOnImportStatement3.js b/tests/baselines/reference/commentOnImportStatement3.js
index f716fa32baa..c33088408e8 100644
--- a/tests/baselines/reference/commentOnImportStatement3.js
+++ b/tests/baselines/reference/commentOnImportStatement3.js
@@ -7,3 +7,4 @@ import foo = require('./foo');
 //// [commentOnImportStatement3.js]
 /* copyright */
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js
index b4819ce9ca3..cdba9542f54 100644
--- a/tests/baselines/reference/commentsDottedModuleName.js
+++ b/tests/baselines/reference/commentsDottedModuleName.js
@@ -24,6 +24,7 @@ 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 });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index 1fe24c676a7..57cc701941a 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/tests/baselines/reference/commentsExternalModules.js
@@ -124,6 +124,7 @@ 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) {
@@ -132,6 +133,7 @@ define(["require", "exports", "commentsExternalModules_0"], function (require, e
     var newVar = new extMod.m1.m2.c();
     extMod.m4.fooExport();
     var newVar2 = new extMod.m4.m2.c();
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
index 7b403061199..6ee40426994 100644
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ b/tests/baselines/reference/commentsExternalModules2.js
@@ -124,6 +124,7 @@ 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) {
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index 68ec3be48bd..ee48cfde328 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/tests/baselines/reference/commentsExternalModules3.js
@@ -123,6 +123,7 @@ 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";
 /**This is on import declaration*/
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js
index 67794577226..2c26b93b82d 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.js
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js
@@ -69,6 +69,7 @@ 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) {
@@ -92,6 +93,7 @@ define(["require", "exports"], function (require, exports) {
         multiM.f = f;
     })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.d();
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index 212f5869744..c1d2a303d7a 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -29,3 +29,4 @@ exports.__esModule = true;
 var foo = require("./foo_0");
 if (foo.C1.s1) {
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index 76610c2d56d..1f37d83c815 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
@@ -55,3 +55,4 @@ var x = {};
 var y = false;
 var z;
 var e = 0;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js
index 1a863dbecbd..08e628cac2a 100644
--- a/tests/baselines/reference/commonSourceDirectory.js
+++ b/tests/baselines/reference/commonSourceDirectory.js
@@ -23,6 +23,7 @@ x + y;
 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]
diff --git a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
index ac198eaf02c..5675c05e34b 100644
--- a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
+++ b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
@@ -42,7 +42,7 @@ sourceFile:index.ts
 3 >       ^^^
 4 >          ^^^^^^^
 5 >                 ^
-6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+6 >                  ^^^^^^^^^->
 1 >
   >
 2 >x
@@ -55,4 +55,5 @@ sourceFile:index.ts
 4 >Emitted(5, 18) Source(4, 6) + SourceIndex(0)
 5 >Emitted(5, 19) Source(4, 7) + SourceIndex(0)
 ---
+>>>exports.__esModule = true;
 >>>//# sourceMappingURL=/app/myMapRoot/index.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js
index 5af2c56b5ef..da7c5710610 100644
--- a/tests/baselines/reference/commonjsSafeImport.js
+++ b/tests/baselines/reference/commonjsSafeImport.js
@@ -19,6 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 "use strict";
 var _10_lib_1 = require("./10_lib");
 _10_lib_1.Foo();
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [10_lib.d.ts]
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 282581fbdb8..9c7c78ad626 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/tests/baselines/reference/constDeclarations-access5.js
@@ -87,4 +87,5 @@ define(["require", "exports", "constDeclarations_access_1"], function (require,
     -m.x;
     +m.x;
     m.x.toString();
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/constEnumExternalModule.js b/tests/baselines/reference/constEnumExternalModule.js
index e0a3f46ee89..e658dc17347 100644
--- a/tests/baselines/reference/constEnumExternalModule.js
+++ b/tests/baselines/reference/constEnumExternalModule.js
@@ -13,9 +13,11 @@ var v = A.V;
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [m2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var v = 100 /* V */;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.js b/tests/baselines/reference/controlFlowBinaryOrExpression.js
index fb48c5a23e0..8b65f916dfa 100644
--- a/tests/baselines/reference/controlFlowBinaryOrExpression.js
+++ b/tests/baselines/reference/controlFlowBinaryOrExpression.js
@@ -55,3 +55,4 @@ if (isHTMLCollection(sourceObj)) {
 if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
     sourceObj.length;
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js
index 006c29597b9..7fa40a63a10 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.js
+++ b/tests/baselines/reference/copyrightWithNewLine1.js
@@ -19,4 +19,5 @@ define(["require", "exports", "./greeter"], function (require, exports, model) {
     var greeter = new model.Greeter(el);
     /** things */
     greeter.start();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js
index 15e3c9f79be..4b31d599713 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.js
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.js
@@ -15,4 +15,5 @@ define(["require", "exports", "./greeter"], function (require, exports, model) {
     var greeter = new model.Greeter(el);
     /** things */
     greeter.start();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/declFileCallSignatures.js b/tests/baselines/reference/declFileCallSignatures.js
index 10b87d4e777..8f79ae6341e 100644
--- a/tests/baselines/reference/declFileCallSignatures.js
+++ b/tests/baselines/reference/declFileCallSignatures.js
@@ -67,6 +67,7 @@ interface IGlobalCallSignatureWithOwnTypeParametes {
 
 //// [declFileCallSignatures_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileCallSignatures_1.js]
 
 
diff --git a/tests/baselines/reference/declFileConstructSignatures.js b/tests/baselines/reference/declFileConstructSignatures.js
index 993c8ea4637..309f7133873 100644
--- a/tests/baselines/reference/declFileConstructSignatures.js
+++ b/tests/baselines/reference/declFileConstructSignatures.js
@@ -67,6 +67,7 @@ interface IGlobalConstructSignatureWithOwnTypeParametes {
 
 //// [declFileConstructSignatures_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileConstructSignatures_1.js]
 
 
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
index 4103ac6976e..e9d140ae2e2 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
@@ -15,6 +15,7 @@ x.a;
 //// [declFileExportAssignmentOfGenericInterface_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [declFileExportAssignmentOfGenericInterface_1.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js
index 5f583d2b6e1..a03fa43afff 100644
--- a/tests/baselines/reference/declFileExportImportChain.js
+++ b/tests/baselines/reference/declFileExportImportChain.js
@@ -45,6 +45,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "declFileExportImportChain_a"], function (require, exports, a) {
     "use strict";
     exports.a = a;
+    exports.__esModule = true;
 });
 //// [declFileExportImportChain_b1.js]
 define(["require", "exports", "declFileExportImportChain_b"], function (require, exports, b) {
@@ -55,6 +56,7 @@ define(["require", "exports", "declFileExportImportChain_b"], function (require,
 define(["require", "exports", "declFileExportImportChain_b1"], function (require, exports, b1) {
     "use strict";
     exports.b1 = b1;
+    exports.__esModule = true;
 });
 //// [declFileExportImportChain_d.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js
index 5fe546663e4..c7feeec7e8c 100644
--- a/tests/baselines/reference/declFileExportImportChain2.js
+++ b/tests/baselines/reference/declFileExportImportChain2.js
@@ -47,6 +47,7 @@ define(["require", "exports", "declFileExportImportChain2_a"], function (require
 define(["require", "exports", "declFileExportImportChain2_b"], function (require, exports, b) {
     "use strict";
     exports.b = b;
+    exports.__esModule = true;
 });
 //// [declFileExportImportChain2_d.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/declFileIndexSignatures.js b/tests/baselines/reference/declFileIndexSignatures.js
index 4d3f3847ca1..b7b2698b11b 100644
--- a/tests/baselines/reference/declFileIndexSignatures.js
+++ b/tests/baselines/reference/declFileIndexSignatures.js
@@ -37,6 +37,7 @@ interface IGlobalIndexSignatureWithTypeParameter<T> {
 
 //// [declFileIndexSignatures_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileIndexSignatures_1.js]
 
 
diff --git a/tests/baselines/reference/declarationEmitIndexTypeNotFound.js b/tests/baselines/reference/declarationEmitIndexTypeNotFound.js
index 22100e5cb72..b1fac7c3cc2 100644
--- a/tests/baselines/reference/declarationEmitIndexTypeNotFound.js
+++ b/tests/baselines/reference/declarationEmitIndexTypeNotFound.js
@@ -7,3 +7,4 @@ export interface Test {
 
 //// [declarationEmitIndexTypeNotFound.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
index 5afadf8723a..dca7f142dc9 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
@@ -17,6 +17,7 @@ export { v }
 {
     var obj = true;
 }
+exports.__esModule = true;
 //// [1.js]
 "use strict";
 var v = "str" || true;
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
index 130122ac840..9228b766d3f 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
@@ -20,6 +20,7 @@ export { v, bar }
 {
     var obj = true;
 }
+exports.__esModule = true;
 //// [1.js]
 "use strict";
 var v = "str" || true;
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
index 44d086abac6..8b2783a73fd 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
@@ -17,6 +17,7 @@ export default x;
 {
     var obj = true;
 }
+exports.__esModule = true;
 //// [1.js]
 "use strict";
 var x = "hi" || 5;
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
index 3c136865c53..3020721dfc8 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
@@ -14,6 +14,7 @@ export { v }
 //// [0.js]
 "use strict";
 var obj = true;
+exports.__esModule = true;
 //// [1.js]
 "use strict";
 //let v2: Z.Data;
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
index d5d455c35e3..c7be3aca6b4 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
@@ -17,6 +17,7 @@ export { v }
 {
     var obj = true;
 }
+exports.__esModule = true;
 //// [1.js]
 "use strict";
 var v = "str" || true;
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
index e3493762072..2177a17efa5 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
@@ -12,6 +12,7 @@ export { v }
 //// [0.js]
 "use strict";
 var obj = true;
+exports.__esModule = true;
 //// [1.js]
 "use strict";
 var v = "str" || true;
diff --git a/tests/baselines/reference/declarationEmitInvalidExport.js b/tests/baselines/reference/declarationEmitInvalidExport.js
index 18ed73b0a5a..4188b673b0b 100644
--- a/tests/baselines/reference/declarationEmitInvalidExport.js
+++ b/tests/baselines/reference/declarationEmitInvalidExport.js
@@ -12,3 +12,4 @@ export type MyClass = typeof myClass;
 if (false) {
     export var myClass = 0;
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js
index 6d848b42869..08747bbe198 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts.js
@@ -129,6 +129,7 @@ var M;
         })(N = Q.N || (Q.N = {}));
     })(Q = M.Q || (M.Q = {}));
 })(M = exports.M || (exports.M = {}));
+exports.__esModule = true;
 
 
 //// [declarationEmit_nameConflicts_1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
index b49e3ad314d..e5c10ab3484 100644
--- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
+++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
@@ -11,6 +11,7 @@ export module M {
 var M;
 (function (M) {
 })(M = exports.M || (exports.M = {}));
+exports.__esModule = true;
 
 
 //// [declarationEmitNameConflictsWithAlias.d.ts]
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
index 2f4fff7d72c..e6ef1234c3a 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
@@ -15,3 +15,4 @@ function foo() {
 function foo() {
     return {};
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js
index 5e03b2d9b51..a08b36e2781 100644
--- a/tests/baselines/reference/declarationMerging2.js
+++ b/tests/baselines/reference/declarationMerging2.js
@@ -30,4 +30,5 @@ define(["require", "exports"], function (require, exports) {
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index 8c7f16c3743..8c4bb8c1266 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -51,3 +51,4 @@ var Wat = (function () {
 __decorate([
     filter(function () { return a_1.test == 'abc'; })
 ], Wat, "whatever", null);
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index 8076c72e391..50dbe2cafdc 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -57,3 +57,4 @@ MyComponent = __decorate([
     decorator,
     __metadata("design:paramtypes", [service_1.default])
 ], MyComponent);
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnImportEquals2.js b/tests/baselines/reference/decoratorOnImportEquals2.js
index b506f474b0b..aa8273699e3 100644
--- a/tests/baselines/reference/decoratorOnImportEquals2.js
+++ b/tests/baselines/reference/decoratorOnImportEquals2.js
@@ -14,3 +14,4 @@ declare function dec<T>(target: T): T;
 exports.__esModule = true;
 //// [decoratorOnImportEquals2_1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index 1b603623776..cba3d6e115c 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -52,4 +52,5 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             const value = yield a_1.default;
         });
     }());
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index d57f4c7ad9e..ea597359a03 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -33,3 +33,4 @@ const a_1 = require("./a");
         const value = yield a_1.default;
     });
 }());
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js
index 28b30b5989b..bd186fa279d 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.js
@@ -50,3 +50,4 @@ var x;
 var y;
 m1_1.default.x;
 m1_1.default.y;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index e686b58a4ca..7b26a1aa59f 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -42,3 +42,4 @@ var x;
 var y;
 var z = new m1_1.default();
 var sum = z.p1 + z.p2;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js
index d2662c1256f..1b2e53f0304 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -42,3 +42,4 @@ var x;
 var y;
 var z = new m1_1.default();
 var sum = z.p1 + z.p2;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.js b/tests/baselines/reference/destructuringInVariableDeclarations2.js
index 9c1366bd8e0..21f272d22a6 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations2.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations2.js
@@ -12,3 +12,4 @@ let { toString } = 1;
 {
     let { toFixed } = 1;
 }
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.js b/tests/baselines/reference/destructuringInVariableDeclarations4.js
index d4b30405143..0f25ca3827f 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations4.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations4.js
@@ -13,4 +13,5 @@ define(["require", "exports"], function (require, exports) {
     {
         let { toFixed } = 1;
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js
index c16a0a7d0a2..fcdefe72df6 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations6.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js
@@ -21,4 +21,5 @@ export {};
     {
         let { toFixed } = 1;
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/duplicateStringNamedProperty1.js b/tests/baselines/reference/duplicateStringNamedProperty1.js
index 102fba9c3d6..5a6d5d7a8db 100644
--- a/tests/baselines/reference/duplicateStringNamedProperty1.js
+++ b/tests/baselines/reference/duplicateStringNamedProperty1.js
@@ -6,3 +6,4 @@ export interface Album {
 
 //// [duplicateStringNamedProperty1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index 9f977f5fd58..05af7a2bac8 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -103,4 +103,5 @@ define(["require", "exports"], function (require, exports) {
             var t;
         })(C = M.C || (M.C = {}));
     })(M || (M = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js
index 2fff5988d89..ee6fbd2b07f 100644
--- a/tests/baselines/reference/elidingImportNames.js
+++ b/tests/baselines/reference/elidingImportNames.js
@@ -30,3 +30,4 @@ var b = a;
 var x;
 var a2 = require("./elidingImportNames_main1"); // alias not used in typeof
 var b2 = a2;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js
index 1d8401803a7..e8915e406af 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -23,3 +23,4 @@ var B = (function (_super) {
     }
     return B;
 }(A));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js
index a6e9f6b6076..9125b5126b2 100644
--- a/tests/baselines/reference/enumFromExternalModule.js
+++ b/tests/baselines/reference/enumFromExternalModule.js
@@ -16,8 +16,10 @@ var Mode;
 (function (Mode) {
     Mode[Mode["Open"] = 0] = "Open";
 })(Mode = exports.Mode || (exports.Mode = {}));
+exports.__esModule = true;
 //// [enumFromExternalModule_1.js]
 "use strict";
 ///<reference path='enumFromExternalModule_0.ts'/>
 var f = require("./enumFromExternalModule_0");
 var x = f.Mode.Open;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/errorForConflictingExportEqualsValue.js b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
index 58ab920d177..88762e7e846 100644
--- a/tests/baselines/reference/errorForConflictingExportEqualsValue.js
+++ b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
@@ -6,4 +6,3 @@ export = {};
 //// [errorForConflictingExportEqualsValue.js]
 "use strict";
 module.exports = {};
-exports.__esModule = true;
diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js
index 4c7dca8274e..52d144c1e49 100644
--- a/tests/baselines/reference/errorsOnImportedSymbol.js
+++ b/tests/baselines/reference/errorsOnImportedSymbol.js
@@ -17,7 +17,9 @@ var y = Sammy.Sammy();
 
 //// [errorsOnImportedSymbol_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [errorsOnImportedSymbol_1.js]
 "use strict";
 var x = new Sammy.Sammy();
 var y = Sammy.Sammy();
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index de92a5e40c3..0ad02c848fd 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -33,3 +33,4 @@ exports.__esModule = true;
 "use strict";
 var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0");
 es3defaultAliasQuoted_file0_1["default"](es3defaultAliasQuoted_file0_1.Foo.CONSTANT === "Foo");
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index cc596980889..28516a541f5 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -65,4 +65,5 @@ define(["require", "exports"], function (require, exports) {
         // alias
         M.M_A = M_M;
     })(M = exports.M || (exports.M = {}));
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index 3148d9b028d..035a8c0be25 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -22,6 +22,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) {
     "use strict";
     var x = es6ImportDefaultBindingAmd_0_1.default;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
index 703e0a7a7bb..66be06536f0 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
@@ -42,6 +42,7 @@ const es6ImportDefaultBindingFollowedWithNamedImport_0_4 = require("./es6ImportD
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_4.x;
 const es6ImportDefaultBindingFollowedWithNamedImport_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_5.m;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index 58d5399c99d..4712a432503 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -39,6 +39,7 @@ var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6Imp
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default;
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
index c6887efba36..dcc2ec2c785 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
@@ -40,6 +40,7 @@ var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("./es6Impo
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x;
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index 95c1485e5c1..db922cb2200 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 "use strict";
 var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 385e65f3f67..92e3fe0a33f 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 "use strict";
 var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = nameSpaceBinding.a;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js
index 257e76bfe02..f6ea8348118 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js
@@ -14,6 +14,7 @@ var a = 10;
 module.exports = a;
 //// [es6ImportDefaultBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index e6daf77e4e9..b9f73ac47eb 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -26,3 +26,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0");
 var x = es6ImportDefaultBindingMergeErrors_0_1.default;
 var defaultBinding2 = "hello world";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
index a40dff3c317..265be908b85 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
@@ -14,3 +14,4 @@ exports.a = 10;
 exports.__esModule = true;
 //// [es6ImportDefaultBindingNoDefaultProperty_1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 8ef828435f0..510750edc50 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 "use strict";
 const nameSpaceBinding = require("./es6ImportNameSpaceImport_0");
 var x = nameSpaceBinding.a;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNameSpaceImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
index 0e795db4c01..ea240338316 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
@@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) {
     "use strict";
     var x = nameSpaceBinding.a;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index 9e05e95244e..88bf937c69c 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 "use strict";
 var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0");
 var x = nameSpaceBinding.a;
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNameSpaceImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
index 357f0f05e7f..696659cb1f7 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
@@ -22,3 +22,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNameSpaceImportMergeErrors_1.js]
 "use strict";
 var nameSpaceBinding3 = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
index 8ece816fd3b..0276c44f8ab 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
@@ -14,3 +14,4 @@ var a = 10;
 module.exports = a;
 //// [es6ImportNameSpaceImportNoNamedExports_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index f60477a73cb..9719305e62b 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -75,6 +75,7 @@ const es6ImportNamedImport_0_8 = require("./es6ImportNamedImport_0");
 var z111 = es6ImportNamedImport_0_8.z1;
 const es6ImportNamedImport_0_9 = require("./es6ImportNamedImport_0");
 var z2 = es6ImportNamedImport_0_9.z2; // z2 shouldn't give redeclare error
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNamedImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js
index 33ea02fd94f..31582223c52 100644
--- a/tests/baselines/reference/es6ImportNamedImportAmd.js
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.js
@@ -69,6 +69,7 @@ define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImport
     var xxxx = es6ImportNamedImportAmd_0_7.x1;
     var z111 = es6ImportNamedImportAmd_0_8.z1;
     var z2 = es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index 85952247395..5c6f3573c7f 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -75,6 +75,7 @@ var es6ImportNamedImportInEs5_0_8 = require("./es6ImportNamedImportInEs5_0");
 var z111 = es6ImportNamedImportInEs5_0_8.z1;
 var es6ImportNamedImportInEs5_0_9 = require("./es6ImportNamedImportInEs5_0");
 var z2 = es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
index 3e85778de58..ce878ca0216 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
@@ -23,6 +23,7 @@ var a;
     }());
     a.c = c;
 })(a = exports.a || (exports.a = {}));
+exports.__esModule = true;
 //// [es6ImportNamedImportInIndirectExportAssignment_1.js]
 "use strict";
 var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
index f3f76ff0184..11bd3b73a9e 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
@@ -31,3 +31,4 @@ exports.__esModule = true;
 "use strict";
 var x = 10;
 var x44 = 10;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
index a3bd672c6f3..87f3c1d5d07 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
@@ -16,3 +16,4 @@ exports.x = exports.a;
 exports.__esModule = true;
 //// [es6ImportNamedImport_1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
index 2198df11f78..a02116b314d 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
@@ -15,3 +15,4 @@ var a = 10;
 module.exports = a;
 //// [es6ImportNamedImportNoNamedExports_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
index 726efa849c2..c90ea418f26 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
@@ -30,6 +30,7 @@ define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWitho
     "use strict";
     var _a = 10;
     var _b = 10;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
index 9d844a8ca8f..0262cfdd045 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportWithoutFromClauseInEs5_1.js]
 "use strict";
 require("es6ImportWithoutFromClauseInEs5_0");
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportWithoutFromClauseInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
index b78466485f9..71874fc7b40 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
@@ -14,6 +14,7 @@ exports.__esModule = true;
 //// [client.js]
 "use strict";
 require("server");
+exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js
index bdfceef6b80..f557bc5d9a4 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.js
+++ b/tests/baselines/reference/exportAssignClassAndModule.js
@@ -31,3 +31,4 @@ module.exports = Foo;
 var z;
 var zz;
 zz.x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js
index 265d082ca35..09daa469ef4 100644
--- a/tests/baselines/reference/exportAssignImportedIdentifier.js
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.js
@@ -30,3 +30,4 @@ module.exports = x;
 "use strict";
 var foo2 = require("./foo2");
 var x = foo2(); // should be boolean
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js
index 02b34715483..645f44545fe 100644
--- a/tests/baselines/reference/exportAssignTypes.js
+++ b/tests/baselines/reference/exportAssignTypes.js
@@ -99,3 +99,4 @@ var iAny = require("./expAny");
 var v6 = iAny;
 var iGeneric = require("./expGeneric");
 var v7 = iGeneric;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
index 26a43e10c6c..e1bdf0d544f 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
@@ -17,9 +17,11 @@ var t2: test; // should not raise a 'container type' error
 //// [exportAssignedTypeAsTypeAnnotation_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [exportAssignedTypeAsTypeAnnotation_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var t2; // should not raise a 'container type' error
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js
index 02c74fe1f39..265afdfd041 100644
--- a/tests/baselines/reference/exportAssignmentClass.js
+++ b/tests/baselines/reference/exportAssignmentClass.js
@@ -27,4 +27,5 @@ define(["require", "exports", "exportAssignmentClass_A"], function (require, exp
     "use strict";
     var d = new D();
     var x = d.p;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
index c0b8f2b50c1..003927c2511 100644
--- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
+++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
@@ -28,3 +28,4 @@ var foo = require("./foo_0");
 var x = new foo(true); // Should error
 var y = new foo({ a: "test", b: 42 }); // Should be OK
 var z = y.test.b;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js
index a4ae6898bce..a30868a18e5 100644
--- a/tests/baselines/reference/exportAssignmentEnum.js
+++ b/tests/baselines/reference/exportAssignmentEnum.js
@@ -31,3 +31,4 @@ var EnumE = require("./exportAssignmentEnum_A");
 var a = EnumE.A;
 var b = EnumE.B;
 var c = EnumE.C;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js
index c8e90571cdb..5743490fec3 100644
--- a/tests/baselines/reference/exportAssignmentFunction.js
+++ b/tests/baselines/reference/exportAssignmentFunction.js
@@ -20,4 +20,5 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "exportAssignmentFunction_A"], function (require, exports, fooFunc) {
     "use strict";
     var n = fooFunc();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js
index 390a929ce35..3ef295639fd 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.js
+++ b/tests/baselines/reference/exportAssignmentGenericType.js
@@ -25,3 +25,4 @@ module.exports = Foo;
 var foo = require("./foo_0");
 var x = new foo();
 var y = x.test;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentInterface.js b/tests/baselines/reference/exportAssignmentInterface.js
index be3f696b19b..8f4403cf40a 100644
--- a/tests/baselines/reference/exportAssignmentInterface.js
+++ b/tests/baselines/reference/exportAssignmentInterface.js
@@ -17,10 +17,12 @@ var n: number = i.p1;
 //// [exportAssignmentInterface_A.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [exportAssignmentInterface_B.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var i;
     var n = i.p1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js
index 7b2443fc26d..e4ba7a9f7d8 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.js
+++ b/tests/baselines/reference/exportAssignmentInternalModule.js
@@ -24,4 +24,5 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "exportAssignmentInternalModule_A"], function (require, exports, modM) {
     "use strict";
     var n = modM.x;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js
index 97c6941cc33..ba77f90557f 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.js
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.js
@@ -25,6 +25,7 @@ z = x.d;
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
@@ -36,4 +37,5 @@ define(["require", "exports"], function (require, exports) {
     if (!!x.c) { }
     var z = { x: 1, y: 2 };
     z = x.d;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js
index aa2a7082f76..59008dfc370 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.js
+++ b/tests/baselines/reference/exportAssignmentMergedModule.js
@@ -52,3 +52,4 @@ var a = foo.a();
 if (!!foo.b) {
     foo.Test.answer = foo.c(42);
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
index a2ddd50511c..280e93f8c01 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
@@ -18,6 +18,7 @@ var b = z(); // call signature - no error
 
 //// [exportAssignmentOfDeclaredExternalModule_0.js]
 "use strict";
+exports.__esModule = true;
 //// [exportAssignmentOfDeclaredExternalModule_1.js]
 "use strict";
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
@@ -25,3 +26,4 @@ var y = Sammy(); // error to use interface name as call target
 var z; // no error - z is of type interface Sammy from module 'M'
 var a = new z(); // constructor - no error
 var b = z(); // call signature - no error
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js
index bab7c815f19..f4417f871e9 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -45,4 +45,5 @@ define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (req
     }(q));
     var m;
     var r = m.foo;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
index 9e073462aac..44afbca1f69 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
@@ -36,4 +36,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     if (foo.answer === 42) {
         var x = new foo();
     }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
index 5043a684326..a6abc6aa37d 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
@@ -38,4 +38,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     if (color === foo.green) {
         color = foo.answer;
     }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
index 0549700e464..4c0abd1d650 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
@@ -33,4 +33,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     if (foo.answer === 42) {
         var x = foo();
     }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
index 03b4ae26af9..0d31a25623c 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
@@ -27,4 +27,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
     if (foo.answer === 42) {
     }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js
index 68a195230df..8f9c02ecfbb 100644
--- a/tests/baselines/reference/exportAssignmentVariable.js
+++ b/tests/baselines/reference/exportAssignmentVariable.js
@@ -18,3 +18,4 @@ module.exports = x;
 "use strict";
 var y = require("./exportAssignmentVariable_A");
 var n = y;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentWithExports.js b/tests/baselines/reference/exportAssignmentWithExports.js
index 0aea8ec80fc..8441b7b4320 100644
--- a/tests/baselines/reference/exportAssignmentWithExports.js
+++ b/tests/baselines/reference/exportAssignmentWithExports.js
@@ -16,4 +16,3 @@ var D = (function () {
     return D;
 }());
 module.exports = D;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
index 9a03aaae595..6c3a951841d 100644
--- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
+++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
@@ -31,6 +31,7 @@ exports.x = t1_1.x;
 exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 //// [t4.js]
 "use strict";
 var t1_1 = require("./t1");
diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js
index 18ced8df9d6..23ce59f2402 100644
--- a/tests/baselines/reference/exportDeclareClass1.js
+++ b/tests/baselines/reference/exportDeclareClass1.js
@@ -14,4 +14,5 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     ;
     ;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js
index 419fecf42e0..08d62eb3782 100644
--- a/tests/baselines/reference/exportDeclaredModule.js
+++ b/tests/baselines/reference/exportDeclaredModule.js
@@ -19,3 +19,4 @@ module.exports = M1;
 "use strict";
 var foo1 = require("./foo1");
 var x = foo1.b();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js
index 4ccdba88556..04ad89f9dc0 100644
--- a/tests/baselines/reference/exportDefaultProperty.js
+++ b/tests/baselines/reference/exportDefaultProperty.js
@@ -73,3 +73,4 @@ var a_1 = require("./a");
 var b = new a_1["default"](a_1["default"].b);
 var b_1 = require("./b");
 b_1["default"] + 1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js
index b5d3e2c053b..861acb7347c 100644
--- a/tests/baselines/reference/exportDefaultProperty2.js
+++ b/tests/baselines/reference/exportDefaultProperty2.js
@@ -31,3 +31,4 @@ exports.__esModule = true;
 "use strict";
 var a_1 = require("./a");
 var x = { c: a_1["default"] };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js
index 9138da0d33d..d8347b62944 100644
--- a/tests/baselines/reference/exportEqualCallable.js
+++ b/tests/baselines/reference/exportEqualCallable.js
@@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "exportEqualCallable_0"], function (require, exports, connect) {
     "use strict";
     connect();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js
index aa715b7d9f2..f8d0afe95da 100644
--- a/tests/baselines/reference/exportEqualErrorType.js
+++ b/tests/baselines/reference/exportEqualErrorType.js
@@ -31,4 +31,5 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "exportEqualErrorType_0"], function (require, exports, connect) {
     "use strict";
     connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js
index 39074e10372..3a4982a7434 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.js
+++ b/tests/baselines/reference/exportEqualMemberMissing.js
@@ -30,3 +30,4 @@ module.exports = server;
 ///<reference path='exportEqualMemberMissing_0.ts'/>
 var connect = require("./exportEqualMemberMissing_0");
 connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js
index 6d75ef5d95d..3cf45681807 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.js
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.js
@@ -25,3 +25,4 @@ module.exports = x;
 "use strict";
 var exp_1 = require("./exp");
 exp_1["default"].toExponential(2);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsProperty.js b/tests/baselines/reference/exportEqualsProperty.js
index 9acb1ee49b7..feb5e563903 100644
--- a/tests/baselines/reference/exportEqualsProperty.js
+++ b/tests/baselines/reference/exportEqualsProperty.js
@@ -69,3 +69,4 @@ var B = require("./a");
 var b = new B(B.b);
 var fooLength = require("./b");
 fooLength + 1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsProperty2.js b/tests/baselines/reference/exportEqualsProperty2.js
index b5d91431722..f51a130e572 100644
--- a/tests/baselines/reference/exportEqualsProperty2.js
+++ b/tests/baselines/reference/exportEqualsProperty2.js
@@ -30,3 +30,4 @@ module.exports = C.B;
 "use strict";
 var B = require("./a");
 var x = { c: B };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js
index 6ca5b6411ff..d947393c05f 100644
--- a/tests/baselines/reference/exportImport.js
+++ b/tests/baselines/reference/exportImport.js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./w1"], function (require, exports, w) {
     "use strict";
     exports.w = w;
+    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports", "./exporter"], function (require, exports, e) {
diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js
index e84e661517b..7defcbac044 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.js
+++ b/tests/baselines/reference/exportImportMultipleFiles.js
@@ -24,9 +24,11 @@ define(["require", "exports", "exportImportMultipleFiles_math"], function (requi
     "use strict";
     exports.math = math;
     exports.math.add(3, 4); // OK
+    exports.__esModule = true;
 });
 //// [exportImportMultipleFiles_userCode.js]
 define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) {
     "use strict";
     lib.math.add(3, 4); // Shouldnt be error
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
index adcdeda7850..77eb0c35ce6 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
@@ -18,10 +18,12 @@ export function w(): e.w { // Should be OK
 //// [w1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [exporter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js
index cb06a818b08..0a8ebd10ee4 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js
@@ -10,3 +10,4 @@ export declare function foo(): X.bar;
 //// [exportSpecifierReferencingOuterDeclaration2_A.js]
 //// [exportSpecifierReferencingOuterDeclaration2_B.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js
index 1badf469996..f0c6dd55984 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js
@@ -12,3 +12,4 @@ export declare function bar(): X.bar; // error
 //// [exportSpecifierReferencingOuterDeclaration2_A.js]
 //// [exportSpecifierReferencingOuterDeclaration2_B.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index 2ef8560a38a..9a4def0dd78 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -74,4 +74,5 @@ define(["require", "exports", "./t4"], function (require, exports, t4_1) {
     t4_1.y;
     t4_1.z;
     t4_1.foo;
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
index 460984a2b13..4b9ec28f6aa 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -66,3 +66,4 @@ t4_1.x;
 t4_1.y;
 t4_1.z;
 t4_1.foo;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js
index dd432ecc1d3..3b74564d4d1 100644
--- a/tests/baselines/reference/exportStarForValues.js
+++ b/tests/baselines/reference/exportStarForValues.js
@@ -11,9 +11,11 @@ var x;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js
index e45d5bdd3ba..74b28ef6d00 100644
--- a/tests/baselines/reference/exportStarForValues2.js
+++ b/tests/baselines/reference/exportStarForValues2.js
@@ -15,14 +15,17 @@ var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js
index 9efe5ccf8e5..52e18851fc9 100644
--- a/tests/baselines/reference/exportStarForValues3.js
+++ b/tests/baselines/reference/exportStarForValues3.js
@@ -27,24 +27,29 @@ var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x = 1;
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x = 1;
+    exports.__esModule = true;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x = 1;
+    exports.__esModule = true;
 });
 //// [file5.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js
index 34b13bb00f3..7697100842e 100644
--- a/tests/baselines/reference/exportStarForValues4.js
+++ b/tests/baselines/reference/exportStarForValues4.js
@@ -19,14 +19,17 @@ var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x = 1;
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x = 1;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js
index 21f2b4c2f09..37c8d59c91a 100644
--- a/tests/baselines/reference/exportStarForValues5.js
+++ b/tests/baselines/reference/exportStarForValues5.js
@@ -11,6 +11,7 @@ export var x;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js
index d0c1f85582c..1311e215fce 100644
--- a/tests/baselines/reference/exportStarForValues7.js
+++ b/tests/baselines/reference/exportStarForValues7.js
@@ -15,6 +15,7 @@ export var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js
index cb3f66fbaf6..b6ee3c56ae7 100644
--- a/tests/baselines/reference/exportStarForValues8.js
+++ b/tests/baselines/reference/exportStarForValues8.js
@@ -27,6 +27,7 @@ export var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js
index fdcb0e5583a..5d24c558ec0 100644
--- a/tests/baselines/reference/exportStarForValues9.js
+++ b/tests/baselines/reference/exportStarForValues9.js
@@ -19,6 +19,7 @@ export var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports, file2_1) {
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index bb9867725b0..44ece871874 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -54,6 +54,7 @@ var X = require("./exportStarFromEmptyModule_module3");
 var s;
 X.A.q;
 X.A.r; // Error
+Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [exportStarFromEmptyModule_module1.d.ts]
diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js
index 6c39978e37d..75b9378c3f4 100644
--- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js
+++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js
@@ -15,4 +15,5 @@ export declare class TPromise<V> {
 //// [exportedInterfaceInaccessibleInCallbackInModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
index 838a6ae9326..0a2ee7d3183 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
@@ -31,7 +31,10 @@ exports.get = get;
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
index 4af17d71653..ea7f554d1b3 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
@@ -28,7 +28,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var as = require("./t1");
 var x = as.as;
 var y = as.return;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [t4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
index 7cdfbe79ebe..2b3e9d36f33 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
@@ -27,3 +27,4 @@ exports.__esModule = true;
 "use strict";
 var m1_1 = require("./m1");
 var __ = m1_1["default"].__, _ = m1_1["default"]._, ___ = m1_1["default"].___;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
index 890e32937a1..3555148f755 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
@@ -25,3 +25,4 @@ exports.__esModule = true;
 "use strict";
 var m1_1 = require("./m1");
 var __esmodule = m1_1["default"].__esmodule, __proto__ = m1_1["default"].__proto__;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
index 3514652db65..028ca80400f 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
@@ -27,3 +27,4 @@ exports.__esModule = true;
 "use strict";
 var m1_1 = require("./m1");
 var ___ = m1_1["default"].___, ___hello = m1_1["default"].___hello, _hi = m1_1["default"]._hi;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
index 25130664b74..fa643c5e7e2 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
@@ -74,3 +74,4 @@ m1_1.___hello();
 m1_1.__esmodule();
 m1_1.__proto();
 m1_1._hi();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js
index 7353c6970e8..a5900c588ba 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -40,3 +40,4 @@ var y = (function (_super) {
     }
     return y;
 }(x));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index 2e26d67db39..4f0d5ced7b5 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -96,3 +96,4 @@ var moduleMap = {
 };
 var moduleName;
 var visModel = new moduleMap[moduleName].VisualizationModel();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js
index 4d60625115b..41ec58a467d 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.js
+++ b/tests/baselines/reference/externalModuleAssignToVar.js
@@ -66,4 +66,5 @@ define(["require", "exports", "externalModuleAssignToVar_core_require", "externa
     y2 = ext2; // ok
     var y3 = ext3;
     y3 = ext3; // ok
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js
index e327e17160e..ca51181ec3b 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.js
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.js
@@ -29,3 +29,4 @@ var a = require("./externalModuleExportingGenericClass_file0");
 var v; // this should report error
 var v2 = (new a()).foo;
 var v3 = (new a()).foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index 646b4471859..bd811cd8b58 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -108,3 +108,4 @@ for ((stuff[n]) in []) { }
 for (var _p = 0, _q = []; _p < _q.length; _p++) {
     (stuff[n]) = _q[_p];
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
index e0e5eaf7bac..75d719670d1 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
@@ -21,4 +21,5 @@ define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExp
     "use strict";
     exports.file1 = file1;
     exports.file1.foo();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
index 9c9861d7c28..a012d0d37b6 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
@@ -30,3 +30,4 @@ exports.__esModule = true;
 var file1 = require("./externalModuleRefernceResolutionOrderInImportDeclaration_file1");
 file1.foo();
 file1.bar();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js
index 40b320ee37e..3d1fe11f88f 100644
--- a/tests/baselines/reference/externalModuleResolution.js
+++ b/tests/baselines/reference/externalModuleResolution.js
@@ -27,3 +27,4 @@ module.exports = M2;
 "use strict";
 var x = require("./foo");
 x.Y; // .ts should be picked
+exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js
index 44753c9f16d..96fb493090f 100644
--- a/tests/baselines/reference/externalModuleResolution2.js
+++ b/tests/baselines/reference/externalModuleResolution2.js
@@ -28,3 +28,4 @@ module.exports = M2;
 "use strict";
 var x = require("./foo");
 x.X; // .ts should be picked
+exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js
index 0b1f17612b0..fa98fbe2223 100644
--- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js
+++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js
@@ -6,3 +6,4 @@
 
 //// [externalModuleWithoutCompilerFlag1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/genericArrayExtenstions.js b/tests/baselines/reference/genericArrayExtenstions.js
index 63c67a13760..87a7fba25c1 100644
--- a/tests/baselines/reference/genericArrayExtenstions.js
+++ b/tests/baselines/reference/genericArrayExtenstions.js
@@ -7,3 +7,4 @@ concat(...items: T[]): T[];
 
 //// [genericArrayExtenstions.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js
index f9bcc86194c..49debc2ca84 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js
@@ -16,4 +16,5 @@ export declare module TypeScript {
 //// [genericRecursiveImplicitConstructorErrors1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.js b/tests/baselines/reference/genericTypeWithMultipleBases1.js
index 2ee085ef07e..3201344c0de 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases1.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases1.js
@@ -25,3 +25,4 @@ var x;
 x.p1;
 x.m1();
 x.m2();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.js b/tests/baselines/reference/genericTypeWithMultipleBases2.js
index 4a31e354de6..a4457144000 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases2.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases2.js
@@ -25,4 +25,5 @@ define(["require", "exports"], function (require, exports) {
     x.p1;
     x.m1();
     x.m2();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
index a181526eb27..74cf137ef37 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
@@ -13,5 +13,6 @@ define(["require", "exports"], function (require, exports) {
     (function (M) {
         M.foo = new C();
     })(M = exports.M || (exports.M = {}));
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.js b/tests/baselines/reference/globalAugmentationModuleResolution.js
index e1a4ebce8c5..6dd87de81fd 100644
--- a/tests/baselines/reference/globalAugmentationModuleResolution.js
+++ b/tests/baselines/reference/globalAugmentationModuleResolution.js
@@ -8,3 +8,4 @@ declare global {
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
index c7dd59f9ab7..040bdccd515 100644
--- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
@@ -21,6 +21,7 @@ var m;
     function foo() { }
     m.foo = foo;
 })(m = exports.m || (exports.m = {}));
+exports.__esModule = true;
 //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js]
 "use strict";
 var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0");
@@ -30,3 +31,4 @@ var m_private;
     m_private.C = r; // no error
     m_private.C.m.foo();
 })(m_private || (m_private = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index c676d8caa62..a626d034c75 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -40,3 +40,4 @@ var Hello = (function (_super) {
     }
     return Hello;
 }(Greeter));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js
index 383c6629ed1..1aadcb875f0 100644
--- a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js
+++ b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js
@@ -7,3 +7,4 @@ declare module "m1" {
 
 //// [importDeclRefereingExternalModuleWithNoResolve.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importHelpersInAmbientContext.js b/tests/baselines/reference/importHelpersInAmbientContext.js
index b9db8c4751f..d91daa19a90 100644
--- a/tests/baselines/reference/importHelpersInAmbientContext.js
+++ b/tests/baselines/reference/importHelpersInAmbientContext.js
@@ -57,3 +57,4 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [b.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js
index 52e5aac62e0..828c1a5a360 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.js
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -98,3 +98,4 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 2d3713ffaf4..917c50f3fee 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -32,9 +32,11 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var answer = 42; // No exports
+    exports.__esModule = true;
 });
 //// [foo_2.js]
 define(["require", "exports", "./foo_1"], function (require, exports, foo) {
     "use strict";
     var x = foo; // Cause a runtime dependency
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js
index d4f12d0c1b6..cfc63f83551 100644
--- a/tests/baselines/reference/importInsideModule.js
+++ b/tests/baselines/reference/importInsideModule.js
@@ -15,3 +15,4 @@ var myModule;
 (function (myModule) {
     var a = foo.x;
 })(myModule = exports.myModule || (exports.myModule = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js
index 2a8e6792860..8af20d4be36 100644
--- a/tests/baselines/reference/importNonExternalModule.js
+++ b/tests/baselines/reference/importNonExternalModule.js
@@ -24,4 +24,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     // Import should fail.  foo_0 not an external module
     if (foo.answer === 42) {
     }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js
index 002092d8162..e5785d92866 100644
--- a/tests/baselines/reference/importNonStringLiteral.js
+++ b/tests/baselines/reference/importNonStringLiteral.js
@@ -6,3 +6,4 @@ import foo = require(x); // invalid
 //// [foo_0.js]
 "use strict";
 var x = "filename";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js
index e15a3337dfd..658b464983a 100644
--- a/tests/baselines/reference/importTsBeforeDTs.js
+++ b/tests/baselines/reference/importTsBeforeDTs.js
@@ -22,3 +22,4 @@ exports.__esModule = true;
 var foo = require("./foo_0");
 var z1 = foo.x + 10; // Should error, as .ts preferred over .d.ts
 var z2 = foo.y + 10; // Should resolve
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index de5ee2a22bd..d44239cec11 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -43,3 +43,4 @@ var Sub = (function (_super) {
 }(foo.Super));
 var s;
 var r = s.foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js
index 807d684b5b1..c5e502f3fdc 100644
--- a/tests/baselines/reference/importWithTrailingSlash.js
+++ b/tests/baselines/reference/importWithTrailingSlash.js
@@ -34,9 +34,11 @@ var _1 = require(".");
 var _2 = require("./");
 _1["default"].a;
 _2["default"].aIndex;
+exports.__esModule = true;
 //// [test.js]
 "use strict";
 var __1 = require("..");
 var _1 = require("../");
 __1["default"].a;
 _1["default"].aIndex;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importWithTrailingSlash_noResolve.js b/tests/baselines/reference/importWithTrailingSlash_noResolve.js
index b523c76af3b..16a4838ba62 100644
--- a/tests/baselines/reference/importWithTrailingSlash_noResolve.js
+++ b/tests/baselines/reference/importWithTrailingSlash_noResolve.js
@@ -5,3 +5,4 @@ import foo from "./foo/";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js
index ffc4491e50a..16c6f2b95c7 100644
--- a/tests/baselines/reference/import_reference-exported-alias.js
+++ b/tests/baselines/reference/import_reference-exported-alias.js
@@ -48,4 +48,5 @@ define(["require", "exports", "file1"], function (require, exports, appJs) {
     var Services = appJs.Services;
     var UserServices = Services.UserServices;
     var x = new UserServices().getUserName();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js
index 1d91f10f672..5934d9b2f5e 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.js
+++ b/tests/baselines/reference/import_reference-to-type-alias.js
@@ -35,10 +35,12 @@ define(["require", "exports"], function (require, exports) {
             Services.UserServices = UserServices;
         })(Services = App.Services || (App.Services = {}));
     })(App = exports.App || (exports.App = {}));
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {
     "use strict";
     var Services = appJs.App.Services;
     var x = new Services.UserServices().getUserName();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
index 157702acd1e..7fb4e02d9fd 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
@@ -21,4 +21,5 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     var testData;
     var p = testData[0].name;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
index 423a3546d31..c2ac2416806 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
@@ -26,4 +26,5 @@ define(["require", "exports", "host"], function (require, exports, host) {
     "use strict";
     var hostVar = host;
     var v = new hostVar.Host();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js
index 754bac96c2c..61b411ea571 100644
--- a/tests/baselines/reference/importedAliasesInTypePositions.js
+++ b/tests/baselines/reference/importedAliasesInTypePositions.js
@@ -41,6 +41,7 @@ define(["require", "exports"], function (require, exports) {
             })(mod = nested.mod || (nested.mod = {}));
         })(nested = elaborate.nested || (elaborate.nested = {}));
     })(elaborate = exports.elaborate || (exports.elaborate = {}));
+    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
@@ -54,4 +55,5 @@ define(["require", "exports"], function (require, exports) {
             return UsesReferredType;
         }());
     })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js
index 8f9649c6768..52761e7e9db 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.js
+++ b/tests/baselines/reference/importedModuleClassNameClash.js
@@ -14,4 +14,5 @@ define(["require", "exports"], function (require, exports) {
         }
         return foo;
     }());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js
index 632483866be..b85c7145a47 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.js
+++ b/tests/baselines/reference/importsImplicitlyReadonly.js
@@ -41,3 +41,4 @@ a2.x = 1;
 a2.y = 1;
 a3.x = 1;
 a3.y = 1;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
index 7a530fdb1df..bc20008c2fa 100644
--- a/tests/baselines/reference/inferenceLimit.js
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -42,6 +42,7 @@ export interface MyModel {
 
 //// [mymodule.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [file1.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js
index da0be4c0e95..9fe669911b2 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.js
+++ b/tests/baselines/reference/instanceOfInExternalModules.js
@@ -28,4 +28,5 @@ define(["require", "exports", "instanceOfInExternalModules_require"], function (
     function IsFoo(value) {
         return value instanceof Bar.Foo;
     }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js
index 653579c81eb..7fb7b08a881 100644
--- a/tests/baselines/reference/interfaceContextualType.js
+++ b/tests/baselines/reference/interfaceContextualType.js
@@ -37,3 +37,4 @@ var Bug = (function () {
     };
     return Bug;
 }());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js
index a4df8926fba..01a64805530 100644
--- a/tests/baselines/reference/interfaceDeclaration3.js
+++ b/tests/baselines/reference/interfaceDeclaration3.js
@@ -119,4 +119,5 @@ define(["require", "exports"], function (require, exports) {
         }
         return C3;
     }());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
index 03b3542eca4..6868a0511a6 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
@@ -38,6 +38,7 @@ var m2;
         var cReturnVal = m3.cProp.foo(10);
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
+exports.__esModule = true;
 
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
index c7b8bf2cacc..de2582debef 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
@@ -29,6 +29,7 @@ var c;
     c.b = a.weekend;
     c.bVal = c.b.Sunday;
 })(c = exports.c || (exports.c = {}));
+exports.__esModule = true;
 
 
 //// [internalAliasEnumInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
index 267fffc7b70..6e54ed79afc 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
@@ -29,6 +29,7 @@ var c;
     var b = a.weekend;
     c.bVal = b.Sunday;
 })(c = exports.c || (exports.c = {}));
+exports.__esModule = true;
 
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
index a44298b6864..c7b5180fd93 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
@@ -31,3 +31,4 @@ var c;
     c.bVal = b.Sunday;
 })(c = exports.c || (exports.c = {}));
 var happyFriday = c.b.Friday;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
index b96586dfa8e..4138970da0b 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
@@ -27,6 +27,7 @@ var c;
     c.bVal = c.b(10);
     c.bVal2 = c.b;
 })(c = exports.c || (exports.c = {}));
+exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
index dca42878157..83cab3c05bb 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
@@ -27,6 +27,7 @@ var c;
     var bVal = b(10);
     c.bVal2 = b;
 })(c = exports.c || (exports.c = {}));
+exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
index 62e5f622ae7..67239e40b1d 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
@@ -28,3 +28,4 @@ var c;
     c.bVal2 = b;
 })(c = exports.c || (exports.c = {}));
 var d = c.b(11);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
index 3bd4c7c2fbc..904c7171818 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
@@ -31,6 +31,7 @@ define(["require", "exports"], function (require, exports) {
         c.b = a.b;
         c.x = new c.b.c();
     })(c = exports.c || (exports.c = {}));
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
index 910319be5e8..eb59627a4cb 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
@@ -30,6 +30,7 @@ var c;
     var b = a.b;
     c.x = new b.c();
 })(c = exports.c || (exports.c = {}));
+exports.__esModule = true;
 
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
index 044b393b367..e2cbdc3b54d 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
@@ -16,6 +16,7 @@ define(["require", "exports"], function (require, exports) {
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
index 78bfc72a789..15e03818d84 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
@@ -16,6 +16,7 @@ define(["require", "exports"], function (require, exports) {
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
index d0c4543c194..ed4c6714196 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
@@ -18,4 +18,5 @@ define(["require", "exports"], function (require, exports) {
     (function (c) {
     })(c = exports.c || (exports.c = {}));
     var x;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
index 38e0c387286..1b74ded4656 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
@@ -19,6 +19,7 @@ var c;
 (function (c) {
     c.x.foo();
 })(c = exports.c || (exports.c = {}));
+exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
index 4912293d48c..a46d7629ae9 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
@@ -19,6 +19,7 @@ var c;
 (function (c) {
     c.x.foo();
 })(c = exports.c || (exports.c = {}));
+exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
index a2921311e53..5cd431470f5 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
@@ -21,6 +21,7 @@ define(["require", "exports"], function (require, exports) {
         c.b = a.x;
         c.bVal = c.b;
     })(c = exports.c || (exports.c = {}));
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
index 8718dc18fdd..956c70d7cbb 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
@@ -21,6 +21,7 @@ define(["require", "exports"], function (require, exports) {
         var b = a.x;
         c.bVal = b;
     })(c = exports.c || (exports.c = {}));
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
index 1e45ee159d6..0d4e00b2593 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
@@ -8,4 +8,5 @@ run(1);
 define(["require", "exports"], function (require, exports) {
     "use strict";
     run(1);
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
index f40d2173685..5cf8d277597 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
@@ -7,3 +7,4 @@ run(1);
 //// [isolatedModulesPlainFile-CommonJS.js]
 "use strict";
 run(1);
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
index ece949b9100..5886a1908a6 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
@@ -16,4 +16,5 @@ run(1);
 })(function (require, exports) {
     "use strict";
     run(1);
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js
index f47b1b52cc6..a3259d55cd3 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.js
+++ b/tests/baselines/reference/jsxEmitWithAttributes.js
@@ -80,3 +80,4 @@ class A {
         ];
     }
 }
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
index a9a925c3e4f..32ebf4d5d54 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
@@ -80,3 +80,4 @@ class A {
         ];
     }
 }
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
index 592675086b1..36b16c62f49 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -81,4 +81,5 @@ class A {
         ];
     }
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
index 26e68d04f1d..71dbb45a155 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
@@ -513,9 +513,10 @@ sourceFile:test.tsx
 ---
 >>>}
 1 >^
-2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
 1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
index e2fe0c52c90..9f408e4db7a 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
@@ -79,3 +79,4 @@ class A {
         ];
     }
 }
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
index a9a718a4b2a..331c7a65d73 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
@@ -79,3 +79,4 @@ class A {
         ];
     }
 }
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index 4d1cc513918..0a7b7f8d387 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -80,4 +80,5 @@ class A {
         ];
     }
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
index c075bc5e839..86ed94197d6 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
@@ -486,9 +486,10 @@ sourceFile:test.tsx
 ---
 >>>}
 1 >^
-2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
 1 >Emitted(11, 2) Source(16, 2) + SourceIndex(0)
 ---
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
index ecf7d13d89d..72200aee75c 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
@@ -25,3 +25,4 @@ var Component = (function () {
     return Component;
 }());
 ;
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js
index c204ea7880d..59bde766a35 100644
--- a/tests/baselines/reference/jsxImportInAttribute.js
+++ b/tests/baselines/reference/jsxImportInAttribute.js
@@ -20,3 +20,4 @@ let x = Test; // emit test_1.default
 var Test_1 = require("Test");
 var x = Test_1["default"]; // emit test_1.default
 <anything attr={Test_1["default"]}/>; // ?
+exports.__esModule = true;
diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js
index 7310da92e92..626a48d191e 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -47,3 +47,4 @@ var TestComponent = (function (_super) {
     };
     return TestComponent;
 }(React.Component));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js
index cee60d848ab..9040455be56 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -47,3 +47,4 @@ var TestComponent = (function (_super) {
     };
     return TestComponent;
 }(React.Component));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/keepImportsInDts1.js b/tests/baselines/reference/keepImportsInDts1.js
index 8189ce43088..3f945a5ebc3 100644
--- a/tests/baselines/reference/keepImportsInDts1.js
+++ b/tests/baselines/reference/keepImportsInDts1.js
@@ -9,6 +9,7 @@ import "test"
 //// [main.js]
 define(["require", "exports", "test"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/keepImportsInDts2.js b/tests/baselines/reference/keepImportsInDts2.js
index 559b4814526..acd75a00c87 100644
--- a/tests/baselines/reference/keepImportsInDts2.js
+++ b/tests/baselines/reference/keepImportsInDts2.js
@@ -9,10 +9,12 @@ import "./folder/test"
 //// [test.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [main.js]
 define(["require", "exports", "./folder/test"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/keepImportsInDts3.js b/tests/baselines/reference/keepImportsInDts3.js
index e48ba693726..aec2e544e2f 100644
--- a/tests/baselines/reference/keepImportsInDts3.js
+++ b/tests/baselines/reference/keepImportsInDts3.js
@@ -9,9 +9,11 @@ import "test"
 //// [outputfile.js]
 define("test", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 define("app/main", ["require", "exports", "test"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/keepImportsInDts4.js b/tests/baselines/reference/keepImportsInDts4.js
index badec87984e..3a959bcbbac 100644
--- a/tests/baselines/reference/keepImportsInDts4.js
+++ b/tests/baselines/reference/keepImportsInDts4.js
@@ -9,9 +9,11 @@ import "./folder/test"
 //// [outputfile.js]
 define("folder/test", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 define("main", ["require", "exports", "folder/test"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js
index 46ca09c2caa..3e6b396184f 100644
--- a/tests/baselines/reference/localAliasExportAssignment.js
+++ b/tests/baselines/reference/localAliasExportAssignment.js
@@ -25,3 +25,4 @@ module.exports = server;
 ///<reference path='localAliasExportAssignment_0.ts'/>
 var connect = require("./localAliasExportAssignment_0");
 connect();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
index 94f65168198..b3c51e66c4b 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
@@ -32,4 +32,5 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) {
     "use strict";
     WinJS.Promise.timeout(10);
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js
index 60f6fedd3f2..c27c5ef8615 100644
--- a/tests/baselines/reference/mergeWithImportedNamespace.js
+++ b/tests/baselines/reference/mergeWithImportedNamespace.js
@@ -16,5 +16,7 @@ var N;
 (function (N) {
     N.x = 1;
 })(N = exports.N || (exports.N = {}));
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js
index e8dc5a3c2f3..21e457b1361 100644
--- a/tests/baselines/reference/mergeWithImportedType.js
+++ b/tests/baselines/reference/mergeWithImportedType.js
@@ -14,5 +14,7 @@ var E;
 (function (E) {
     E[E["X"] = 0] = "X";
 })(E = exports.E || (exports.E = {}));
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js
index e3d1ddc6e0e..d1becde5240 100644
--- a/tests/baselines/reference/mergedDeclarations7.js
+++ b/tests/baselines/reference/mergedDeclarations7.js
@@ -26,3 +26,4 @@ let p: Passport = passport.use();
 "use strict";
 var passport = require("passport");
 var p = passport.use();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
index 573701d407b..c4e5c8dfa10 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
@@ -40,3 +40,4 @@ var X;
         Y.B = B;
     })(Y = X.Y || (X.Y = {}));
 })(X = exports.X || (exports.X = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js
index fa93f2f2143..ace3445911c 100644
--- a/tests/baselines/reference/metadataOfEventAlias.js
+++ b/tests/baselines/reference/metadataOfEventAlias.js
@@ -14,6 +14,7 @@ export class SomeClass {
 //// [event.js]
 "use strict";
 ;
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
diff --git a/tests/baselines/reference/missingFunctionImplementation2.js b/tests/baselines/reference/missingFunctionImplementation2.js
index 7b3456015c8..dde60611657 100644
--- a/tests/baselines/reference/missingFunctionImplementation2.js
+++ b/tests/baselines/reference/missingFunctionImplementation2.js
@@ -11,5 +11,7 @@ export function f(a?, b?);
 
 //// [missingFunctionImplementation2_a.js]
 "use strict";
+exports.__esModule = true;
 //// [missingFunctionImplementation2_b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
index 76138193938..2d33c5b9768 100644
--- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
+++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
@@ -15,3 +15,4 @@ exports.__esModule = true;
 //// [b.js]
 "use strict";
 (function () { return 1; }());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
index c6fb35e3737..95ef30bb8d6 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
@@ -26,4 +26,5 @@ define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (requ
     }
     a.x; // OK
     fn(a); // Error: property 'x' is missing from 'a'
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
index 2e84e1492be..76eb8237cc6 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
@@ -36,21 +36,25 @@ let x: Observable<number>;
 //// [observable.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [map1.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
     observable_1.Observable.prototype.map = function () { };
+    exports.__esModule = true;
 });
 //// [map2.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
     observable_1.Observable.prototype.map = function () { };
+    exports.__esModule = true;
 });
 //// [main.js]
 define(["require", "exports", "./map1", "./map2"], function (require, exports) {
     "use strict";
     var x;
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
index 7b44fb7a637..92bb6cd1d99 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
@@ -38,15 +38,18 @@ var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
+exports.__esModule = true;
 //// [map.js]
 "use strict";
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
+exports.__esModule = true;
 //// [main.js]
 "use strict";
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
+exports.__esModule = true;
 
 
 //// [observable.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
index 547d017c502..02d461e642d 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
@@ -39,10 +39,12 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
+exports.__esModule = true;
 //// [map.js]
 "use strict";
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
+exports.__esModule = true;
 //// [main.js]
 "use strict";
 var observable_1 = require("./observable");
@@ -51,6 +53,7 @@ var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
+exports.__esModule = true;
 
 
 //// [observable.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
index 0f884f26756..cae38270898 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
@@ -57,6 +57,7 @@ var N1;
 (function (N1) {
     N1.x = 1;
 })(N1 || (N1 = {}));
+exports.__esModule = true;
 //// [observable.js]
 "use strict";
 exports.x = 1;
@@ -68,3 +69,4 @@ exports.__esModule = true;
 //// [main.js]
 "use strict";
 require("./x");
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
index 0a8b1b0b4b5..5dc02dc3082 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
@@ -38,8 +38,10 @@ let y = x.map(x => x + 1);
 "use strict";
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
+exports.__esModule = true;
 //// [main.js]
 "use strict";
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
index 2d65953e2a3..28461511dff 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
@@ -40,6 +40,7 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 "use strict";
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
+exports.__esModule = true;
 //// [main.js]
 "use strict";
 /// <reference path="observable.d.ts"/>
@@ -49,6 +50,7 @@ var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
+exports.__esModule = true;
 
 
 //// [map.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
index a539100c2ed..0becae3f0ff 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
@@ -38,12 +38,15 @@ var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
+exports.__esModule = true;
 //// [map.js]
 "use strict";
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
+exports.__esModule = true;
 //// [main.js]
 "use strict";
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
index 389f2119aba..cdad871ac21 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
@@ -39,10 +39,12 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
+exports.__esModule = true;
 //// [map.js]
 "use strict";
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
+exports.__esModule = true;
 //// [main.js]
 "use strict";
 var observable_1 = require("./observable");
@@ -51,3 +53,4 @@ var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js
index 4f1eb3bde6b..6569631a8d7 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.js
@@ -31,6 +31,7 @@ exports.__esModule = true;
 "use strict";
 var x = [1];
 var y = x.getA().x;
+exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js
index 03334d17cb8..222e337dd64 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.js
@@ -32,6 +32,7 @@ exports.__esModule = true;
 "use strict";
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
+exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js
index 21be25c6373..88e6b2c204d 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.js
@@ -33,11 +33,13 @@ exports.A = A;
 exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 require("./f2");
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
+exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js
index 38f186d0e05..6d9d76f8aaf 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal4.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal4.js
@@ -20,12 +20,15 @@ import "./f2";
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 //// [f3.js]
 "use strict";
 require("./f1");
 require("./f2");
+exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js
index 70c81893bd8..f25dffba5e8 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.js
@@ -27,6 +27,7 @@ import "B";
 /// <reference path="f2.d.ts"/>
 require("A");
 require("B");
+exports.__esModule = true;
 
 
 //// [f3.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8.js b/tests/baselines/reference/moduleAugmentationGlobal8.js
index 261dfd21b58..77b467f9e4d 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal8.js
@@ -10,4 +10,5 @@ export {}
 //// [moduleAugmentationGlobal8.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8_1.js b/tests/baselines/reference/moduleAugmentationGlobal8_1.js
index 2ac585a711b..70e9c336e7c 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8_1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal8_1.js
@@ -10,4 +10,5 @@ export {}
 //// [moduleAugmentationGlobal8_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
index d0b1592da39..6a825dcf34c 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
@@ -49,11 +49,13 @@ exports.__esModule = true;
 "use strict";
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
+exports.__esModule = true;
 //// [f4.js]
 "use strict";
 require("./f3");
 var a;
 var b = a.foo().n;
+exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index dfb71d81497..4f30d1210ff 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -61,11 +61,13 @@ exports.__esModule = true;
 "use strict";
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
+exports.__esModule = true;
 //// [f4.js]
 "use strict";
 require("./f3");
 var a;
 var b = a.foo().n;
+exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index 312a56792b6..66de9f1c596 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -59,11 +59,13 @@ exports.__esModule = true;
 "use strict";
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
+exports.__esModule = true;
 //// [f4.js]
 "use strict";
 require("./f3");
 var a;
 var b = a.foo().n;
+exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
index 690ec91226a..0729457fc51 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
@@ -61,6 +61,7 @@ exports.__esModule = true;
 "use strict";
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
+exports.__esModule = true;
 //// [f4.js]
 "use strict";
 require("./f3");
@@ -68,3 +69,4 @@ var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
index efb3fc04f9f..7970f65f412 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -61,6 +61,7 @@ exports.__esModule = true;
 "use strict";
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
+exports.__esModule = true;
 //// [f4.js]
 "use strict";
 require("./f3");
@@ -68,6 +69,7 @@ var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
+exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
index 228320ec9c6..3b290b82975 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
@@ -61,6 +61,7 @@ exports.__esModule = true;
 "use strict";
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
+exports.__esModule = true;
 //// [f4.js]
 "use strict";
 require("./f3");
@@ -68,6 +69,7 @@ var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
+exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
index aecb8954d53..852d50f8d01 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
@@ -33,6 +33,7 @@ x.foo().x;
 "use strict";
 var x;
 x.foo().x;
+exports.__esModule = true;
 
 
 //// [main.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
index 5529afc674f..1fdb32a55b5 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
@@ -34,3 +34,4 @@ x.foo().x;
 require("Map");
 var x;
 x.foo().x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
index 3a94c50ef1f..aa6b33baef3 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
@@ -45,3 +45,4 @@ require("Map");
 var x;
 x.foo().x;
 x.foo2().x2;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
index bf0339d3107..5f209f753cf 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
@@ -48,3 +48,4 @@ require("Map");
 var x;
 x.foo().x;
 x.foo2().x2;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
index 2e6503c4774..55226da5ee9 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
@@ -29,6 +29,7 @@ let y = x.getA().x;
 require("array");
 var x = [1];
 var y = x.getA().x;
+exports.__esModule = true;
 
 
 //// [f.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInDependency.js b/tests/baselines/reference/moduleAugmentationInDependency.js
index 1c5995339c3..757b71754d6 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency.js
@@ -11,3 +11,4 @@ import "A"
 //// [app.js]
 "use strict";
 require("A");
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.js b/tests/baselines/reference/moduleAugmentationInDependency2.js
index 381f1e72d8f..53d2e6ede71 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency2.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency2.js
@@ -10,6 +10,8 @@ import "A"
 
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 //// [app.js]
 "use strict";
 require("A");
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.js b/tests/baselines/reference/moduleAugmentationNoNewNames.js
index ccd4a668497..6edaf5b9fca 100644
--- a/tests/baselines/reference/moduleAugmentationNoNewNames.js
+++ b/tests/baselines/reference/moduleAugmentationNoNewNames.js
@@ -30,12 +30,15 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 //// [map.js]
 "use strict";
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
+exports.__esModule = true;
 //// [main.js]
 "use strict";
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
index a55585e6ace..d41be369917 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
@@ -70,6 +70,7 @@ define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) {
     "use strict";
     m1_1.Cls.prototype.foo = function () { return 1; };
     m1_1.Cls.prototype.bar = function () { return "1"; };
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m3", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -91,6 +92,7 @@ define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) {
     "use strict";
     m1_2.Cls.prototype.baz1 = function () { return undefined; };
     m1_2.Cls.prototype.baz2 = function () { return undefined; };
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("test", ["require", "exports", "m2", "m4"], function (require, exports) {
     "use strict";
@@ -99,6 +101,7 @@ define("test", ["require", "exports", "m2", "m4"], function (require, exports) {
     c.bar().toLowerCase();
     c.baz1().x.toExponential();
     c.baz2().x.toLowerCase();
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
index 26a04928440..4f93e976dfc 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.js
+++ b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -68,12 +68,14 @@ define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
     a_1.A.prototype.getB = function () { return undefined; };
     a_1.A.prototype.getCls = function () { return undefined; };
+    exports.__esModule = true;
 });
 define("main", ["require", "exports", "d"], function (require, exports) {
     "use strict";
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
index 82858bcada0..94d418c7fc7 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.js
+++ b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -72,16 +72,19 @@ define("b", ["require", "exports"], function (require, exports) {
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
     a_1.A.prototype.getB = function () { return undefined; };
+    exports.__esModule = true;
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_2) {
     "use strict";
     a_2.A.prototype.getCls = function () { return undefined; };
+    exports.__esModule = true;
 });
 define("main", ["require", "exports", "d", "e"], function (require, exports) {
     "use strict";
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 8bdbb647421..71f96df940c 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -70,12 +70,14 @@ define("b", ["require", "exports"], function (require, exports) {
 define("e", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
     a_1.A.prototype.getCls = function () { return undefined; };
+    exports.__esModule = true;
 });
 define("main", ["require", "exports", "D", "e"], function (require, exports) {
     "use strict";
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index 82b8624c35c..2883d91d03c 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -73,6 +73,7 @@ define("main", ["require", "exports", "D", "E"], function (require, exports) {
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js
index 362785a5d68..e66235ca2bc 100644
--- a/tests/baselines/reference/moduleCodegenTest4.js
+++ b/tests/baselines/reference/moduleCodegenTest4.js
@@ -12,3 +12,4 @@ var Baz;
 })(Baz = exports.Baz || (exports.Baz = {}));
 Baz.x = "goodbye";
 void 0;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js
index 130091cd61c..7db2ce416dd 100644
--- a/tests/baselines/reference/moduleExports1.js
+++ b/tests/baselines/reference/moduleExports1.js
@@ -36,4 +36,5 @@ define(["require", "exports"], function (require, exports) {
     void 0;
     if (!module.exports)
         module.exports = "";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
index 26d262a76fe..9e79d8d81b2 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -14,6 +14,7 @@ class Test1 extends C1<M2.M2C> {
 //// [moduleImportedForTypeArgumentPosition_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [moduleImportedForTypeArgumentPosition_1.js]
 var __extends = (this && this.__extends) || (function () {
@@ -40,4 +41,5 @@ define(["require", "exports"], function (require, exports) {
         }
         return Test1;
     }(C1));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js
index 8c18060d506..314460661b2 100644
--- a/tests/baselines/reference/moduleInTypePosition1.js
+++ b/tests/baselines/reference/moduleInTypePosition1.js
@@ -23,3 +23,4 @@ exports.__esModule = true;
 //// [moduleInTypePosition1_1.js]
 "use strict";
 var x = function (w1) { };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js
index 5ab4ab381e0..edf18bb7d58 100644
--- a/tests/baselines/reference/moduleMergeConstructor.js
+++ b/tests/baselines/reference/moduleMergeConstructor.js
@@ -36,4 +36,5 @@ define(["require", "exports", "foo"], function (require, exports, foo) {
         }
         return Test;
     }());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js
index e3c323bba71..685a2ac0233 100644
--- a/tests/baselines/reference/moduleResolutionNoResolve.js
+++ b/tests/baselines/reference/moduleResolutionNoResolve.js
@@ -10,6 +10,7 @@ export var c = '';
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 exports.c = '';
diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js
index 554f8110994..39217292117 100644
--- a/tests/baselines/reference/moduleResolutionNoTs.js
+++ b/tests/baselines/reference/moduleResolutionNoTs.js
@@ -31,3 +31,4 @@ exports["default"] = 0;
 exports.__esModule = true;
 //// [user.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js
index 1f241c1ed96..d2ee65a508a 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions.js
@@ -32,8 +32,11 @@ exports.__esModule = true;
 // No extension: '.ts' added 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 // '.js' extension: stripped and replaced with '.ts' 
 //// [d.js]
 "use strict";
+exports.__esModule = true;
 //// [jquery_user_1.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js
index 2e5297bdf65..6bce8b8d3c5 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js
@@ -15,3 +15,4 @@ import js from "./js";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js
index c340f65f251..a11d43d56df 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js
@@ -10,3 +10,4 @@ import jsx from "./jsx";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js
index f362701bbda..ca0fa6ca402 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js
@@ -10,3 +10,4 @@ import jsx from "./jsx";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
index afd5ce5a578..fb8904c5748 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
@@ -16,3 +16,4 @@ exports["default"] = 0;
 exports.__esModule = true;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
index b5d4ae20a4d..014207d2400 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
@@ -15,3 +15,4 @@ import "normalize.css";
 //// [a.js]
 "use strict";
 require("normalize.css");
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
index dc9df79e4df..c53efeb0961 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
@@ -15,3 +15,4 @@ import "foo";
 //// [a.js]
 "use strict";
 require("foo");
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js
index 51d476338c0..3563f7db251 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js
@@ -16,3 +16,4 @@ import { x } from "js";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js
index f326ab9231a..e0aebb04d76 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js
@@ -61,6 +61,7 @@ var x;
 var y;
 x = y;
 y = x;
+exports.__esModule = true;
 /*
 # To reproduce in a real project:
 
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
index f88665c6808..55317e413bf 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
@@ -32,3 +32,4 @@ exports.__esModule = true;
 var abc_1 = require("./shared/abc");
 var abc_2 = require("./shared2/abc");
 abc_1.x + abc_2.x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
index 7d778942524..d4fb798e8c7 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
@@ -40,3 +40,4 @@ var x;
 var y;
 x = y;
 y = x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
index 7411123a872..7caaf1e55f6 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
@@ -21,6 +21,7 @@ var Animals;
     Animals[Animals["Dog"] = 1] = "Dog";
 })(Animals = exports.Animals || (exports.Animals = {}));
 ;
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 var c_1 = require("./c");
diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js
index 20a518e2511..bee7a06ce6f 100644
--- a/tests/baselines/reference/moduleScoping.js
+++ b/tests/baselines/reference/moduleScoping.js
@@ -39,5 +39,6 @@ var t1 = v1;
 var t2 = v2;
 var t3 = file3.v3;
 var v4 = { a: true, b: NaN }; // Should shadow global v2 in this module
+exports.__esModule = true;
 //// [file5.js]
 var x = v2; // Should be global v2 of type number again
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
index 2cd5440ce6e..afc2fa1f5bd 100644
--- a/tests/baselines/reference/multiImportExport.js
+++ b/tests/baselines/reference/multiImportExport.js
@@ -45,10 +45,12 @@ module.exports = Math;
 //// [Drawing.js]
 "use strict";
 exports.Math = require("./Math/Math");
+exports.__esModule = true;
 //// [consumer.js]
 "use strict";
 var Drawing = require("./Drawing");
 var addr = new Drawing.Math.Adder();
+exports.__esModule = true;
 
 
 //// [Adder.d.ts]
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index a0e06a40da5..4ea2e7cb8f0 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -36,3 +36,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 "use strict";
 var m1_1 = require("./m1");
 m1_1.default();
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index 210fa21e803..5fe294d1939 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -28,3 +28,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 "use strict";
 var m1_1 = require("./m1");
 m1_1.default();
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js
index fd6ac67e82a..75a4e125f21 100644
--- a/tests/baselines/reference/multipleExports.js
+++ b/tests/baselines/reference/multipleExports.js
@@ -22,3 +22,4 @@ var x = 0;
 (function (M) {
     M.v;
 })(M = exports.M || (exports.M = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js
index 36b8e0e8d27..4677da0df7b 100644
--- a/tests/baselines/reference/nameDelimitedBySlashes.js
+++ b/tests/baselines/reference/nameDelimitedBySlashes.js
@@ -16,3 +16,4 @@ exports.__esModule = true;
 "use strict";
 var foo = require("./test/foo_0");
 var x = foo.foo + 42;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js
index 86c384cdbdf..de42c5ed60c 100644
--- a/tests/baselines/reference/nameWithFileExtension.js
+++ b/tests/baselines/reference/nameWithFileExtension.js
@@ -16,3 +16,4 @@ exports.__esModule = true;
 "use strict";
 var foo = require("./foo_0.js");
 var x = foo.foo + 42;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js
index 57ff852ec35..e7c85322317 100644
--- a/tests/baselines/reference/nameWithRelativePaths.js
+++ b/tests/baselines/reference/nameWithRelativePaths.js
@@ -40,6 +40,7 @@ var M2;
 (function (M2) {
     M2.x = true;
 })(M2 = exports.M2 || (exports.M2 = {}));
+exports.__esModule = true;
 //// [foo_3.js]
 "use strict";
 var foo0 = require("../foo_0");
@@ -48,3 +49,4 @@ var foo2 = require("./.././test/foo_2");
 if (foo2.M2.x) {
     var x = foo0.foo + foo1.f();
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution1.js b/tests/baselines/reference/nodeResolution1.js
index a48eb71c8bc..21f6e259d3d 100644
--- a/tests/baselines/reference/nodeResolution1.js
+++ b/tests/baselines/reference/nodeResolution1.js
@@ -13,3 +13,4 @@ exports.x = 1;
 exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution2.js b/tests/baselines/reference/nodeResolution2.js
index a139eaf62cf..6d0963c6acb 100644
--- a/tests/baselines/reference/nodeResolution2.js
+++ b/tests/baselines/reference/nodeResolution2.js
@@ -9,3 +9,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution3.js b/tests/baselines/reference/nodeResolution3.js
index 99b6a692819..8750e3ff07d 100644
--- a/tests/baselines/reference/nodeResolution3.js
+++ b/tests/baselines/reference/nodeResolution3.js
@@ -9,3 +9,4 @@ import y = require("b");
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution4.js b/tests/baselines/reference/nodeResolution4.js
index 7aac08fe6d0..0591dc5a299 100644
--- a/tests/baselines/reference/nodeResolution4.js
+++ b/tests/baselines/reference/nodeResolution4.js
@@ -18,3 +18,4 @@ var x = 1;
 exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution5.js b/tests/baselines/reference/nodeResolution5.js
index 766d4118e97..f5a6165906f 100644
--- a/tests/baselines/reference/nodeResolution5.js
+++ b/tests/baselines/reference/nodeResolution5.js
@@ -12,3 +12,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution6.js b/tests/baselines/reference/nodeResolution6.js
index 196e8ae57cf..cda821991d0 100644
--- a/tests/baselines/reference/nodeResolution6.js
+++ b/tests/baselines/reference/nodeResolution6.js
@@ -15,3 +15,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution7.js b/tests/baselines/reference/nodeResolution7.js
index 028d7ed2e81..f8cbff14726 100644
--- a/tests/baselines/reference/nodeResolution7.js
+++ b/tests/baselines/reference/nodeResolution7.js
@@ -12,3 +12,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nodeResolution8.js b/tests/baselines/reference/nodeResolution8.js
index 1d90399ff70..5facd2edc39 100644
--- a/tests/baselines/reference/nodeResolution8.js
+++ b/tests/baselines/reference/nodeResolution8.js
@@ -14,3 +14,4 @@ import y = require("a");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/nounusedTypeParameterConstraint.js b/tests/baselines/reference/nounusedTypeParameterConstraint.js
index aa403187f7a..f8881e6d0a0 100644
--- a/tests/baselines/reference/nounusedTypeParameterConstraint.js
+++ b/tests/baselines/reference/nounusedTypeParameterConstraint.js
@@ -10,5 +10,7 @@ export type DomainEntityConstructor<TEntity extends IEventSourcedEntity> = { new
 
 //// [bar.js]
 "use strict";
+exports.__esModule = true;
 //// [test.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/objectIndexer.js b/tests/baselines/reference/objectIndexer.js
index f5bf47e3475..08dda7376dc 100644
--- a/tests/baselines/reference/objectIndexer.js
+++ b/tests/baselines/reference/objectIndexer.js
@@ -24,4 +24,5 @@ define(["require", "exports"], function (require, exports) {
         }
         return Emitter;
     }());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/overloadModifiersMustAgree.js b/tests/baselines/reference/overloadModifiersMustAgree.js
index e7256562e76..748854e38e8 100644
--- a/tests/baselines/reference/overloadModifiersMustAgree.js
+++ b/tests/baselines/reference/overloadModifiersMustAgree.js
@@ -24,3 +24,4 @@ var baz = (function () {
     return baz;
 }());
 function bar(s) { }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserEnum1.js b/tests/baselines/reference/parserEnum1.js
index d2c29d847cd..52971b2b9c2 100644
--- a/tests/baselines/reference/parserEnum1.js
+++ b/tests/baselines/reference/parserEnum1.js
@@ -17,3 +17,4 @@ var SignatureFlags;
     SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer";
     SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer";
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserEnum2.js b/tests/baselines/reference/parserEnum2.js
index f5888addf75..47d5899990d 100644
--- a/tests/baselines/reference/parserEnum2.js
+++ b/tests/baselines/reference/parserEnum2.js
@@ -17,3 +17,4 @@ var SignatureFlags;
     SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer";
     SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer";
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserEnum3.js b/tests/baselines/reference/parserEnum3.js
index 602171e8d94..e18a4c20696 100644
--- a/tests/baselines/reference/parserEnum3.js
+++ b/tests/baselines/reference/parserEnum3.js
@@ -9,3 +9,4 @@
 var SignatureFlags;
 (function (SignatureFlags) {
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserEnum4.js b/tests/baselines/reference/parserEnum4.js
index 6af07b0a1c7..90c0253e1f9 100644
--- a/tests/baselines/reference/parserEnum4.js
+++ b/tests/baselines/reference/parserEnum4.js
@@ -10,3 +10,4 @@
 var SignatureFlags;
 (function (SignatureFlags) {
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserExportAssignment7.js b/tests/baselines/reference/parserExportAssignment7.js
index 8f9d4fe84d9..dd6750bec32 100644
--- a/tests/baselines/reference/parserExportAssignment7.js
+++ b/tests/baselines/reference/parserExportAssignment7.js
@@ -12,4 +12,3 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserExportAssignment8.js b/tests/baselines/reference/parserExportAssignment8.js
index 1334db7782a..07ff257fb61 100644
--- a/tests/baselines/reference/parserExportAssignment8.js
+++ b/tests/baselines/reference/parserExportAssignment8.js
@@ -12,4 +12,3 @@ var C = (function () {
     return C;
 }());
 module.exports = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserInterfaceDeclaration6.js b/tests/baselines/reference/parserInterfaceDeclaration6.js
index 1ec3325de34..cbc734b534c 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration6.js
+++ b/tests/baselines/reference/parserInterfaceDeclaration6.js
@@ -4,3 +4,4 @@ export export interface I {
 
 //// [parserInterfaceDeclaration6.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.js b/tests/baselines/reference/parserInterfaceDeclaration7.js
index eed874db143..0c52f4639ce 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration7.js
+++ b/tests/baselines/reference/parserInterfaceDeclaration7.js
@@ -4,3 +4,4 @@ export interface I {
 
 //// [parserInterfaceDeclaration7.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/parserModule1.js b/tests/baselines/reference/parserModule1.js
index 749715a39d1..5bd983595dc 100644
--- a/tests/baselines/reference/parserModule1.js
+++ b/tests/baselines/reference/parserModule1.js
@@ -59,3 +59,4 @@ var CompilerDiagnostics;
     }
     CompilerDiagnostics.assert = assert;
 })(CompilerDiagnostics = exports.CompilerDiagnostics || (exports.CompilerDiagnostics = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
index 9713cae56f5..e05006539a9 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
@@ -42,4 +42,5 @@ define(["require", "exports", "./file3", "file4"], function (require, exports, f
 define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) {
     "use strict";
     use(file2_1.x.toExponential());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
index 966f50202c0..515f6e51715 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
@@ -34,3 +34,4 @@ exports.__esModule = true;
 "use strict";
 var file2_1 = require("folder2/file2");
 use(file2_1.x.toExponential());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
index 25ca74cc848..28b3eb8a902 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
@@ -38,4 +38,5 @@ define(["require", "exports", "./file3", "file4"], function (require, exports, f
 define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) {
     "use strict";
     use(file2_1.x.toExponential());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
index 8f8fe447550..cf9e143ebb0 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
@@ -30,3 +30,4 @@ exports.__esModule = true;
 "use strict";
 var file2_1 = require("folder2/file2");
 use(file2_1.x.toExponential());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
index 9b9054390ed..46244521fab 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
@@ -56,4 +56,5 @@ define(["require", "exports", "folder2/file1", "folder3/file2", "components/file
     use(file2_1.y.toExponential());
     use(file3_1.z.toExponential());
     use(file4_1.z1.toExponential());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
index fdf2c8edbaf..69e5e16fe91 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
@@ -47,3 +47,4 @@ use(file1_1.x.toExponential());
 use(file2_1.y.toExponential());
 use(file3_1.z.toExponential());
 use(file4_1.z1.toExponential());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
index c871f804b05..12e8e5dbda5 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
@@ -21,4 +21,5 @@ define(["require", "exports", "../file2"], function (require, exports, file2_1)
 define(["require", "exports", "./project/file3"], function (require, exports, file3_1) {
     "use strict";
     use(file3_1.x.toExponential());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
index 5ae4aa284c0..5cc834d0712 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
@@ -20,3 +20,4 @@ exports.__esModule = true;
 "use strict";
 var file3_1 = require("./project/file3");
 use(file3_1.x.toFixed());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
index 3acc7ca8740..9aa886aeb26 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
@@ -44,4 +44,5 @@ define(["require", "exports", "./project/file2", "module3"], function (require,
     "use strict";
     use(file2_1.x.toFixed());
     use(module3_1.y.toFixed());
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
index a9870d0cbc6..8095c4de6a1 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
@@ -44,3 +44,4 @@ var file2_1 = require("./project/file2");
 var module3_1 = require("module3");
 use(file2_1.x.toFixed());
 use(module3_1.y.toFixed());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
index 55ffb41de13..44a53df492a 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
@@ -24,3 +24,4 @@ exports.bar = bar;
 exports.__esModule = true;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js
index 1774876911f..4fded4a78ad 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js
@@ -5,3 +5,4 @@ import { foo } from "foo";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
index 54ad8acd2f1..98e87342287 100644
--- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
+++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
@@ -10,6 +10,7 @@ export interface B<T> extends A<T> {
 //// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
index ff241a726bf..b8e8139675b 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
@@ -24,6 +24,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_0.d.ts]
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
index 8b2c4de8bf3..6d2748dd8dc 100644
--- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
@@ -96,4 +96,5 @@ interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInter
 
 //// [privacyInterfaceExtendsClauseDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 //// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.js]
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
index b328e8b3036..5006bab0ad1 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
@@ -294,3 +294,4 @@ var import_private;
     import_private.publicUse_im_private_mi_public = new import_private.im_private_mi_public.c();
     var privateUse_im_private_mu_public;
 })(import_private || (import_private = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
index 7d4a80a0d29..9cc12f1c798 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
@@ -295,4 +295,5 @@ define(["require", "exports"], function (require, exports) {
         import_private.publicUse_im_private_mi_public = new im_private_mi_public.c();
         var privateUse_im_private_mu_public;
     })(import_private || (import_private = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js
index b66e5b6e6ba..5daa1879628 100644
--- a/tests/baselines/reference/project/baseline/amd/emit.js
+++ b/tests/baselines/reference/project/baseline/amd/emit.js
@@ -1,4 +1,5 @@
 define(["require", "exports", "./decl"], function (require, exports, g) {
     "use strict";
     var p = g.point(10, 20);
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js
index b33f5d1b198..17c96719d0b 100644
--- a/tests/baselines/reference/project/baseline/node/emit.js
+++ b/tests/baselines/reference/project/baseline/node/emit.js
@@ -1,3 +1,4 @@
 "use strict";
 var g = require("./decl");
 var p = g.point(10, 20);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
index 523d596dca1..859d262e9c6 100644
--- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
@@ -1,4 +1,5 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var p = { x: 10, y: 20 };
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js
index e5a1637efb1..c172dcd312f 100644
--- a/tests/baselines/reference/project/baseline2/node/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js
@@ -1,2 +1,3 @@
 "use strict";
 var p = { x: 10, y: 20 };
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline3/amd/nestedModule.js b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
index 36eb17665d6..3fa69311ffa 100644
--- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
@@ -8,4 +8,5 @@ define(["require", "exports"], function (require, exports) {
             inner.a = local;
         })(inner = outer.inner || (outer.inner = {}));
     })(outer = exports.outer || (exports.outer = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js
index 1d5c5c9d534..9596b38253a 100644
--- a/tests/baselines/reference/project/baseline3/node/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js
@@ -7,3 +7,4 @@ var outer;
         inner.a = local;
     })(inner = outer.inner || (outer.inner = {}));
 })(outer = exports.outer || (exports.outer = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
index a5da0ab9314..a6563ac4f73 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
@@ -6,4 +6,5 @@ define(["require", "exports", "private_m4"], function (require, exports, private
         var d3 = private_m4.d;
         var f3 = private_m4.foo();
     })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
index 3cc7f82feb7..24526ded58b 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
@@ -7,3 +7,4 @@ var usePrivate_m4_m1;
     var d3 = private_m4.d;
     var f3 = private_m4.foo();
 })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
index 5b8a451c781..b5c401da717 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
@@ -3,4 +3,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
index 59944c663e9..fb163c512b8 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
@@ -3,3 +3,4 @@ var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
index 5a3916f07d1..432701235d5 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
@@ -4,4 +4,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     m1.f2.a = "10"; // Error: Should be number
     m1.rel = 42; // Error: Should be boolean
     m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
index fb4faf236b2..12d17b60709 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
@@ -4,3 +4,4 @@ m1.f1("test");
 m1.f2.a = "10"; // Error: Should be number
 m1.rel = 42; // Error: Should be boolean
 m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
index 9ef3915c851..81c077dfd9c 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
@@ -4,4 +4,5 @@ define(["require", "exports", "m1", "m4"], function (require, exports, m1, m4) {
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
     var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
index f6783cda79b..0d06a91c2a6 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
@@ -5,3 +5,4 @@ m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
 var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js
index 08e0b38c7df..11da1c899c1 100644
--- a/tests/baselines/reference/project/nonRelative/amd/consume.js
+++ b/tests/baselines/reference/project/nonRelative/amd/consume.js
@@ -6,4 +6,5 @@ define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (requi
     if (str !== "success") {
         fail();
     }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js
index 35d658abb62..d4f9f6e288d 100644
--- a/tests/baselines/reference/project/nonRelative/node/consume.js
+++ b/tests/baselines/reference/project/nonRelative/node/consume.js
@@ -8,3 +8,4 @@ var str = mod.call();
 if (str !== "success") {
     fail();
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js
index 3053eb35cb4..eb08364649a 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js
@@ -1,3 +1,4 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js
index 3053eb35cb4..eb08364649a 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js
@@ -1,3 +1,4 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js
index 0c14aab22f7..64cbe53a861 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js
@@ -1 +1,2 @@
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js
index 0c14aab22f7..64cbe53a861 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js
@@ -1 +1,2 @@
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
index f62acb89dfd..b16939b5d8f 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
@@ -45,4 +45,5 @@ define(["require", "exports"], function (require, exports) {
     }());
     var y;
     var y;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js
index fdf24fbeb16..bec6247b7cc 100644
--- a/tests/baselines/reference/reExportDefaultExport.js
+++ b/tests/baselines/reference/reExportDefaultExport.js
@@ -27,3 +27,4 @@ var m1_1 = require("./m1");
 var m1_2 = require("./m1");
 m1_2.f();
 m1_1.default();
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/reExportGlobalDeclaration1.js b/tests/baselines/reference/reExportGlobalDeclaration1.js
index c0db9a0eaf3..9ab432fd084 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration1.js
+++ b/tests/baselines/reference/reExportGlobalDeclaration1.js
@@ -22,3 +22,4 @@ export {b as b2};
 
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportGlobalDeclaration2.js b/tests/baselines/reference/reExportGlobalDeclaration2.js
index 160a9b28f54..52e55bb18c4 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration2.js
+++ b/tests/baselines/reference/reExportGlobalDeclaration2.js
@@ -18,3 +18,4 @@ export {I2 as III2};
 
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportGlobalDeclaration3.js b/tests/baselines/reference/reExportGlobalDeclaration3.js
index e1b85b6b8d5..ed111b42197 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration3.js
+++ b/tests/baselines/reference/reExportGlobalDeclaration3.js
@@ -18,3 +18,4 @@ export {NS2 as NNNS2};
 
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportGlobalDeclaration4.js b/tests/baselines/reference/reExportGlobalDeclaration4.js
index 09d6b760790..a7a0e7525ca 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration4.js
+++ b/tests/baselines/reference/reExportGlobalDeclaration4.js
@@ -18,3 +18,4 @@ export {Cls2 as CCCls2};
 
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportUndefined1.js b/tests/baselines/reference/reExportUndefined1.js
index 94729e4f544..7540901fa30 100644
--- a/tests/baselines/reference/reExportUndefined1.js
+++ b/tests/baselines/reference/reExportUndefined1.js
@@ -4,3 +4,4 @@ export { undefined };
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reExportUndefined2.js b/tests/baselines/reference/reExportUndefined2.js
index 5054ea672c9..726b25c748d 100644
--- a/tests/baselines/reference/reExportUndefined2.js
+++ b/tests/baselines/reference/reExportUndefined2.js
@@ -19,3 +19,4 @@ exports.__esModule = true;
 "use strict";
 var a_1 = require("./a");
 use(a_1.undefined);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.js b/tests/baselines/reference/reactNamespaceImportPresevation.js
index 5c44674d031..99eb5a94bac 100644
--- a/tests/baselines/reference/reactNamespaceImportPresevation.js
+++ b/tests/baselines/reference/reactNamespaceImportPresevation.js
@@ -18,3 +18,4 @@ declare var foo: any;
 "use strict";
 var myReactLib = require("my-React-Lib"); // should not be elided
 <foo data/>;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js
index 6f8304df658..87e85e9d20f 100644
--- a/tests/baselines/reference/recursiveMods.js
+++ b/tests/baselines/reference/recursiveMods.js
@@ -51,3 +51,4 @@ var Foo;
         return;
     }
 })(Foo = exports.Foo || (exports.Foo = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js
index 0242a57d4f5..9bd5fb62e1a 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -51,3 +51,4 @@ var x = (function (_super) {
     }
     return x;
 }(foo2.x));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/relativeNamesInClassicResolution.js b/tests/baselines/reference/relativeNamesInClassicResolution.js
index 3d24d8428f5..68fef5a3e9d 100644
--- a/tests/baselines/reference/relativeNamesInClassicResolution.js
+++ b/tests/baselines/reference/relativeNamesInClassicResolution.js
@@ -10,6 +10,7 @@ export let x = 1;
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/relativePathMustResolve.js b/tests/baselines/reference/relativePathMustResolve.js
index 6986d8ddb68..a8c841261fd 100644
--- a/tests/baselines/reference/relativePathMustResolve.js
+++ b/tests/baselines/reference/relativePathMustResolve.js
@@ -12,3 +12,4 @@ var z = foo.x + 10;
 "use strict";
 var foo = require("./test/foo");
 var z = foo.x + 10;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/relativePathToDeclarationFile.js b/tests/baselines/reference/relativePathToDeclarationFile.js
index 36673510aef..84a784779f6 100644
--- a/tests/baselines/reference/relativePathToDeclarationFile.js
+++ b/tests/baselines/reference/relativePathToDeclarationFile.js
@@ -34,3 +34,4 @@ var relMod = require("./sub/relMod");
 if (foo.M2.x) {
     var x = new relMod(other.M2.x.charCodeAt(0));
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/requireAsFunctionInExternalModule.js b/tests/baselines/reference/requireAsFunctionInExternalModule.js
index 52b40608608..39a39fb1bbe 100644
--- a/tests/baselines/reference/requireAsFunctionInExternalModule.js
+++ b/tests/baselines/reference/requireAsFunctionInExternalModule.js
@@ -36,3 +36,4 @@ exports.__esModule = true;
 "use strict";
 var m_1 = require("./m");
 m_1.hello();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js
index 7ac73b6f3df..6ef27122df4 100644
--- a/tests/baselines/reference/requireEmitSemicolon.js
+++ b/tests/baselines/reference/requireEmitSemicolon.js
@@ -31,6 +31,7 @@ define(["require", "exports"], function (require, exports) {
         }());
         Models.Person = Person;
     })(Models = exports.Models || (exports.Models = {}));
+    exports.__esModule = true;
 });
 //// [requireEmitSemicolon_1.js]
 define(["require", "exports", "requireEmitSemicolon_0"], function (require, exports, P) {
@@ -47,4 +48,5 @@ define(["require", "exports", "requireEmitSemicolon_0"], function (require, expo
         }());
         Database.DB = DB;
     })(Database = exports.Database || (exports.Database = {}));
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/requireOfAnEmptyFile1.js b/tests/baselines/reference/requireOfAnEmptyFile1.js
index 53642272191..a1e6dbbc447 100644
--- a/tests/baselines/reference/requireOfAnEmptyFile1.js
+++ b/tests/baselines/reference/requireOfAnEmptyFile1.js
@@ -12,3 +12,4 @@ import fs = require('./requireOfAnEmptyFile1_b');
 //// [requireOfAnEmptyFile1_a.js]
 //requireOfAnEmptyFile1
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js
index d9c8105c35f..6b0941349e0 100644
--- a/tests/baselines/reference/reservedWords2.js
+++ b/tests/baselines/reference/reservedWords2.js
@@ -37,3 +37,4 @@ if ()
 (function () {
 })( || ( = {}));
 void {};
+exports.__esModule = true;
diff --git a/tests/baselines/reference/reuseInnerModuleMember.js b/tests/baselines/reference/reuseInnerModuleMember.js
index a8d254f56c1..c4d0a7745fa 100644
--- a/tests/baselines/reference/reuseInnerModuleMember.js
+++ b/tests/baselines/reference/reuseInnerModuleMember.js
@@ -17,6 +17,7 @@ module bar {
 
 //// [reuseInnerModuleMember_0.js]
 "use strict";
+exports.__esModule = true;
 //// [reuseInnerModuleMember_1.js]
 "use strict";
 ///<reference path='reuseInnerModuleMember_0.ts'/>
@@ -24,3 +25,4 @@ var bar;
 (function (bar) {
     var x;
 })(bar || (bar = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/scannerEnum1.js b/tests/baselines/reference/scannerEnum1.js
index 5d8b506e62f..17a0b66fde2 100644
--- a/tests/baselines/reference/scannerEnum1.js
+++ b/tests/baselines/reference/scannerEnum1.js
@@ -11,3 +11,4 @@ var CodeGenTarget;
     CodeGenTarget[CodeGenTarget["ES3"] = 0] = "ES3";
     CodeGenTarget[CodeGenTarget["ES5"] = 1] = "ES5";
 })(CodeGenTarget = exports.CodeGenTarget || (exports.CodeGenTarget = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/shebangBeforeReferences.js b/tests/baselines/reference/shebangBeforeReferences.js
index 6c3e1420c4a..67f0cbff690 100644
--- a/tests/baselines/reference/shebangBeforeReferences.js
+++ b/tests/baselines/reference/shebangBeforeReferences.js
@@ -20,3 +20,4 @@ use(x);
 "use strict";
 var test_1 = require("test");
 use(test_1.x);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/shorthand-property-es6-amd.js b/tests/baselines/reference/shorthand-property-es6-amd.js
index 383d5d99e9e..f1a26e46144 100644
--- a/tests/baselines/reference/shorthand-property-es6-amd.js
+++ b/tests/baselines/reference/shorthand-property-es6-amd.js
@@ -10,6 +10,7 @@ define(["require", "exports", "./foo"], function (require, exports, foo_1) {
     "use strict";
     const baz = 42;
     const bar = { foo: foo_1.foo, baz };
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
index be20fb287ab..339878ad4a5 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
+++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
@@ -26,3 +26,4 @@ const missingModule_1 = require("./missingModule");
 const test = { x: existingModule_1.x, foo: missingModule_1.foo };
 use(existingModule_1.x);
 use(missingModule_1.foo);
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js
index f77980caf2f..823f2bc44ec 100644
--- a/tests/baselines/reference/staticInstanceResolution3.js
+++ b/tests/baselines/reference/staticInstanceResolution3.js
@@ -29,3 +29,4 @@ exports.__esModule = true;
 ///<reference path='staticInstanceResolution3_0.ts'/>
 var WinJS = require("./staticInstanceResolution3_0");
 WinJS.Promise.timeout(10);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js
index 3ec32566658..da64e191cc8 100644
--- a/tests/baselines/reference/staticInstanceResolution5.js
+++ b/tests/baselines/reference/staticInstanceResolution5.js
@@ -37,4 +37,5 @@ define(["require", "exports"], function (require, exports) {
     var x = function (w1) { };
     var y = function (w2) { };
     function z(w3) { }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js
index 50ed1b4d755..409e6f67584 100644
--- a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js
+++ b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js
@@ -5,3 +5,4 @@ import public = require("1");
 
 //// [strictModeReservedWordInImportEqualDeclaration.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/topLevelAmbientModule.js b/tests/baselines/reference/topLevelAmbientModule.js
index da5885fafab..d496cfc4f85 100644
--- a/tests/baselines/reference/topLevelAmbientModule.js
+++ b/tests/baselines/reference/topLevelAmbientModule.js
@@ -17,3 +17,4 @@ var z = foo.x + 10;
 /// <reference path="foo_0.ts"/>
 var foo = require("foo");
 var z = foo.x + 10;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/topLevelFileModule.js b/tests/baselines/reference/topLevelFileModule.js
index b8ff23c13bd..cc97c8e2ffe 100644
--- a/tests/baselines/reference/topLevelFileModule.js
+++ b/tests/baselines/reference/topLevelFileModule.js
@@ -20,3 +20,4 @@ exports.__esModule = true;
 var foo = require("./vs/foo_0");
 var fum = require("./vs/fum");
 var z = foo.x + fum.y;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/topLevelFileModuleMissing.js b/tests/baselines/reference/topLevelFileModuleMissing.js
index edd090d49cc..0861d67389d 100644
--- a/tests/baselines/reference/topLevelFileModuleMissing.js
+++ b/tests/baselines/reference/topLevelFileModuleMissing.js
@@ -12,3 +12,4 @@ var z = foo.x + 10;
 "use strict";
 var foo = require("vs/foo");
 var z = foo.x + 10;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
index cb329014412..7ded4600300 100644
--- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
+++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
@@ -23,3 +23,4 @@ var z2 = foo.y() + 10; // Should resolve
 var foo = require("vs/foo_0");
 var z1 = foo.x + 10; // Should error, as declaration should win
 var z2 = foo.y() + 10; // Should resolve
+exports.__esModule = true;
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.js b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
index 7c3597ddc4b..6b3930271bb 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.js
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
@@ -99,3 +99,4 @@ function a() {
         });
     });
 }
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
index f1e36ae9b15..a4356e562e7 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
@@ -20,4 +20,5 @@ MyClass1 = __decorate([
     __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
 ], MyClass1);
 var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js
index 61a703e13bb..7e30c98d6e8 100644
--- a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
@@ -1,3 +1,4 @@
 "use strict";
 var x = 0;
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js
index 9d108d63313..f350f205d5a 100644
--- a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
@@ -1,4 +1,5 @@
 "use strict";
 a;
 b;
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js
index 9eadd1f2717..12a13d2aebf 100644
--- a/tests/baselines/reference/transpile/Generates module output.js	
+++ b/tests/baselines/reference/transpile/Generates module output.js	
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var x = 0;
+    exports.__esModule = true;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js
index 88d98628eee..0b3dcfad991 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
@@ -1,4 +1,5 @@
 "use strict";
 /// <reference path="file2.ts" />
 var x = 0;
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js
index 1ceb1bcd146..e9493d9d591 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js	
@@ -1,2 +1,3 @@
 "use strict";
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js
index 61a703e13bb..7e30c98d6e8 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
@@ -1,3 +1,4 @@
 "use strict";
 var x = 0;
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js
index 61a703e13bb..7e30c98d6e8 100644
--- a/tests/baselines/reference/transpile/No extra errors for file without extension.js	
+++ b/tests/baselines/reference/transpile/No extra errors for file without extension.js	
@@ -1,3 +1,4 @@
 "use strict";
 var x = 0;
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js
index a0dd948c9fc..4f5beb97d2c 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
@@ -1,5 +1,6 @@
 define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) {
     "use strict";
     use(SomeName_1.foo);
+    exports.__esModule = true;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js
index c2b337076ba..97215e27b98 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
@@ -10,5 +10,6 @@
     "use strict";
     var SomeName_1 = require("SomeOtherName");
     use(SomeName_1.foo);
+    exports.__esModule = true;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js
index 1ceb1bcd146..e9493d9d591 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js	
@@ -1,2 +1,3 @@
 "use strict";
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js
index 1ceb1bcd146..e9493d9d591 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js	
@@ -1,2 +1,3 @@
 "use strict";
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with lib values.js b/tests/baselines/reference/transpile/Support options with lib values.js
index 36c68f08b9f..1ac09c54ab8 100644
--- a/tests/baselines/reference/transpile/Support options with lib values.js	
+++ b/tests/baselines/reference/transpile/Support options with lib values.js	
@@ -1,3 +1,4 @@
 "use strict";
 var a = 10;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with types values.js b/tests/baselines/reference/transpile/Support options with types values.js
index 36c68f08b9f..1ac09c54ab8 100644
--- a/tests/baselines/reference/transpile/Support options with types values.js	
+++ b/tests/baselines/reference/transpile/Support options with types values.js	
@@ -1,3 +1,4 @@
 "use strict";
 var a = 10;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js
index 942449753b0..e109ef9014f 100644
--- a/tests/baselines/reference/transpile/Supports backslashes in file name.js	
+++ b/tests/baselines/reference/transpile/Supports backslashes in file name.js	
@@ -1,3 +1,4 @@
 "use strict";
 var x;
+exports.__esModule = true;
 //# sourceMappingURL=b.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowJs.js b/tests/baselines/reference/transpile/Supports setting allowJs.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting allowJs.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowJs.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.js b/tests/baselines/reference/transpile/Supports setting baseUrl.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting baseUrl.js	
+++ b/tests/baselines/reference/transpile/Supports setting baseUrl.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting charset.js b/tests/baselines/reference/transpile/Supports setting charset.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting charset.js	
+++ b/tests/baselines/reference/transpile/Supports setting charset.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declaration.js b/tests/baselines/reference/transpile/Supports setting declaration.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting declaration.js	
+++ b/tests/baselines/reference/transpile/Supports setting declaration.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declarationDir.js b/tests/baselines/reference/transpile/Supports setting declarationDir.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting declarationDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting declarationDir.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitBOM.js b/tests/baselines/reference/transpile/Supports setting emitBOM.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting emitBOM.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitBOM.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
+++ b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
+++ b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting isolatedModules.js b/tests/baselines/reference/transpile/Supports setting isolatedModules.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
+++ b/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsx.js b/tests/baselines/reference/transpile/Supports setting jsx.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting jsx.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsx.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsxFactory.js b/tests/baselines/reference/transpile/Supports setting jsxFactory.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting lib.js b/tests/baselines/reference/transpile/Supports setting lib.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting lib.js	
+++ b/tests/baselines/reference/transpile/Supports setting lib.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting locale.js b/tests/baselines/reference/transpile/Supports setting locale.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting locale.js	
+++ b/tests/baselines/reference/transpile/Supports setting locale.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting module.js b/tests/baselines/reference/transpile/Supports setting module.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting module.js	
+++ b/tests/baselines/reference/transpile/Supports setting module.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.js b/tests/baselines/reference/transpile/Supports setting moduleResolution.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
+++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting newLine.js b/tests/baselines/reference/transpile/Supports setting newLine.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting newLine.js	
+++ b/tests/baselines/reference/transpile/Supports setting newLine.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmit.js b/tests/baselines/reference/transpile/Supports setting noEmit.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmit.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmit.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
+++ b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
+++ b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js
index 8394371f908..5233b2a8e48 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
@@ -1,2 +1,3 @@
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noLib.js b/tests/baselines/reference/transpile/Supports setting noLib.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noLib.js	
+++ b/tests/baselines/reference/transpile/Supports setting noLib.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noResolve.js b/tests/baselines/reference/transpile/Supports setting noResolve.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting noResolve.js	
+++ b/tests/baselines/reference/transpile/Supports setting noResolve.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting out.js b/tests/baselines/reference/transpile/Supports setting out.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting out.js	
+++ b/tests/baselines/reference/transpile/Supports setting out.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outDir.js b/tests/baselines/reference/transpile/Supports setting outDir.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting outDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting outDir.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outFile.js b/tests/baselines/reference/transpile/Supports setting outFile.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting outFile.js	
+++ b/tests/baselines/reference/transpile/Supports setting outFile.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting paths.js b/tests/baselines/reference/transpile/Supports setting paths.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting paths.js	
+++ b/tests/baselines/reference/transpile/Supports setting paths.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
+++ b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting reactNamespace.js b/tests/baselines/reference/transpile/Supports setting reactNamespace.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
+++ b/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting removeComments.js b/tests/baselines/reference/transpile/Supports setting removeComments.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting removeComments.js	
+++ b/tests/baselines/reference/transpile/Supports setting removeComments.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDir.js b/tests/baselines/reference/transpile/Supports setting rootDir.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDir.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDirs.js b/tests/baselines/reference/transpile/Supports setting rootDirs.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDirs.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDirs.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
+++ b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting stripInternal.js b/tests/baselines/reference/transpile/Supports setting stripInternal.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting stripInternal.js	
+++ b/tests/baselines/reference/transpile/Supports setting stripInternal.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting typeRoots.js b/tests/baselines/reference/transpile/Supports setting typeRoots.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting typeRoots.js	
+++ b/tests/baselines/reference/transpile/Supports setting typeRoots.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting types.js b/tests/baselines/reference/transpile/Supports setting types.js
index 8d91090453b..5487d181a84 100644
--- a/tests/baselines/reference/transpile/Supports setting types.js	
+++ b/tests/baselines/reference/transpile/Supports setting types.js	
@@ -1,3 +1,4 @@
 "use strict";
 x;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports urls in file name.js b/tests/baselines/reference/transpile/Supports urls in file name.js
index 3923d3c9a41..071466dd65f 100644
--- a/tests/baselines/reference/transpile/Supports urls in file name.js	
+++ b/tests/baselines/reference/transpile/Supports urls in file name.js	
@@ -1,3 +1,4 @@
 "use strict";
 var x;
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js
index bab9c3c4443..2c2e8563d24 100644
--- a/tests/baselines/reference/transpile/Uses correct newLine character.js	
+++ b/tests/baselines/reference/transpile/Uses correct newLine character.js	
@@ -1,3 +1,4 @@
 "use strict";
 var x = 0;
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js
index c17099d84ba..54832b95928 100644
--- a/tests/baselines/reference/transpile/transpile .js files.js	
+++ b/tests/baselines/reference/transpile/transpile .js files.js	
@@ -1,3 +1,4 @@
 "use strict";
 var a = 10;
+exports.__esModule = true;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js
index baa27ee64ce..ff03528b3e5 100644
--- a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
+++ b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
@@ -1,3 +1,4 @@
 "use strict";
 var x = React.createElement("div", null);
+exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js
index f9488552e6d..210d92fa884 100644
--- a/tests/baselines/reference/tsxDefaultImports.js
+++ b/tests/baselines/reference/tsxDefaultImports.js
@@ -32,3 +32,4 @@ exports.__esModule = true;
 "use strict";
 var a_1 = require("./a");
 var a = a_1["default"].E.one;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxElementResolution17.js b/tests/baselines/reference/tsxElementResolution17.js
index 1f813b7e24b..9f56d05406e 100644
--- a/tests/baselines/reference/tsxElementResolution17.js
+++ b/tests/baselines/reference/tsxElementResolution17.js
@@ -32,4 +32,5 @@ import s2 = require('elements2');
 define(["require", "exports", "elements1"], function (require, exports, s1) {
     "use strict";
     <s1.MyElement />;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
index 95cb3555d30..921d831809d 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -36,4 +36,5 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "react", "./file1"], function (require, exports, React, file1_1) {
     "use strict";
     React.createElement(file1_1.MyClass, null);
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index 6c01a48af78..ae190baba4c 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -32,3 +32,4 @@ var mod_1 = require("mod");
 React.createElement(Foo, { handler: mod_1["default"] });
 // Should see mod_1['default'] in emit here
 React.createElement(Foo, __assign({}, mod_1["default"]));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxPreserveEmit1.js b/tests/baselines/reference/tsxPreserveEmit1.js
index feb314ee2e6..4e227238f6c 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.js
+++ b/tests/baselines/reference/tsxPreserveEmit1.js
@@ -45,4 +45,5 @@ define(["require", "exports", "react", "react-router"], function (require, expor
         // Should emit 'M.X' in both opening and closing tags
         var y = <M.X></M.X>;
     })(M || (M = {}));
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/tsxPreserveEmit3.js b/tests/baselines/reference/tsxPreserveEmit3.js
index 500b7d26c93..fdbe8cc2bb4 100644
--- a/tests/baselines/reference/tsxPreserveEmit3.js
+++ b/tests/baselines/reference/tsxPreserveEmit3.js
@@ -21,4 +21,5 @@ import {React} from "./test";
 //// [react-consumer.jsx]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js
index c3e58d0a0da..88d9d6aa95e 100644
--- a/tests/baselines/reference/tsxReactEmit5.js
+++ b/tests/baselines/reference/tsxReactEmit5.js
@@ -36,3 +36,4 @@ var test_1 = require("./test");
 //  and React.__spread
 var foo;
 var spread1 = test_1.React.createElement("div", __assign({ x: '' }, foo, { y: '' }));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
index a7507a15d8b..a67614a5522 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -82,3 +82,4 @@ var g = <BigGreeter key={100}/>;
 var h = <div ref={function (x) { return x.innerText; }}/>;
 // Error - property not on ontextually typed intrinsic ref callback parameter
 var i = <div ref={function (x) { return x.propertyNotOnHtmlDivElement; }}/>;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.js b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
index 02ddcc8a58e..6cc6e6638f2 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
@@ -34,4 +34,5 @@ define(["require", "exports", "react"], function (require, exports, React) {
         <MainMenu />
 	</div>);
     };
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.js b/tests/baselines/reference/tsxUnionTypeComponent1.js
index b73b1f35361..5c123cf634f 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -59,3 +59,4 @@ var MyButtonComponent = (function (_super) {
     return MyButtonComponent;
 }(React.Component));
 React.createElement(MyComponent, { AnyComponent: MyButtonComponent });
+exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.js b/tests/baselines/reference/tsxUnionTypeComponent2.js
index 3cc6f44c699..725f3041855 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.js
@@ -16,3 +16,4 @@ const X: Invalid1 = 1;
 var React = require("react");
 var X = 1;
 React.createElement(X, null);
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.js b/tests/baselines/reference/typeAliasDeclarationEmit.js
index 1f72e1d1b00..cd0e3af0507 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.js
@@ -7,6 +7,7 @@ export type CallbackArray<T extends callback> = () => T;
 //// [typeAliasDeclarationEmit.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.js b/tests/baselines/reference/typeAliasDeclarationEmit2.js
index b94eb56a2a2..dcf5e7898e7 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit2.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.js
@@ -5,6 +5,7 @@ export type A<a> = { value: a };
 //// [typeAliasDeclarationEmit2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
index 42ee2407403..82336a2e6b8 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
@@ -23,6 +23,7 @@ exports.__esModule = true;
 "use strict";
 var f = require("./file1");
 f.foo();
+exports.__esModule = true;
 
 
 //// [file1.d.ts]
diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js
index 87e0075a942..0520bf5ac9b 100644
--- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js
+++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js
@@ -37,4 +37,5 @@ define(["require", "exports"], function (require, exports) {
     i = a; // error
     a2 = i2; // no error
     i2 = a2; // no error
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/typeReferenceDirectives10.js b/tests/baselines/reference/typeReferenceDirectives10.js
index e4253bb3a58..5d56ef0cf8f 100644
--- a/tests/baselines/reference/typeReferenceDirectives10.js
+++ b/tests/baselines/reference/typeReferenceDirectives10.js
@@ -17,6 +17,7 @@ export interface A {
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives13.js b/tests/baselines/reference/typeReferenceDirectives13.js
index 9fecdd47f77..c776a507de4 100644
--- a/tests/baselines/reference/typeReferenceDirectives13.js
+++ b/tests/baselines/reference/typeReferenceDirectives13.js
@@ -17,6 +17,7 @@ export interface A {
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives5.js b/tests/baselines/reference/typeReferenceDirectives5.js
index 41448cbeab2..d663ded713a 100644
--- a/tests/baselines/reference/typeReferenceDirectives5.js
+++ b/tests/baselines/reference/typeReferenceDirectives5.js
@@ -16,6 +16,7 @@ export interface A {
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives9.js b/tests/baselines/reference/typeReferenceDirectives9.js
index c4de6646675..f624eb6e488 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.js
+++ b/tests/baselines/reference/typeReferenceDirectives9.js
@@ -47,6 +47,7 @@ exports.__esModule = true;
 "use strict";
 var main_1 = require("./main");
 main_1.Cls.prototype.foo = function () { return undefined; };
+exports.__esModule = true;
 //// [mod2.js]
 "use strict";
 var main_1 = require("./main");
diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js
index cc2bd589bb0..184abcf3f87 100644
--- a/tests/baselines/reference/typeResolution.js
+++ b/tests/baselines/reference/typeResolution.js
@@ -274,5 +274,6 @@ define(["require", "exports"], function (require, exports) {
             SubModule3.ClassA = ClassA;
         })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {}));
     })(TopLevelModule2 || (TopLevelModule2 = {}));
+    exports.__esModule = true;
 });
 //# sourceMappingURL=typeResolution.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt
index 8cfb638991c..598d7f17ebe 100644
--- a/tests/baselines/reference/typeResolution.sourcemap.txt
+++ b/tests/baselines/reference/typeResolution.sourcemap.txt
@@ -2969,5 +2969,6 @@ sourceFile:typeResolution.ts
 6 >Emitted(163, 43) Source(102, 23) + SourceIndex(0)
 7 >Emitted(163, 51) Source(108, 2) + SourceIndex(0)
 ---
+>>>    exports.__esModule = true;
 >>>});
 >>>//# sourceMappingURL=typeResolution.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
index a2542ca9cc0..4e4d3810ed2 100644
--- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
@@ -29,3 +29,4 @@ var xyz_1 = require("xyz");
 var pdq_1 = require("pdq");
 var abc_1 = require("abc");
 xyz_1.x + pdq_1.y + abc_1.z;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
index 9e93755d1f0..d6e50572187 100644
--- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
@@ -15,3 +15,4 @@ x;
 "use strict";
 var xyz_1 = require("xyz");
 xyz_1.x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeUsedAsValueError2.js b/tests/baselines/reference/typeUsedAsValueError2.js
index c3bd736cbb7..fc247b6443c 100644
--- a/tests/baselines/reference/typeUsedAsValueError2.js
+++ b/tests/baselines/reference/typeUsedAsValueError2.js
@@ -24,14 +24,17 @@ HelloNamespace.world;
 //// [helloInterface.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [helloNamespace.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
 //// [world.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
     HelloInterface.world;
     HelloNamespace.world;
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js
index 621ec74ebc4..7a11fae8f8f 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.js
+++ b/tests/baselines/reference/typeofAmbientExternalModules.js
@@ -45,3 +45,4 @@ var y1 = ext;
 y1 = exp;
 var y2 = exp;
 y2 = ext;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js
index 9ec889e0676..f28ff7e1033 100644
--- a/tests/baselines/reference/typeofExternalModules.js
+++ b/tests/baselines/reference/typeofExternalModules.js
@@ -41,3 +41,4 @@ var y1 = ext;
 y1 = exp;
 var y2 = exp;
 y2 = ext;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
index 1424f9343aa..c321e548181 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
@@ -22,9 +22,11 @@ var y: {M2: Object} = foo0;
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
 var foo0 = require("./foo_0");
 // Per 11.2.3, foo_0 should still be "instantiated", albeit with no members
 var x = {};
 var y = foo0;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js
index e466124a48d..c935d8b6728 100644
--- a/tests/baselines/reference/typingsLookup4.js
+++ b/tests/baselines/reference/typingsLookup4.js
@@ -35,3 +35,4 @@ var jquery_1 = require("jquery");
 var kquery_1 = require("kquery");
 var lquery_1 = require("lquery");
 jquery_1.j + kquery_1.k + lquery_1.l;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/typingsLookupAmd.js b/tests/baselines/reference/typingsLookupAmd.js
index 1e99644d489..2dc19872ad4 100644
--- a/tests/baselines/reference/typingsLookupAmd.js
+++ b/tests/baselines/reference/typingsLookupAmd.js
@@ -15,4 +15,5 @@ import {B} from "b";
 //// [foo.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/umd-augmentation-1.js b/tests/baselines/reference/umd-augmentation-1.js
index ee4c143486c..5665f5b2024 100644
--- a/tests/baselines/reference/umd-augmentation-1.js
+++ b/tests/baselines/reference/umd-augmentation-1.js
@@ -48,3 +48,4 @@ var magnitude = m.getLength(v);
 var p = v.translate(5, 5);
 p = v.reverse();
 var t = p.x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/umd-augmentation-3.js b/tests/baselines/reference/umd-augmentation-3.js
index e9abf724881..4cdd28a9552 100644
--- a/tests/baselines/reference/umd-augmentation-3.js
+++ b/tests/baselines/reference/umd-augmentation-3.js
@@ -54,3 +54,4 @@ var magnitude = m.getLength(v);
 var p = v.translate(5, 5);
 p = v.reverse();
 var t = p.x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/umd3.js b/tests/baselines/reference/umd3.js
index 03e15be2ecf..563b73ec508 100644
--- a/tests/baselines/reference/umd3.js
+++ b/tests/baselines/reference/umd3.js
@@ -20,3 +20,4 @@ var Foo = require("./foo");
 Foo.fn();
 var x;
 var y = x.n;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/umd4.js b/tests/baselines/reference/umd4.js
index d06fc3aba93..dcd720b866a 100644
--- a/tests/baselines/reference/umd4.js
+++ b/tests/baselines/reference/umd4.js
@@ -20,3 +20,4 @@ var Bar = require("./foo");
 Bar.fn();
 var x;
 var y = x.n;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js
index 95626132f77..cd99ace83b3 100644
--- a/tests/baselines/reference/umd5.js
+++ b/tests/baselines/reference/umd5.js
@@ -24,3 +24,4 @@ var x;
 var y = x.n;
 // should error
 var z = Foo;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/umd8.js b/tests/baselines/reference/umd8.js
index e76b3902156..0b9109873be 100644
--- a/tests/baselines/reference/umd8.js
+++ b/tests/baselines/reference/umd8.js
@@ -27,3 +27,4 @@ var y; // OK in type position
 y.foo();
 var z; // OK in ns position
 var x = Foo; // Not OK in value position
+exports.__esModule = true;
diff --git a/tests/baselines/reference/umdDependencyComment2.js b/tests/baselines/reference/umdDependencyComment2.js
index 4e784d87fa3..1039bbac500 100644
--- a/tests/baselines/reference/umdDependencyComment2.js
+++ b/tests/baselines/reference/umdDependencyComment2.js
@@ -19,4 +19,5 @@ m1.f();
     "use strict";
     var m1 = require("m2");
     m1.f();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/umdDependencyCommentName1.js b/tests/baselines/reference/umdDependencyCommentName1.js
index 45cae25192a..2f7326d8f81 100644
--- a/tests/baselines/reference/umdDependencyCommentName1.js
+++ b/tests/baselines/reference/umdDependencyCommentName1.js
@@ -19,4 +19,5 @@ m1.f();
     "use strict";
     var m1 = require("m2");
     m1.f();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/umdDependencyCommentName2.js b/tests/baselines/reference/umdDependencyCommentName2.js
index e85d5b99b14..9814a1d5e38 100644
--- a/tests/baselines/reference/umdDependencyCommentName2.js
+++ b/tests/baselines/reference/umdDependencyCommentName2.js
@@ -23,4 +23,5 @@ m1.f();
     "use strict";
     var m1 = require("m2");
     m1.f();
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/umdGlobalConflict.js b/tests/baselines/reference/umdGlobalConflict.js
index e8a820e2333..114bdd643e4 100644
--- a/tests/baselines/reference/umdGlobalConflict.js
+++ b/tests/baselines/reference/umdGlobalConflict.js
@@ -18,6 +18,7 @@ const p: string = Alpha.x;
 
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 //// [global.js]
 // Should be OK, first in wins
 var p = Alpha.x;
diff --git a/tests/baselines/reference/unclosedExportClause02.js b/tests/baselines/reference/unclosedExportClause02.js
index 680ab9be46d..1ff1f585768 100644
--- a/tests/baselines/reference/unclosedExportClause02.js
+++ b/tests/baselines/reference/unclosedExportClause02.js
@@ -27,12 +27,16 @@ exports.__esModule = true;
 //// [t2.js]
 "use strict";
 "./t1";
+exports.__esModule = true;
 //// [t3.js]
 "use strict";
 "./t1";
+exports.__esModule = true;
 //// [t4.js]
 "use strict";
 "./t1";
+exports.__esModule = true;
 //// [t5.js]
 "use strict";
 "./t1";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js
index 88f5e3ab352..b8bec8ceb13 100644
--- a/tests/baselines/reference/undeclaredModuleError.js
+++ b/tests/baselines/reference/undeclaredModuleError.js
@@ -35,4 +35,5 @@ define(["require", "exports", "fs"], function (require, exports, fs) {
             });
         });
     }
+    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/untypedModuleImport.js b/tests/baselines/reference/untypedModuleImport.js
index e3548856411..7f088859221 100644
--- a/tests/baselines/reference/untypedModuleImport.js
+++ b/tests/baselines/reference/untypedModuleImport.js
@@ -25,13 +25,16 @@ foo(bar());
 "use strict";
 var foo = require("foo");
 foo.bar();
+exports.__esModule = true;
 //// [b.js]
 "use strict";
 var foo = require("foo");
 foo();
+exports.__esModule = true;
 //// [c.js]
 "use strict";
 var foo_1 = require("foo");
 require("./a");
 require("./b");
 foo_1["default"](foo_1.bar());
+exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_allowJs.js b/tests/baselines/reference/untypedModuleImport_allowJs.js
index 8ca5115a386..3948c748286 100644
--- a/tests/baselines/reference/untypedModuleImport_allowJs.js
+++ b/tests/baselines/reference/untypedModuleImport_allowJs.js
@@ -14,3 +14,4 @@ foo.bar();
 "use strict";
 var foo_1 = require("foo");
 foo_1["default"].bar();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny.js b/tests/baselines/reference/untypedModuleImport_noImplicitAny.js
index ab1e1940e36..86e2ae3c175 100644
--- a/tests/baselines/reference/untypedModuleImport_noImplicitAny.js
+++ b/tests/baselines/reference/untypedModuleImport_noImplicitAny.js
@@ -11,3 +11,4 @@ import * as foo from "foo";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_noLocalImports.js b/tests/baselines/reference/untypedModuleImport_noLocalImports.js
index 8fa67a0857f..6328101a2ee 100644
--- a/tests/baselines/reference/untypedModuleImport_noLocalImports.js
+++ b/tests/baselines/reference/untypedModuleImport_noLocalImports.js
@@ -11,3 +11,4 @@ import * as foo from "./foo";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.js b/tests/baselines/reference/untypedModuleImport_vsAmbient.js
index 080cd443375..6968f603061 100644
--- a/tests/baselines/reference/untypedModuleImport_vsAmbient.js
+++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.js
@@ -21,3 +21,4 @@ x;
 /// <reference path="./declarations.d.ts" />
 var foo_1 = require("foo");
 foo_1.x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation.js b/tests/baselines/reference/untypedModuleImport_withAugmentation.js
index 17eda95aa8a..e8fc892f4a0 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation.js
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation.js
@@ -17,3 +17,4 @@ x;
 "use strict";
 var foo_1 = require("foo");
 foo_1.x;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation2.js b/tests/baselines/reference/untypedModuleImport_withAugmentation2.js
index f9fa7443224..6a01db5dd25 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation2.js
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation2.js
@@ -17,3 +17,4 @@ import { } from "augmenter";
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js
index ef1d5018892..9cffa5547fe 100644
--- a/tests/baselines/reference/unusedImportDeclaration.js
+++ b/tests/baselines/reference/unusedImportDeclaration.js
@@ -29,6 +29,7 @@ var thingy = {
     me: "A"
 };
 foo("IN " + thingy.me + "!");
+exports.__esModule = true;
 
 
 //// [unusedImportDeclaration_testerB.d.ts]
diff --git a/tests/baselines/reference/unusedImports1.js b/tests/baselines/reference/unusedImports1.js
index 33d4ab267f7..910070b8955 100644
--- a/tests/baselines/reference/unusedImports1.js
+++ b/tests/baselines/reference/unusedImports1.js
@@ -20,3 +20,4 @@ exports.Calculator = Calculator;
 exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js
index 2597aed8670..be28b2f8d40 100644
--- a/tests/baselines/reference/unusedImports11.js
+++ b/tests/baselines/reference/unusedImports11.js
@@ -39,3 +39,4 @@ new b_2["default"]();
 new b_2.Member();
 new ns.Member();
 new r.Member();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports12.js b/tests/baselines/reference/unusedImports12.js
index 9ec3e8aa17a..90e6446d48e 100644
--- a/tests/baselines/reference/unusedImports12.js
+++ b/tests/baselines/reference/unusedImports12.js
@@ -25,3 +25,4 @@ exports["default"] = Member;
 exports.__esModule = true;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports2.js b/tests/baselines/reference/unusedImports2.js
index a1477dbc323..d498a242a57 100644
--- a/tests/baselines/reference/unusedImports2.js
+++ b/tests/baselines/reference/unusedImports2.js
@@ -35,3 +35,4 @@ exports.__esModule = true;
 var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports3.js b/tests/baselines/reference/unusedImports3.js
index 7516825aa50..a3ab3117b67 100644
--- a/tests/baselines/reference/unusedImports3.js
+++ b/tests/baselines/reference/unusedImports3.js
@@ -41,3 +41,4 @@ exports.__esModule = true;
 var file1_1 = require("./file1");
 file1_1.test();
 file1_1.test2();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports4.js b/tests/baselines/reference/unusedImports4.js
index 350fb3301ac..53e48513bc9 100644
--- a/tests/baselines/reference/unusedImports4.js
+++ b/tests/baselines/reference/unusedImports4.js
@@ -43,3 +43,4 @@ var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
 file1_1.test2();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports5.js b/tests/baselines/reference/unusedImports5.js
index 3861d2a9cff..5856638cd09 100644
--- a/tests/baselines/reference/unusedImports5.js
+++ b/tests/baselines/reference/unusedImports5.js
@@ -43,3 +43,4 @@ var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
 file1_1.test();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports6.js b/tests/baselines/reference/unusedImports6.js
index 61d17fdf17f..861862fe7a6 100644
--- a/tests/baselines/reference/unusedImports6.js
+++ b/tests/baselines/reference/unusedImports6.js
@@ -39,3 +39,4 @@ exports["default"] = test2;
 exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports7.js b/tests/baselines/reference/unusedImports7.js
index 2bee99f3ba4..519511fb9e1 100644
--- a/tests/baselines/reference/unusedImports7.js
+++ b/tests/baselines/reference/unusedImports7.js
@@ -37,3 +37,4 @@ exports["default"] = test2;
 exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports8.js b/tests/baselines/reference/unusedImports8.js
index b47ae034e37..aa2aa248ff7 100644
--- a/tests/baselines/reference/unusedImports8.js
+++ b/tests/baselines/reference/unusedImports8.js
@@ -43,3 +43,4 @@ var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
 file1_1.test();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports9.js b/tests/baselines/reference/unusedImports9.js
index 8b83697fa55..f6fdc1b9e6f 100644
--- a/tests/baselines/reference/unusedImports9.js
+++ b/tests/baselines/reference/unusedImports9.js
@@ -35,3 +35,4 @@ exports.test2 = test2;
 exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParameters.js b/tests/baselines/reference/unusedLocalsAndParameters.js
index 64ff373db4a..e538c9754b4 100644
--- a/tests/baselines/reference/unusedLocalsAndParameters.js
+++ b/tests/baselines/reference/unusedLocalsAndParameters.js
@@ -166,3 +166,4 @@ var N;
 (function (N) {
     var x;
 })(N || (N = {}));
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
index d6e2326842a..b3088ac69c7 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
@@ -323,3 +323,4 @@ var N;
     });
 })(N || (N = {}));
 N;
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js
index b854278a3e3..20706997d5b 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js
@@ -33,3 +33,4 @@ var x;
 x();
 var y;
 y[0]();
+exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js
index 7da916370ca..7ab951c984d 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js
@@ -16,3 +16,4 @@ export {}
 function foo() {
     foo();
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
index c80d65158dc..dcc6a1364c2 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
@@ -27,11 +27,14 @@ function run(configuration: commands.IConfiguration) {
 
 //// [visibilityOfCrossModuleTypeUsage_server.js]
 "use strict";
+exports.__esModule = true;
 //// [visibilityOfCrossModuleTypeUsage_commands.js]
 //visibilityOfCrossModuleTypeUsage
 "use strict";
+exports.__esModule = true;
 //// [visibilityOfCrossModuleTypeUsage_fs.js]
 "use strict";
 function run(configuration) {
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
index 5e5af215fb5..204482e7548 100644
--- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
+++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
@@ -25,3 +25,4 @@ var fs = require("./voidAsNonAmbiguousReturnType_0");
 function main() {
     fs.mkdirSync('test'); // should not error - return types are the same
 }
+exports.__esModule = true;
diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js
index d3fefee6c41..feb48648252 100644
--- a/tests/baselines/reference/withImportDecl.js
+++ b/tests/baselines/reference/withImportDecl.js
@@ -81,6 +81,7 @@ define(["require", "exports", "withImportDecl_0"], function (require, exports, m
     })(m1 || (m1 = {}));
     var b = new m3.A();
     b.foo;
+    exports.__esModule = true;
 });
 
 

From 229ba436647d38bef70c556828a9613f9388eb1a Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Tue, 7 Feb 2017 14:23:31 -0800
Subject: [PATCH 105/127] Allow export "__esModule" in system

---
 src/compiler/checker.ts                       |  4 ++--
 tests/baselines/reference/es5-system2.js      | 16 ++++++++++++++++
 tests/baselines/reference/es5-system2.symbols |  5 +++++
 tests/baselines/reference/es5-system2.types   |  6 ++++++
 tests/cases/compiler/es5-system2.ts           |  6 ++++++
 5 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/es5-system2.js
 create mode 100644 tests/baselines/reference/es5-system2.symbols
 create mode 100644 tests/baselines/reference/es5-system2.types
 create mode 100644 tests/cases/compiler/es5-system2.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 43a9590ec14..57f81fce8ea 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1,4 +1,4 @@
-/// <reference path="moduleNameResolver.ts"/>
+/// <reference path="moduleNameResolver.ts"/>
 /// <reference path="binder.ts"/>
 
 /* @internal */
@@ -22010,7 +22010,7 @@ namespace ts {
                 }
             }
 
-            if (compilerOptions.module !== ModuleKind.ES2015 && !compilerOptions.noEmit &&
+            if (compilerOptions.module !== ModuleKind.ES2015 && compilerOptions.module !== ModuleKind.System && !compilerOptions.noEmit &&
                 !isInAmbientContext(node.parent.parent) && hasModifier(node.parent.parent, ModifierFlags.Export)) {
                 checkESModuleMarker(node.name);
             }
diff --git a/tests/baselines/reference/es5-system2.js b/tests/baselines/reference/es5-system2.js
new file mode 100644
index 00000000000..39b5e5daca2
--- /dev/null
+++ b/tests/baselines/reference/es5-system2.js
@@ -0,0 +1,16 @@
+//// [es5-system2.ts]
+
+export var __esModule = 1;
+
+//// [es5-system2.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var __esModule;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("__esModule", __esModule = 1);
+        }
+    };
+});
diff --git a/tests/baselines/reference/es5-system2.symbols b/tests/baselines/reference/es5-system2.symbols
new file mode 100644
index 00000000000..2c8779b730b
--- /dev/null
+++ b/tests/baselines/reference/es5-system2.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/es5-system2.ts ===
+
+export var __esModule = 1;
+>__esModule : Symbol(__esModule, Decl(es5-system2.ts, 1, 10))
+
diff --git a/tests/baselines/reference/es5-system2.types b/tests/baselines/reference/es5-system2.types
new file mode 100644
index 00000000000..e67258a8732
--- /dev/null
+++ b/tests/baselines/reference/es5-system2.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/es5-system2.ts ===
+
+export var __esModule = 1;
+>__esModule : number
+>1 : 1
+
diff --git a/tests/cases/compiler/es5-system2.ts b/tests/cases/compiler/es5-system2.ts
new file mode 100644
index 00000000000..0eb77f8b9b9
--- /dev/null
+++ b/tests/cases/compiler/es5-system2.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: system
+
+export var __esModule = 1;
\ No newline at end of file

From 915ffab8cc2224ebd7e0c8096fa979fb168de2f5 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 7 Feb 2017 14:47:07 -0800
Subject: [PATCH 106/127] disable fs watcher for UNC paths on Windows (#13937)

---
 src/compiler/sys.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 71ff4485343..8ac797507b1 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -485,7 +485,10 @@ namespace ts {
                     // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     let options: any;
-                    if (!directoryExists(directoryName)) {
+                    if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
+                        // do nothing if either 
+                        // - target folder does not exist
+                        // - this is UNC path on Windows (https://github.com/Microsoft/TypeScript/issues/13874)
                         return noOpFileWatcher;
                     }
 
@@ -509,6 +512,10 @@ namespace ts {
                             };
                         }
                     );
+
+                    function isUNCPath(s: string): boolean {
+                        return s.length > 2 && s.charCodeAt(0) === CharacterCodes.slash && s.charCodeAt(1) === CharacterCodes.slash;
+                    }
                 },
                 resolvePath: function(path: string): string {
                     return _path.resolve(path);

From 0a1d75dbd1718216ef7bf2606bea2b54955cd1bf Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 7 Feb 2017 18:14:23 -0800
Subject: [PATCH 107/127] use tsconfig.json files in jake (#13869)

---
 Jakefile.js | 201 +++++++++-------------------------------------------
 1 file changed, 32 insertions(+), 169 deletions(-)

diff --git a/Jakefile.js b/Jakefile.js
index 0b3a26dbb77..f422a995725 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -6,6 +6,8 @@ var path = require("path");
 var child_process = require("child_process");
 var fold = require("travis-fold");
 var runTestsInParallel = require("./scripts/mocha-parallel").runTestsInParallel;
+var ts = require("./lib/typescript");
+
 
 // Variables
 var compilerDirectory = "src/compiler/";
@@ -34,6 +36,25 @@ if (process.env.path !== undefined) {
     process.env.PATH = nodeModulesPathPrefix + process.env.PATH;
 }
 
+function filesFromConfig(configPath) {
+    console.log(configPath);
+    var configText = fs.readFileSync(configPath).toString();
+    var config = ts.parseConfigFileTextToJson(configPath, configText, /*stripComments*/ true);
+    if (config.error) {
+        throw new Error(diagnosticsToString([config.error]));
+    }
+    const configFileContent = ts.parseJsonConfigFileContent(config.config, ts.sys, path.dirname(configPath));
+    if (configFileContent.errors && configFileContent.errors.length) {
+        throw new Error(diagnosticsToString(configFileContent.errors));
+    }
+
+    return configFileContent.fileNames;
+
+    function diagnosticsToString(s) {
+        return s.map(function(e) { return ts.flattenDiagnosticMessageText(e.messageText, ts.sys.newLine); }).join(ts.sys.newLine);
+    }
+}
+
 function toNs(diff) {
     return diff[0] * 1e9 + diff[1];
 }
@@ -56,173 +77,12 @@ function measure(marker) {
     console.log("travis_time:end:" + marker.id + ":start=" + toNs(marker.stamp) + ",finish=" + toNs(total) + ",duration=" + toNs(diff) + "\r");
 }
 
-var compilerSources = [
-    "core.ts",
-    "performance.ts",
-    "sys.ts",
-    "types.ts",
-    "scanner.ts",
-    "parser.ts",
-    "utilities.ts",
-    "binder.ts",
-    "checker.ts",
-    "factory.ts",
-    "visitor.ts",
-    "transformers/destructuring.ts",
-    "transformers/ts.ts",
-    "transformers/jsx.ts",
-    "transformers/esnext.ts",
-    "transformers/es2017.ts",
-    "transformers/es2016.ts",
-    "transformers/es2015.ts",
-    "transformers/generators.ts",
-    "transformers/es5.ts",
-    "transformers/module/es2015.ts",
-    "transformers/module/system.ts",
-    "transformers/module/module.ts",
-    "transformer.ts",
-    "sourcemap.ts",
-    "comments.ts",
-    "declarationEmitter.ts",
-    "emitter.ts",
-    "program.ts",
-    "commandLineParser.ts",
-    "tsc.ts",
-    "diagnosticInformationMap.generated.ts"
-].map(function (f) {
-    return path.join(compilerDirectory, f);
-});
-
-var servicesSources = [
-    "core.ts",
-    "performance.ts",
-    "sys.ts",
-    "types.ts",
-    "scanner.ts",
-    "parser.ts",
-    "utilities.ts",
-    "binder.ts",
-    "checker.ts",
-    "factory.ts",
-    "visitor.ts",
-    "transformers/destructuring.ts",
-    "transformers/ts.ts",
-    "transformers/jsx.ts",
-    "transformers/esnext.ts",
-    "transformers/es2017.ts",
-    "transformers/es2016.ts",
-    "transformers/es2015.ts",
-    "transformers/generators.ts",
-    "transformers/es5.ts",
-    "transformers/module/es2015.ts",
-    "transformers/module/system.ts",
-    "transformers/module/module.ts",
-    "transformer.ts",
-    "sourcemap.ts",
-    "comments.ts",
-    "declarationEmitter.ts",
-    "emitter.ts",
-    "program.ts",
-    "commandLineParser.ts",
-    "diagnosticInformationMap.generated.ts"
-].map(function (f) {
-    return path.join(compilerDirectory, f);
-}).concat([
-    "types.ts",
-    "utilities.ts",
-    "breakpoints.ts",
-    "classifier.ts",
-    "completions.ts",
-    "documentHighlights.ts",
-    "documentRegistry.ts",
-    "findAllReferences.ts",
-    "goToDefinition.ts",
-    "goToImplementation.ts",
-    "jsDoc.ts",
-    "jsTyping.ts",
-    "navigateTo.ts",
-    "navigationBar.ts",
-    "outliningElementsCollector.ts",
-    "patternMatcher.ts",
-    "preProcess.ts",
-    "rename.ts",
-    "services.ts",
-    "shims.ts",
-    "signatureHelp.ts",
-    "symbolDisplay.ts",
-    "transpile.ts",
-    // Formatting
-    "formatting/formatting.ts",
-    "formatting/formattingContext.ts",
-    "formatting/formattingRequestKind.ts",
-    "formatting/formattingScanner.ts",
-    "formatting/references.ts",
-    "formatting/rule.ts",
-    "formatting/ruleAction.ts",
-    "formatting/ruleDescriptor.ts",
-    "formatting/ruleFlag.ts",
-    "formatting/ruleOperation.ts",
-    "formatting/ruleOperationContext.ts",
-    "formatting/rules.ts",
-    "formatting/rulesMap.ts",
-    "formatting/rulesProvider.ts",
-    "formatting/smartIndenter.ts",
-    "formatting/tokenRange.ts",
-    // CodeFixes
-    "codeFixProvider.ts",
-    "codefixes/fixes.ts",
-    "codefixes/fixExtendsInterfaceBecomesImplements.ts",
-    "codefixes/fixClassIncorrectlyImplementsInterface.ts",
-    "codefixes/fixClassDoesntImplementInheritedAbstractMember.ts",
-    "codefixes/fixClassSuperMustPrecedeThisAccess.ts",
-    "codefixes/fixConstructorForDerivedNeedSuperCall.ts",
-    "codefixes/helpers.ts",
-    "codefixes/importFixes.ts",
-    "codefixes/unusedIdentifierFixes.ts"
-].map(function (f) {
-    return path.join(servicesDirectory, f);
-}));
-
-var baseServerCoreSources = [
-	"builder.ts",
-    "editorServices.ts",
-    "lsHost.ts",
-    "project.ts",
-    "protocol.ts",
-    "scriptInfo.ts",
-    "scriptVersionCache.ts",
-    "session.ts",
-    "shared.ts",
-    "types.ts",
-    "typingsCache.ts",
-    "utilities.ts",
-].map(function (f) {
-    return path.join(serverDirectory, f);
-});
-
-var serverCoreSources = [
-    "server.ts"
-].map(function (f) {
-    return path.join(serverDirectory, f);
-}).concat(baseServerCoreSources);
-
-var cancellationTokenSources = [
-    "cancellationToken.ts"
-].map(function (f) {
-    return path.join(cancellationTokenDirectory, f);
-});
-
-var typingsInstallerSources = [
-    "../types.ts",
-    "../shared.ts",
-    "typingsInstaller.ts",
-    "nodeTypingsInstaller.ts"
-].map(function (f) {
-    return path.join(typingsInstallerDirectory, f);
-});
-
-var serverSources = serverCoreSources.concat(servicesSources);
-var languageServiceLibrarySources = baseServerCoreSources.concat(servicesSources);
+var compilerSources = filesFromConfig("./src/compiler/tsconfig.json");
+var servicesSources = filesFromConfig("./src/services/tsconfig.json");
+var cancellationTokenSources = filesFromConfig(path.join(serverDirectory, "cancellationToken/tsconfig.json"));
+var typingsInstallerSources = filesFromConfig(path.join(serverDirectory, "typingsInstaller/tsconfig.json"));
+var serverSources = filesFromConfig(path.join(serverDirectory, "tsconfig.json"))
+var languageServiceLibrarySources = filesFromConfig(path.join(serverDirectory, "tsconfig.library.json"));
 
 var harnessCoreSources = [
     "harness.ts",
@@ -1230,13 +1090,16 @@ var lintTargets = compilerSources
     .concat(harnessSources)
     // Other harness sources
     .concat(["instrumenter.ts"].map(function (f) { return path.join(harnessDirectory, f) }))
-    .concat(serverCoreSources)
+    .concat(serverSources)
     .concat(tslintRulesFiles)
     .concat(servicesSources)
     .concat(typingsInstallerSources)
     .concat(cancellationTokenSources)
     .concat(["Gulpfile.ts"])
-    .concat([nodeServerInFile, perftscPath, "tests/perfsys.ts", webhostPath]);
+    .concat([nodeServerInFile, perftscPath, "tests/perfsys.ts", webhostPath])
+    .map(function (p) { return path.resolve(p) });
+// keep only unique items
+lintTargets = Array.from(new Set(lintTargets));
 
 function sendNextFile(files, child, callback, failures) {
     var file = files.pop();

From f4080a4f9e310fbbe24e5d2813bfebc1c362b85b Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 7 Feb 2017 18:23:22 -0800
Subject: [PATCH 108/127] Add test for #13925

---
 .../reference/capturedLetConstInLoop13.js     | 52 ++++++++++++++++
 .../capturedLetConstInLoop13.symbols          | 48 +++++++++++++++
 .../reference/capturedLetConstInLoop13.types  | 59 +++++++++++++++++++
 .../compiler/capturedLetConstInLoop13.ts      | 22 +++++++
 4 files changed, 181 insertions(+)
 create mode 100644 tests/baselines/reference/capturedLetConstInLoop13.js
 create mode 100644 tests/baselines/reference/capturedLetConstInLoop13.symbols
 create mode 100644 tests/baselines/reference/capturedLetConstInLoop13.types
 create mode 100644 tests/cases/compiler/capturedLetConstInLoop13.ts

diff --git a/tests/baselines/reference/capturedLetConstInLoop13.js b/tests/baselines/reference/capturedLetConstInLoop13.js
new file mode 100644
index 00000000000..a2e0921ab1d
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop13.js
@@ -0,0 +1,52 @@
+//// [capturedLetConstInLoop13.ts]
+class Main {
+
+    constructor() {
+        this.register("a", "b", "c");
+    }
+
+    private register(...names: string[]): void {
+        for (let name of names) {
+
+            this.bar({
+                [name + ".a"]: () => { this.foo(name); },
+            });
+        }
+    }
+
+    private bar(a: any): void { }
+
+    private foo(name: string): void { }
+
+}
+
+new Main();
+
+//// [capturedLetConstInLoop13.js]
+var Main = (function () {
+    function Main() {
+        this.register("a", "b", "c");
+    }
+    Main.prototype.register = function () {
+        var _this = this;
+        var names = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            names[_i] = arguments[_i];
+        }
+        var _loop_1 = function (name) {
+            this_1.bar((_a = {},
+                _a[name + ".a"] = function () { _this.foo(name); },
+                _a));
+            var _a;
+        };
+        var this_1 = this;
+        for (var _a = 0, names_1 = names; _a < names_1.length; _a++) {
+            var name = names_1[_a];
+            _loop_1(name);
+        }
+    };
+    Main.prototype.bar = function (a) { };
+    Main.prototype.foo = function (name) { };
+    return Main;
+}());
+new Main();
diff --git a/tests/baselines/reference/capturedLetConstInLoop13.symbols b/tests/baselines/reference/capturedLetConstInLoop13.symbols
new file mode 100644
index 00000000000..c7a824d26fa
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop13.symbols
@@ -0,0 +1,48 @@
+=== tests/cases/compiler/capturedLetConstInLoop13.ts ===
+class Main {
+>Main : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0))
+
+    constructor() {
+        this.register("a", "b", "c");
+>this.register : Symbol(Main.register, Decl(capturedLetConstInLoop13.ts, 4, 5))
+>this : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0))
+>register : Symbol(Main.register, Decl(capturedLetConstInLoop13.ts, 4, 5))
+    }
+
+    private register(...names: string[]): void {
+>register : Symbol(Main.register, Decl(capturedLetConstInLoop13.ts, 4, 5))
+>names : Symbol(names, Decl(capturedLetConstInLoop13.ts, 6, 21))
+
+        for (let name of names) {
+>name : Symbol(name, Decl(capturedLetConstInLoop13.ts, 7, 16))
+>names : Symbol(names, Decl(capturedLetConstInLoop13.ts, 6, 21))
+
+            this.bar({
+>this.bar : Symbol(Main.bar, Decl(capturedLetConstInLoop13.ts, 13, 5))
+>this : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0))
+>bar : Symbol(Main.bar, Decl(capturedLetConstInLoop13.ts, 13, 5))
+
+                [name + ".a"]: () => { this.foo(name); },
+>name : Symbol(name, Decl(capturedLetConstInLoop13.ts, 7, 16))
+>this.foo : Symbol(Main.foo, Decl(capturedLetConstInLoop13.ts, 15, 33))
+>this : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0))
+>foo : Symbol(Main.foo, Decl(capturedLetConstInLoop13.ts, 15, 33))
+>name : Symbol(name, Decl(capturedLetConstInLoop13.ts, 7, 16))
+
+            });
+        }
+    }
+
+    private bar(a: any): void { }
+>bar : Symbol(Main.bar, Decl(capturedLetConstInLoop13.ts, 13, 5))
+>a : Symbol(a, Decl(capturedLetConstInLoop13.ts, 15, 16))
+
+    private foo(name: string): void { }
+>foo : Symbol(Main.foo, Decl(capturedLetConstInLoop13.ts, 15, 33))
+>name : Symbol(name, Decl(capturedLetConstInLoop13.ts, 17, 16))
+
+}
+
+new Main();
+>Main : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0))
+
diff --git a/tests/baselines/reference/capturedLetConstInLoop13.types b/tests/baselines/reference/capturedLetConstInLoop13.types
new file mode 100644
index 00000000000..e6f97255d75
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop13.types
@@ -0,0 +1,59 @@
+=== tests/cases/compiler/capturedLetConstInLoop13.ts ===
+class Main {
+>Main : Main
+
+    constructor() {
+        this.register("a", "b", "c");
+>this.register("a", "b", "c") : void
+>this.register : (...names: string[]) => void
+>this : this
+>register : (...names: string[]) => void
+>"a" : "a"
+>"b" : "b"
+>"c" : "c"
+    }
+
+    private register(...names: string[]): void {
+>register : (...names: string[]) => void
+>names : string[]
+
+        for (let name of names) {
+>name : string
+>names : string[]
+
+            this.bar({
+>this.bar({                [name + ".a"]: () => { this.foo(name); },            }) : void
+>this.bar : (a: any) => void
+>this : this
+>bar : (a: any) => void
+>{                [name + ".a"]: () => { this.foo(name); },            } : { [x: string]: () => void; }
+
+                [name + ".a"]: () => { this.foo(name); },
+>name + ".a" : string
+>name : string
+>".a" : ".a"
+>() => { this.foo(name); } : () => void
+>this.foo(name) : void
+>this.foo : (name: string) => void
+>this : this
+>foo : (name: string) => void
+>name : string
+
+            });
+        }
+    }
+
+    private bar(a: any): void { }
+>bar : (a: any) => void
+>a : any
+
+    private foo(name: string): void { }
+>foo : (name: string) => void
+>name : string
+
+}
+
+new Main();
+>new Main() : Main
+>Main : typeof Main
+
diff --git a/tests/cases/compiler/capturedLetConstInLoop13.ts b/tests/cases/compiler/capturedLetConstInLoop13.ts
new file mode 100644
index 00000000000..0aa00b0e1a0
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop13.ts
@@ -0,0 +1,22 @@
+class Main {
+
+    constructor() {
+        this.register("a", "b", "c");
+    }
+
+    private register(...names: string[]): void {
+        for (let name of names) {
+
+            this.bar({
+                [name + ".a"]: () => { this.foo(name); },
+            });
+        }
+    }
+
+    private bar(a: any): void { }
+
+    private foo(name: string): void { }
+
+}
+
+new Main();
\ No newline at end of file

From f4583313d9bf6ff3ed1e5464277c73f5bd124234 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 8 Feb 2017 06:13:32 -0800
Subject: [PATCH 109/127] Use `!!` to convert to boolean

---
 src/harness/fourslash.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 3deddf1f2cc..c7f455bd753 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -911,7 +911,7 @@ namespace FourSlash {
 
             function rangeToReferenceEntry(r: Range) {
                 let { isWriteAccess, isDefinition } = (r.marker && r.marker.data) || { isWriteAccess: false, isDefinition: false };
-                isWriteAccess = isWriteAccess || false; isDefinition = isDefinition || false;
+                isWriteAccess = !!isWriteAccess; isDefinition = !!isDefinition;
                 return { fileName: r.fileName, textSpan: { start: r.start, length: r.end - r.start }, isWriteAccess, isDefinition }
             }
         }

From a928ad3bd36e8aea806b307ff0b4b2d683f12ee8 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Wed, 8 Feb 2017 10:17:58 -0800
Subject: [PATCH 110/127] Address code review: move only expose
 emitLeadingCommentsOfPosition

---
 src/compiler/comments.ts | 16 ++++++++++------
 src/compiler/emitter.ts  | 17 +++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
index 8e17bf2d91b..dcb471dcfcc 100644
--- a/src/compiler/comments.ts
+++ b/src/compiler/comments.ts
@@ -9,7 +9,7 @@ namespace ts {
         emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
         emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void): void;
         emitTrailingCommentsOfPosition(pos: number): void;
-        emitLeadingComments(pos: number, isEmittedNode: boolean): void;
+        emitLeadingCommentsOfPosition(pos: number): void;
     }
 
     export function createCommentWriter(printerOptions: PrinterOptions, emitPos: ((pos: number) => void) | undefined): CommentWriter {
@@ -33,7 +33,7 @@ namespace ts {
             emitNodeWithComments,
             emitBodyWithDetachedComments,
             emitTrailingCommentsOfPosition,
-            emitLeadingComments,
+            emitLeadingCommentsOfPosition,
         };
 
         function emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) {
@@ -169,10 +169,6 @@ namespace ts {
         }
 
         function emitLeadingComments(pos: number, isEmittedNode: boolean) {
-            if (disabled) {
-                return;
-            }
-
             hasWrittenComment = false;
 
             if (isEmittedNode) {
@@ -216,6 +212,14 @@ namespace ts {
             }
         }
 
+        function emitLeadingCommentsOfPosition(pos: number) {
+            if (disabled || pos === -1) {
+                return;
+            }
+
+            emitLeadingComments(pos, /*isEmittedNode*/ true);
+        }
+
         function emitTrailingComments(pos: number) {
             forEachTrailingCommentToEmit(pos, emitTrailingComment);
         }
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 7adac106e8c..fcb3fb826c9 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1,4 +1,4 @@
-/// <reference path="checker.ts" />
+/// <reference path="checker.ts" />
 /// <reference path="transformer.ts" />
 /// <reference path="declarationEmitter.ts" />
 /// <reference path="sourcemap.ts" />
@@ -211,7 +211,7 @@ namespace ts {
             emitNodeWithComments,
             emitBodyWithDetachedComments,
             emitTrailingCommentsOfPosition,
-            emitLeadingComments,
+            emitLeadingCommentsOfPosition,
         } = comments;
 
         let currentSourceFile: SourceFile;
@@ -1348,7 +1348,7 @@ namespace ts {
                 writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
                 emitBlockStatements(node);
                 // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted
-                emitLeadingComments(node.statements.end, /*isEmittedNode*/true);
+                emitLeadingCommentsOfPosition(node.statements.end);
                 writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
             }
         }
@@ -2235,10 +2235,10 @@ namespace ts {
                         //      function commentedParameters(
                         //          /* Parameter a */
                         //          a
-                        //          /* End of parameter a */ -> this comment doesn't consider to be trailing comment of parameter "a" due to newline
+                        //          /* End of parameter a */ -> this comment isn't considered to be trailing comment of parameter "a" due to newline
                         //          ,
-                        if (emitLeadingComments && delimiter && previousSibling.end !== parentNode.end) {
-                            emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement);
+                        if (emitLeadingCommentsOfPosition && delimiter && previousSibling.end !== parentNode.end) {
+                            emitLeadingCommentsOfPosition(previousSibling.end);
                         }
                         write(delimiter);
 
@@ -2294,10 +2294,7 @@ namespace ts {
                 //          /* end of element 2 */
                 //       ];
                 if (previousSibling && delimiter && previousSibling.end !== parentNode.end) {
-                    emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement);
-                    if (hasTrailingComma) {
-                        emitLeadingComments(previousSibling.end,  /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement);
-                    }
+                    emitLeadingCommentsOfPosition(previousSibling.end);
                 }
 
                 // Decrease the indent, if requested.

From bb71dcdde8bf95611cfe98d8b33738250f4fb5b8 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Wed, 8 Feb 2017 11:01:32 -0800
Subject: [PATCH 111/127] add projectUsesOutFile field to
 protocol.CompileOnSaveAffectedFileListSingleProject (#13915)

---
 .../unittests/tsserverProjectSystem.ts        | 48 +++++++++++++++++++
 src/server/protocol.ts                        |  5 ++
 src/server/session.ts                         |  3 +-
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 5ed0d981511..93027675bd6 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -3031,6 +3031,54 @@ namespace ts.projectSystem {
         });
     });
 
+    describe("emit with outFile or out setting", () => {
+        function test(opts: CompilerOptions, expectedUsesOutFile: boolean) {
+            const f1 = {
+                path: "/a/a.ts",
+                content: "let x = 1"
+            };
+            const f2 = {
+                path: "/a/b.ts",
+                content: "let y = 1"
+            };
+            const config = {
+                path: "/a/tsconfig.json",
+                content: JSON.stringify({
+                    compilerOptions: opts,
+                    compileOnSave: true
+                })
+            };
+            const host = createServerHost([f1, f2, config]);
+            const session = createSession(host);
+            session.executeCommand(<protocol.OpenRequest>{
+                seq: 1,
+                type: "request",
+                command: "open",
+                arguments: { file: f1.path }
+            });
+            checkNumberOfProjects(session.getProjectService(), { configuredProjects: 1 });
+            const { response } = session.executeCommand(<protocol.CompileOnSaveAffectedFileListRequest>{
+                seq: 2,
+                type: "request",
+                command: "compileOnSaveAffectedFileList",
+                arguments: { file: f1.path }
+            });
+            assert.equal((<protocol.CompileOnSaveAffectedFileListSingleProject[]>response).length, 1, "expected output for 1 project");
+            assert.equal((<protocol.CompileOnSaveAffectedFileListSingleProject[]>response)[0].fileNames.length, 2, "expected output for 1 project");
+            assert.equal((<protocol.CompileOnSaveAffectedFileListSingleProject[]>response)[0].projectUsesOutFile, expectedUsesOutFile, "usesOutFile");
+        }
+
+        it ("projectUsesOutFile should not be returned if not set", () => {
+            test({}, /*expectedUsesOutFile*/ false);
+        });
+        it ("projectUsesOutFile should be true if outFile is set", () => {
+            test({ outFile: "/a/out.js" }, /*expectedUsesOutFile*/ true);
+        });
+        it ("projectUsesOutFile should be true if out is set", () => {
+            test({ out: "/a/out.js" }, /*expectedUsesOutFile*/ true);
+        });
+    });
+
     describe("import helpers", () => {
         it("should not crash in tsserver", () => {
             const f1 = {
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index e3fe17362d7..c1b78e9dbaa 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -1239,6 +1239,11 @@ namespace ts.server.protocol {
          * List of files names that should be recompiled
          */
         fileNames: string[];
+
+        /**
+         * true if project uses outFile or out compiler option
+         */
+        projectUsesOutFile: boolean;
     }
 
     /**
diff --git a/src/server/session.ts b/src/server/session.ts
index 825ad8506d7..5d745fc7965 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -1040,7 +1040,8 @@ namespace ts.server {
                 if (project.compileOnSaveEnabled && project.languageServiceEnabled) {
                     result.push({
                         projectFileName: project.getProjectName(),
-                        fileNames: project.getCompileOnSaveAffectedFileList(info)
+                        fileNames: project.getCompileOnSaveAffectedFileList(info),
+                        projectUsesOutFile: !!project.getCompilerOptions().outFile || !!project.getCompilerOptions().out
                     });
                 }
             }

From 125dd57a757612367bcf495ed3070bb932ae75ed Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 8 Feb 2017 13:28:23 -0800
Subject: [PATCH 112/127] Fix assigned type of assignment nested in literals

Fixes #12946
---
 src/compiler/checker.ts                       | 10 +++++-
 .../reference/assignmentNestedInLiterals.js   | 13 +++++++
 .../assignmentNestedInLiterals.symbols        | 25 +++++++++++++
 .../assignmentNestedInLiterals.types          | 35 +++++++++++++++++++
 .../compiler/assignmentNestedInLiterals.ts    |  6 ++++
 5 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/assignmentNestedInLiterals.js
 create mode 100644 tests/baselines/reference/assignmentNestedInLiterals.symbols
 create mode 100644 tests/baselines/reference/assignmentNestedInLiterals.types
 create mode 100644 tests/cases/compiler/assignmentNestedInLiterals.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 4423b574e31..428a4e6eeef 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -9469,11 +9469,19 @@ namespace ts {
         }
 
         function getAssignedTypeOfBinaryExpression(node: BinaryExpression): Type {
-            return node.parent.kind === SyntaxKind.ArrayLiteralExpression || node.parent.kind === SyntaxKind.PropertyAssignment ?
+            const isDestructuringDefaultAssignment =
+                node.parent.kind === SyntaxKind.ArrayLiteralExpression && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === SyntaxKind.PropertyAssignment && isDestructuringAssignmentTarget(node.parent.parent);
+            return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
 
+        function isDestructuringAssignmentTarget(parent: Node) {
+            return parent.parent.kind === SyntaxKind.BinaryExpression && (parent.parent as BinaryExpression).left === parent ||
+                parent.parent.kind === SyntaxKind.ForOfStatement && (parent.parent as ForOfStatement).initializer === parent;
+        }
+
         function getAssignedTypeOfArrayLiteralElement(node: ArrayLiteralExpression, element: Expression): Type {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), indexOf(node.elements, element));
         }
diff --git a/tests/baselines/reference/assignmentNestedInLiterals.js b/tests/baselines/reference/assignmentNestedInLiterals.js
new file mode 100644
index 00000000000..cd4bc6c6699
--- /dev/null
+++ b/tests/baselines/reference/assignmentNestedInLiterals.js
@@ -0,0 +1,13 @@
+//// [assignmentNestedInLiterals.ts]
+var target, x, y;
+target = [x = 1, y = x];
+
+var aegis, a, b;
+aegis = { x: a = 1, y: b = a };
+
+
+//// [assignmentNestedInLiterals.js]
+var target, x, y;
+target = [x = 1, y = x];
+var aegis, a, b;
+aegis = { x: a = 1, y: b = a };
diff --git a/tests/baselines/reference/assignmentNestedInLiterals.symbols b/tests/baselines/reference/assignmentNestedInLiterals.symbols
new file mode 100644
index 00000000000..90edd9ed04f
--- /dev/null
+++ b/tests/baselines/reference/assignmentNestedInLiterals.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/assignmentNestedInLiterals.ts ===
+var target, x, y;
+>target : Symbol(target, Decl(assignmentNestedInLiterals.ts, 0, 3))
+>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(assignmentNestedInLiterals.ts, 0, 14))
+
+target = [x = 1, y = x];
+>target : Symbol(target, Decl(assignmentNestedInLiterals.ts, 0, 3))
+>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 0, 11))
+>y : Symbol(y, Decl(assignmentNestedInLiterals.ts, 0, 14))
+>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 0, 11))
+
+var aegis, a, b;
+>aegis : Symbol(aegis, Decl(assignmentNestedInLiterals.ts, 3, 3))
+>a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10))
+>b : Symbol(b, Decl(assignmentNestedInLiterals.ts, 3, 13))
+
+aegis = { x: a = 1, y: b = a };
+>aegis : Symbol(aegis, Decl(assignmentNestedInLiterals.ts, 3, 3))
+>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 4, 9))
+>a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10))
+>y : Symbol(y, Decl(assignmentNestedInLiterals.ts, 4, 19))
+>b : Symbol(b, Decl(assignmentNestedInLiterals.ts, 3, 13))
+>a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10))
+
diff --git a/tests/baselines/reference/assignmentNestedInLiterals.types b/tests/baselines/reference/assignmentNestedInLiterals.types
new file mode 100644
index 00000000000..8c4d5aadc7d
--- /dev/null
+++ b/tests/baselines/reference/assignmentNestedInLiterals.types
@@ -0,0 +1,35 @@
+=== tests/cases/compiler/assignmentNestedInLiterals.ts ===
+var target, x, y;
+>target : any
+>x : any
+>y : any
+
+target = [x = 1, y = x];
+>target = [x = 1, y = x] : number[]
+>target : any
+>[x = 1, y = x] : number[]
+>x = 1 : 1
+>x : any
+>1 : 1
+>y = x : number
+>y : any
+>x : number
+
+var aegis, a, b;
+>aegis : any
+>a : any
+>b : any
+
+aegis = { x: a = 1, y: b = a };
+>aegis = { x: a = 1, y: b = a } : { x: number; y: number; }
+>aegis : any
+>{ x: a = 1, y: b = a } : { x: number; y: number; }
+>x : number
+>a = 1 : 1
+>a : any
+>1 : 1
+>y : number
+>b = a : number
+>b : any
+>a : number
+
diff --git a/tests/cases/compiler/assignmentNestedInLiterals.ts b/tests/cases/compiler/assignmentNestedInLiterals.ts
new file mode 100644
index 00000000000..5b1f52cb450
--- /dev/null
+++ b/tests/cases/compiler/assignmentNestedInLiterals.ts
@@ -0,0 +1,6 @@
+// @noImplicitAny: true
+var target, x, y;
+target = [x = 1, y = x];
+
+var aegis, a, b;
+aegis = { x: a = 1, y: b = a };

From 8b8c490ff6b5cd89cee0d9049c733e6bbba1a719 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Wed, 8 Feb 2017 13:36:19 -0800
Subject: [PATCH 113/127] Address code review: fix indentation

---
 src/compiler/emitter.ts                       |  2 ++
 .../reference/amdImportAsPrimaryExpression.js |  2 +-
 tests/baselines/reference/argsInScope.js      |  2 +-
 .../reference/commentLeadingCloseBrace.js     |  2 +-
 .../commonJSImportAsPrimaryExpression.js      |  2 +-
 .../reference/duplicateLocalVariable1.js      |  2 +-
 .../jsFileCompilationLetBeingRenamed.js       |  2 +-
 .../narrowExceptionVariableInCatchClause.js   |  2 +-
 tests/baselines/reference/noCatchBlock.js     |  4 +--
 tests/baselines/reference/noCatchBlock.js.map |  2 +-
 .../reference/noCatchBlock.sourcemap.txt      | 28 +++++++++----------
 tests/baselines/reference/objectRestForOf.js  |  2 +-
 .../baselines/reference/parserRealSource14.js |  2 +-
 tests/baselines/reference/recursiveReturns.js |  2 +-
 .../reference/sourceMap-SkippedNode.js        |  4 +--
 .../reference/sourceMap-SkippedNode.js.map    |  2 +-
 .../sourceMap-SkippedNode.sourcemap.txt       | 28 +++++++++----------
 17 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index fcb3fb826c9..03804dfeebe 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1348,7 +1348,9 @@ namespace ts {
                 writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
                 emitBlockStatements(node);
                 // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted
+                increaseIndent();
                 emitLeadingCommentsOfPosition(node.statements.end);
+                decreaseIndent();
                 writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
             }
         }
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js
index 25f390c0b32..6ff3216fb58 100644
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js
@@ -26,6 +26,6 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
     if (foo.E1.A === 0) {
-    // Should cause runtime import - interesting optimization possibility, as gets inlined to 0.
+        // Should cause runtime import - interesting optimization possibility, as gets inlined to 0.
     }
 });
diff --git a/tests/baselines/reference/argsInScope.js b/tests/baselines/reference/argsInScope.js
index 27405a47d87..a38bc778039 100644
--- a/tests/baselines/reference/argsInScope.js
+++ b/tests/baselines/reference/argsInScope.js
@@ -17,7 +17,7 @@ var C = (function () {
     }
     C.prototype.P = function (ii, j, k) {
         for (var i = 0; i < arguments.length; i++) {
-        // WScript.Echo("param: " + arguments[i]);
+            // WScript.Echo("param: " + arguments[i]);
         }
     };
     return C;
diff --git a/tests/baselines/reference/commentLeadingCloseBrace.js b/tests/baselines/reference/commentLeadingCloseBrace.js
index 9fc696219e1..d5f5afbb884 100644
--- a/tests/baselines/reference/commentLeadingCloseBrace.js
+++ b/tests/baselines/reference/commentLeadingCloseBrace.js
@@ -16,7 +16,7 @@ function ifelse() {
     if (commentedParameters(1, 2)) {
         /*comment1*/
         commentedParameters(3, 4);
-    /*comment2*/
+        /*comment2*/
     }
     else {
         commentedParameters(5, 6);
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index 1eb7b5ff214..0cbb7470dfc 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -27,5 +27,5 @@ exports.C1 = C1;
 "use strict";
 var foo = require("./foo_0");
 if (foo.C1.s1) {
-// Should cause runtime import
+    // Should cause runtime import
 }
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index 432830d85b6..39848b3bb6a 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -391,7 +391,7 @@ var TestRunner = (function () {
                     }
                 }
                 if (testResult === false) {
-                //console.log(e.message);
+                    //console.log(e.message);
                 }
             }
             if ((testcase.errorMessageRegEx !== undefined) && !exception) {
diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
index bb2aa10dc95..a87dad3c914 100644
--- a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
+++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
@@ -9,6 +9,6 @@ function foo(a) {
 //// [out.js]
 function foo(a) {
     for (var a_1 = 0; a_1 < 10; a_1++) {
-    // do something
+        // do something
     }
 }
diff --git a/tests/baselines/reference/narrowExceptionVariableInCatchClause.js b/tests/baselines/reference/narrowExceptionVariableInCatchClause.js
index 18344df5994..b7dbf717e34 100644
--- a/tests/baselines/reference/narrowExceptionVariableInCatchClause.js
+++ b/tests/baselines/reference/narrowExceptionVariableInCatchClause.js
@@ -27,7 +27,7 @@ function tryCatch() {
 //// [narrowExceptionVariableInCatchClause.js]
 function tryCatch() {
     try {
-    // do stuff...
+        // do stuff...
     }
     catch (err) {
         if (isFooError(err)) {
diff --git a/tests/baselines/reference/noCatchBlock.js b/tests/baselines/reference/noCatchBlock.js
index 158ac1257f3..ecc9c7f8c7e 100644
--- a/tests/baselines/reference/noCatchBlock.js
+++ b/tests/baselines/reference/noCatchBlock.js
@@ -8,9 +8,9 @@ try {
 
 //// [noCatchBlock.js]
 try {
-// ...
+    // ...
 }
 finally {
-// N.B. No 'catch' block
+    // N.B. No 'catch' block
 }
 //# sourceMappingURL=noCatchBlock.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.js.map b/tests/baselines/reference/noCatchBlock.js.map
index ddac2894e0b..392ec588108 100644
--- a/tests/baselines/reference/noCatchBlock.js.map
+++ b/tests/baselines/reference/noCatchBlock.js.map
@@ -1,2 +1,2 @@
 //// [noCatchBlock.js.map]
-{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAI,CAAC;AACJ,MAAM;AACP,CAAC;QAAS,CAAC;AACV,wBAAwB;AACzB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAI,CAAC;IACJ,MAAM;AACP,CAAC;QAAS,CAAC;IACV,wBAAwB;AACzB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.sourcemap.txt b/tests/baselines/reference/noCatchBlock.sourcemap.txt
index a75c119ca9f..5210f12d734 100644
--- a/tests/baselines/reference/noCatchBlock.sourcemap.txt
+++ b/tests/baselines/reference/noCatchBlock.sourcemap.txt
@@ -12,7 +12,7 @@ sourceFile:noCatchBlock.ts
 1 >
 2 >^^^^
 3 >    ^
-4 >     ^^->
+4 >     ^^^^^^->
 1 >
   >
 2 >try 
@@ -21,14 +21,14 @@ sourceFile:noCatchBlock.ts
 2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
 3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
 ---
->>>// ...
-1->
-2 >^^^^^^
+>>>    // ...
+1->^^^^
+2 >    ^^^^^^
 1->
   > 
-2 >// ...
-1->Emitted(2, 1) Source(3, 2) + SourceIndex(0)
-2 >Emitted(2, 7) Source(3, 8) + SourceIndex(0)
+2 >    // ...
+1->Emitted(2, 5) Source(3, 2) + SourceIndex(0)
+2 >Emitted(2, 11) Source(3, 8) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -43,20 +43,20 @@ sourceFile:noCatchBlock.ts
 >>>finally {
 1->^^^^^^^^
 2 >        ^
-3 >         ^^^^^^^^^^^^^^^^->
+3 >         ^^^^^^^^^^^^^^^^^^^^->
 1-> finally 
 2 >        {
 1->Emitted(4, 9) Source(4, 11) + SourceIndex(0)
 2 >Emitted(4, 10) Source(4, 12) + SourceIndex(0)
 ---
->>>// N.B. No 'catch' block
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^
+>>>    // N.B. No 'catch' block
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   > 
-2 >// N.B. No 'catch' block
-1->Emitted(5, 1) Source(5, 2) + SourceIndex(0)
-2 >Emitted(5, 25) Source(5, 26) + SourceIndex(0)
+2 >    // N.B. No 'catch' block
+1->Emitted(5, 5) Source(5, 2) + SourceIndex(0)
+2 >Emitted(5, 29) Source(5, 26) + SourceIndex(0)
 ---
 >>>}
 1 >
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index 5f0399b2df2..7ff72db06e5 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -37,5 +37,5 @@ for (let _b of array) {
 }
 for (const norest of array.map(a => (Object.assign({}, a, { x: 'a string' })))) {
     [norest.x, norest.y];
-// x is now a string. who knows why.
+    // x is now a string. who knows why.
 }
diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js
index 4e4e23e81c3..635d122db04 100644
--- a/tests/baselines/reference/parserRealSource14.js
+++ b/tests/baselines/reference/parserRealSource14.js
@@ -1011,7 +1011,7 @@ var TypeScript;
                         ctx.path.push(cur);
                     }
                     else {
-                    //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");
+                        //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");
                     }
                 }
                 // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually
diff --git a/tests/baselines/reference/recursiveReturns.js b/tests/baselines/reference/recursiveReturns.js
index 56762a9ad2d..d2619e18796 100644
--- a/tests/baselines/reference/recursiveReturns.js
+++ b/tests/baselines/reference/recursiveReturns.js
@@ -23,7 +23,7 @@ function R1() {
 function R2() { R2(); }
 function R3(n) {
     if (n == 0) {
-    //return;
+        //return;
     }
     else {
         R3(n--);
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js b/tests/baselines/reference/sourceMap-SkippedNode.js
index daac27cf49f..f25c0d75c82 100644
--- a/tests/baselines/reference/sourceMap-SkippedNode.js
+++ b/tests/baselines/reference/sourceMap-SkippedNode.js
@@ -7,9 +7,9 @@ try {
 
 //// [sourceMap-SkippedNode.js]
 try {
-// ...
+    // ...
 }
 finally {
-// N.B. No 'catch' block
+    // N.B. No 'catch' block
 }
 //# sourceMappingURL=sourceMap-SkippedNode.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js.map b/tests/baselines/reference/sourceMap-SkippedNode.js.map
index b86b3905a73..f3444919d41 100644
--- a/tests/baselines/reference/sourceMap-SkippedNode.js.map
+++ b/tests/baselines/reference/sourceMap-SkippedNode.js.map
@@ -1,2 +1,2 @@
 //// [sourceMap-SkippedNode.js.map]
-{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;AACL,MAAM;AACN,CAAC;QAAS,CAAC;AACX,wBAAwB;AACxB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;IACL,MAAM;AACN,CAAC;QAAS,CAAC;IACX,wBAAwB;AACxB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
index b48a5f09f4a..c54676a697e 100644
--- a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
@@ -12,7 +12,7 @@ sourceFile:sourceMap-SkippedNode.ts
 1 >
 2 >^^^^
 3 >    ^
-4 >     ^^->
+4 >     ^^^^^^->
 1 >
 2 >try 
 3 >    {
@@ -20,14 +20,14 @@ sourceFile:sourceMap-SkippedNode.ts
 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0)
 ---
->>>// ...
-1->
-2 >^^^^^^
+>>>    // ...
+1->^^^^
+2 >    ^^^^^^
 1->
   >
-2 >// ...
-1->Emitted(2, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+2 >    // ...
+1->Emitted(2, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 11) Source(2, 7) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -42,20 +42,20 @@ sourceFile:sourceMap-SkippedNode.ts
 >>>finally {
 1->^^^^^^^^
 2 >        ^
-3 >         ^^^^^^^^^^^^^^^^->
+3 >         ^^^^^^^^^^^^^^^^^^^^->
 1-> finally 
 2 >        {
 1->Emitted(4, 9) Source(3, 11) + SourceIndex(0)
 2 >Emitted(4, 10) Source(3, 12) + SourceIndex(0)
 ---
->>>// N.B. No 'catch' block
-1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^
+>>>    // N.B. No 'catch' block
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-2 >// N.B. No 'catch' block
-1->Emitted(5, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(5, 25) Source(4, 25) + SourceIndex(0)
+2 >    // N.B. No 'catch' block
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 29) Source(4, 25) + SourceIndex(0)
 ---
 >>>}
 1 >

From a46cb033db7ad608c81e2541052cc1e3633ecadc Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 8 Feb 2017 16:14:36 -0800
Subject: [PATCH 114/127] Add for-of test case

---
 .../reference/assignmentNestedInLiterals.js      |  8 ++++++++
 .../reference/assignmentNestedInLiterals.symbols | 12 ++++++++++++
 .../reference/assignmentNestedInLiterals.types   | 16 ++++++++++++++++
 .../cases/compiler/assignmentNestedInLiterals.ts |  4 ++++
 4 files changed, 40 insertions(+)

diff --git a/tests/baselines/reference/assignmentNestedInLiterals.js b/tests/baselines/reference/assignmentNestedInLiterals.js
index cd4bc6c6699..8a048082565 100644
--- a/tests/baselines/reference/assignmentNestedInLiterals.js
+++ b/tests/baselines/reference/assignmentNestedInLiterals.js
@@ -4,6 +4,10 @@ target = [x = 1, y = x];
 
 var aegis, a, b;
 aegis = { x: a = 1, y: b = a };
+
+var kowloona, c, d;
+for (kowloona of [c = 1, d = c]) {
+}
 
 
 //// [assignmentNestedInLiterals.js]
@@ -11,3 +15,7 @@ var target, x, y;
 target = [x = 1, y = x];
 var aegis, a, b;
 aegis = { x: a = 1, y: b = a };
+var kowloona, c, d;
+for (var _i = 0, _a = [c = 1, d = c]; _i < _a.length; _i++) {
+    kowloona = _a[_i];
+}
diff --git a/tests/baselines/reference/assignmentNestedInLiterals.symbols b/tests/baselines/reference/assignmentNestedInLiterals.symbols
index 90edd9ed04f..761930ab9ce 100644
--- a/tests/baselines/reference/assignmentNestedInLiterals.symbols
+++ b/tests/baselines/reference/assignmentNestedInLiterals.symbols
@@ -23,3 +23,15 @@ aegis = { x: a = 1, y: b = a };
 >b : Symbol(b, Decl(assignmentNestedInLiterals.ts, 3, 13))
 >a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10))
 
+var kowloona, c, d;
+>kowloona : Symbol(kowloona, Decl(assignmentNestedInLiterals.ts, 6, 3))
+>c : Symbol(c, Decl(assignmentNestedInLiterals.ts, 6, 13))
+>d : Symbol(d, Decl(assignmentNestedInLiterals.ts, 6, 16))
+
+for (kowloona of [c = 1, d = c]) {
+>kowloona : Symbol(kowloona, Decl(assignmentNestedInLiterals.ts, 6, 3))
+>c : Symbol(c, Decl(assignmentNestedInLiterals.ts, 6, 13))
+>d : Symbol(d, Decl(assignmentNestedInLiterals.ts, 6, 16))
+>c : Symbol(c, Decl(assignmentNestedInLiterals.ts, 6, 13))
+}
+
diff --git a/tests/baselines/reference/assignmentNestedInLiterals.types b/tests/baselines/reference/assignmentNestedInLiterals.types
index 8c4d5aadc7d..8ab73f80691 100644
--- a/tests/baselines/reference/assignmentNestedInLiterals.types
+++ b/tests/baselines/reference/assignmentNestedInLiterals.types
@@ -33,3 +33,19 @@ aegis = { x: a = 1, y: b = a };
 >b : any
 >a : number
 
+var kowloona, c, d;
+>kowloona : any
+>c : any
+>d : any
+
+for (kowloona of [c = 1, d = c]) {
+>kowloona : any
+>[c = 1, d = c] : number[]
+>c = 1 : 1
+>c : any
+>1 : 1
+>d = c : number
+>d : any
+>c : number
+}
+
diff --git a/tests/cases/compiler/assignmentNestedInLiterals.ts b/tests/cases/compiler/assignmentNestedInLiterals.ts
index 5b1f52cb450..09d8c94488f 100644
--- a/tests/cases/compiler/assignmentNestedInLiterals.ts
+++ b/tests/cases/compiler/assignmentNestedInLiterals.ts
@@ -4,3 +4,7 @@ target = [x = 1, y = x];
 
 var aegis, a, b;
 aegis = { x: a = 1, y: b = a };
+
+var kowloona, c, d;
+for (kowloona of [c = 1, d = c]) {
+}

From 2480e8d492ecd90849b189f98e57eb63ad1918c3 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Wed, 8 Feb 2017 20:35:01 -0800
Subject: [PATCH 115/127] do secondary lookup only if module has non-relative
 name

---
 Jakefile.js                               |  1 -
 src/harness/unittests/typingsInstaller.ts | 39 +++++++++++++++++++++++
 src/server/lsHost.ts                      |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Jakefile.js b/Jakefile.js
index f422a995725..4fd3be57e4f 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -37,7 +37,6 @@ if (process.env.path !== undefined) {
 }
 
 function filesFromConfig(configPath) {
-    console.log(configPath);
     var configText = fs.readFileSync(configPath).toString();
     var config = ts.parseConfigFileTextToJson(configPath, configText, /*stripComments*/ true);
     if (config.error) {
diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts
index 2b79141c3e3..29076df80f2 100644
--- a/src/harness/unittests/typingsInstaller.ts
+++ b/src/harness/unittests/typingsInstaller.ts
@@ -46,6 +46,45 @@ namespace ts.projectSystem {
 
     import typingsName = server.typingsInstaller.typingsName;
 
+    describe("local module", () => {
+        it("should not be picked up", () => {
+            const f1 = {
+                path: "/a/app.js",
+                content: "const c = require('./config');"
+            };
+            const f2 = {
+                path: "/a/config.js",
+                content: "export let x = 1"
+            };
+            const typesCache = "/cache"
+            const typesConfig = {
+                path: typesCache + "/node_modules/@types/config/index.d.ts",
+                content: "export let y: number;"
+            };
+            const config = {
+                path: "/a/jsconfig.json",
+                content: JSON.stringify({
+                    compilerOptions: { moduleResolution: "commonjs" },
+                    typeAcquisition: { enable: true }
+                })
+            };
+            const host = createServerHost([f1, f2, config, typesConfig]);
+            const installer = new (class extends Installer {
+                constructor() {
+                    super(host, { typesRegistry: createTypesRegistry("config"), globalTypingsCacheLocation: typesCache });
+                }
+                installWorker(_requestId: number, _args: string[], _cwd: string, _cb: server.typingsInstaller.RequestCompletedAction) {
+                    assert(false, "should not be called")
+                }
+            })();
+            const service = createProjectService(host, { typingsInstaller: installer });
+            service.openClientFile(f1.path);
+            service.checkNumberOfProjects({ configuredProjects: 1 });
+            checkProjectActualFiles(service.configuredProjects[0], [f1.path, f2.path]);
+            installer.installAll(0);
+        });
+    });
+
     describe("typingsInstaller", () => {
         it("configured projects (typings installed) 1", () => {
             const file1 = {
diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts
index 9d8c9c08cb6..eee80d82e7f 100644
--- a/src/server/lsHost.ts
+++ b/src/server/lsHost.ts
@@ -28,7 +28,7 @@ namespace ts.server {
                     : undefined;
                 const primaryResult = resolveModuleName(moduleName, containingFile, compilerOptions, host);
                 // return result immediately only if it is .ts, .tsx or .d.ts
-                if (!(primaryResult.resolvedModule && extensionIsTypeScript(primaryResult.resolvedModule.extension)) && globalCache !== undefined) {
+                if (moduleHasNonRelativeName(moduleName) && !(primaryResult.resolvedModule && extensionIsTypeScript(primaryResult.resolvedModule.extension)) && globalCache !== undefined) {
                     // otherwise try to load typings from @types
 
                     // create different collection of failed lookup locations for second pass

From 8da2bd97bd0389fffb62d852d6e8ddeda53df47c Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Thu, 9 Feb 2017 12:32:50 -0800
Subject: [PATCH 116/127] Address code review

---
 src/compiler/emitter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 03804dfeebe..e881c94cc83 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2239,7 +2239,7 @@ namespace ts {
                         //          a
                         //          /* End of parameter a */ -> this comment isn't considered to be trailing comment of parameter "a" due to newline
                         //          ,
-                        if (emitLeadingCommentsOfPosition && delimiter && previousSibling.end !== parentNode.end) {
+                        if (delimiter && previousSibling.end !== parentNode.end) {
                             emitLeadingCommentsOfPosition(previousSibling.end);
                         }
                         write(delimiter);

From 84fc29f9005f969f84480e3d142a88087d6b9f71 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 9 Feb 2017 12:46:09 -0800
Subject: [PATCH 117/127] Fix lint failures detected by tslint@4.4.2

---
 src/compiler/sys.ts                               | 2 +-
 src/harness/fourslash.ts                          | 2 +-
 src/harness/harnessLanguageService.ts             | 4 ++--
 src/harness/unittests/tsserverProjectSystem.ts    | 2 +-
 src/server/cancellationToken/cancellationToken.ts | 2 +-
 src/services/codefixes/unusedIdentifierFixes.ts   | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 8ac797507b1..c90a3484a8a 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -486,7 +486,7 @@ namespace ts {
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     let options: any;
                     if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
-                        // do nothing if either 
+                        // do nothing if either
                         // - target folder does not exist
                         // - this is UNC path on Windows (https://github.com/Microsoft/TypeScript/issues/13874)
                         return noOpFileWatcher;
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index c7f455bd753..fc85fb7276c 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -183,7 +183,7 @@ namespace FourSlash {
 
         // The current caret position in the active file
         public currentCaretPosition = 0;
-        public lastKnownMarker: string = "";
+        public lastKnownMarker = "";
 
         // The file that's currently 'opened'
         public activeFile: FourSlashFile;
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
index cd44fbf7a3a..59930fd98ba 100644
--- a/src/harness/harnessLanguageService.ts
+++ b/src/harness/harnessLanguageService.ts
@@ -5,7 +5,7 @@
 
 namespace Harness.LanguageService {
     export class ScriptInfo {
-        public version: number = 1;
+        public version = 1;
         public editRanges: { length: number; textChangeRange: ts.TextChangeRange; }[] = [];
         private lineMap: number[] = undefined;
 
@@ -594,7 +594,7 @@ namespace Harness.LanguageService {
     class SessionServerHost implements ts.server.ServerHost, ts.server.Logger {
         args: string[] = [];
         newLine: string;
-        useCaseSensitiveFileNames: boolean = false;
+        useCaseSensitiveFileNames = false;
 
         constructor(private host: NativeLanguageServiceHost) {
             this.newLine = this.host.getNewLine();
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 93027675bd6..e6f4abde382 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -3115,7 +3115,7 @@ namespace ts.projectSystem {
             let options = project.getCompilerOptions();
             assert.isTrue(options.maxNodeModuleJsDepth === 2);
 
-            // Assert the option sticks 
+            // Assert the option sticks
             projectService.setCompilerOptionsForInferredProjects({ target: ScriptTarget.ES2016 });
             project = projectService.inferredProjects[0];
             options = project.getCompilerOptions();
diff --git a/src/server/cancellationToken/cancellationToken.ts b/src/server/cancellationToken/cancellationToken.ts
index 6d3dec67cc6..de59f3a1bce 100644
--- a/src/server/cancellationToken/cancellationToken.ts
+++ b/src/server/cancellationToken/cancellationToken.ts
@@ -1,7 +1,7 @@
 /// <reference types="node" />
 
 
-// TODO: extract services types 
+// TODO: extract services types
 interface HostCancellationToken {
     isCancellationRequested(): boolean;
 }
diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index 0ca01a81eb1..6c0bc04eca8 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -94,9 +94,9 @@ namespace ts.codefix {
                                 return removeSingleItem(namedImports.elements, token);
                             }
 
-                        // handle case where "import d, * as ns from './file'" 
+                        // handle case where "import d, * as ns from './file'"
                         // or "'import {a, b as ns} from './file'"
-                        case SyntaxKind.ImportClause: // this covers both 'import |d|' and 'import |d,| *'  
+                        case SyntaxKind.ImportClause: // this covers both 'import |d|' and 'import |d,| *'
                             const importClause = <ImportClause>token.parent;
                             if (!importClause.namedBindings) { // |import d from './file'| or |import * as ns from './file'|
                                 const importDecl = findImportDeclaration(importClause);

From 24ddbe4b60a2d755a604a5f485206eb704e4599b Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 9 Feb 2017 14:55:07 -0800
Subject: [PATCH 118/127] Widen after sub-type-reduction took place

---
 src/compiler/checker.ts                       |  6 ++---
 .../jsFileClassPropertyType3.errors.txt       | 22 +++++++++++++++++++
 .../reference/multipleDeclarations.types      |  2 +-
 .../compiler/jsFileClassPropertyType3.ts      | 18 +++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 tests/baselines/reference/jsFileClassPropertyType3.errors.txt
 create mode 100644 tests/cases/compiler/jsFileClassPropertyType3.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 10c5f5422e3..831126adfa1 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3378,7 +3378,7 @@ namespace ts {
         }
 
         // Return the inferred type for a variable, parameter, or property declaration
-        function getWidenedTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type {
+        function getTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type {
             const expression = declaration.kind === SyntaxKind.BinaryExpression ? <BinaryExpression>declaration :
                 declaration.kind === SyntaxKind.PropertyAccessExpression ? <BinaryExpression>getAncestor(declaration, SyntaxKind.BinaryExpression) :
                 undefined;
@@ -3395,7 +3395,7 @@ namespace ts {
                 }
             }
 
-            return getWidenedType(getWidenedLiteralType(checkExpressionCached(expression.right)));
+            return getWidenedLiteralType(checkExpressionCached(expression.right));
         }
 
         // Return the type implied by a binding pattern element. This is the type of the initializer of the element if
@@ -3552,7 +3552,7 @@ namespace ts {
                 // * className.prototype.method = expr
                 if (declaration.kind === SyntaxKind.BinaryExpression ||
                     declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {
-                    type = getUnionType(map(symbol.declarations, getWidenedTypeForJSSpecialPropertyDeclaration), /*subtypeReduction*/ true);
+                    type = getWidenedType(getUnionType(map(symbol.declarations, getTypeForJSSpecialPropertyDeclaration), /*subtypeReduction*/ true));
                 }
                 else {
                     type = getWidenedTypeForVariableLikeDeclaration(<VariableLikeDeclaration>declaration, /*reportErrors*/ true);
diff --git a/tests/baselines/reference/jsFileClassPropertyType3.errors.txt b/tests/baselines/reference/jsFileClassPropertyType3.errors.txt
new file mode 100644
index 00000000000..bf225095b01
--- /dev/null
+++ b/tests/baselines/reference/jsFileClassPropertyType3.errors.txt
@@ -0,0 +1,22 @@
+tests/cases/compiler/bar.ts(2,1): error TS2322: Type '"string"' is not assignable to type 'number'.
+
+
+==== tests/cases/compiler/foo.js (0 errors) ====
+    
+    class C {
+        constructor() {
+            if (cond) {
+                this.p = null;
+            }
+            else {
+                this.p = 0;
+            }
+        }
+    }
+    
+==== tests/cases/compiler/bar.ts (1 errors) ====
+    
+    (new C()).p = "string"; // Error
+    ~~~~~~~~~~~
+!!! error TS2322: Type '"string"' is not assignable to type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/multipleDeclarations.types b/tests/baselines/reference/multipleDeclarations.types
index c11bd13dffe..195bdc2ad0d 100644
--- a/tests/baselines/reference/multipleDeclarations.types
+++ b/tests/baselines/reference/multipleDeclarations.types
@@ -21,7 +21,7 @@ C.prototype.m = function() {
     this.nothing();
 >this.nothing() : any
 >this.nothing : any
->this : { m: any; }
+>this : { m: () => void; }
 >nothing : any
 }
 class X {
diff --git a/tests/cases/compiler/jsFileClassPropertyType3.ts b/tests/cases/compiler/jsFileClassPropertyType3.ts
new file mode 100644
index 00000000000..7c240e942fb
--- /dev/null
+++ b/tests/cases/compiler/jsFileClassPropertyType3.ts
@@ -0,0 +1,18 @@
+// @allowJs: true
+// @noEmit: true
+
+// @filename: foo.js
+class C {
+    constructor() {
+        if (cond) {
+            this.p = null;
+        }
+        else {
+            this.p = 0;
+        }
+    }
+}
+
+// @filename: bar.ts
+
+(new C()).p = "string"; // Error

From a47c47611f6be54e86454a45e90bd89a270597fc Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 9 Feb 2017 15:25:49 -0800
Subject: [PATCH 119/127] Respond to code review comments

---
 src/compiler/checker.ts   | 6 ++----
 src/compiler/utilities.ts | 5 +++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 6b49b0bdb93..88f4b1bfe6b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5226,7 +5226,7 @@ namespace ts {
                 let hasThisParameter: boolean;
                 const iife = getImmediatelyInvokedFunctionExpression(declaration);
                 const isJSConstructSignature = isJSDocConstructSignature(declaration);
-                const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration);
+                const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration) && !hasJSDocParamterTags(declaration);
 
                 // If this is a JSDoc construct signature, then skip the first parameter in the
                 // parameter list.  The first parameter represents the return type of the construct
@@ -5252,13 +5252,11 @@ namespace ts {
                         hasLiteralTypes = true;
                     }
 
-                    const isUntypedParamInJSFile = isUntypedSignatureInJSFile && !param.type && !getJSDocParameterTags(param);
-
                     // Record a new minimum argument count if this is not an optional parameter
                     const isOptionalParameter = param.initializer || param.questionToken || param.dotDotDotToken ||
                         iife && parameters.length > iife.arguments.length && !param.type ||
                         isJSDocOptionalParameter(param) ||
-                        isUntypedParamInJSFile;
+                        isUntypedSignatureInJSFile;
                     if (!isOptionalParameter) {
                         minArgumentCount = parameters.length;
                     }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 01cfcb08047..9935c2fb849 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1518,6 +1518,11 @@ namespace ts {
         return map(getJSDocs(node), doc => doc.comment);
     }
 
+    export function hasJSDocParamterTags(node: FunctionLikeDeclaration | SignatureDeclaration) {
+        const parameterTags = getJSDocTags(node, SyntaxKind.JSDocParameterTag);
+        return parameterTags && parameterTags.length > 0;
+    }
+
     function getJSDocTags(node: Node, kind: SyntaxKind): JSDocTag[] {
         const docs = getJSDocs(node);
         if (docs) {

From 43c49b1ae7218b38f7d5c9d43b7529054c5d4b04 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 9 Feb 2017 15:32:17 -0800
Subject: [PATCH 120/127] Properly handle private/protected properties in
 intersection types

---
 src/compiler/checker.ts              | 146 ++++++++++++++++++++-------
 src/compiler/diagnosticMessages.json |   4 +
 src/compiler/types.ts                |   8 +-
 3 files changed, 117 insertions(+), 41 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index a0878b47ebb..e25f3681278 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3736,9 +3736,9 @@ namespace ts {
             return getObjectFlags(type) & ObjectFlags.Reference ? (<TypeReference>type).target : type;
         }
 
-        function hasBaseType(type: BaseType, checkBase: BaseType) {
+        function hasBaseType(type: Type, checkBase: Type) {
             return check(type);
-            function check(type: BaseType): boolean {
+            function check(type: Type): boolean {
                 if (getObjectFlags(type) & (ObjectFlags.ClassOrInterface | ObjectFlags.Reference)) {
                     const target = <InterfaceType>getTargetType(type);
                     return target === checkBase || forEach(getBaseTypes(target), check);
@@ -4939,17 +4939,19 @@ namespace ts {
         }
 
         function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol {
-            const types = containingType.types;
-            const excludeModifiers = containingType.flags & TypeFlags.Union ? ModifierFlags.Private | ModifierFlags.Protected : 0;
             let props: Symbol[];
+            const types = containingType.types;
+            const isUnion = containingType.flags & TypeFlags.Union;
+            const excludeModifiers = isUnion ? ModifierFlags.NonPublicAccessibilityModifier : 0;
             // Flags we want to propagate to the result if they exist in all source symbols
-            let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None;
+            let commonFlags = isUnion ? SymbolFlags.None : SymbolFlags.Optional;
             let checkFlags = CheckFlags.SyntheticProperty;
             for (const current of types) {
                 const type = getApparentType(current);
                 if (type !== unknownType) {
                     const prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & excludeModifiers)) {
+                    const modifiers = prop ? getDeclarationModifierFlagsFromSymbol(prop) : 0;
+                    if (prop && !(modifiers & excludeModifiers)) {
                         commonFlags &= prop.flags;
                         if (!props) {
                             props = [prop];
@@ -4957,11 +4959,13 @@ namespace ts {
                         else if (!contains(props, prop)) {
                             props.push(prop);
                         }
-                        if (isReadonlySymbol(prop)) {
-                            checkFlags |= CheckFlags.Readonly;
-                        }
+                        checkFlags |= (isReadonlySymbol(prop) ? CheckFlags.Readonly : 0) |
+                            (!(modifiers & ModifierFlags.NonPublicAccessibilityModifier) ? CheckFlags.ContainsPublic : 0) |
+                            (modifiers & ModifierFlags.Protected ? CheckFlags.ContainsProtected : 0) |
+                            (modifiers & ModifierFlags.Private ? CheckFlags.ContainsPrivate : 0) |
+                            (modifiers & ModifierFlags.Static ? CheckFlags.ContainsStatic : 0);
                     }
-                    else if (containingType.flags & TypeFlags.Union) {
+                    else if (isUnion) {
                         checkFlags |= CheckFlags.Partial;
                     }
                 }
@@ -4992,7 +4996,7 @@ namespace ts {
             result.checkFlags = checkFlags;
             result.containingType = containingType;
             result.declarations = declarations;
-            result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
 
@@ -6066,7 +6070,10 @@ namespace ts {
                 if (type.flags & TypeFlags.Union && typeSet.unionIndex === undefined) {
                     typeSet.unionIndex = typeSet.length;
                 }
-                typeSet.push(type);
+                if (!(type.flags & TypeFlags.Object && (<ObjectType>type).objectFlags & ObjectFlags.Anonymous &&
+                    type.symbol && type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method) && containsIdenticalType(typeSet, type))) {
+                    typeSet.push(type);
+                }
             }
         }
 
@@ -7950,6 +7957,12 @@ namespace ts {
                             const sourcePropFlags = getDeclarationModifierFlagsFromSymbol(sourceProp);
                             const targetPropFlags = getDeclarationModifierFlagsFromSymbol(targetProp);
                             if (sourcePropFlags & ModifierFlags.Private || targetPropFlags & ModifierFlags.Private) {
+                                if (getCheckFlags(sourceProp) & CheckFlags.ContainsPrivate) {
+                                    if (reportErrors) {
+                                        reportError(Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                                    }
+                                    return Ternary.False;
+                                }
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
                                         if (sourcePropFlags & ModifierFlags.Private && targetPropFlags & ModifierFlags.Private) {
@@ -7965,13 +7978,10 @@ namespace ts {
                                 }
                             }
                             else if (targetPropFlags & ModifierFlags.Protected) {
-                                const sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & SymbolFlags.Class;
-                                const sourceClass = sourceDeclaredInClass ? <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined;
-                                const targetClass = <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp));
-                                if (!sourceClass || !hasBaseType(sourceClass, targetClass)) {
+                                if (!isValidOverrideOf(sourceProp, targetProp)) {
                                     if (reportErrors) {
-                                        reportError(Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2,
-                                            symbolToString(targetProp), typeToString(sourceClass || source), typeToString(targetClass));
+                                        reportError(Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp),
+                                            typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
                                     }
                                     return Ternary.False;
                                 }
@@ -8213,6 +8223,49 @@ namespace ts {
             }
         }
 
+        // Invoke the callback for each underlying property symbol of the given symbol and return the first
+        // value that isn't undefined.
+        function forEachProperty<T>(prop: Symbol, callback: (p: Symbol) => T): T {
+            if (getCheckFlags(prop) & CheckFlags.SyntheticProperty) {
+                for (const t of (<TransientSymbol>prop).containingType.types) {
+                    const p = getPropertyOfType(t, prop.name);
+                    const result = p && forEachProperty(p, callback);
+                    if (result) {
+                        return result;
+                    }
+                }
+                return undefined;
+            }
+            return callback(prop);
+        }
+
+        // Return the declaring class type of a property or undefined if property not declared in class
+        function getDeclaringClass(prop: Symbol) {
+            return prop.parent && prop.parent.flags & SymbolFlags.Class ? getDeclaredTypeOfSymbol(getParentOfSymbol(prop)) : undefined;
+        }
+
+        // Return true if some underlying source property is declared in a class that derives
+        // from the given base class.
+        function isPropertyInClassDerivedFrom(prop: Symbol, baseClass: Type) {
+            return forEachProperty(prop, sp => {
+                const sourceClass = getDeclaringClass(sp);
+                return sourceClass ? hasBaseType(sourceClass, baseClass) : false;
+            });
+        }
+
+        // Return true if source property is a valid override of protected parts of target property.
+        function isValidOverrideOf(sourceProp: Symbol, targetProp: Symbol) {
+            return !forEachProperty(targetProp, tp => getDeclarationModifierFlagsFromSymbol(tp) & ModifierFlags.Protected ?
+                !isPropertyInClassDerivedFrom(sourceProp, getDeclaringClass(tp)) : false);
+        }
+
+        // Return true if the given class derives from each of the declaring classes of the protected
+        // constituents of the given property.
+        function isClassDerivedFromDeclaringClasses(checkClass: Type, prop: Symbol) {
+            return forEachProperty(prop, p => getDeclarationModifierFlagsFromSymbol(p) & ModifierFlags.Protected ?
+                !hasBaseType(checkClass, getDeclaringClass(p)) : false) ? undefined : checkClass;
+        }
+
         // Return true if the given type is the constructor type for an abstract class
         function isAbstractConstructorType(type: Type) {
             if (getObjectFlags(type) & ObjectFlags.Anonymous) {
@@ -12369,7 +12422,22 @@ namespace ts {
         }
 
         function getDeclarationModifierFlagsFromSymbol(s: Symbol): ModifierFlags {
-            return s.valueDeclaration ? getCombinedModifierFlags(s.valueDeclaration) : s.flags & SymbolFlags.Prototype ? ModifierFlags.Public | ModifierFlags.Static : 0;
+            if (s.valueDeclaration) {
+                const flags = getCombinedModifierFlags(s.valueDeclaration);
+                return s.parent && s.parent.flags & SymbolFlags.Class ? flags : flags & ~ModifierFlags.AccessibilityModifier;
+            }
+            if (getCheckFlags(s) & CheckFlags.SyntheticProperty) {
+                const checkFlags = (<TransientSymbol>s).checkFlags;
+                const accessModifier = checkFlags & CheckFlags.ContainsPrivate ? ModifierFlags.Private :
+                    checkFlags & CheckFlags.ContainsPublic ? ModifierFlags.Public :
+                    ModifierFlags.Protected;
+                const staticModifier = checkFlags & CheckFlags.ContainsStatic ? ModifierFlags.Static : 0;
+                return accessModifier | staticModifier;
+            }
+            if (s.flags & SymbolFlags.Prototype) {
+                return ModifierFlags.Public | ModifierFlags.Static;
+            }
+            return 0;
         }
 
         function getDeclarationNodeFlagsFromSymbol(s: Symbol): NodeFlags {
@@ -12384,12 +12452,18 @@ namespace ts {
          * @param type The type of left.
          * @param prop The symbol for the right hand side of the property access.
          */
-        function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName | VariableLikeDeclaration, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean {
+        function checkPropertyAccessibility(node: PropertyAccessExpression | QualifiedName | VariableLikeDeclaration, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean {
             const flags = getDeclarationModifierFlagsFromSymbol(prop);
-            const declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
             const errorNode = node.kind === SyntaxKind.PropertyAccessExpression || node.kind === SyntaxKind.VariableDeclaration ?
                 (<PropertyAccessExpression | VariableDeclaration>node).name :
                 (<QualifiedName>node).right;
+
+            if (getCheckFlags(prop) & CheckFlags.ContainsPrivate) {
+                // Synthetic property with private constituent property
+                error(errorNode, Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
+                return false;
+            }
+
             if (left.kind === SyntaxKind.SuperKeyword) {
                 // TS 1.0 spec (April 2014): 4.8.2
                 // - In a constructor, instance member function, instance member accessor, or
@@ -12408,14 +12482,12 @@ namespace ts {
                         return false;
                     }
                 }
-
                 if (flags & ModifierFlags.Abstract) {
                     // A method cannot be accessed in a super property access if the method is abstract.
                     // This error could mask a private property access error. But, a member
                     // cannot simultaneously be private and abstract, so this will trigger an
                     // additional error elsewhere.
-
-                    error(errorNode, Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(declaringClass));
+                    error(errorNode, Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(getDeclaringClass(prop)));
                     return false;
                 }
             }
@@ -12431,7 +12503,7 @@ namespace ts {
             if (flags & ModifierFlags.Private) {
                 const declaringClassDeclaration = <ClassLikeDeclaration>getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
                 if (!isNodeWithinClass(node, declaringClassDeclaration)) {
-                    error(errorNode, Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
+                    error(errorNode, Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(getDeclaringClass(prop)));
                     return false;
                 }
                 return true;
@@ -12444,15 +12516,15 @@ namespace ts {
                 return true;
             }
 
-            // Get the enclosing class that has the declaring class as its base type
+            // Find the first enclosing class that has the declaring classes of the protected constituents
+            // of the property as base classes
             const enclosingClass = forEachEnclosingClass(node, enclosingDeclaration => {
                 const enclosingClass = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
-                return hasBaseType(enclosingClass, declaringClass) ? enclosingClass : undefined;
+                return isClassDerivedFromDeclaringClasses(enclosingClass, prop) ? enclosingClass : undefined;
             });
-
             // A protected property is accessible if the property is within the declaring class or classes derived from it
             if (!enclosingClass) {
-                error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
+                error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(getDeclaringClass(prop) || type));
                 return false;
             }
             // No further restrictions for static properties
@@ -12464,9 +12536,7 @@ namespace ts {
                 // get the original type -- represented as the type constraint of the 'this' type
                 type = getConstraintOfTypeParameter(<TypeParameter>type);
             }
-
-            // TODO: why is the first part of this check here?
-            if (!(getObjectFlags(getTargetType(type)) & ObjectFlags.ClassOrInterface && hasBaseType(<InterfaceType>type, enclosingClass))) {
+            if (!(getObjectFlags(getTargetType(type)) & ObjectFlags.ClassOrInterface && hasBaseType(type, enclosingClass))) {
                 error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
@@ -12553,9 +12623,7 @@ namespace ts {
 
             getNodeLinks(node).resolvedSymbol = prop;
 
-            if (prop.parent && prop.parent.flags & SymbolFlags.Class) {
-                checkClassPropertyAccess(node, left, apparentType, prop);
-            }
+            checkPropertyAccessibility(node, left, apparentType, prop);
 
             const propType = getTypeOfSymbol(prop);
             const assignmentKind = getAssignmentTargetKind(node);
@@ -12587,8 +12655,8 @@ namespace ts {
             const type = checkExpression(left);
             if (type !== unknownType && !isTypeAny(type)) {
                 const prop = getPropertyOfType(getWidenedType(type), propertyName);
-                if (prop && prop.parent && prop.parent.flags & SymbolFlags.Class) {
-                    return checkClassPropertyAccess(node, left, type, prop);
+                if (prop) {
+                    return checkPropertyAccessibility(node, left, type, prop);
                 }
             }
             return true;
@@ -17527,8 +17595,8 @@ namespace ts {
                 const name = node.propertyName || <Identifier>node.name;
                 const property = getPropertyOfType(parentType, getTextOfPropertyName(name));
                 markPropertyAsReferenced(property);
-                if (parent.initializer && property && getParentOfSymbol(property)) {
-                    checkClassPropertyAccess(parent, parent.initializer, parentType, property);
+                if (parent.initializer && property) {
+                    checkPropertyAccessibility(parent, parent.initializer, parentType, property);
                 }
             }
 
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 93953a3b90a..880547bac85 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1787,6 +1787,10 @@
         "category": "Error",
         "code": 2545
     },
+    "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'.": {
+        "category": "Error",
+        "code": 2546
+    },
     "JSX element attributes type '{0}' may not be a union type.": {
         "category": "Error",
         "code": 2600
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 6912931be65..db9873734aa 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2727,8 +2727,12 @@
         Instantiated      = 1 << 0,         // Instantiated symbol
         SyntheticProperty = 1 << 1,         // Property in union or intersection type
         Readonly          = 1 << 2,         // Readonly transient symbol
-        Partial           = 1 << 3,         // Property present in some but not all constituents
-        HasNonUniformType = 1 << 4,         // Constituents have non-uniform types
+        Partial           = 1 << 3,         // Synthetic property present in some but not all constituents
+        HasNonUniformType = 1 << 4,         // Synthetic property with non-uniform type in constituents
+        ContainsPublic    = 1 << 5,         // Synthetic property with public constituent(s)
+        ContainsProtected = 1 << 6,         // Synthetic property with protected constituent(s)
+        ContainsPrivate   = 1 << 7,         // Synthetic property with private constituent(s)
+        ContainsStatic    = 1 << 8,         // Synthetic property with static constituent(s)
     }
 
     /* @internal */

From e76607e8649d86d6fba3342345f6fb020501bc96 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 9 Feb 2017 16:24:32 -0800
Subject: [PATCH 121/127] Fix typo

---
 src/compiler/checker.ts   | 2 +-
 src/compiler/utilities.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 88f4b1bfe6b..62b761cae5b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5226,7 +5226,7 @@ namespace ts {
                 let hasThisParameter: boolean;
                 const iife = getImmediatelyInvokedFunctionExpression(declaration);
                 const isJSConstructSignature = isJSDocConstructSignature(declaration);
-                const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration) && !hasJSDocParamterTags(declaration);
+                const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration) && !hasJSDocParameterTags(declaration);
 
                 // If this is a JSDoc construct signature, then skip the first parameter in the
                 // parameter list.  The first parameter represents the return type of the construct
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 9935c2fb849..7d6d93c3c4e 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1518,7 +1518,7 @@ namespace ts {
         return map(getJSDocs(node), doc => doc.comment);
     }
 
-    export function hasJSDocParamterTags(node: FunctionLikeDeclaration | SignatureDeclaration) {
+    export function hasJSDocParameterTags(node: FunctionLikeDeclaration | SignatureDeclaration) {
         const parameterTags = getJSDocTags(node, SyntaxKind.JSDocParameterTag);
         return parameterTags && parameterTags.length > 0;
     }

From 88961a276d4011e88eec5f45c739eec084b66710 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 9 Feb 2017 17:47:04 -0800
Subject: [PATCH 122/127] Add tests

---
 .../compiler/mixinPrivateAndProtected.ts      |  88 ++++++++++++++
 .../classes/mixinAccessModifiers.ts           | 108 ++++++++++++++++++
 2 files changed, 196 insertions(+)
 create mode 100644 tests/cases/compiler/mixinPrivateAndProtected.ts
 create mode 100644 tests/cases/conformance/classes/mixinAccessModifiers.ts

diff --git a/tests/cases/compiler/mixinPrivateAndProtected.ts b/tests/cases/compiler/mixinPrivateAndProtected.ts
new file mode 100644
index 00000000000..5cbcdb1c7b6
--- /dev/null
+++ b/tests/cases/compiler/mixinPrivateAndProtected.ts
@@ -0,0 +1,88 @@
+// Repro from #13830
+
+type Constructor<T> = new(...args: any[]) => T;
+
+class A {
+    public pb: number = 2;
+    protected ptd: number = 1;
+    private pvt: number = 0;
+}
+
+function mixB<T extends Constructor<{}>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 10;
+        private pvt: number = 0;
+    };
+}
+
+function mixB2<T extends Constructor<A>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 10;
+    };
+}
+
+const
+    AB = mixB(A),
+    AB2 = mixB2(A);
+
+function mixC<T extends Constructor<{}>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 100;
+        private pvt: number = 0;
+    };
+}
+
+const
+    AB2C = mixC(AB2),
+    ABC = mixC(AB);
+
+const
+    a = new A(),
+    ab = new AB(),
+    abc = new ABC(),
+    ab2c = new AB2C();
+
+a.pb.toFixed();
+a.ptd.toFixed();    // Error
+a.pvt.toFixed();    // Error
+
+ab.pb.toFixed();
+ab.ptd.toFixed();   // Error
+ab.pvt.toFixed();   // Error
+
+abc.pb.toFixed();
+abc.ptd.toFixed();  // Error
+abc.pvt.toFixed();  // Error
+
+ab2c.pb.toFixed();
+ab2c.ptd.toFixed(); // Error
+ab2c.pvt.toFixed(); // Error
+
+// Repro from #13924
+
+class Person {
+	constructor(public name: string) {}
+
+	protected myProtectedFunction() {
+		// do something
+	}
+}
+
+function PersonMixin<T extends Constructor<Person>>(Base: T) {
+	return class extends Base {
+		constructor(...args: any[]) {
+			super(...args);
+		}
+
+		myProtectedFunction() {
+			super.myProtectedFunction();
+			// do more things
+		}
+	};
+}
+
+class Customer extends PersonMixin(Person) {
+	accountBalance: number;
+    f() {
+    }
+}
diff --git a/tests/cases/conformance/classes/mixinAccessModifiers.ts b/tests/cases/conformance/classes/mixinAccessModifiers.ts
new file mode 100644
index 00000000000..a628371eec6
--- /dev/null
+++ b/tests/cases/conformance/classes/mixinAccessModifiers.ts
@@ -0,0 +1,108 @@
+// @declaration: true
+
+type Constructable = new (...args: any[]) => object;
+
+class Private {
+	constructor (...args: any[]) {}
+	private p: string;
+}
+
+class Private2 {
+	constructor (...args: any[]) {}
+	private p: string;
+}
+
+class Protected {
+	constructor (...args: any[]) {}
+	protected p: string;
+	protected static s: string;
+}
+
+class Protected2 {
+	constructor (...args: any[]) {}
+	protected p: string;
+	protected static s: string;
+}
+
+class Public {
+	constructor (...args: any[]) {}
+	public p: string;
+	public static s: string;
+}
+
+class Public2 {
+	constructor (...args: any[]) {}
+	public p: string;
+	public static s: string;
+}
+
+function f1(x: Private & Private2) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f2(x: Private & Protected) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f3(x: Private & Public) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f4(x: Protected & Protected2) {
+	x.p;  // Error, protected when all constituents are protected
+}
+
+function f5(x: Protected & Public) {
+	x.p;  // Ok, public if any constituent is public
+}
+
+function f6(x: Public & Public2) {
+	x.p;  // Ok, public if any constituent is public
+}
+
+declare function Mix<T, U>(c1: T, c2: U): T & U;
+
+// Can't derive from type with inaccessible properties
+
+class C1 extends Mix(Private, Private2) {}
+class C2 extends Mix(Private, Protected) {}
+class C3 extends Mix(Private, Public) {}
+
+class C4 extends Mix(Protected, Protected2) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;
+		C5.s;
+		C6.s
+	}
+}
+
+class C5 extends Mix(Protected, Public) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;  // Error, not in class deriving from Protected2
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;  // Error, not in class deriving from Protected2
+		C5.s;
+		C6.s
+	}
+}
+
+class C6 extends Mix(Public, Public2) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;  // Error, not in class deriving from Protected2
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;  // Error, not in class deriving from Protected2
+		C5.s;
+		C6.s
+	}
+}

From c870beffc73959f9e16e879dd9feafc193e1085d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 9 Feb 2017 17:47:25 -0800
Subject: [PATCH 123/127] Accept new baselines

---
 .../reference/mixinAccessModifiers.errors.txt | 156 +++++++++
 .../reference/mixinAccessModifiers.js         | 323 ++++++++++++++++++
 .../mixinPrivateAndProtected.errors.txt       | 116 +++++++
 .../reference/mixinPrivateAndProtected.js     | 197 +++++++++++
 4 files changed, 792 insertions(+)
 create mode 100644 tests/baselines/reference/mixinAccessModifiers.errors.txt
 create mode 100644 tests/baselines/reference/mixinAccessModifiers.js
 create mode 100644 tests/baselines/reference/mixinPrivateAndProtected.errors.txt
 create mode 100644 tests/baselines/reference/mixinPrivateAndProtected.js

diff --git a/tests/baselines/reference/mixinAccessModifiers.errors.txt b/tests/baselines/reference/mixinAccessModifiers.errors.txt
new file mode 100644
index 00000000000..a161a855881
--- /dev/null
+++ b/tests/baselines/reference/mixinAccessModifiers.errors.txt
@@ -0,0 +1,156 @@
+tests/cases/conformance/classes/mixinAccessModifiers.ts(39,4): error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Private2'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(43,4): error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Protected'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(47,4): error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Public'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(51,4): error TS2445: Property 'p' is protected and only accessible within class 'Protected & Protected2' and its subclasses.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(66,7): error TS2415: Class 'C1' incorrectly extends base class 'Private & Private2'.
+  Type 'C1' is not assignable to type 'Private'.
+    Property 'p' has conflicting declarations and is inaccessible in type 'C1'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(67,7): error TS2415: Class 'C2' incorrectly extends base class 'Private & Protected'.
+  Type 'C2' is not assignable to type 'Private'.
+    Property 'p' has conflicting declarations and is inaccessible in type 'C2'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(68,7): error TS2415: Class 'C3' incorrectly extends base class 'Private & Public'.
+  Type 'C3' is not assignable to type 'Private'.
+    Property 'p' has conflicting declarations and is inaccessible in type 'C3'.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(85,6): error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(90,6): error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(98,6): error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses.
+tests/cases/conformance/classes/mixinAccessModifiers.ts(103,6): error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses.
+
+
+==== tests/cases/conformance/classes/mixinAccessModifiers.ts (11 errors) ====
+    
+    type Constructable = new (...args: any[]) => object;
+    
+    class Private {
+    	constructor (...args: any[]) {}
+    	private p: string;
+    }
+    
+    class Private2 {
+    	constructor (...args: any[]) {}
+    	private p: string;
+    }
+    
+    class Protected {
+    	constructor (...args: any[]) {}
+    	protected p: string;
+    	protected static s: string;
+    }
+    
+    class Protected2 {
+    	constructor (...args: any[]) {}
+    	protected p: string;
+    	protected static s: string;
+    }
+    
+    class Public {
+    	constructor (...args: any[]) {}
+    	public p: string;
+    	public static s: string;
+    }
+    
+    class Public2 {
+    	constructor (...args: any[]) {}
+    	public p: string;
+    	public static s: string;
+    }
+    
+    function f1(x: Private & Private2) {
+    	x.p;  // Error, private constituent makes property inaccessible
+    	  ~
+!!! error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Private2'.
+    }
+    
+    function f2(x: Private & Protected) {
+    	x.p;  // Error, private constituent makes property inaccessible
+    	  ~
+!!! error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Protected'.
+    }
+    
+    function f3(x: Private & Public) {
+    	x.p;  // Error, private constituent makes property inaccessible
+    	  ~
+!!! error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Public'.
+    }
+    
+    function f4(x: Protected & Protected2) {
+    	x.p;  // Error, protected when all constituents are protected
+    	  ~
+!!! error TS2445: Property 'p' is protected and only accessible within class 'Protected & Protected2' and its subclasses.
+    }
+    
+    function f5(x: Protected & Public) {
+    	x.p;  // Ok, public if any constituent is public
+    }
+    
+    function f6(x: Public & Public2) {
+    	x.p;  // Ok, public if any constituent is public
+    }
+    
+    declare function Mix<T, U>(c1: T, c2: U): T & U;
+    
+    // Can't derive from type with inaccessible properties
+    
+    class C1 extends Mix(Private, Private2) {}
+          ~~
+!!! error TS2415: Class 'C1' incorrectly extends base class 'Private & Private2'.
+!!! error TS2415:   Type 'C1' is not assignable to type 'Private'.
+!!! error TS2415:     Property 'p' has conflicting declarations and is inaccessible in type 'C1'.
+    class C2 extends Mix(Private, Protected) {}
+          ~~
+!!! error TS2415: Class 'C2' incorrectly extends base class 'Private & Protected'.
+!!! error TS2415:   Type 'C2' is not assignable to type 'Private'.
+!!! error TS2415:     Property 'p' has conflicting declarations and is inaccessible in type 'C2'.
+    class C3 extends Mix(Private, Public) {}
+          ~~
+!!! error TS2415: Class 'C3' incorrectly extends base class 'Private & Public'.
+!!! error TS2415:   Type 'C3' is not assignable to type 'Private'.
+!!! error TS2415:     Property 'p' has conflicting declarations and is inaccessible in type 'C3'.
+    
+    class C4 extends Mix(Protected, Protected2) {
+    	f(c4: C4, c5: C5, c6: C6) {
+    		c4.p;
+    		c5.p;
+    		c6.p;
+    	}
+    	static g() {
+    		C4.s;
+    		C5.s;
+    		C6.s
+    	}
+    }
+    
+    class C5 extends Mix(Protected, Public) {
+    	f(c4: C4, c5: C5, c6: C6) {
+    		c4.p;  // Error, not in class deriving from Protected2
+    		   ~
+!!! error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses.
+    		c5.p;
+    		c6.p;
+    	}
+    	static g() {
+    		C4.s;  // Error, not in class deriving from Protected2
+    		   ~
+!!! error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses.
+    		C5.s;
+    		C6.s
+    	}
+    }
+    
+    class C6 extends Mix(Public, Public2) {
+    	f(c4: C4, c5: C5, c6: C6) {
+    		c4.p;  // Error, not in class deriving from Protected2
+    		   ~
+!!! error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses.
+    		c5.p;
+    		c6.p;
+    	}
+    	static g() {
+    		C4.s;  // Error, not in class deriving from Protected2
+    		   ~
+!!! error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses.
+    		C5.s;
+    		C6.s
+    	}
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/mixinAccessModifiers.js b/tests/baselines/reference/mixinAccessModifiers.js
new file mode 100644
index 00000000000..5bf42f480fb
--- /dev/null
+++ b/tests/baselines/reference/mixinAccessModifiers.js
@@ -0,0 +1,323 @@
+//// [mixinAccessModifiers.ts]
+
+type Constructable = new (...args: any[]) => object;
+
+class Private {
+	constructor (...args: any[]) {}
+	private p: string;
+}
+
+class Private2 {
+	constructor (...args: any[]) {}
+	private p: string;
+}
+
+class Protected {
+	constructor (...args: any[]) {}
+	protected p: string;
+	protected static s: string;
+}
+
+class Protected2 {
+	constructor (...args: any[]) {}
+	protected p: string;
+	protected static s: string;
+}
+
+class Public {
+	constructor (...args: any[]) {}
+	public p: string;
+	public static s: string;
+}
+
+class Public2 {
+	constructor (...args: any[]) {}
+	public p: string;
+	public static s: string;
+}
+
+function f1(x: Private & Private2) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f2(x: Private & Protected) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f3(x: Private & Public) {
+	x.p;  // Error, private constituent makes property inaccessible
+}
+
+function f4(x: Protected & Protected2) {
+	x.p;  // Error, protected when all constituents are protected
+}
+
+function f5(x: Protected & Public) {
+	x.p;  // Ok, public if any constituent is public
+}
+
+function f6(x: Public & Public2) {
+	x.p;  // Ok, public if any constituent is public
+}
+
+declare function Mix<T, U>(c1: T, c2: U): T & U;
+
+// Can't derive from type with inaccessible properties
+
+class C1 extends Mix(Private, Private2) {}
+class C2 extends Mix(Private, Protected) {}
+class C3 extends Mix(Private, Public) {}
+
+class C4 extends Mix(Protected, Protected2) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;
+		C5.s;
+		C6.s
+	}
+}
+
+class C5 extends Mix(Protected, Public) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;  // Error, not in class deriving from Protected2
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;  // Error, not in class deriving from Protected2
+		C5.s;
+		C6.s
+	}
+}
+
+class C6 extends Mix(Public, Public2) {
+	f(c4: C4, c5: C5, c6: C6) {
+		c4.p;  // Error, not in class deriving from Protected2
+		c5.p;
+		c6.p;
+	}
+	static g() {
+		C4.s;  // Error, not in class deriving from Protected2
+		C5.s;
+		C6.s
+	}
+}
+
+
+//// [mixinAccessModifiers.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var Private = (function () {
+    function Private() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Private;
+}());
+var Private2 = (function () {
+    function Private2() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Private2;
+}());
+var Protected = (function () {
+    function Protected() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Protected;
+}());
+var Protected2 = (function () {
+    function Protected2() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Protected2;
+}());
+var Public = (function () {
+    function Public() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Public;
+}());
+var Public2 = (function () {
+    function Public2() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+    }
+    return Public2;
+}());
+function f1(x) {
+    x.p; // Error, private constituent makes property inaccessible
+}
+function f2(x) {
+    x.p; // Error, private constituent makes property inaccessible
+}
+function f3(x) {
+    x.p; // Error, private constituent makes property inaccessible
+}
+function f4(x) {
+    x.p; // Error, protected when all constituents are protected
+}
+function f5(x) {
+    x.p; // Ok, public if any constituent is public
+}
+function f6(x) {
+    x.p; // Ok, public if any constituent is public
+}
+// Can't derive from type with inaccessible properties
+var C1 = (function (_super) {
+    __extends(C1, _super);
+    function C1() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return C1;
+}(Mix(Private, Private2)));
+var C2 = (function (_super) {
+    __extends(C2, _super);
+    function C2() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return C2;
+}(Mix(Private, Protected)));
+var C3 = (function (_super) {
+    __extends(C3, _super);
+    function C3() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return C3;
+}(Mix(Private, Public)));
+var C4 = (function (_super) {
+    __extends(C4, _super);
+    function C4() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    C4.prototype.f = function (c4, c5, c6) {
+        c4.p;
+        c5.p;
+        c6.p;
+    };
+    C4.g = function () {
+        C4.s;
+        C5.s;
+        C6.s;
+    };
+    return C4;
+}(Mix(Protected, Protected2)));
+var C5 = (function (_super) {
+    __extends(C5, _super);
+    function C5() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    C5.prototype.f = function (c4, c5, c6) {
+        c4.p; // Error, not in class deriving from Protected2
+        c5.p;
+        c6.p;
+    };
+    C5.g = function () {
+        C4.s; // Error, not in class deriving from Protected2
+        C5.s;
+        C6.s;
+    };
+    return C5;
+}(Mix(Protected, Public)));
+var C6 = (function (_super) {
+    __extends(C6, _super);
+    function C6() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    C6.prototype.f = function (c4, c5, c6) {
+        c4.p; // Error, not in class deriving from Protected2
+        c5.p;
+        c6.p;
+    };
+    C6.g = function () {
+        C4.s; // Error, not in class deriving from Protected2
+        C5.s;
+        C6.s;
+    };
+    return C6;
+}(Mix(Public, Public2)));
+
+
+//// [mixinAccessModifiers.d.ts]
+declare type Constructable = new (...args: any[]) => object;
+declare class Private {
+    constructor(...args: any[]);
+    private p;
+}
+declare class Private2 {
+    constructor(...args: any[]);
+    private p;
+}
+declare class Protected {
+    constructor(...args: any[]);
+    protected p: string;
+    protected static s: string;
+}
+declare class Protected2 {
+    constructor(...args: any[]);
+    protected p: string;
+    protected static s: string;
+}
+declare class Public {
+    constructor(...args: any[]);
+    p: string;
+    static s: string;
+}
+declare class Public2 {
+    constructor(...args: any[]);
+    p: string;
+    static s: string;
+}
+declare function f1(x: Private & Private2): void;
+declare function f2(x: Private & Protected): void;
+declare function f3(x: Private & Public): void;
+declare function f4(x: Protected & Protected2): void;
+declare function f5(x: Protected & Public): void;
+declare function f6(x: Public & Public2): void;
+declare function Mix<T, U>(c1: T, c2: U): T & U;
+declare class C1 extends Private & Private2 {
+}
+declare class C2 extends Private & Protected {
+}
+declare class C3 extends Private & Public {
+}
+declare class C4 extends Protected & Protected2 {
+    f(c4: C4, c5: C5, c6: C6): void;
+    static g(): void;
+}
+declare class C5 extends Protected & Public {
+    f(c4: C4, c5: C5, c6: C6): void;
+    static g(): void;
+}
+declare class C6 extends Public & Public2 {
+    f(c4: C4, c5: C5, c6: C6): void;
+    static g(): void;
+}
diff --git a/tests/baselines/reference/mixinPrivateAndProtected.errors.txt b/tests/baselines/reference/mixinPrivateAndProtected.errors.txt
new file mode 100644
index 00000000000..131aff967d9
--- /dev/null
+++ b/tests/baselines/reference/mixinPrivateAndProtected.errors.txt
@@ -0,0 +1,116 @@
+tests/cases/compiler/mixinPrivateAndProtected.ts(46,3): error TS2445: Property 'ptd' is protected and only accessible within class 'A' and its subclasses.
+tests/cases/compiler/mixinPrivateAndProtected.ts(47,3): error TS2341: Property 'pvt' is private and only accessible within class 'A'.
+tests/cases/compiler/mixinPrivateAndProtected.ts(50,4): error TS2445: Property 'ptd' is protected and only accessible within class 'mixB<typeof A>.(Anonymous class) & A' and its subclasses.
+tests/cases/compiler/mixinPrivateAndProtected.ts(51,4): error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixB<typeof A>.(Anonymous class) & A'.
+tests/cases/compiler/mixinPrivateAndProtected.ts(54,5): error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB<typeof A>.(Anonymous class); prototype: mixB<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB<typeof A>.(Anonymous class) & A' and its subclasses.
+tests/cases/compiler/mixinPrivateAndProtected.ts(55,5): error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB<typeof A>.(Anonymous class); prototype: mixB<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB<typeof A>.(Anonymous class) & A'.
+tests/cases/compiler/mixinPrivateAndProtected.ts(58,6): error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB2<typeof A>.(Anonymous class); prototype: mixB2<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2<typeof A>.(Anonymous class) & A' and its subclasses.
+tests/cases/compiler/mixinPrivateAndProtected.ts(59,6): error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB2<typeof A>.(Anonymous class); prototype: mixB2<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2<typeof A>.(Anonymous class) & A'.
+
+
+==== tests/cases/compiler/mixinPrivateAndProtected.ts (8 errors) ====
+    // Repro from #13830
+    
+    type Constructor<T> = new(...args: any[]) => T;
+    
+    class A {
+        public pb: number = 2;
+        protected ptd: number = 1;
+        private pvt: number = 0;
+    }
+    
+    function mixB<T extends Constructor<{}>>(Cls: T) {
+        return class extends Cls {
+            protected ptd: number = 10;
+            private pvt: number = 0;
+        };
+    }
+    
+    function mixB2<T extends Constructor<A>>(Cls: T) {
+        return class extends Cls {
+            protected ptd: number = 10;
+        };
+    }
+    
+    const
+        AB = mixB(A),
+        AB2 = mixB2(A);
+    
+    function mixC<T extends Constructor<{}>>(Cls: T) {
+        return class extends Cls {
+            protected ptd: number = 100;
+            private pvt: number = 0;
+        };
+    }
+    
+    const
+        AB2C = mixC(AB2),
+        ABC = mixC(AB);
+    
+    const
+        a = new A(),
+        ab = new AB(),
+        abc = new ABC(),
+        ab2c = new AB2C();
+    
+    a.pb.toFixed();
+    a.ptd.toFixed();    // Error
+      ~~~
+!!! error TS2445: Property 'ptd' is protected and only accessible within class 'A' and its subclasses.
+    a.pvt.toFixed();    // Error
+      ~~~
+!!! error TS2341: Property 'pvt' is private and only accessible within class 'A'.
+    
+    ab.pb.toFixed();
+    ab.ptd.toFixed();   // Error
+       ~~~
+!!! error TS2445: Property 'ptd' is protected and only accessible within class 'mixB<typeof A>.(Anonymous class) & A' and its subclasses.
+    ab.pvt.toFixed();   // Error
+       ~~~
+!!! error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixB<typeof A>.(Anonymous class) & A'.
+    
+    abc.pb.toFixed();
+    abc.ptd.toFixed();  // Error
+        ~~~
+!!! error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB<typeof A>.(Anonymous class); prototype: mixB<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB<typeof A>.(Anonymous class) & A' and its subclasses.
+    abc.pvt.toFixed();  // Error
+        ~~~
+!!! error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB<typeof A>.(Anonymous class); prototype: mixB<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB<typeof A>.(Anonymous class) & A'.
+    
+    ab2c.pb.toFixed();
+    ab2c.ptd.toFixed(); // Error
+         ~~~
+!!! error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB2<typeof A>.(Anonymous class); prototype: mixB2<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2<typeof A>.(Anonymous class) & A' and its subclasses.
+    ab2c.pvt.toFixed(); // Error
+         ~~~
+!!! error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB2<typeof A>.(Anonymous class); prototype: mixB2<any>.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2<typeof A>.(Anonymous class) & A'.
+    
+    // Repro from #13924
+    
+    class Person {
+    	constructor(public name: string) {}
+    
+    	protected myProtectedFunction() {
+    		// do something
+    	}
+    }
+    
+    function PersonMixin<T extends Constructor<Person>>(Base: T) {
+    	return class extends Base {
+    		constructor(...args: any[]) {
+    			super(...args);
+    		}
+    
+    		myProtectedFunction() {
+    			super.myProtectedFunction();
+    			// do more things
+    		}
+    	};
+    }
+    
+    class Customer extends PersonMixin(Person) {
+    	accountBalance: number;
+        f() {
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/mixinPrivateAndProtected.js b/tests/baselines/reference/mixinPrivateAndProtected.js
new file mode 100644
index 00000000000..9b8f3ee0c12
--- /dev/null
+++ b/tests/baselines/reference/mixinPrivateAndProtected.js
@@ -0,0 +1,197 @@
+//// [mixinPrivateAndProtected.ts]
+// Repro from #13830
+
+type Constructor<T> = new(...args: any[]) => T;
+
+class A {
+    public pb: number = 2;
+    protected ptd: number = 1;
+    private pvt: number = 0;
+}
+
+function mixB<T extends Constructor<{}>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 10;
+        private pvt: number = 0;
+    };
+}
+
+function mixB2<T extends Constructor<A>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 10;
+    };
+}
+
+const
+    AB = mixB(A),
+    AB2 = mixB2(A);
+
+function mixC<T extends Constructor<{}>>(Cls: T) {
+    return class extends Cls {
+        protected ptd: number = 100;
+        private pvt: number = 0;
+    };
+}
+
+const
+    AB2C = mixC(AB2),
+    ABC = mixC(AB);
+
+const
+    a = new A(),
+    ab = new AB(),
+    abc = new ABC(),
+    ab2c = new AB2C();
+
+a.pb.toFixed();
+a.ptd.toFixed();    // Error
+a.pvt.toFixed();    // Error
+
+ab.pb.toFixed();
+ab.ptd.toFixed();   // Error
+ab.pvt.toFixed();   // Error
+
+abc.pb.toFixed();
+abc.ptd.toFixed();  // Error
+abc.pvt.toFixed();  // Error
+
+ab2c.pb.toFixed();
+ab2c.ptd.toFixed(); // Error
+ab2c.pvt.toFixed(); // Error
+
+// Repro from #13924
+
+class Person {
+	constructor(public name: string) {}
+
+	protected myProtectedFunction() {
+		// do something
+	}
+}
+
+function PersonMixin<T extends Constructor<Person>>(Base: T) {
+	return class extends Base {
+		constructor(...args: any[]) {
+			super(...args);
+		}
+
+		myProtectedFunction() {
+			super.myProtectedFunction();
+			// do more things
+		}
+	};
+}
+
+class Customer extends PersonMixin(Person) {
+	accountBalance: number;
+    f() {
+    }
+}
+
+
+//// [mixinPrivateAndProtected.js]
+// Repro from #13830
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var A = (function () {
+    function A() {
+        this.pb = 2;
+        this.ptd = 1;
+        this.pvt = 0;
+    }
+    return A;
+}());
+function mixB(Cls) {
+    return (function (_super) {
+        __extends(class_1, _super);
+        function class_1() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.ptd = 10;
+            _this.pvt = 0;
+            return _this;
+        }
+        return class_1;
+    }(Cls));
+}
+function mixB2(Cls) {
+    return (function (_super) {
+        __extends(class_2, _super);
+        function class_2() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.ptd = 10;
+            return _this;
+        }
+        return class_2;
+    }(Cls));
+}
+var AB = mixB(A), AB2 = mixB2(A);
+function mixC(Cls) {
+    return (function (_super) {
+        __extends(class_3, _super);
+        function class_3() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.ptd = 100;
+            _this.pvt = 0;
+            return _this;
+        }
+        return class_3;
+    }(Cls));
+}
+var AB2C = mixC(AB2), ABC = mixC(AB);
+var a = new A(), ab = new AB(), abc = new ABC(), ab2c = new AB2C();
+a.pb.toFixed();
+a.ptd.toFixed(); // Error
+a.pvt.toFixed(); // Error
+ab.pb.toFixed();
+ab.ptd.toFixed(); // Error
+ab.pvt.toFixed(); // Error
+abc.pb.toFixed();
+abc.ptd.toFixed(); // Error
+abc.pvt.toFixed(); // Error
+ab2c.pb.toFixed();
+ab2c.ptd.toFixed(); // Error
+ab2c.pvt.toFixed(); // Error
+// Repro from #13924
+var Person = (function () {
+    function Person(name) {
+        this.name = name;
+    }
+    Person.prototype.myProtectedFunction = function () {
+        // do something
+    };
+    return Person;
+}());
+function PersonMixin(Base) {
+    return (function (_super) {
+        __extends(class_4, _super);
+        function class_4() {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return _super.apply(this, args) || this;
+        }
+        class_4.prototype.myProtectedFunction = function () {
+            _super.prototype.myProtectedFunction.call(this);
+            // do more things
+        };
+        return class_4;
+    }(Base));
+}
+var Customer = (function (_super) {
+    __extends(Customer, _super);
+    function Customer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Customer.prototype.f = function () {
+    };
+    return Customer;
+}(PersonMixin(Person)));

From 15935ec48e16b80577b59d2fcb68ce885dc70a1c Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Fri, 10 Feb 2017 12:46:32 -0800
Subject: [PATCH 124/127] Emit "__esModule" before other statments

---
 src/compiler/transformers/module/module.ts    |  17 +-
 .../baselines/reference/APISample_compile.js  |   2 +-
 tests/baselines/reference/APISample_linter.js |   2 +-
 .../reference/APISample_parseConfig.js        |   2 +-
 .../reference/APISample_transform.js          |   2 +-
 .../baselines/reference/APISample_watcher.js  |   2 +-
 tests/baselines/reference/aliasAssignments.js |   4 +-
 .../reference/aliasOnMergedModuleInterface.js |   2 +-
 .../reference/aliasUsageInAccessorsOfClass.js |   6 +-
 .../baselines/reference/aliasUsageInArray.js  |   6 +-
 .../aliasUsageInFunctionExpression.js         |   6 +-
 .../reference/aliasUsageInGenericFunction.js  |   6 +-
 .../reference/aliasUsageInIndexerOfClass.js   |   6 +-
 .../reference/aliasUsageInObjectLiteral.js    |   6 +-
 .../reference/aliasUsageInOrExpression.js     |   6 +-
 ...aliasUsageInTypeArgumentOfExtendsClause.js |   6 +-
 .../reference/aliasUsageInVarAssignment.js    |   6 +-
 .../reference/aliasUsedAsNameValue.js         |   4 +-
 ...aceExportAssignmentUsedInVarInitializer.js |   2 +-
 .../allowSyntheticDefaultImports1.js          |   4 +-
 .../allowSyntheticDefaultImports10.js         |   2 +-
 .../allowSyntheticDefaultImports4.js          |   2 +-
 .../allowSyntheticDefaultImports9.js          |   2 +-
 .../reference/alwaysStrictModule4.js          |   2 +-
 .../reference/alwaysStrictModule6.js          |   2 +-
 .../reference/ambientDeclarationsExternal.js  |   2 +-
 .../reference/ambientDeclarationsPatterns.js  |   2 +-
 .../reference/ambientExternalModuleMerging.js |   2 +-
 ...rnalModuleWithInternalImportDeclaration.js |   2 +-
 ...lModuleWithoutInternalImportDeclaration.js |   2 +-
 tests/baselines/reference/ambientShorthand.js |   2 +-
 .../reference/ambientShorthand_reExport.js    |   6 +-
 .../reference/amdDependencyComment1.js        |   2 +-
 .../reference/amdDependencyComment2.js        |   2 +-
 .../reference/amdDependencyCommentName1.js    |   2 +-
 .../reference/amdDependencyCommentName2.js    |   2 +-
 .../reference/amdDependencyCommentName3.js    |   2 +-
 .../reference/amdDependencyCommentName4.js    |   2 +-
 .../reference/amdImportAsPrimaryExpression.js |   4 +-
 .../amdImportNotAsPrimaryExpression.js        |   4 +-
 .../reference/anonymousDefaultExportsAmd.js   |   4 +-
 .../anonymousDefaultExportsCommonjs.js        |   4 +-
 .../reference/anonymousDefaultExportsUmd.js   |   4 +-
 tests/baselines/reference/asOperator4.js      |   4 +-
 .../asyncAwaitIsolatedModules_es5.js          |   2 +-
 .../reference/asyncImportedPromise_es5.js     |   4 +-
 .../reference/asyncImportedPromise_es6.js     |   4 +-
 .../reference/augmentExportEquals1.js         |   2 +-
 .../reference/augmentExportEquals1_1.js       |   2 +-
 .../reference/augmentExportEquals2.js         |   2 +-
 .../reference/augmentExportEquals2_1.js       |   2 +-
 .../reference/augmentExportEquals3.js         |   4 +-
 .../reference/augmentExportEquals3_1.js       |   4 +-
 .../reference/augmentExportEquals4.js         |   4 +-
 .../reference/augmentExportEquals4_1.js       |   4 +-
 .../reference/augmentExportEquals5.js         |   2 +-
 .../reference/augmentExportEquals6.js         |   4 +-
 .../reference/augmentExportEquals6_1.js       |   2 +-
 .../augmentedTypesExternalModule1.js          |   2 +-
 tests/baselines/reference/cacheResolutions.js |   6 +-
 .../baselines/reference/chainedImportAlias.js |   4 +-
 .../baselines/reference/circularReference.js  |   4 +-
 .../reference/circularReferenceInImport.js    |   2 +-
 .../reference/classAbstractManyKeywords.js    |   2 +-
 .../reference/classExtendsAcrossFiles.js      |   4 +-
 ...classMemberInitializerWithLamdaScoping3.js |   2 +-
 ...classMemberInitializerWithLamdaScoping4.js |   2 +-
 .../collisionExportsRequireAndAlias.js        |   6 +-
 .../collisionExportsRequireAndAmbientClass.js |   2 +-
 .../collisionExportsRequireAndAmbientEnum.js  |   2 +-
 ...llisionExportsRequireAndAmbientFunction.js |   2 +-
 ...collisionExportsRequireAndAmbientModule.js |   2 +-
 .../collisionExportsRequireAndAmbientVar.js   |   2 +-
 .../collisionExportsRequireAndClass.js        |   2 +-
 .../collisionExportsRequireAndEnum.js         |   2 +-
 .../collisionExportsRequireAndFunction.js     |   2 +-
 ...ionExportsRequireAndInternalModuleAlias.js |   2 +-
 .../collisionExportsRequireAndModule.js       |   2 +-
 ...onExportsRequireAndUninstantiatedModule.js |   2 +-
 .../collisionExportsRequireAndVar.js          |   2 +-
 .../commentOnExportEnumDeclaration.js         |   2 +-
 .../reference/commentsDottedModuleName.js     |   2 +-
 .../reference/commentsExternalModules.js      |   4 +-
 .../reference/commentsExternalModules2.js     |   4 +-
 .../reference/commentsExternalModules3.js     |   4 +-
 .../reference/commentsMultiModuleMultiFile.js |   4 +-
 .../reference/commentsOnRequireStatement.js   |   6 +-
 .../commonJSImportAsPrimaryExpression.js      |   4 +-
 .../commonJSImportNotAsPrimaryExpression.js   |   4 +-
 tests/baselines/reference/commonSourceDir5.js |   6 +-
 tests/baselines/reference/commonSourceDir6.js |   6 +-
 .../reference/commonSourceDirectory.js        |   2 +-
 .../reference/commonSourceDirectory.js.map    |   2 +-
 .../commonSourceDirectory.sourcemap.txt       |  26 +-
 .../reference/commonSourceDirectory_dts.js    |   2 +-
 .../commonSourceDirectory_dts.js.map          |   2 +-
 .../commonSourceDirectory_dts.sourcemap.txt   |  20 +-
 .../baselines/reference/commonjsSafeImport.js |   4 +-
 .../reference/complexNarrowingWithAny.js      |   2 +-
 .../reference/constDeclarations-access5.js    |   4 +-
 .../reference/constEnumExternalModule.js      |   2 +-
 .../controlFlowBinaryOrExpression.js          |   2 +-
 .../controlFlowPropertyDeclarations.js        |   2 +-
 .../controlFlowSelfReferentialLoop.js         |   2 +-
 .../reference/copyrightWithNewLine1.js        |   2 +-
 .../reference/copyrightWithoutNewLine1.js     |   2 +-
 .../crashIntypeCheckInvocationExpression.js   |   2 +-
 ...rashIntypeCheckObjectCreationExpression.js |   2 +-
 .../baselines/reference/declFileAccessors.js  |   2 +-
 .../declFileAliasUseBeforeDeclaration.js      |   4 +-
 ...assWithStaticMethodReturningConstructor.js |   2 +-
 .../reference/declFileConstructors.js         |   2 +-
 ...lFileExportAssignmentOfGenericInterface.js |   2 +-
 .../reference/declFileExportImportChain.js    |   4 +-
 .../reference/declFileExportImportChain2.js   |   2 +-
 .../reference/declFileForExportedImport.js    |   2 +-
 .../baselines/reference/declFileFunctions.js  |   2 +-
 .../reference/declFileGenericType.js          |   2 +-
 ...eclFileImportModuleWithExportAssignment.js |   2 +-
 tests/baselines/reference/declFileMethods.js  |   2 +-
 .../declarationEmitClassMemberNameConflict.js |   2 +-
 .../declarationEmitExportAssignment.js        |   2 +-
 .../declarationEmitExportDeclaration.js       |   4 +-
 .../declarationEmitExpressionInExtends3.js    |   2 +-
 .../declarationEmitIdentifierPredicates01.js  |   2 +-
 ...itIdentifierPredicatesWithPrivateName01.js |   2 +-
 ...declarationEmitInferedDefaultExportType.js |   2 +-
 .../declarationEmitInferedTypeAlias1.js       |   4 +-
 .../declarationEmitInferedTypeAlias2.js       |   4 +-
 .../declarationEmitInferedTypeAlias3.js       |   4 +-
 .../declarationEmitInferedTypeAlias5.js       |   4 +-
 .../declarationEmitInferedTypeAlias6.js       |   4 +-
 .../declarationEmitInferedTypeAlias7.js       |   4 +-
 .../declarationEmitInferedTypeAlias9.js       |   2 +-
 .../reference/declarationEmitInvalidExport.js |   2 +-
 .../reference/declarationEmitNameConflicts.js |   2 +-
 .../declarationEmitNameConflictsWithAlias.js  |   2 +-
 .../reference/declarationEmitPromise.js       |   2 +-
 .../declarationEmitThisPredicates01.js        |   2 +-
 .../declarationEmitThisPredicates02.js        |   2 +-
 ...tionEmitThisPredicatesWithPrivateName01.js |   2 +-
 ...tionEmitThisPredicatesWithPrivateName02.js |   2 +-
 ...arationEmitTypeAliasWithTypeParameters1.js |   2 +-
 ...arationEmitTypeAliasWithTypeParameters2.js |   2 +-
 ...arationEmitTypeAliasWithTypeParameters5.js |   2 +-
 .../reference/declarationEmitUnknownImport.js |   2 +-
 .../declarationEmitUnknownImport2.js          |   2 +-
 .../reference/declarationMerging2.js          |   2 +-
 .../decoratedClassExportsCommonJS1.js         |   2 +-
 .../decoratedClassExportsCommonJS2.js         |   2 +-
 .../decoratedDefaultExportsGetExportedAmd.js  |   4 +-
 ...oratedDefaultExportsGetExportedCommonjs.js |   4 +-
 .../decoratedDefaultExportsGetExportedUmd.js  |   4 +-
 ...ratorInstantiateModulesInFunctionBodies.js |   4 +-
 .../baselines/reference/decoratorMetadata.js  |   4 +-
 .../decoratorMetadataOnInferredType.js        |   2 +-
 ...orMetadataRestParameterWithImportedType.js |   8 +-
 .../decoratorMetadataWithConstructorType.js   |   2 +-
 ...adataWithImportDeclarationNameCollision.js |   4 +-
 ...dataWithImportDeclarationNameCollision2.js |   4 +-
 ...dataWithImportDeclarationNameCollision3.js |   4 +-
 ...dataWithImportDeclarationNameCollision4.js |   4 +-
 ...dataWithImportDeclarationNameCollision5.js |   4 +-
 ...dataWithImportDeclarationNameCollision6.js |   4 +-
 ...dataWithImportDeclarationNameCollision7.js |   4 +-
 ...dataWithImportDeclarationNameCollision8.js |   4 +-
 .../baselines/reference/decoratorOnClass2.js  |   2 +-
 .../reference/decoratorOnClassConstructor2.js |   4 +-
 .../reference/decoratorOnClassConstructor3.js |   4 +-
 .../defaultExportInAwaitExpression01.js       |   4 +-
 .../defaultExportInAwaitExpression02.js       |   4 +-
 .../reference/defaultExportWithOverloads01.js |   2 +-
 .../reference/defaultExportsCannotMerge01.js  |   4 +-
 .../reference/defaultExportsCannotMerge02.js  |   4 +-
 .../reference/defaultExportsCannotMerge03.js  |   4 +-
 .../reference/defaultExportsCannotMerge04.js  |   2 +-
 .../reference/defaultExportsGetExportedAmd.js |   4 +-
 .../defaultExportsGetExportedCommonjs.js      |   4 +-
 .../reference/defaultExportsGetExportedUmd.js |   4 +-
 .../reference/dependencyViaImportAlias.js     |   2 +-
 .../destructuringInVariableDeclarations1.js   |   2 +-
 .../destructuringInVariableDeclarations2.js   |   2 +-
 .../destructuringInVariableDeclarations3.js   |   2 +-
 .../destructuringInVariableDeclarations4.js   |   2 +-
 .../destructuringInVariableDeclarations5.js   |   2 +-
 .../destructuringInVariableDeclarations6.js   |   2 +-
 .../reference/downlevelLetConst13.js          |   2 +-
 .../reference/duplicateLocalVariable1.js      |   2 +-
 .../reference/duplicateLocalVariable2.js      |   2 +-
 .../duplicateSymbolsExportMatching.js         |   2 +-
 .../reference/dynamicModuleTypecheckError.js  |   2 +-
 .../baselines/reference/elidingImportNames.js |   6 +-
 tests/baselines/reference/emptyModuleName.js  |   2 +-
 .../reference/enumFromExternalModule.js       |   4 +-
 .../reference/errorsOnImportedSymbol.js       |   2 +-
 .../reference/es3defaultAliasIsQuoted.js      |   4 +-
 tests/baselines/reference/es5-commonjs.js     |   2 +-
 tests/baselines/reference/es5-commonjs2.js    |   2 +-
 tests/baselines/reference/es5-commonjs3.js    |   2 +-
 tests/baselines/reference/es5-commonjs4.js    |   2 +-
 tests/baselines/reference/es5-commonjs5.js    |   2 +-
 tests/baselines/reference/es5-commonjs6.js    |   2 +-
 .../es5-importHelpersAsyncFunctions.js        |   2 +-
 tests/baselines/reference/es5-umd2.js         |   2 +-
 tests/baselines/reference/es5-umd3.js         |   2 +-
 .../es5ExportDefaultClassDeclaration.js       |   2 +-
 .../es5ExportDefaultClassDeclaration2.js      |   2 +-
 .../es5ExportDefaultClassDeclaration3.js      |   2 +-
 .../reference/es5ExportDefaultExpression.js   |   2 +-
 .../es5ExportDefaultFunctionDeclaration.js    |   2 +-
 .../es5ExportDefaultFunctionDeclaration2.js   |   2 +-
 .../es5ExportDefaultFunctionDeclaration3.js   |   2 +-
 .../reference/es5ExportDefaultIdentifier.js   |   2 +-
 .../es5ModuleInternalNamedImports.js          |   2 +-
 .../reference/es5ModuleWithModuleGenAmd.js    |   2 +-
 .../es5ModuleWithModuleGenCommonjs.js         |   2 +-
 .../es5ModuleWithoutModuleGenTarget.js        |   2 +-
 tests/baselines/reference/es6-umd2.js         |   2 +-
 .../baselines/reference/es6ExportAllInEs5.js  |   4 +-
 .../reference/es6ExportClauseInEs5.js         |   2 +-
 .../es6ExportClauseWithAssignmentInEs5.js     |   2 +-
 ...ExportClauseWithoutModuleSpecifierInEs5.js |   4 +-
 .../reference/es6ExportEqualsInterop.js       |   2 +-
 .../reference/es6ImportDefaultBindingAmd.js   |   4 +-
 .../reference/es6ImportDefaultBindingDts.js   |   4 +-
 ...rtDefaultBindingFollowedWithNamedImport.js |   4 +-
 ...ultBindingFollowedWithNamedImport1InEs5.js |   4 +-
 ...ndingFollowedWithNamedImport1WithExport.js |   4 +-
 ...efaultBindingFollowedWithNamedImportDts.js |   4 +-
 ...faultBindingFollowedWithNamedImportDts1.js |   4 +-
 ...aultBindingFollowedWithNamedImportInEs5.js |   4 +-
 ...indingFollowedWithNamedImportWithExport.js |   4 +-
 ...ndingFollowedWithNamespaceBinding1InEs5.js |   4 +-
 ...FollowedWithNamespaceBinding1WithExport.js |   4 +-
 ...tBindingFollowedWithNamespaceBindingDts.js |   4 +-
 ...BindingFollowedWithNamespaceBindingDts1.js |   4 +-
 ...indingFollowedWithNamespaceBindingInEs5.js |   4 +-
 ...gFollowedWithNamespaceBindingWithExport.js |   4 +-
 .../es6ImportDefaultBindingMergeErrors.js     |   4 +-
 ...s6ImportDefaultBindingNoDefaultProperty.js |   2 +-
 .../es6ImportDefaultBindingWithExport.js      |   4 +-
 .../reference/es6ImportNameSpaceImport.js     |   4 +-
 .../reference/es6ImportNameSpaceImportAmd.js  |   4 +-
 .../reference/es6ImportNameSpaceImportDts.js  |   4 +-
 .../es6ImportNameSpaceImportInEs5.js          |   4 +-
 .../es6ImportNameSpaceImportMergeErrors.js    |   4 +-
 .../es6ImportNameSpaceImportWithExport.js     |   4 +-
 .../reference/es6ImportNamedImport.js         |   4 +-
 .../reference/es6ImportNamedImportAmd.js      |   4 +-
 .../reference/es6ImportNamedImportDts.js      |   4 +-
 .../reference/es6ImportNamedImportInEs5.js    |   4 +-
 .../es6ImportNamedImportInExportAssignment.js |   2 +-
 ...rtNamedImportInIndirectExportAssignment.js |   2 +-
 .../es6ImportNamedImportMergeErrors.js        |   4 +-
 .../es6ImportNamedImportNoExportMember.js     |   2 +-
 .../es6ImportNamedImportWithExport.js         |   4 +-
 .../es6ImportNamedImportWithTypesAndValues.js |   4 +-
 .../es6ImportWithoutFromClauseAmd.js          |   6 +-
 .../es6ImportWithoutFromClauseInEs5.js        |   4 +-
 .../es6ImportWithoutFromClauseWithExport.js   |   4 +-
 .../es6ModuleWithModuleGenTargetAmd.js        |   2 +-
 .../es6ModuleWithModuleGenTargetCommonjs.js   |   2 +-
 .../reference/exportAndImport-es3-amd.js      |   4 +-
 .../reference/exportAndImport-es3.js          |   4 +-
 .../reference/exportAndImport-es5-amd.js      |   4 +-
 .../reference/exportAndImport-es5.js          |   4 +-
 .../reference/exportArrayBindingPattern.js    |   2 +-
 .../reference/exportAssignClassAndModule.js   |   2 +-
 .../reference/exportAssignDottedName.js       |   2 +-
 .../exportAssignImportedIdentifier.js         |   4 +-
 .../baselines/reference/exportAssignTypes.js  |   2 +-
 .../exportAssignedTypeAsTypeAnnotation.js     |   2 +-
 .../reference/exportAssignmentClass.js        |   2 +-
 .../exportAssignmentConstrainedGenericType.js |   2 +-
 .../reference/exportAssignmentEnum.js         |   2 +-
 .../reference/exportAssignmentFunction.js     |   2 +-
 .../reference/exportAssignmentGenericType.js  |   2 +-
 .../reference/exportAssignmentInterface.js    |   2 +-
 .../exportAssignmentInternalModule.js         |   2 +-
 .../exportAssignmentMergedInterface.js        |   2 +-
 .../reference/exportAssignmentMergedModule.js |   2 +-
 ...xportAssignmentOfDeclaredExternalModule.js |   2 +-
 .../exportAssignmentOfGenericType1.js         |   2 +-
 .../exportAssignmentTopLevelClodule.js        |   2 +-
 .../exportAssignmentTopLevelEnumdule.js       |   2 +-
 .../exportAssignmentTopLevelFundule.js        |   2 +-
 .../exportAssignmentTopLevelIdentifier.js     |   2 +-
 .../reference/exportAssignmentVariable.js     |   2 +-
 ...ationWithModuleSpecifierNameOnNextLine1.js |   8 +-
 .../reference/exportDeclareClass1.js          |   4 +-
 .../reference/exportDeclaredModule.js         |   2 +-
 .../reference/exportDefaultProperty.js        |   6 +-
 .../reference/exportDefaultProperty2.js       |   4 +-
 .../reference/exportEqualCallable.js          |   2 +-
 .../reference/exportEqualErrorType.js         |   2 +-
 .../reference/exportEqualMemberMissing.js     |   2 +-
 .../reference/exportEqualsDefaultProperty.js  |   2 +-
 .../reference/exportEqualsProperty.js         |   2 +-
 .../reference/exportEqualsProperty2.js        |   2 +-
 tests/baselines/reference/exportImport.js     |   4 +-
 .../reference/exportImportMultipleFiles.js    |   6 +-
 .../exportImportNonInstantiatedModule2.js     |   2 +-
 .../exportNonInitializedVariablesAMD.js       |   2 +-
 .../exportNonInitializedVariablesCommonJS.js  |   2 +-
 .../exportNonInitializedVariablesUMD.js       |   2 +-
 .../exportRedeclarationTypeAliases.js         |   2 +-
 .../reference/exportSameNameFuncVar.js        |   2 +-
 .../reference/exportSpecifierForAGlobal.js    |   2 +-
 tests/baselines/reference/exportStar-amd.js   |  10 +-
 tests/baselines/reference/exportStar.js       |  10 +-
 .../reference/exportStarForValues.js          |   2 +-
 .../reference/exportStarForValues2.js         |   4 +-
 .../reference/exportStarForValues3.js         |   8 +-
 .../reference/exportStarForValues4.js         |   4 +-
 .../reference/exportStarForValues7.js         |   4 +-
 .../reference/exportStarForValues8.js         |   8 +-
 .../reference/exportStarForValues9.js         |   4 +-
 .../reference/exportStarFromEmptyModule.js    |   6 +-
 tests/baselines/reference/exportToString.js   |   2 +-
 tests/baselines/reference/exportVisibility.js |   2 +-
 .../exportedBlockScopedDeclarations.js        |   2 +-
 .../baselines/reference/exportedVariable1.js  |   2 +-
 .../exportingContainingVisibleType.js         |   2 +-
 .../reference/exportsAndImports1-amd.js       |   6 +-
 .../reference/exportsAndImports1-es6.js       |   6 +-
 .../baselines/reference/exportsAndImports1.js |   6 +-
 .../reference/exportsAndImports2-amd.js       |   6 +-
 .../reference/exportsAndImports2-es6.js       |   6 +-
 .../baselines/reference/exportsAndImports2.js |   6 +-
 .../reference/exportsAndImports3-amd.js       |   6 +-
 .../reference/exportsAndImports3-es6.js       |   6 +-
 .../baselines/reference/exportsAndImports3.js |   6 +-
 .../reference/exportsAndImports4-amd.js       |   4 +-
 .../reference/exportsAndImports4-es6.js       |   4 +-
 .../baselines/reference/exportsAndImports4.js |   4 +-
 ...sAndImportsWithContextualKeywordNames01.js |   2 +-
 ...sAndImportsWithContextualKeywordNames02.js |   4 +-
 .../exportsAndImportsWithUnderscores1.js      |   4 +-
 .../exportsAndImportsWithUnderscores2.js      |   4 +-
 .../exportsAndImportsWithUnderscores3.js      |   4 +-
 .../exportsAndImportsWithUnderscores4.js      |   4 +-
 .../extendClassExpressionFromModule.js        |   2 +-
 ...xtendingClassFromAliasAndUsageInIndexer.js |   8 +-
 .../reference/externalModuleAssignToVar.js    |   4 +-
 .../externalModuleExportingGenericClass.js    |   2 +-
 .../externalModuleImmutableBindings.js        |   4 +-
 .../reference/externalModuleQualification.js  |   2 +-
 ...ceOfImportDeclarationWithExportModifier.js |   4 +-
 ...ernceResolutionOrderInImportDeclaration.js |   4 +-
 .../reference/externalModuleResolution.js     |   2 +-
 .../reference/externalModuleResolution2.js    |   2 +-
 .../reference/fieldAndGetterWithSameName.js   |   2 +-
 ...ilesEmittingIntoSameOutputWithOutOption.js |   2 +-
 .../functionAndImportNameConflict.js          |   4 +-
 .../functionLikeInParameterInitializer.js     |   2 +-
 .../reference/generatorES6InAMDModule.js      |   2 +-
 .../reference/genericClassesInModule2.js      |   2 +-
 .../genericInterfaceFunctionTypeParameter.js  |   2 +-
 .../reference/genericMemberFunction.js        |   2 +-
 .../reference/genericReturnTypeFromGetter1.js |   2 +-
 .../genericTypeWithMultipleBases1.js          |   2 +-
 .../genericTypeWithMultipleBases2.js          |   2 +-
 .../genericWithIndexerOfTypeParameterType2.js |   2 +-
 ...getEmitOutputWithDeclarationFile2.baseline |   2 +-
 .../getEmitOutputWithEmitterErrors2.baseline  |   2 +-
 tests/baselines/reference/giant.js            |   2 +-
 ...sAnExternalModuleInsideAnInternalModule.js |   4 +-
 .../baselines/reference/importAsBaseClass.js  |   4 +-
 tests/baselines/reference/importDecl.js       |  12 +-
 .../reference/importDeclWithClassModifiers.js |   2 +-
 .../importDeclWithDeclareModifier.js          |   2 +-
 .../reference/importDeclWithExportModifier.js |   2 +-
 ...clWithExportModifierAndExportAssignment.js |   2 +-
 .../importDeclarationUsedAsTypeQuery.js       |   2 +-
 tests/baselines/reference/importHelpers.js    |   2 +-
 tests/baselines/reference/importHelpersAmd.js |   4 +-
 .../importHelpersInIsolatedModules.js         |   4 +-
 .../baselines/reference/importHelpersInTsx.js |   2 +-
 .../reference/importHelpersNoHelpers.js       |   2 +-
 .../reference/importHelpersNoModule.js        |   2 +-
 .../reference/importHelpersOutFile.js         |   6 +-
 .../reference/importImportOnlyModule.js       |   6 +-
 .../baselines/reference/importInsideModule.js |   2 +-
 .../reference/importNonExternalModule.js      |   2 +-
 .../reference/importNonStringLiteral.js       |   2 +-
 .../baselines/reference/importTsBeforeDTs.js  |   4 +-
 .../reference/importUsedInExtendsList1.js     |   4 +-
 .../reference/importWithTrailingSlash.js      |   8 +-
 .../import_reference-exported-alias.js        |   2 +-
 .../import_reference-to-type-alias.js         |   4 +-
 ...-referenecing-aliased-type-throug-array.js |   2 +-
 ...ar-referencing-an-imported-module-alias.js |   4 +-
 .../importedAliasesInTypePositions.js         |   4 +-
 .../reference/importedModuleClassNameClash.js |   2 +-
 .../reference/importsImplicitlyReadonly.js    |   4 +-
 tests/baselines/reference/inferenceLimit.js   |   2 +-
 .../reference/instanceOfInExternalModules.js  |   4 +-
 .../reference/interfaceContextualType.js      |   2 +-
 .../reference/interfaceDeclaration3.js        |   2 +-
 .../reference/interfaceDeclaration5.js        |   2 +-
 .../reference/interfaceImplementation6.js     |   2 +-
 ...alAliasClassInsideLocalModuleWithExport.js |   2 +-
 ...liasClassInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...liasClassInsideTopLevelModuleWithExport.js |   2 +-
 ...sClassInsideTopLevelModuleWithoutExport.js |   2 +-
 ...nalAliasEnumInsideLocalModuleWithExport.js |   2 +-
 ...AliasEnumInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...AliasEnumInsideTopLevelModuleWithExport.js |   2 +-
 ...asEnumInsideTopLevelModuleWithoutExport.js |   2 +-
 ...liasFunctionInsideLocalModuleWithExport.js |   2 +-
 ...sFunctionInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...sFunctionInsideTopLevelModuleWithExport.js |   2 +-
 ...nctionInsideTopLevelModuleWithoutExport.js |   2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |   2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |   2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |   2 +-
 ...iasInterfaceInsideLocalModuleWithExport.js |   2 +-
 ...InterfaceInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |   2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |   2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |   2 +-
 ...rnalAliasVarInsideLocalModuleWithExport.js |   2 +-
 ...lAliasVarInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...lAliasVarInsideTopLevelModuleWithExport.js |   2 +-
 ...iasVarInsideTopLevelModuleWithoutExport.js |   2 +-
 .../reference/intersectionTypeInference1.js   |   2 +-
 .../isolatedModulesImportExportElision.js     |   2 +-
 .../reference/isolatedModulesPlainFile-AMD.js |   2 +-
 .../isolatedModulesPlainFile-CommonJS.js      |   2 +-
 .../reference/isolatedModulesPlainFile-UMD.js |   2 +-
 ...jsFileCompilationRestParamJsDocFunction.js |   2 +-
 .../reference/jsxEmitWithAttributes.js        |   4 +-
 .../reference/jsxFactoryAndReactNamespace.js  |   4 +-
 .../reference/jsxFactoryIdentifier.js         |   4 +-
 .../reference/jsxFactoryIdentifier.js.map     |   4 +-
 .../jsxFactoryIdentifier.sourcemap.txt        | 248 +++++++++---------
 .../jsxFactoryIdentifierAsParameter.js        |   2 +-
 .../jsxFactoryIdentifierAsParameter.js.map    |   2 +-
 ...FactoryIdentifierAsParameter.sourcemap.txt |  33 ++-
 ...jsxFactoryIdentifierWithAbsentParameter.js |   2 +-
 ...actoryIdentifierWithAbsentParameter.js.map |   2 +-
 ...dentifierWithAbsentParameter.sourcemap.txt |  29 +-
 .../jsxFactoryNotIdentifierOrQualifiedName.js |   4 +-
 ...jsxFactoryNotIdentifierOrQualifiedName2.js |   4 +-
 .../reference/jsxFactoryQualifiedName.js      |   4 +-
 .../reference/jsxFactoryQualifiedName.js.map  |   4 +-
 .../jsxFactoryQualifiedName.sourcemap.txt     | 232 ++++++++--------
 .../jsxFactoryQualifiedNameResolutionError.js |   2 +-
 ...FactoryQualifiedNameResolutionError.js.map |   2 +-
 ...QualifiedNameResolutionError.sourcemap.txt |  33 ++-
 .../jsxFactoryQualifiedNameWithEs5.js         |   2 +-
 .../reference/jsxImportInAttribute.js         |   2 +-
 tests/baselines/reference/jsxViaImport.2.js   |   2 +-
 tests/baselines/reference/jsxViaImport.js     |   2 +-
 .../reference/localAliasExportAssignment.js   |   2 +-
 .../baselines/reference/mapOnTupleTypes01.js  |   2 +-
 .../baselines/reference/mapOnTupleTypes02.js  |   2 +-
 .../memberAccessMustUseModuleInstances.js     |   4 +-
 .../reference/mergeWithImportedNamespace.js   |   2 +-
 .../reference/mergeWithImportedType.js        |   2 +-
 .../reference/mergedDeclarations6.js          |   4 +-
 .../reference/mergedDeclarations7.js          |   2 +-
 .../mergedModuleDeclarationCodeGen.js         |   2 +-
 .../reference/metadataOfEventAlias.js         |   4 +-
 .../missingFunctionImplementation.js          |   2 +-
 .../missingSemicolonInModuleSpecifier.js      |   4 +-
 .../moduleAliasAsFunctionArgument.js          |   2 +-
 ...gmentationCollidingNamesInAugmentation1.js |   6 +-
 .../moduleAugmentationDeclarationEmit1.js     |   6 +-
 .../moduleAugmentationDeclarationEmit2.js     |   6 +-
 .../moduleAugmentationDisallowedExtensions.js |  10 +-
 .../moduleAugmentationExtendAmbientModule1.js |   4 +-
 .../moduleAugmentationExtendAmbientModule2.js |   4 +-
 .../moduleAugmentationExtendFileModule1.js    |   6 +-
 .../moduleAugmentationExtendFileModule2.js    |   6 +-
 .../reference/moduleAugmentationGlobal1.js    |   4 +-
 .../reference/moduleAugmentationGlobal2.js    |   4 +-
 .../reference/moduleAugmentationGlobal3.js    |   4 +-
 .../reference/moduleAugmentationGlobal4.js    |   2 +-
 .../reference/moduleAugmentationGlobal5.js    |   2 +-
 .../moduleAugmentationImportsAndExports1.js   |   8 +-
 .../moduleAugmentationImportsAndExports2.js   |   8 +-
 .../moduleAugmentationImportsAndExports3.js   |   8 +-
 .../moduleAugmentationImportsAndExports4.js   |   8 +-
 .../moduleAugmentationImportsAndExports5.js   |   8 +-
 .../moduleAugmentationImportsAndExports6.js   |   8 +-
 .../moduleAugmentationInAmbientModule1.js     |   2 +-
 .../moduleAugmentationInAmbientModule2.js     |   2 +-
 .../moduleAugmentationInAmbientModule3.js     |   2 +-
 .../moduleAugmentationInAmbientModule4.js     |   2 +-
 .../moduleAugmentationInAmbientModule5.js     |   2 +-
 .../moduleAugmentationInDependency.js         |   2 +-
 .../moduleAugmentationInDependency2.js        |   2 +-
 .../reference/moduleAugmentationNoNewNames.js |   4 +-
 .../moduleAugmentationsBundledOutput1.js      |  10 +-
 .../reference/moduleAugmentationsImports1.js  |   8 +-
 .../reference/moduleAugmentationsImports2.js  |  10 +-
 .../reference/moduleAugmentationsImports3.js  |   8 +-
 .../reference/moduleAugmentationsImports4.js  |   6 +-
 .../baselines/reference/moduleCodeGenTest5.js |   2 +-
 .../baselines/reference/moduleCodegenTest4.js |   2 +-
 .../reference/moduleDuplicateIdentifiers.js   |   2 +-
 tests/baselines/reference/moduleExports1.js   |   2 +-
 .../moduleImportedForTypeArgumentPosition.js  |   2 +-
 .../reference/moduleInTypePosition1.js        |   4 +-
 .../reference/moduleMergeConstructor.js       |   2 +-
 tests/baselines/reference/moduleNoneErrors.js |   2 +-
 .../baselines/reference/modulePrologueAMD.js  |   2 +-
 .../reference/modulePrologueCommonjs.js       |   2 +-
 .../baselines/reference/modulePrologueUmd.js  |   2 +-
 .../reference/moduleResolutionNoResolve.js    |   2 +-
 .../reference/moduleResolutionNoTs.js         |   4 +-
 .../moduleResolutionWithExtensions.js         |   2 +-
 ...moduleResolutionWithExtensions_preferTs.js |   2 +-
 ...duleResolutionWithExtensions_unexpected.js |   2 +-
 ...uleResolutionWithExtensions_unexpected2.js |   2 +-
 .../reference/moduleResolutionWithSymlinks.js |   6 +-
 ...ResolutionWithSymlinks_notInNodeModules.js |   6 +-
 ...moduleResolutionWithSymlinks_withOutDir.js |   6 +-
 ...duleSameValueDuplicateExportedBindings1.js |   6 +-
 ...duleSameValueDuplicateExportedBindings2.js |   6 +-
 tests/baselines/reference/moduleScoping.js    |   4 +-
 .../baselines/reference/multiImportExport.js  |   4 +-
 .../reference/multipleDefaultExports01.js     |   4 +-
 .../reference/multipleDefaultExports02.js     |   4 +-
 .../reference/multipleDefaultExports03.js     |  24 +-
 .../reference/multipleDefaultExports04.js     |  12 +-
 .../reference/multipleExportDefault1.js       |   2 +-
 .../reference/multipleExportDefault2.js       |   2 +-
 .../reference/multipleExportDefault3.js       |   2 +-
 .../reference/multipleExportDefault4.js       |   2 +-
 .../reference/multipleExportDefault5.js       |   2 +-
 .../reference/multipleExportDefault6.js       |   2 +-
 tests/baselines/reference/multipleExports.js  |   2 +-
 .../reference/nameDelimitedBySlashes.js       |   4 +-
 .../reference/nameWithFileExtension.js        |   4 +-
 .../reference/nameWithRelativePaths.js        |   8 +-
 .../reference/project/baseline/amd/decl.js    |   2 +-
 .../reference/project/baseline/amd/emit.js    |   2 +-
 .../reference/project/baseline/node/decl.js   |   2 +-
 .../reference/project/baseline/node/emit.js   |   2 +-
 .../reference/project/baseline2/amd/decl.js   |   2 +-
 .../project/baseline2/amd/dont_emit.js        |   2 +-
 .../reference/project/baseline2/node/decl.js  |   2 +-
 .../project/baseline2/node/dont_emit.js       |   2 +-
 .../project/baseline3/amd/nestedModule.js     |   2 +-
 .../project/baseline3/node/nestedModule.js    |   2 +-
 .../reference/project/declarationDir/amd/a.js |   2 +-
 .../project/declarationDir/amd/subfolder/b.js |   2 +-
 .../project/declarationDir/amd/subfolder/c.js |   2 +-
 .../project/declarationDir/node/a.js          |   2 +-
 .../declarationDir/node/subfolder/b.js        |   2 +-
 .../declarationDir/node/subfolder/c.js        |   2 +-
 .../project/declarationDir2/amd/out/a.js      |   2 +-
 .../declarationDir2/amd/out/subfolder/b.js    |   2 +-
 .../declarationDir2/amd/out/subfolder/c.js    |   2 +-
 .../project/declarationDir2/node/out/a.js     |   2 +-
 .../declarationDir2/node/out/subfolder/b.js   |   2 +-
 .../declarationDir2/node/out/subfolder/c.js   |   2 +-
 .../project/declarationDir3/amd/out.js        |   6 +-
 .../declarationsCascadingImports/amd/m4.js    |   2 +-
 .../declarationsCascadingImports/node/m4.js   |   2 +-
 .../declarationsGlobalImport/amd/glo_m4.js    |   2 +-
 .../declarationsGlobalImport/amd/useModule.js |   2 +-
 .../declarationsGlobalImport/node/glo_m4.js   |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/private_m4.js                         |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/private_m4.js                        |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/fncOnly_m4.js                         |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/fncOnly_m4.js                        |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/m4.js                                 |   2 +-
 .../amd/m5.js                                 |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/m4.js                                |   2 +-
 .../node/m5.js                                |   2 +-
 .../node/useModule.js                         |   2 +-
 .../declarationsMultipleTimesImport/amd/m4.js |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/m4.js                                |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/m4.js                                 |   2 +-
 .../amd/m5.js                                 |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/m4.js                                |   2 +-
 .../node/m5.js                                |   2 +-
 .../node/useModule.js                         |   2 +-
 .../declarationsSimpleImport/amd/m4.js        |   2 +-
 .../declarationsSimpleImport/amd/useModule.js |   2 +-
 .../declarationsSimpleImport/node/m4.js       |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/main.js                               |   2 +-
 .../node/main.js                              |   2 +-
 .../amd/main.js                               |   2 +-
 .../node/main.js                              |   2 +-
 .../emitDecoratorMetadataSystemJS/amd/main.js |   2 +-
 .../node/main.js                              |   2 +-
 .../amd/main.js                               |   2 +-
 .../node/main.js                              |   2 +-
 .../amd/main.js                               |   2 +-
 .../node/main.js                              |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../maprootUrlModuleSimpleNoOutdir/amd/m1.js  |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../maprootUrlModuleSimpleNoOutdir/node/m1.js |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/importHigher/root.js                  |   2 +-
 .../node/importHigher/root.js                 |   2 +-
 .../amd/maxDepthExceeded/built/root.js        |   2 +-
 .../node/maxDepthExceeded/built/root.js       |   2 +-
 .../amd/maxDepthIncreased/root.js             |   2 +-
 .../node/maxDepthIncreased/root.js            |   2 +-
 .../project/nonRelative/amd/consume.js        |   2 +-
 .../reference/project/nonRelative/amd/decl.js |   2 +-
 .../project/nonRelative/amd/lib/bar/a.js      |   2 +-
 .../project/nonRelative/amd/lib/foo/a.js      |   2 +-
 .../project/nonRelative/amd/lib/foo/b.js      |   2 +-
 .../project/nonRelative/node/consume.js       |   2 +-
 .../project/nonRelative/node/decl.js          |   2 +-
 .../project/nonRelative/node/lib/bar/a.js     |   2 +-
 .../project/nonRelative/node/lib/foo/a.js     |   2 +-
 .../project/nonRelative/node/lib/foo/b.js     |   2 +-
 .../outMixedSubfolderNoOutdir/amd/ref/m2.js   |   2 +-
 .../outMixedSubfolderNoOutdir/node/ref/m2.js  |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/diskFile0.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../outModuleMultifolderNoOutdir/amd/test.js  |   2 +-
 .../node/diskFile0.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../outModuleMultifolderNoOutdir/node/test.js |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../project/outModuleSimpleNoOutdir/amd/m1.js |   2 +-
 .../outModuleSimpleNoOutdir/amd/test.js       |   2 +-
 .../outModuleSimpleNoOutdir/node/m1.js        |   2 +-
 .../outModuleSimpleNoOutdir/node/test.js      |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../outModuleSubfolderNoOutdir/amd/ref/m1.js  |   2 +-
 .../outModuleSubfolderNoOutdir/amd/test.js    |   2 +-
 .../outModuleSubfolderNoOutdir/node/ref/m1.js |   2 +-
 .../outModuleSubfolderNoOutdir/node/test.js   |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../sourcemapModuleSimpleNoOutdir/amd/m1.js   |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../sourcemapModuleSimpleNoOutdir/amd/test.js |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../sourcemapModuleSimpleNoOutdir/node/m1.js  |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/fs.js                                 |   2 +-
 .../node/fs.js                                |   2 +-
 ...ata when transpile with CommonJS option.js |   2 +-
 .../Does not generate semantic diagnostics.js |   2 +-
 ...enerates expected syntactic diagnostics.js |   2 +-
 .../transpile/Generates module output.js      |   2 +-
 ...diagnostics for missing file references.js |   2 +-
 ...erates no diagnostics with valid inputs.js |   2 +-
 ...extra errors for file without extension.js |   2 +-
 .../transpile/Rename dependencies - AMD.js    |   2 +-
 .../transpile/Rename dependencies - UMD.js    |   2 +-
 .../Support options with lib values.js        |   2 +-
 .../Support options with types values.js      |   2 +-
 .../Supports backslashes in file name.js      |   2 +-
 .../transpile/Supports setting allowJs.js     |   2 +-
 ...ts setting allowSyntheticDefaultImports.js |   2 +-
 .../Supports setting allowUnreachableCode.js  |   2 +-
 .../Supports setting allowUnusedLabels.js     |   2 +-
 .../Supports setting alwaysStrict.js          |   2 +-
 .../transpile/Supports setting baseUrl.js     |   2 +-
 .../transpile/Supports setting charset.js     |   2 +-
 .../transpile/Supports setting declaration.js |   2 +-
 .../Supports setting declarationDir.js        |   2 +-
 .../transpile/Supports setting emitBOM.js     |   2 +-
 .../Supports setting emitDecoratorMetadata.js |   2 +-
 ...Supports setting experimentalDecorators.js |   2 +-
 ...etting forceConsistentCasingInFileNames.js |   2 +-
 .../Supports setting isolatedModules.js       |   2 +-
 .../transpile/Supports setting jsx.js         |   2 +-
 .../transpile/Supports setting jsxFactory.js  |   2 +-
 .../transpile/Supports setting lib.js         |   2 +-
 .../transpile/Supports setting locale.js      |   2 +-
 .../transpile/Supports setting module.js      |   2 +-
 .../Supports setting moduleResolution.js      |   2 +-
 .../transpile/Supports setting newLine.js     |   2 +-
 .../transpile/Supports setting noEmit.js      |   2 +-
 .../Supports setting noEmitHelpers.js         |   2 +-
 .../Supports setting noEmitOnError.js         |   2 +-
 .../Supports setting noErrorTruncation.js     |   2 +-
 ...orts setting noFallthroughCasesInSwitch.js |   2 +-
 .../Supports setting noImplicitAny.js         |   2 +-
 .../Supports setting noImplicitReturns.js     |   2 +-
 .../Supports setting noImplicitThis.js        |   2 +-
 .../Supports setting noImplicitUseStrict.js   |   2 +-
 .../transpile/Supports setting noLib.js       |   2 +-
 .../transpile/Supports setting noResolve.js   |   2 +-
 .../transpile/Supports setting out.js         |   2 +-
 .../transpile/Supports setting outDir.js      |   2 +-
 .../transpile/Supports setting outFile.js     |   2 +-
 .../transpile/Supports setting paths.js       |   2 +-
 .../Supports setting preserveConstEnums.js    |   2 +-
 .../Supports setting reactNamespace.js        |   2 +-
 .../Supports setting removeComments.js        |   2 +-
 .../transpile/Supports setting rootDir.js     |   2 +-
 .../transpile/Supports setting rootDirs.js    |   2 +-
 .../Supports setting skipDefaultLibCheck.js   |   2 +-
 .../Supports setting skipLibCheck.js          |   2 +-
 .../Supports setting strictNullChecks.js      |   2 +-
 .../Supports setting stripInternal.js         |   2 +-
 ...ts setting suppressExcessPropertyErrors.js |   2 +-
 ... setting suppressImplicitAnyIndexErrors.js |   2 +-
 .../transpile/Supports setting typeRoots.js   |   2 +-
 .../transpile/Supports setting types.js       |   2 +-
 .../transpile/Supports urls in file name.js   |   2 +-
 ... with emit decorators and emit metadata.js |   2 +-
 .../Uses correct newLine character.js         |   2 +-
 .../transpile/transpile .js files.js          |   2 +-
 ...anspile file as tsx if jsx is specified.js |   2 +-
 tests/baselines/reference/withExportDecl.js   |   2 +-
 tests/baselines/reference/withImportDecl.js   |   4 +-
 1328 files changed, 2004 insertions(+), 2006 deletions(-)

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index cdd3380b3b7..bf963bdc0e5 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/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
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 37383082983..0315fd516b5 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/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;
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index cc57b184960..57ebd64c4e2 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/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;
diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js
index d97acbdc14f..77f0a07c1df 100644
--- a/tests/baselines/reference/APISample_parseConfig.js
+++ b/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;
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index 1156d643354..0716e59edb7 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/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;
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index d877071a228..f4400ccda4c 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js
index 84e20daa7c7..c21fe575e76 100644
--- a/tests/baselines/reference/aliasAssignments.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js
index 8fbeaf78d95..d3d312e53bb 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
index 03888704e70..883cbb84ee3 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/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 });
diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js
index 5be50e00f30..1ccbc958aec 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js
index 0f15ecda6ac..de661ae803e 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index 8c61ddeefb8..2ca49ea8dfc 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index acd4dd1f533..81084b8b92f 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index 10dcc50083c..6f4adfae58c 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index 07dea7ea22d..178ccaaee23 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index 509797bd260..5ac28396fba 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index e5c7af13078..a85d61fd34c 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js
index b86051d7b19..168567eb80f 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
index 9cc8372a0bb..58565bbb916 100644
--- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
+++ b/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;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js
index dceecdd4001..a659eb60151 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.js
+++ b/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;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.js b/tests/baselines/reference/allowSyntheticDefaultImports10.js
index 09e80cc799f..ad3ed5715c0 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports10.js
+++ b/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;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js
index 69bfedadc49..762c032b812 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports4.js
+++ b/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;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.js b/tests/baselines/reference/allowSyntheticDefaultImports9.js
index a455f0e7570..2d8ab463d83 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports9.js
+++ b/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;
diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js
index 7ca68d85000..dcaafdfeee6 100644
--- a/tests/baselines/reference/alwaysStrictModule4.js
+++ b/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;
diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js
index 161e341ba79..cd97b55b67b 100644
--- a/tests/baselines/reference/alwaysStrictModule6.js
+++ b/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 });
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js
index 7f8741d3baf..dfff030b78f 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.js
+++ b/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;
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js
index fac34990e5e..84088d11d4e 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.js
+++ b/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;
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.js b/tests/baselines/reference/ambientExternalModuleMerging.js
index 0dddb3a307c..6c2de62c90a 100644
--- a/tests/baselines/reference/ambientExternalModuleMerging.js
+++ b/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]
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
index 537c765a482..9efd9e4ada9 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
index 692c5707332..98d3d46912a 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js
index 5dd15c8e0ef..a7513e7eb58 100644
--- a/tests/baselines/reference/ambientShorthand.js
+++ b/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;
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
index 6818cca28d3..6842d0f7554 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/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;
diff --git a/tests/baselines/reference/amdDependencyComment1.js b/tests/baselines/reference/amdDependencyComment1.js
index 1c5594ea7c3..6be26909f3a 100644
--- a/tests/baselines/reference/amdDependencyComment1.js
+++ b/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;
diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js
index db87e4e9422..222093cf159 100644
--- a/tests/baselines/reference/amdDependencyComment2.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js
index e886d4b1579..d0e4d73fb7a 100644
--- a/tests/baselines/reference/amdDependencyCommentName1.js
+++ b/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;
diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js
index bb2fc9a2389..c39902371a0 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js
index dafbe2463f9..f842ad0cbf8 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
index d82eab0d12f..6542aa14fa2 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js
index b1275322069..7819c0c7205 100644
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index 7f75124dba7..651ae7a6d39 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.js b/tests/baselines/reference/anonymousDefaultExportsAmd.js
index a3b8b7cd98a..24e833b7542 100644
--- a/tests/baselines/reference/anonymousDefaultExportsAmd.js
+++ b/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 });
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
index dbfdfd0f420..e22000856d6 100644
--- a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
+++ b/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 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js
index a8984434c9c..484238b8722 100644
--- a/tests/baselines/reference/anonymousDefaultExportsUmd.js
+++ b/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 });
 });
diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js
index b19fa3ca14c..3a43f328f35 100644
--- a/tests/baselines/reference/asOperator4.js
+++ b/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;
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
index 06b9fd14682..bd05f90a26e 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
+++ b/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 });
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index 25a771ffbfb..550f0d2357e 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/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 });
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js
index b3fa2c4b491..6b84f5615b3 100644
--- a/tests/baselines/reference/asyncImportedPromise_es6.js
+++ b/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 });
diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js
index ef176ac90da..7b0bfcf7335 100644
--- a/tests/baselines/reference/augmentExportEquals1.js
+++ b/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
 });
diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js
index 1e094701f79..51bc67e7fa4 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.js
+++ b/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
 });
diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js
index fe55906b657..efdce1bc0cf 100644
--- a/tests/baselines/reference/augmentExportEquals2.js
+++ b/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
 });
diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js
index 5b80ef1d512..322ab3b36bf 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.js
+++ b/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
 });
diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js
index 3e12c9968d2..387ef86ff79 100644
--- a/tests/baselines/reference/augmentExportEquals3.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js
index 9fd08cb8f7f..e91ca4498dd 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js
index 1a83e86f3fc..37be30731de 100644
--- a/tests/baselines/reference/augmentExportEquals4.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js
index e039e7dcda6..71d39aedb1f 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js
index ee26ddda90e..7bc5102ca9d 100644
--- a/tests/baselines/reference/augmentExportEquals5.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js
index 2db5bc66e3c..4299f8653dd 100644
--- a/tests/baselines/reference/augmentExportEquals6.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals6_1.js b/tests/baselines/reference/augmentExportEquals6_1.js
index 6ba35346109..e69728a766b 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js
index 32111846162..0a8b7404bd1 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/cacheResolutions.js b/tests/baselines/reference/cacheResolutions.js
index 1c8c6ec0168..6b28c90e321 100644
--- a/tests/baselines/reference/cacheResolutions.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js
index 3af2cc7a5f9..8fcdd501707 100644
--- a/tests/baselines/reference/chainedImportAlias.js
+++ b/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;
diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js
index 8d3419f1db6..198a886f026 100644
--- a/tests/baselines/reference/circularReference.js
+++ b/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;
diff --git a/tests/baselines/reference/circularReferenceInImport.js b/tests/baselines/reference/circularReferenceInImport.js
index 28f43fa7985..8b49f45dbd2 100644
--- a/tests/baselines/reference/circularReferenceInImport.js
+++ b/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]
diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js
index 298395a232c..8ba50dcee1c 100644
--- a/tests/baselines/reference/classAbstractManyKeywords.js
+++ b/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;
diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js
index 8a648cc62cd..933f92cad64 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/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 });
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
index ce46e75bed8..d4df05f2ea3 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
+++ b/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;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
index 890d2bbd500..76835e757e0 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js
index b6d3159b0f9..487553bb004 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
index cbe0104ebce..1a16f4a2d5f 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
index b931a6210cf..0e717b01d3b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
index 5d462fb1ce2..050799d4c2b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
index 045e7dcb796..2eb5ea74f92 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
index a75732a65ba..8454248845a 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js
index ca16128e9cd..0bc56b97cf1 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.js
+++ b/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 () {
diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js
index d6fb21ba60a..4bb6614ffe7 100644
--- a/tests/baselines/reference/collisionExportsRequireAndEnum.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js
index 7e538d462b2..1da8cf29d66 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
index 7ac6ba06ed6..9cb3c4e797e 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js
index d1ca4d3a75c..42820955004 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
index ba1926dd965..b9552c16223 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js
index 9c7a24b176f..9a20472ea68 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.js
+++ b/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;
diff --git a/tests/baselines/reference/commentOnExportEnumDeclaration.js b/tests/baselines/reference/commentOnExportEnumDeclaration.js
index 33ea3d7fcfb..353b70f4d3c 100644
--- a/tests/baselines/reference/commentOnExportEnumDeclaration.js
+++ b/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;
diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js
index cdba9542f54..1c1df104039 100644
--- a/tests/baselines/reference/commentsDottedModuleName.js
+++ b/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 });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index 57cc701941a..39002f90d91 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/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 });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
index 6ee40426994..d06c588425f 100644
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ b/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 });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index ee48cfde328..81e90a159d5 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/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]
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js
index 2c26b93b82d..25dd8a90780 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.js
+++ b/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 });
 });
 
 
diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js
index 6feff1bd813..eee05c80493 100644
--- a/tests/baselines/reference/commentsOnRequireStatement.js
+++ b/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 });
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index c1d2a303d7a..ee2846d4a60 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/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;
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index 1f37d83c815..5ac0e3fcc64 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/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;
diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js
index f1ec275cf73..ef6e97f4d5e 100644
--- a/tests/baselines/reference/commonSourceDir5.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js
index d52fde52cf2..071953afcdc 100644
--- a/tests/baselines/reference/commonSourceDir6.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js
index 08e628cac2a..5569ae6d52b 100644
--- a/tests/baselines/reference/commonSourceDirectory.js
+++ b/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]
diff --git a/tests/baselines/reference/commonSourceDirectory.js.map b/tests/baselines/reference/commonSourceDirectory.js.map
index 8e3f925eee9..fd88719859b 100644
--- a/tests/baselines/reference/commonSourceDirectory.js.map
+++ b/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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
index 5675c05e34b..c880d2d0059 100644
--- a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
+++ b/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
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js
index e49192dbe2f..249edeceddd 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js
+++ b/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]
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js.map b/tests/baselines/reference/commonSourceDirectory_dts.js.map
index b33518dd04c..552da577884 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js.map
+++ b/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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
index ccbbc89465d..925a3d30ed4 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
+++ b/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
\ No newline at end of file
diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js
index da7c5710610..e7a251e9cee 100644
--- a/tests/baselines/reference/commonjsSafeImport.js
+++ b/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]
diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js
index 5c665a52cb3..4408d64acbf 100644
--- a/tests/baselines/reference/complexNarrowingWithAny.js
+++ b/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;
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 9c7c78ad626..f02b9611541 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/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 });
 });
diff --git a/tests/baselines/reference/constEnumExternalModule.js b/tests/baselines/reference/constEnumExternalModule.js
index e658dc17347..8ea5625ac07 100644
--- a/tests/baselines/reference/constEnumExternalModule.js
+++ b/tests/baselines/reference/constEnumExternalModule.js
@@ -18,6 +18,6 @@ define(["require", "exports"], function (require, exports) {
 //// [m2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var v = 100 /* V */;
     exports.__esModule = true;
+    var v = 100 /* V */;
 });
diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.js b/tests/baselines/reference/controlFlowBinaryOrExpression.js
index 8b65f916dfa..752479cf4e9 100644
--- a/tests/baselines/reference/controlFlowBinaryOrExpression.js
+++ b/tests/baselines/reference/controlFlowBinaryOrExpression.js
@@ -38,6 +38,7 @@ if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
 
 //// [controlFlowBinaryOrExpression.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var cond;
 (x = "") || (x = 0);
@@ -55,4 +56,3 @@ if (isHTMLCollection(sourceObj)) {
 if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
     sourceObj.length;
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.js b/tests/baselines/reference/controlFlowPropertyDeclarations.js
index be61fc2c75a..27fce9a9a12 100644
--- a/tests/baselines/reference/controlFlowPropertyDeclarations.js
+++ b/tests/baselines/reference/controlFlowPropertyDeclarations.js
@@ -151,6 +151,7 @@ export class StyleParser {
 //// [controlFlowPropertyDeclarations.js]
 // Repro from ##8913
 "use strict";
+exports.__esModule = true;
 var HTMLDOMPropertyConfig = require('react/lib/HTMLDOMPropertyConfig');
 // Populate property map with ReactJS's attribute and property mappings
 // TODO handle/use .Properties value eg: MUST_USE_PROPERTY is not HTML attr
@@ -289,4 +290,3 @@ var StyleParser = (function () {
     return StyleParser;
 }());
 exports.StyleParser = StyleParser;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
index d1422112fff..0a7eff198ff 100644
--- a/tests/baselines/reference/controlFlowSelfReferentialLoop.js
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
@@ -104,6 +104,7 @@ export default md5;
 //// [controlFlowSelfReferentialLoop.js]
 // Repro from #12319
 "use strict";
+exports.__esModule = true;
 function md5(string) {
     function FF(a, b, c, d, x, s, ac) {
         return 0;
@@ -204,4 +205,3 @@ function md5(string) {
     }
 }
 exports["default"] = md5;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js
index 7fa40a63a10..f7c1ac602dd 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.js
+++ b/tests/baselines/reference/copyrightWithNewLine1.js
@@ -15,9 +15,9 @@ greeter.start();
 ****************************/
 define(["require", "exports", "./greeter"], function (require, exports, model) {
     "use strict";
+    exports.__esModule = true;
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
     greeter.start();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js
index 4b31d599713..0f479c3db7f 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.js
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.js
@@ -11,9 +11,9 @@ greeter.start();
 //// [copyrightWithoutNewLine1.js]
 define(["require", "exports", "./greeter"], function (require, exports, model) {
     "use strict";
+    exports.__esModule = true;
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
     greeter.start();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
index 67eba038d46..d555d3f3bca 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
@@ -15,6 +15,7 @@ export var compileServer = task<number, number, any>(<P0, P1, P2>() => {
 //// [crashIntypeCheckInvocationExpression.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var nake;
     function doCompile(fileset, moduleType) {
         return undefined;
@@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) {
         var folder = path.join(), fileset = nake.fileSetSync(folder);
         return doCompile(fileset, moduleType);
     });
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
index 48fe4dad45f..a115e7ab0a3 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
@@ -11,6 +11,7 @@ export class BuildWorkspaceService {
 //// [crashIntypeCheckObjectCreationExpression.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var BuildWorkspaceService = (function () {
         function BuildWorkspaceService() {
         }
@@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) {
         return BuildWorkspaceService;
     }());
     exports.BuildWorkspaceService = BuildWorkspaceService;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
index b0cc0c8fbaa..64a99bb8438 100644
--- a/tests/baselines/reference/declFileAccessors.js
+++ b/tests/baselines/reference/declFileAccessors.js
@@ -103,6 +103,7 @@ class c2 {
 
 //// [declFileAccessors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** This is comment for c1*/
 var c1 = (function () {
     function c1() {
@@ -185,7 +186,6 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileAccessors_1.js]
 /** This is comment for c2 - the global class*/
 var c2 = (function () {
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
index f89863a3029..56b8992811b 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
@@ -10,18 +10,18 @@ import foo = require("./declFileAliasUseBeforeDeclaration_foo");
 
 //// [declFileAliasUseBeforeDeclaration_foo.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
 //// [declFileAliasUseBeforeDeclaration_test.js]
 "use strict";
+exports.__esModule = true;
 function bar(a) { }
 exports.bar = bar;
-exports.__esModule = true;
 
 
 //// [declFileAliasUseBeforeDeclaration_foo.d.ts]
diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
index 218157185af..ee1964415c9 100644
--- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
+++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
@@ -8,6 +8,7 @@ export class Enhancement {
 
 //// [declFileClassWithStaticMethodReturningConstructor.js]
 "use strict";
+exports.__esModule = true;
 var Enhancement = (function () {
     function Enhancement() {
     }
@@ -17,7 +18,6 @@ var Enhancement = (function () {
     return Enhancement;
 }());
 exports.Enhancement = Enhancement;
-exports.__esModule = true;
 
 
 //// [declFileClassWithStaticMethodReturningConstructor.d.ts]
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
index 87cf77e733e..214620193b7 100644
--- a/tests/baselines/reference/declFileConstructors.js
+++ b/tests/baselines/reference/declFileConstructors.js
@@ -99,6 +99,7 @@ class GlobalConstructorWithParameterInitializer {
 
 //// [declFileConstructors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SimpleConstructor = (function () {
     /** This comment should appear for foo*/
     function SimpleConstructor() {
@@ -162,7 +163,6 @@ var ConstructorWithParameterInitializer = (function () {
     return ConstructorWithParameterInitializer;
 }());
 exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileConstructors_1.js]
 var GlobalSimpleConstructor = (function () {
     /** This comment should appear for foo*/
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
index e9d140ae2e2..1caa9207193 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
@@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) {
 //// [declFileExportAssignmentOfGenericInterface_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x.a;
     exports.__esModule = true;
+    exports.x.a;
 });
 
 
diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js
index a03fa43afff..2af2103b62a 100644
--- a/tests/baselines/reference/declFileExportImportChain.js
+++ b/tests/baselines/reference/declFileExportImportChain.js
@@ -44,8 +44,8 @@ define(["require", "exports"], function (require, exports) {
 //// [declFileExportImportChain_b.js]
 define(["require", "exports", "declFileExportImportChain_a"], function (require, exports, a) {
     "use strict";
-    exports.a = a;
     exports.__esModule = true;
+    exports.a = a;
 });
 //// [declFileExportImportChain_b1.js]
 define(["require", "exports", "declFileExportImportChain_b"], function (require, exports, b) {
@@ -55,8 +55,8 @@ define(["require", "exports", "declFileExportImportChain_b"], function (require,
 //// [declFileExportImportChain_c.js]
 define(["require", "exports", "declFileExportImportChain_b1"], function (require, exports, b1) {
     "use strict";
-    exports.b1 = b1;
     exports.__esModule = true;
+    exports.b1 = b1;
 });
 //// [declFileExportImportChain_d.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js
index c7feeec7e8c..70478fdf430 100644
--- a/tests/baselines/reference/declFileExportImportChain2.js
+++ b/tests/baselines/reference/declFileExportImportChain2.js
@@ -46,8 +46,8 @@ define(["require", "exports", "declFileExportImportChain2_a"], function (require
 //// [declFileExportImportChain2_c.js]
 define(["require", "exports", "declFileExportImportChain2_b"], function (require, exports, b) {
     "use strict";
-    exports.b = b;
     exports.__esModule = true;
+    exports.b = b;
 });
 //// [declFileExportImportChain2_d.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js
index 0bb2c7dfe55..809f01878d4 100644
--- a/tests/baselines/reference/declFileForExportedImport.js
+++ b/tests/baselines/reference/declFileForExportedImport.js
@@ -16,12 +16,12 @@ var z = b.x;
 exports.__esModule = true;
 //// [declFileForExportedImport_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='declFileForExportedImport_0.ts'/>
 exports.a = require("./declFileForExportedImport_0");
 var y = exports.a.x;
 exports.b = exports.a;
 var z = exports.b.x;
-exports.__esModule = true;
 
 
 //// [declFileForExportedImport_0.d.ts]
diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js
index c93dee4e30e..f62b7772b41 100644
--- a/tests/baselines/reference/declFileFunctions.js
+++ b/tests/baselines/reference/declFileFunctions.js
@@ -79,6 +79,7 @@ function globalfooWithOverloads(a: any): any {
 
 //// [declFileFunctions_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** This comment should appear for foo*/
 function foo() {
 }
@@ -145,7 +146,6 @@ function nonExportedFooWithRestParameters(a) {
 function nonExportedFooWithOverloads(a) {
     return a;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileFunctions_1.js]
 /** This comment should appear for foo*/
 function globalfoo() {
diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js
index ab3fc63f450..f56abaf6b97 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -51,6 +51,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C;
 (function (C) {
     var A = (function () {
@@ -102,7 +103,6 @@ var h = (function (_super) {
 }(C.A));
 exports.h = h;
 exports.j = C.F6;
-exports.__esModule = true;
 
 
 //// [declFileGenericType.d.ts]
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
index d1d9589e8c7..110539774df 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
@@ -32,11 +32,11 @@ var m2;
 module.exports = m2;
 //// [declFileImportModuleWithExportAssignment_1.js]
 "use strict";
+exports.__esModule = true;
 /**This is on import declaration*/
 var a1 = require("./declFileImportModuleWithExportAssignment_0");
 exports.a = a1;
 exports.a.test1(null, null, null);
-exports.__esModule = true;
 
 
 //// [declFileImportModuleWithExportAssignment_0.d.ts]
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
index dee10473f2c..61e2bfab700 100644
--- a/tests/baselines/reference/declFileMethods.js
+++ b/tests/baselines/reference/declFileMethods.js
@@ -192,6 +192,7 @@ interface I2 {
 
 //// [declFileMethods_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c1 = (function () {
     function c1() {
     }
@@ -274,7 +275,6 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileMethods_1.js]
 var c2 = (function () {
     function c2() {
diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
index 35a861a6046..698622a8650 100644
--- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
+++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
@@ -38,6 +38,7 @@ export class C4 {
 
 //// [declarationEmitClassMemberNameConflict.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C1 = (function () {
     function C1() {
     }
@@ -91,7 +92,6 @@ var C4 = (function () {
     return C4;
 }());
 exports.C4 = C4;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitClassMemberNameConflict.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js
index 5557ff71020..223376ef8ff 100644
--- a/tests/baselines/reference/declarationEmitExportAssignment.js
+++ b/tests/baselines/reference/declarationEmitExportAssignment.js
@@ -12,11 +12,11 @@ export = foo;
 
 //// [utils.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
 var utils_1 = require("./utils");
diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js
index e019203030e..57c39b95e64 100644
--- a/tests/baselines/reference/declarationEmitExportDeclaration.js
+++ b/tests/baselines/reference/declarationEmitExportDeclaration.js
@@ -15,18 +15,18 @@ export {bar};
 
 //// [utils.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("./utils");
 exports.bar = utils_1.bar;
 utils_1.foo();
 var obj;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [utils.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
index a1e3aac8823..a02eac46dba 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -55,6 +55,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var ExportedClass = (function () {
     function ExportedClass() {
     }
@@ -104,4 +105,3 @@ var MyClass4 = (function (_super) {
     return MyClass4;
 }(getExportedClass(undefined)));
 exports.MyClass4 = MyClass4;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
index 87141cfb699..08208c2435d 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
@@ -6,11 +6,11 @@ export function f(x: any): x is number {
 
 //// [declarationEmitIdentifierPredicates01.js]
 "use strict";
+exports.__esModule = true;
 function f(x) {
     return typeof x === "number";
 }
 exports.f = f;
-exports.__esModule = true;
 
 
 //// [declarationEmitIdentifierPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
index f20654d508c..5829e9b4427 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
@@ -10,8 +10,8 @@ export function f(x: any): x is I {
 
 //// [declarationEmitIdentifierPredicatesWithPrivateName01.js]
 "use strict";
+exports.__esModule = true;
 function f(x) {
     return typeof x.a === "number";
 }
 exports.f = f;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
index 55500652830..608f172cd1f 100644
--- a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
+++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
@@ -9,13 +9,13 @@ export default {
 
 //// [declarationEmitInferedDefaultExportType.js]
 "use strict";
+exports.__esModule = true;
 // test.ts
 exports["default"] = {
     foo: [],
     bar: undefined,
     baz: null
 };
-exports.__esModule = true;
 
 
 //// [declarationEmitInferedDefaultExportType.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
index dca7f142dc9..4e41c8558c6 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
@@ -14,15 +14,15 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
index 9228b766d3f..601026ab6f3 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
@@ -17,19 +17,19 @@ export { v, bar }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
 function bar() {
     return v;
 }
 exports.bar = bar;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
index 8b2783a73fd..30df7e38b01 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
@@ -14,15 +14,15 @@ export default x;
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var x = "hi" || 5;
 exports["default"] = x;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
index 3020721dfc8..24f2a52c5d8 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
@@ -13,14 +13,14 @@ export { v }
 
 //// [0.js]
 "use strict";
-var obj = true;
 exports.__esModule = true;
+var obj = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 //let v2: Z.Data;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
index c7be3aca6b4..5b14a3738e4 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
@@ -14,15 +14,15 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
index 2177a17efa5..9a9b1247e24 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
@@ -11,13 +11,13 @@ export { v }
 
 //// [0.js]
 "use strict";
-var obj = true;
 exports.__esModule = true;
+var obj = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
index 70560f5a54d..cddb4630740 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
@@ -9,12 +9,12 @@ export function returnSomeGlobalValue() {
 
 //// [declarationEmitInferedTypeAlias9.js]
 "use strict";
+exports.__esModule = true;
 var x;
 function returnSomeGlobalValue() {
     return x;
 }
 exports.returnSomeGlobalValue = returnSomeGlobalValue;
-exports.__esModule = true;
 
 
 //// [declarationEmitInferedTypeAlias9.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInvalidExport.js b/tests/baselines/reference/declarationEmitInvalidExport.js
index 4188b673b0b..d4280cd00c6 100644
--- a/tests/baselines/reference/declarationEmitInvalidExport.js
+++ b/tests/baselines/reference/declarationEmitInvalidExport.js
@@ -9,7 +9,7 @@ export type MyClass = typeof myClass;
 
 //// [declarationEmitInvalidExport.js]
 "use strict";
+exports.__esModule = true;
 if (false) {
     export var myClass = 0;
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js
index 08747bbe198..5440f3d3584 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts.js
@@ -63,6 +63,7 @@ var f;
 module.exports = f;
 //// [declarationEmit_nameConflicts_0.js]
 "use strict";
+exports.__esModule = true;
 var im = require("./declarationEmit_nameConflicts_1");
 var M;
 (function (M) {
@@ -129,7 +130,6 @@ var M;
         })(N = Q.N || (Q.N = {}));
     })(Q = M.Q || (M.Q = {}));
 })(M = exports.M || (exports.M = {}));
-exports.__esModule = true;
 
 
 //// [declarationEmit_nameConflicts_1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
index e5c10ab3484..4b4aca4f4b2 100644
--- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
+++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
@@ -8,10 +8,10 @@ export module M {
 
 //// [declarationEmitNameConflictsWithAlias.js]
 "use strict";
+exports.__esModule = true;
 var M;
 (function (M) {
 })(M = exports.M || (exports.M = {}));
-exports.__esModule = true;
 
 
 //// [declarationEmitNameConflictsWithAlias.d.ts]
diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js
index 4f56ad91864..7444a956a2a 100644
--- a/tests/baselines/reference/declarationEmitPromise.js
+++ b/tests/baselines/reference/declarationEmitPromise.js
@@ -32,6 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class bluebird {
 }
 exports.bluebird = bluebird;
@@ -53,7 +54,6 @@ function runSampleBreaks(a, b, c, d, e) {
     });
 }
 exports.runSampleBreaks = runSampleBreaks;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitPromise.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js
index 2845a120b74..e95a7db05ed 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -38,7 +39,6 @@ var D = (function (_super) {
     return D;
 }(C));
 exports.D = D;
-exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js
index b9a81b2fb8e..0e7c99df1f3 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates02.js
@@ -15,13 +15,13 @@ export const obj = {
 
 //// [declarationEmitThisPredicates02.js]
 "use strict";
+exports.__esModule = true;
 exports.obj = {
     m: function () {
         var dis = this;
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
-exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates02.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
index 16ae267bc3c..a0f611d2d29 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -37,4 +38,3 @@ var D = (function (_super) {
     }
     return D;
 }(C));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
index fcc373ccbe8..7ec7ba5dec8 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
@@ -15,10 +15,10 @@ export const obj = {
 
 //// [declarationEmitThisPredicatesWithPrivateName02.js]
 "use strict";
+exports.__esModule = true;
 exports.obj = {
     m: function () {
         var dis = this;
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
index 303959f5504..84b55a9792f 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
@@ -6,8 +6,8 @@ export const y = (x: Foo<string>) => 1
 
 //// [declarationEmitTypeAliasWithTypeParameters1.js]
 "use strict";
-exports.y = function (x) { return 1; };
 exports.__esModule = true;
+exports.y = function (x) { return 1; };
 
 
 //// [declarationEmitTypeAliasWithTypeParameters1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
index 52f696a9448..1bb6beac9e1 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
@@ -7,8 +7,8 @@ export const y = (x: Baa<number>) => 1
 
 //// [declarationEmitTypeAliasWithTypeParameters2.js]
 "use strict";
-exports.y = function (x) { return 1; };
 exports.__esModule = true;
+exports.y = function (x) { return 1; };
 
 
 //// [declarationEmitTypeAliasWithTypeParameters2.d.ts]
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
index e6ef1234c3a..28997a75496 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
@@ -12,7 +12,7 @@ function foo() {
 
 //// [declarationEmitTypeAliasWithTypeParameters5.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     return {};
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitUnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js
index 686ed8dce2c..1ac1e934578 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport.js
@@ -5,6 +5,6 @@ export {Foo}
 
 //// [declarationEmitUnknownImport.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = SomeNonExistingName;
 exports.Foo = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js
index 10b8b1b9886..1f291312913 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport2.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport2.js
@@ -5,7 +5,7 @@ export default Foo
 
 //// [declarationEmitUnknownImport2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = From;
 './Foo'; // Syntax error
 exports.default = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js
index a08b36e2781..64a6cf2d849 100644
--- a/tests/baselines/reference/declarationMerging2.js
+++ b/tests/baselines/reference/declarationMerging2.js
@@ -18,6 +18,7 @@ declare module "./a" {
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
index d0e8504713d..b624c11e79d 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
@@ -14,6 +14,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 let Testing123 = Testing123_1 = class Testing123 {
 };
 Testing123.prop1 = Testing123_1.prop0;
@@ -22,4 +23,3 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
index 3e24af5f427..978d8f18402 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
@@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 let Testing123 = Testing123_1 = class Testing123 {
 };
 Testing123 = Testing123_1 = __decorate([
@@ -20,4 +21,3 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
index bf5e9e5dcfc..dadaa5ed6df 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
@@ -22,6 +22,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let Foo = class Foo {
     };
@@ -29,7 +30,6 @@ define(["require", "exports"], function (require, exports) {
         decorator
     ], Foo);
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -40,6 +40,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let default_1 = class {
     };
@@ -47,5 +48,4 @@ define(["require", "exports"], function (require, exports) {
         decorator
     ], default_1);
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
index fe62d15c27f..f6c7b7cbc8b 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
@@ -21,6 +21,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
 let Foo = class Foo {
 };
@@ -28,7 +29,6 @@ Foo = __decorate([
     decorator
 ], Foo);
 exports.default = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -37,6 +37,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
 let default_1 = class {
 };
@@ -44,4 +45,3 @@ default_1 = __decorate([
     decorator
 ], default_1);
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
index e6f4773df7d..beb5fa26755 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
@@ -30,6 +30,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let Foo = class Foo {
     };
@@ -37,7 +38,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
         decorator
     ], Foo);
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -56,6 +56,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let default_1 = class {
     };
@@ -63,5 +64,4 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
         decorator
     ], default_1);
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index 8c4bb8c1266..22e4a448f1e 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -23,9 +23,9 @@ class Wat {
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // from #3108
 exports.test = 'abc';
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -34,6 +34,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 function filter(handler) {
     return function (target, propertyKey) {
@@ -51,4 +52,3 @@ var Wat = (function () {
 __decorate([
     filter(function () { return a_1.test == 'abc'; })
 ], Wat, "whatever", null);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index 50dbe2cafdc..9998ae3d08a 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -20,13 +20,13 @@ class MyComponent {
 
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Service = (function () {
     function Service() {
     }
     return Service;
 }());
 exports.default = Service;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [component.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -38,6 +38,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var service_1 = require("./service");
 var MyComponent = (function () {
     function MyComponent(Service) {
@@ -57,4 +58,3 @@ MyComponent = __decorate([
     decorator,
     __metadata("design:paramtypes", [service_1.default])
 ], MyComponent);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js
index 653bc911ed4..6f247637729 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.js
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js
@@ -19,6 +19,7 @@ export class B {
 
 //// [decoratorMetadataOnInferredType.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
         console.log('new A');
@@ -38,4 +39,3 @@ __decorate([
     __metadata("design:type", Object)
 ], B.prototype, "x", void 0);
 exports.B = B;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
index 9cbc514d932..a65ba5b2f73 100644
--- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
+++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
@@ -42,31 +42,31 @@ export class ClassA {
 
 //// [aux.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass = (function () {
     function SomeClass() {
     }
     return SomeClass;
 }());
 exports.SomeClass = SomeClass;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass1 = (function () {
     function SomeClass1() {
     }
     return SomeClass1;
 }());
 exports.SomeClass1 = SomeClass1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass2 = (function () {
     function SomeClass2() {
     }
     return SomeClass2;
 }());
 exports.SomeClass2 = SomeClass2;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -78,6 +78,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var aux_1 = require("./aux");
 var aux1_1 = require("./aux1");
 function annotation() {
@@ -113,4 +114,3 @@ ClassA = __decorate([
     __metadata("design:paramtypes", [aux_1.SomeClass])
 ], ClassA);
 exports.ClassA = ClassA;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
index 91c3814774c..10aa42ddce7 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
@@ -19,6 +19,7 @@ export class B {
 
 //// [decoratorMetadataWithConstructorType.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
         console.log('new A');
@@ -38,4 +39,3 @@ __decorate([
     __metadata("design:type", A)
 ], B.prototype, "x", void 0);
 exports.B = B;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index e2cd357f14a..b0e23a78971 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index 19c8bafa4c1..f03190cff0c 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index 63177201f1d..c1eca081527 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 1979adf9c82..7d78cf7adbe 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db"); // error no default export
 function someDecorator(target) {
     return target;
@@ -53,4 +54,3 @@ MyClass = __decorate([
 ], MyClass);
 exports.MyClass = MyClass;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index f3f82342fad..3f7069902ce 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.default = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 34f63af38ea..66eb30dc710 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.default = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 4b0d77b9d2f..1dd09c3a177 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.default = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index a587baf1d05..830e6bc80ee 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var database = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [database.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index 6ec7a58da66..77020e7cb77 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var C = (function () {
     function C() {
     }
@@ -22,4 +23,3 @@ C = __decorate([
     dec
 ], C);
 exports.C = C;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
index 0e289d51c71..2af3b0426dc 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -16,6 +16,7 @@ export class C  extends base{
 
 //// [0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var base = (function () {
     function base() {
     }
@@ -24,7 +25,6 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -46,6 +46,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var _0_ts_1 = require("./0.ts");
 var _0_ts_2 = require("./0.ts");
 var C = (function (_super) {
@@ -59,4 +60,3 @@ C = __decorate([
     __param(0, _0_ts_2.foo)
 ], C);
 exports.C = C;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
index 518ddee0a81..4ed401284a9 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -18,6 +18,7 @@ export class C  extends base{
 
 //// [0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var base = (function () {
     function base() {
     }
@@ -26,7 +27,6 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -48,6 +48,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var _0_1 = require("./0");
 var _0_2 = require("./0");
 /* Comment on the Class Declaration */
@@ -62,4 +63,3 @@ C = __decorate([
     __param(0, _0_2.foo)
 ], C);
 exports.C = C;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index cba3d6e115c..6a31461fe3c 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -23,9 +23,9 @@ import x from './a';
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     const x = new Promise((resolve, reject) => { resolve({}); });
     exports.default = x;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -46,11 +46,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     const a_1 = require("./a");
     (function () {
         return __awaiter(this, void 0, void 0, function* () {
             const value = yield a_1.default;
         });
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index ea597359a03..565cfb41617 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -14,9 +14,9 @@ import x from './a';
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const x = new Promise((resolve, reject) => { resolve({}); });
 exports.default = x;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -27,10 +27,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const a_1 = require("./a");
 (function () {
     return __awaiter(this, void 0, void 0, function* () {
         const value = yield a_1.default;
     });
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js
index d74cc416e28..a273b891679 100644
--- a/tests/baselines/reference/defaultExportWithOverloads01.js
+++ b/tests/baselines/reference/defaultExportWithOverloads01.js
@@ -7,6 +7,7 @@ export default function f(...args: any[]) {
 
 //// [defaultExportWithOverloads01.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -14,4 +15,3 @@ function f() {
     }
 }
 exports.default = f;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js
index bd186fa279d..aaadfaefebb 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.js
@@ -32,6 +32,7 @@ Entity.y;
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Decl() {
     return 0;
 }
@@ -41,13 +42,12 @@ var Decl;
     Decl.x = 10;
     Decl.y = 20;
 })(Decl = exports.Decl || (exports.Decl = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
 var y;
 m1_1.default.x;
 m1_1.default.y;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index 7b26a1aa59f..b83d54548ca 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -27,19 +27,19 @@ var sum = z.p1 + z.p2
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Decl = (function () {
     function Decl() {
     }
     return Decl;
 }());
 exports.default = Decl;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
 var y;
 var z = new m1_1.default();
 var sum = z.p1 + z.p2;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js
index 1b2e53f0304..254723ec5f1 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -27,19 +27,19 @@ var sum = z.p1 + z.p2
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Decl = (function () {
     function Decl() {
     }
     return Decl;
 }());
 exports.default = Decl;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
 var y;
 var z = new m1_1.default();
 var sum = z.p1 + z.p2;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js
index baade857296..38ab4861c62 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge04.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge04.js
@@ -15,10 +15,10 @@ export interface Foo {
 
 //// [defaultExportsCannotMerge04.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Foo() {
 }
 exports.default = Foo;
 var Foo;
 (function (Foo) {
 })(Foo || (Foo = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js
index 214522a56c8..c5037364b00 100644
--- a/tests/baselines/reference/defaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js
@@ -10,15 +10,15 @@ export default function foo() {}
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function foo() { }
     exports.default = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
index c31174a5acd..051ab7bbf03 100644
--- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
@@ -9,12 +9,12 @@ export default function foo() {}
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class Foo {
 }
 exports.default = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.default = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js
index 8eb92f872bb..5417b9b9a96 100644
--- a/tests/baselines/reference/defaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js
@@ -18,10 +18,10 @@ export default function foo() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 (function (factory) {
@@ -34,7 +34,7 @@ export default function foo() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function foo() { }
     exports.default = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js
index fd2f277c71a..285cfbcda16 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.js
+++ b/tests/baselines/reference/dependencyViaImportAlias.js
@@ -13,13 +13,13 @@ export = A;
 //// [A.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [B.js]
 define(["require", "exports", "A"], function (require, exports, a) {
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js
index 37eed711067..a7645ceabe9 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations1.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js
@@ -7,8 +7,8 @@ export let { toString } = 1;
 
 //// [destructuringInVariableDeclarations1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.toString = (1).toString;
 {
     let { toFixed } = 1;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.js b/tests/baselines/reference/destructuringInVariableDeclarations2.js
index 21f272d22a6..43a2f740c94 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations2.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations2.js
@@ -8,8 +8,8 @@ export {};
 
 //// [destructuringInVariableDeclarations2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let { toString } = 1;
 {
     let { toFixed } = 1;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js
index 11e242da1a2..2522a704e18 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations3.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js
@@ -8,9 +8,9 @@ export let { toString } = 1;
 //// [destructuringInVariableDeclarations3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.toString = (1).toString;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.js b/tests/baselines/reference/destructuringInVariableDeclarations4.js
index 0f25ca3827f..867417cf01f 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations4.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations4.js
@@ -9,9 +9,9 @@ export {};
 //// [destructuringInVariableDeclarations4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     let { toString } = 1;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js
index 6c799d10803..20a094a0375 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations5.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js
@@ -16,9 +16,9 @@ export let { toString } = 1;
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.toString = (1).toString;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js
index fcdefe72df6..583a2cd1f1d 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations6.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js
@@ -17,9 +17,9 @@ export {};
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     let { toString } = 1;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js
index b1983c82d15..324c0cd9293 100644
--- a/tests/baselines/reference/downlevelLetConst13.js
+++ b/tests/baselines/reference/downlevelLetConst13.js
@@ -21,6 +21,7 @@ export module M {
 
 //// [downlevelLetConst13.js]
 'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
 // exported let\const bindings should not be renamed
 exports.foo = 10;
 exports.bar = "123";
@@ -37,4 +38,3 @@ var M;
     M.bar7 = { a: 1 }.a;
     M.bar8 = { a: 1 }.a;
 })(M = exports.M || (exports.M = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index c348443fb29..0deb672456c 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -347,6 +347,7 @@ export var tests: TestRunner = (function () {
 
 //// [duplicateLocalVariable1.js]
 "use strict";
+exports.__esModule = true;
 / /;
 commonjs;
 var TestFileDir = ".\\TempTestFiles";
@@ -636,4 +637,3 @@ exports.tests = (function () {
     }, "Codepoint at index: 3 has control value: 8"));
     return testRunner;
 })();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js
index 3e89e88fd3c..2962e544b9b 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -38,6 +38,7 @@ export var tests: TestRunner = (function () {
 //// [duplicateLocalVariable2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TestCase = (function () {
         function TestCase(name, test, errorMessageRegEx) {
             this.name = name;
@@ -77,5 +78,4 @@ define(["require", "exports"], function (require, exports) {
         }));
         return testRunner;
     })();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index 05af7a2bac8..5f5590e2b41 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -68,6 +68,7 @@ export interface D { }
 //// [duplicateSymbolsExportMatching.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // Should report error only once for instantiated module
     var M;
     (function (M) {
@@ -103,5 +104,4 @@ define(["require", "exports"], function (require, exports) {
             var t;
         })(C = M.C || (M.C = {}));
     })(M || (M = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js
index 9fc3f440414..2c94e692dd0 100644
--- a/tests/baselines/reference/dynamicModuleTypecheckError.js
+++ b/tests/baselines/reference/dynamicModuleTypecheckError.js
@@ -10,8 +10,8 @@ for(var i = 0; i < 30; i++) {
 
 //// [dynamicModuleTypecheckError.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 for (var i = 0; i < 30; i++) {
     exports.x = i * 1000; // should not be an error here
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js
index ee6fbd2b07f..f878c5044ea 100644
--- a/tests/baselines/reference/elidingImportNames.js
+++ b/tests/baselines/reference/elidingImportNames.js
@@ -17,17 +17,17 @@ export var main = 10;
 
 //// [elidingImportNames_main.js]
 "use strict";
-exports.main = 10;
 exports.__esModule = true;
+exports.main = 10;
 //// [elidingImportNames_main1.js]
 "use strict";
-exports.main = 10;
 exports.__esModule = true;
+exports.main = 10;
 //// [elidingImportNames_test.js]
 "use strict";
+exports.__esModule = true;
 var a = require("./elidingImportNames_main"); // alias used in typeof
 var b = a;
 var x;
 var a2 = require("./elidingImportNames_main1"); // alias not used in typeof
 var b2 = a2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js
index e8915e406af..d98359d94bb 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var A = require("");
 var B = (function (_super) {
     __extends(B, _super);
@@ -23,4 +24,3 @@ var B = (function (_super) {
     }
     return B;
 }(A));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js
index 9125b5126b2..2a1865d3ccd 100644
--- a/tests/baselines/reference/enumFromExternalModule.js
+++ b/tests/baselines/reference/enumFromExternalModule.js
@@ -12,14 +12,14 @@ var x = f.Mode.Open;
 
 //// [enumFromExternalModule_0.js]
 "use strict";
+exports.__esModule = true;
 var Mode;
 (function (Mode) {
     Mode[Mode["Open"] = 0] = "Open";
 })(Mode = exports.Mode || (exports.Mode = {}));
-exports.__esModule = true;
 //// [enumFromExternalModule_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='enumFromExternalModule_0.ts'/>
 var f = require("./enumFromExternalModule_0");
 var x = f.Mode.Open;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js
index 52d144c1e49..15ae0c90bd1 100644
--- a/tests/baselines/reference/errorsOnImportedSymbol.js
+++ b/tests/baselines/reference/errorsOnImportedSymbol.js
@@ -20,6 +20,6 @@ var y = Sammy.Sammy();
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [errorsOnImportedSymbol_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var x = new Sammy.Sammy();
 var y = Sammy.Sammy();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index 0ad02c848fd..d3bb3d006e5 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -16,6 +16,7 @@ assert(Foo.CONSTANT === "Foo");
 
 //// [es3defaultAliasQuoted_file0.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -28,9 +29,8 @@ function assert(value) {
         throw new Error("Assertion failed!");
 }
 exports["default"] = assert;
-exports.__esModule = true;
 //// [es3defaultAliasQuoted_file1.js]
 "use strict";
+exports.__esModule = true;
 var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0");
 es3defaultAliasQuoted_file0_1["default"](es3defaultAliasQuoted_file0_1.Foo.CONSTANT === "Foo");
-exports.__esModule = true;
diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js
index 72c954b02f2..8ebcfb01be6 100644
--- a/tests/baselines/reference/es5-commonjs.js
+++ b/tests/baselines/reference/es5-commonjs.js
@@ -16,6 +16,7 @@ export default class A
 
 //// [es5-commonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -25,4 +26,3 @@ var A = (function () {
     return A;
 }());
 exports.default = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs2.js b/tests/baselines/reference/es5-commonjs2.js
index ce15d3a5ce4..2c38edef6ae 100644
--- a/tests/baselines/reference/es5-commonjs2.js
+++ b/tests/baselines/reference/es5-commonjs2.js
@@ -5,5 +5,5 @@ export default 1;
 
 //// [es5-commonjs2.js]
 "use strict";
-exports.default = 1;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = 1;
diff --git a/tests/baselines/reference/es5-commonjs3.js b/tests/baselines/reference/es5-commonjs3.js
index 5fc9462b955..15c11b189a3 100644
--- a/tests/baselines/reference/es5-commonjs3.js
+++ b/tests/baselines/reference/es5-commonjs3.js
@@ -6,6 +6,6 @@ export var __esModule = 1;
 
 //// [es5-commonjs3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "test";
 exports.__esModule = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js
index bf28e064500..d2530d1bdf2 100644
--- a/tests/baselines/reference/es5-commonjs4.js
+++ b/tests/baselines/reference/es5-commonjs4.js
@@ -17,6 +17,7 @@ export var __esModule = 1;
 
 //// [es5-commonjs4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -27,4 +28,3 @@ var A = (function () {
 }());
 exports.default = A;
 exports.__esModule = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js
index 93a0ed94a5c..bbc9bbba7c2 100644
--- a/tests/baselines/reference/es5-commonjs5.js
+++ b/tests/baselines/reference/es5-commonjs5.js
@@ -7,8 +7,8 @@ export default function () {
 
 //// [es5-commonjs5.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function default_1() {
     return "test";
 }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs6.js b/tests/baselines/reference/es5-commonjs6.js
index 33015271d7a..87d2f7d62a6 100644
--- a/tests/baselines/reference/es5-commonjs6.js
+++ b/tests/baselines/reference/es5-commonjs6.js
@@ -6,6 +6,6 @@ var __esModule = 1;
 
 //// [es5-commonjs6.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "test";
 var __esModule = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
index 5bb6f87e4e5..f62c861b7c9 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
@@ -19,6 +19,7 @@ export declare function __generator(body: Function): any;
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 function foo() {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -28,7 +29,6 @@ function foo() {
     });
 }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js
index 6f129f5e58d..b55422ca7b1 100644
--- a/tests/baselines/reference/es5-umd2.js
+++ b/tests/baselines/reference/es5-umd2.js
@@ -25,6 +25,7 @@ export class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -34,5 +35,4 @@ export class A
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js
index 1291c739fcb..37b19ece1ac 100644
--- a/tests/baselines/reference/es5-umd3.js
+++ b/tests/baselines/reference/es5-umd3.js
@@ -25,6 +25,7 @@ export default class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -34,5 +35,4 @@ export default class A
         return A;
     }());
     exports.default = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
index f6817129fb3..25a1db0a25f 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
@@ -7,6 +7,7 @@ export default class C {
 
 //// [es5ExportDefaultClassDeclaration.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C = (function () {
     function C() {
     }
@@ -14,7 +15,6 @@ var C = (function () {
     return C;
 }());
 exports.default = C;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
index 5cf3405c437..931eab75c72 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
@@ -7,6 +7,7 @@ export default class {
 
 //// [es5ExportDefaultClassDeclaration2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var default_1 = (function () {
     function default_1() {
     }
@@ -14,7 +15,6 @@ var default_1 = (function () {
     return default_1;
 }());
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
index d28148d1416..927536114ef 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
@@ -16,6 +16,7 @@ var t: typeof C = C;
 
 //// [es5ExportDefaultClassDeclaration3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var before = new C();
 var C = (function () {
     function C() {
@@ -28,7 +29,6 @@ var C = (function () {
 exports.default = C;
 var after = new C();
 var t = C;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultExpression.js b/tests/baselines/reference/es5ExportDefaultExpression.js
index 6ebab2a4b0d..0821543134c 100644
--- a/tests/baselines/reference/es5ExportDefaultExpression.js
+++ b/tests/baselines/reference/es5ExportDefaultExpression.js
@@ -5,8 +5,8 @@ export default (1 + 2);
 
 //// [es5ExportDefaultExpression.js]
 "use strict";
-exports.default = (1 + 2);
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (1 + 2);
 
 
 //// [es5ExportDefaultExpression.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
index 1060607886a..068a966faa2 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
@@ -5,9 +5,9 @@ export default function f() { }
 
 //// [es5ExportDefaultFunctionDeclaration.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() { }
 exports.default = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
index 13f9e014be6..ab44c4cb584 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
@@ -5,9 +5,9 @@ export default function () { }
 
 //// [es5ExportDefaultFunctionDeclaration2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function default_1() { }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
index 47ed66880e6..c4bbcd4373e 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
@@ -10,13 +10,13 @@ var after: typeof func = func();
 
 //// [es5ExportDefaultFunctionDeclaration3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var before = func();
 function func() {
     return func;
 }
 exports.default = func;
 var after = func();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js
index 1102eab997d..d60fba590ac 100644
--- a/tests/baselines/reference/es5ExportDefaultIdentifier.js
+++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js
@@ -7,10 +7,10 @@ export default f;
 
 //// [es5ExportDefaultIdentifier.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() { }
 exports.f = f;
 exports.default = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultIdentifier.d.ts]
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index 28516a541f5..abc81b3dc94 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -39,6 +39,7 @@ import M3 from "M3";
 //// [es5ModuleInternalNamedImports.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var M;
     (function (M) {
         // variable
@@ -65,5 +66,4 @@ define(["require", "exports"], function (require, exports) {
         // alias
         M.M_A = M_M;
     })(M = exports.M || (exports.M = {}));
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
index 02774139add..dc55545617d 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
@@ -14,6 +14,7 @@ export class A
 //// [es5ModuleWithModuleGenAmd.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
index 4c58c0bd20f..93056203f9b 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es5ModuleWithModuleGenCommonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -22,4 +23,3 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
index 4479259a523..89d11045dda 100644
--- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es5ModuleWithoutModuleGenTarget.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -22,4 +23,3 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js
index 6f1d083ebe8..c0707b869cc 100644
--- a/tests/baselines/reference/es6-umd2.js
+++ b/tests/baselines/reference/es6-umd2.js
@@ -24,6 +24,7 @@ export class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class A {
         constructor() {
         }
@@ -32,5 +33,4 @@ export class A
         }
     }
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js
index 80d31b41695..91910ba2616 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.js
+++ b/tests/baselines/reference/es6ExportAllInEs5.js
@@ -18,6 +18,7 @@ export * from "./server";
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -29,14 +30,13 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("./server"));
 Object.defineProperty(exports, "__esModule", { value: true });
+__export(require("./server"));
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js
index 98940523143..3d3625aad18 100644
--- a/tests/baselines/reference/es6ExportClauseInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseInEs5.js
@@ -18,6 +18,7 @@ export { x };
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -32,7 +33,6 @@ var m;
 exports.instantiatedModule = m;
 var x = 10;
 exports.x = x;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
index f1cb97ad0f6..d8aa8e607e3 100644
--- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
@@ -19,6 +19,7 @@ export { foo, baz, baz as quux, buzz, bizz };
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var foo = 2;
 exports.foo = foo;
 exports.foo = foo = 3;
@@ -34,4 +35,3 @@ exports.bizz = bizz;
 exports.bizz = bizz += 1; // compiles to exports.bizz = bizz += 1
 exports.bizz = bizz -= 1; // similarly
 exports.bizz = ++bizz; // compiles to exports.bizz = ++bizz
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index 5891de57310..ecfccd5d843 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -22,6 +22,7 @@ export { x } from "./server";
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -33,9 +34,9 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.c = server_1.c;
 var server_2 = require("./server");
@@ -44,7 +45,6 @@ var server_3 = require("./server");
 exports.instantiatedModule = server_3.m;
 var server_4 = require("./server");
 exports.x = server_4.x;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index c84c76839ee..d1f8de5faa7 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -213,6 +213,7 @@ export * from "class-module";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 var z2 = require("variable");
 var z3 = require("interface-variable");
 var z4 = require("module");
@@ -304,4 +305,3 @@ __export(require("function"));
 __export(require("function-module"));
 __export(require("class"));
 __export(require("class-module"));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index 035a8c0be25..977b94f8790 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -14,15 +14,15 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import
 //// [es6ImportDefaultBindingAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = 10;
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [es6ImportDefaultBindingAmd_1.js]
 define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) {
     "use strict";
-    var x = es6ImportDefaultBindingAmd_0_1.default;
     Object.defineProperty(exports, "__esModule", { value: true });
+    var x = es6ImportDefaultBindingAmd_0_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index 6f4836a6680..94b824a3766 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -13,18 +13,18 @@ import defaultBinding2 from "./server"; // elide this import since defaultBindin
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
     return c;
 }());
 exports.default = c;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x = new server_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
index 66be06536f0..8335a1953de 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
@@ -24,13 +24,14 @@ var x1: number = m;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
 exports.default = {};
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_1.a;
 const es6ImportDefaultBindingFollowedWithNamedImport_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
@@ -42,7 +43,6 @@ const es6ImportDefaultBindingFollowedWithNamedImport_0_4 = require("./es6ImportD
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_4.x;
 const es6ImportDefaultBindingFollowedWithNamedImport_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_5.m;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index 4712a432503..8eb76b487f8 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -22,11 +22,12 @@ var x: number = defaultBinding6;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default;
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
@@ -39,7 +40,6 @@ var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6Imp
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default;
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index 5d2518bb774..d72751c7610 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -22,11 +22,12 @@ export var x1: number = defaultBinding6;
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x1 = server_1.default;
 var server_2 = require("./server");
@@ -39,7 +40,6 @@ var server_5 = require("./server");
 exports.x1 = server_5.default;
 var server_6 = require("./server");
 exports.x1 = server_6.default;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
index 0556d872480..5bf268709d3 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
@@ -26,6 +26,7 @@ export var x6 = new m();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
@@ -62,9 +63,9 @@ var x11 = (function () {
     return x11;
 }());
 exports.x11 = x11;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.x1 = new server_1.a();
 var server_2 = require("./server");
@@ -76,7 +77,6 @@ var server_4 = require("./server");
 exports.x3 = new server_4.x11();
 var server_5 = require("./server");
 exports.x6 = new server_5.m();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index f52c590f44e..307dcc92f46 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -21,15 +21,16 @@ export var x6 = new defaultBinding6();
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = (function () {
     function a() {
     }
     return a;
 }());
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x1 = new server_1.default();
 var server_2 = require("./server");
@@ -42,7 +43,6 @@ var server_5 = require("./server");
 exports.x5 = new server_5.default();
 var server_6 = require("./server");
 exports.x6 = new server_6.default();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
index dcc2ec2c785..2e9d8104a39 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
@@ -23,12 +23,13 @@ var x1: number = m;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a;
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
@@ -40,7 +41,6 @@ var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("./es6Impo
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x;
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
index 247c64c3e7f..77266084bda 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
@@ -25,22 +25,22 @@ export var x1: number = m;
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
     exports.default = {};
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x1 = server_1.a;
     exports.x1 = server_2.a;
     exports.x1 = server_3.x;
     exports.x1 = server_3.a;
     exports.x1 = server_4.x;
     exports.x1 = server_5.m;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index db922cb2200..c1c41968934 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -11,14 +11,14 @@ var x: number = defaultBinding;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index fbd045e81de..b82fb9aeee9 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -12,15 +12,15 @@ export var x: number = defaultBinding;
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = 10;
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
-    exports.x = server_1.default;
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = server_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index 8b430e2cf46..8d033c69536 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -10,18 +10,18 @@ export var x = new nameSpaceBinding.a();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
     return a;
 }());
 exports.a = a;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.a();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 09caf0db18a..c488db3e88e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -12,19 +12,19 @@ export var x = new defaultBinding();
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = (function () {
         function a() {
         }
         return a;
     }());
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
-    exports.x = new server_1.default();
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = new server_1.default();
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 92e3fe0a33f..0db21dfd064 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -10,13 +10,13 @@ var x: number = nameSpaceBinding.a;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = nameSpaceBinding.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index 0b5670b18a9..96720294a8a 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -10,13 +10,13 @@ export var x: number = nameSpaceBinding.a;
 
 //// [server.js]
 "use strict";
-exports.a = 10;
 exports.__esModule = true;
+exports.a = 10;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = nameSpaceBinding.a;
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index b9f73ac47eb..4c51a54462d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -18,12 +18,12 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould
 
 //// [es6ImportDefaultBindingMergeErrors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingMergeErrors_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0");
 var x = es6ImportDefaultBindingMergeErrors_0_1.default;
 var defaultBinding2 = "hello world";
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
index 265be908b85..e294c08befa 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
@@ -10,8 +10,8 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0";
 
 //// [es6ImportDefaultBindingNoDefaultProperty_0.js]
 "use strict";
-exports.a = 10;
 exports.__esModule = true;
+exports.a = 10;
 //// [es6ImportDefaultBindingNoDefaultProperty_1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index 6ea0812d40b..a9f760f1278 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -13,15 +13,15 @@ export import defaultBinding2 from "server"; // non referenced
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = 10;
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
-    exports.x = server_1.default;
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = server_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 510750edc50..b5296d15f9b 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this
 
 //// [es6ImportNameSpaceImport_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNameSpaceImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const nameSpaceBinding = require("./es6ImportNameSpaceImport_0");
 var x = nameSpaceBinding.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNameSpaceImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
index ea240338316..200f49a2986 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
@@ -13,14 +13,14 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi
 //// [es6ImportNameSpaceImportAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.a = 10;
     exports.__esModule = true;
+    exports.a = 10;
 });
 //// [es6ImportNameSpaceImportAmd_1.js]
 define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) {
     "use strict";
-    var x = nameSpaceBinding.a;
     exports.__esModule = true;
+    var x = nameSpaceBinding.a;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index 20b9d3af20b..cae90885ce2 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -11,6 +11,7 @@ import * as nameSpaceBinding2 from "./server"; // unreferenced
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var c = (function () {
     function c() {
     }
@@ -18,12 +19,11 @@ var c = (function () {
 }());
 exports.c = c;
 ;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index 88bf937c69c..ee00df9a2cc 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide
 
 //// [es6ImportNameSpaceImportInEs5_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNameSpaceImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0");
 var x = nameSpaceBinding.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNameSpaceImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
index 696659cb1f7..39594102007 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
@@ -17,9 +17,9 @@ var nameSpaceBinding3 = 10;
 
 //// [es6ImportNameSpaceImportMergeErrors_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNameSpaceImportMergeErrors_1.js]
 "use strict";
-var nameSpaceBinding3 = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+var nameSpaceBinding3 = 10;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
index 1663d7ec923..3c8b40f550e 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
@@ -13,14 +13,14 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.a = 10;
     exports.__esModule = true;
+    exports.a = 10;
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) {
     "use strict";
-    exports.x = nameSpaceBinding.a;
     exports.__esModule = true;
+    exports.x = nameSpaceBinding.a;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index 9719305e62b..a9fcb861ec5 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImport_0";
 
 //// [es6ImportNamedImport_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -51,9 +52,9 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0");
 var xxxx = es6ImportNamedImport_0_1.a;
 const es6ImportNamedImport_0_2 = require("./es6ImportNamedImport_0");
@@ -75,7 +76,6 @@ const es6ImportNamedImport_0_8 = require("./es6ImportNamedImport_0");
 var z111 = es6ImportNamedImport_0_8.z1;
 const es6ImportNamedImport_0_9 = require("./es6ImportNamedImport_0");
 var z2 = es6ImportNamedImport_0_9.z2; // z2 shouldn't give redeclare error
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNamedImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js
index 31582223c52..bd6213f259f 100644
--- a/tests/baselines/reference/es6ImportNamedImportAmd.js
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.js
@@ -44,6 +44,7 @@ import { aaaa as bbbb } from "es6ImportNamedImportAmd_0";
 //// [es6ImportNamedImportAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
@@ -52,11 +53,11 @@ define(["require", "exports"], function (require, exports) {
     exports.z1 = 10;
     exports.z2 = 10;
     exports.aaaa = 10;
-    exports.__esModule = true;
 });
 //// [es6ImportNamedImportAmd_1.js]
 define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, es6ImportNamedImportAmd_0_1, es6ImportNamedImportAmd_0_2, es6ImportNamedImportAmd_0_3, es6ImportNamedImportAmd_0_4, es6ImportNamedImportAmd_0_5, es6ImportNamedImportAmd_0_6, es6ImportNamedImportAmd_0_7, es6ImportNamedImportAmd_0_8, es6ImportNamedImportAmd_0_9) {
     "use strict";
+    exports.__esModule = true;
     var xxxx = es6ImportNamedImportAmd_0_1.a;
     var xxxx = es6ImportNamedImportAmd_0_2.a;
     var xxxx = es6ImportNamedImportAmd_0_3.x;
@@ -69,7 +70,6 @@ define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImport
     var xxxx = es6ImportNamedImportAmd_0_7.x1;
     var z111 = es6ImportNamedImportAmd_0_8.z1;
     var z2 = es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js
index f8fdf461644..d68ffd794a7 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportNamedImportDts.js
@@ -48,6 +48,7 @@ import { aaaa1 as bbbb } from "./server";
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
@@ -132,9 +133,9 @@ var aaaa1 = (function () {
     return aaaa1;
 }());
 exports.aaaa1 = aaaa1;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.xxxx = new server_1.a();
 var server_2 = require("./server");
@@ -156,7 +157,6 @@ var server_8 = require("./server");
 exports.z111 = new server_8.z1();
 var server_9 = require("./server");
 exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index 5c6f3573c7f..9e025dca61b 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0";
 
 //// [es6ImportNamedImportInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -51,9 +52,9 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_1.a;
 var es6ImportNamedImportInEs5_0_2 = require("./es6ImportNamedImportInEs5_0");
@@ -75,7 +76,6 @@ var es6ImportNamedImportInEs5_0_8 = require("./es6ImportNamedImportInEs5_0");
 var z111 = es6ImportNamedImportInEs5_0_8.z1;
 var es6ImportNamedImportInEs5_0_9 = require("./es6ImportNamedImportInEs5_0");
 var z2 = es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
index 0743f1658b4..d64b517c50f 100644
--- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
@@ -10,8 +10,8 @@ export = a;
 
 //// [es6ImportNamedImportInExportAssignment_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNamedImportInExportAssignment_1.js]
 "use strict";
 const es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
index ce878ca0216..38cda17bd7e 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
@@ -14,6 +14,7 @@ export = x;
 
 //// [es6ImportNamedImportInIndirectExportAssignment_0.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var c = (function () {
@@ -23,7 +24,6 @@ var a;
     }());
     a.c = c;
 })(a = exports.a || (exports.a = {}));
-exports.__esModule = true;
 //// [es6ImportNamedImportInIndirectExportAssignment_1.js]
 "use strict";
 var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
index 11bd3b73a9e..261039bcc10 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
@@ -22,13 +22,13 @@ import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be erro
 
 //// [es6ImportNamedImportMergeErrors_0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
 exports.z = exports.a;
 exports.z1 = exports.a;
-exports.__esModule = true;
 //// [es6ImportNamedImportMergeErrors_1.js]
 "use strict";
+exports.__esModule = true;
 var x = 10;
 var x44 = 10;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
index 87f3c1d5d07..4e78df34b6d 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
@@ -11,9 +11,9 @@ import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
 
 //// [es6ImportNamedImportNoExportMember_0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
-exports.__esModule = true;
 //// [es6ImportNamedImport_1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js
index 7377f737e47..13e2d40144b 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js
@@ -42,6 +42,7 @@ export import { aaaa as bbbb } from "./server";
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -50,9 +51,9 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.xxxx = server_1.a;
 var server_2 = require("./server");
@@ -74,7 +75,6 @@ var server_8 = require("./server");
 exports.z111 = server_8.z1;
 var server_9 = require("./server");
 exports.z2 = server_9.z2; // z2 shouldn't give redeclare error
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index 1bbab226ae8..0aa3214e5d7 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -22,6 +22,7 @@ export var cVal = new C();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
         this.prop = "hello";
@@ -36,12 +37,11 @@ var C2 = (function () {
     return C2;
 }());
 exports.C2 = C2;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 exports.cVal = new server_1.C();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
index c90ea418f26..d83ba9370ee 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
@@ -16,21 +16,21 @@ var _b = 10;
 //// [es6ImportWithoutFromClauseAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.a = 10;
     exports.__esModule = true;
+    exports.a = 10;
 });
 //// [es6ImportWithoutFromClauseAmd_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.b = 10;
     exports.__esModule = true;
+    exports.b = 10;
 });
 //// [es6ImportWithoutFromClauseAmd_2.js]
 define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var _a = 10;
     var _b = 10;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
index 0262cfdd045..b11e2ea9a07 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
@@ -9,12 +9,12 @@ import "es6ImportWithoutFromClauseInEs5_0";
 
 //// [es6ImportWithoutFromClauseInEs5_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportWithoutFromClauseInEs5_1.js]
 "use strict";
-require("es6ImportWithoutFromClauseInEs5_0");
 Object.defineProperty(exports, "__esModule", { value: true });
+require("es6ImportWithoutFromClauseInEs5_0");
 
 
 //// [es6ImportWithoutFromClauseInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
index 71874fc7b40..99214d2a2c6 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
@@ -9,12 +9,12 @@ export import "server";
 
 //// [server.js]
 "use strict";
-exports.a = 10;
 exports.__esModule = true;
+exports.a = 10;
 //// [client.js]
 "use strict";
-require("server");
 exports.__esModule = true;
+require("server");
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
index bd45a62e2f4..4ced3a35ab2 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
@@ -14,6 +14,7 @@ export class A
 //// [es6ModuleWithModuleGenTargetAmd.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class A {
         constructor() {
         }
@@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) {
         }
     }
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
index a7cf0599e54..187ece7e718 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es6ModuleWithModuleGenTargetCommonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class A {
     constructor() {
     }
@@ -21,4 +22,3 @@ class A {
     }
 }
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js
index b2a01bbb552..d19de0c78b0 100644
--- a/tests/baselines/reference/exportAndImport-es3-amd.js
+++ b/tests/baselines/reference/exportAndImport-es3-amd.js
@@ -15,17 +15,17 @@ export default function f2() {
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function f1() {
     }
     exports["default"] = f1;
-    exports.__esModule = true;
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     "use strict";
+    exports.__esModule = true;
     function f2() {
         m1_1["default"]();
     }
     exports["default"] = f2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js
index 898261ef7fe..13b6f1eaf48 100644
--- a/tests/baselines/reference/exportAndImport-es3.js
+++ b/tests/baselines/reference/exportAndImport-es3.js
@@ -14,15 +14,15 @@ export default function f2() {
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 function f1() {
 }
 exports["default"] = f1;
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 function f2() {
     m1_1["default"]();
 }
 exports["default"] = f2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js
index fcc918bb8ce..60b1246b616 100644
--- a/tests/baselines/reference/exportAndImport-es5-amd.js
+++ b/tests/baselines/reference/exportAndImport-es5-amd.js
@@ -15,17 +15,17 @@ export default function f2() {
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function f1() {
     }
     exports.default = f1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function f2() {
         m1_1.default();
     }
     exports.default = f2;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js
index fa1652c603e..f4bc496e6b2 100644
--- a/tests/baselines/reference/exportAndImport-es5.js
+++ b/tests/baselines/reference/exportAndImport-es5.js
@@ -14,15 +14,15 @@ export default function f2() {
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f1() {
 }
 exports.default = f1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 function f2() {
     m1_1.default();
 }
 exports.default = f2;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportArrayBindingPattern.js b/tests/baselines/reference/exportArrayBindingPattern.js
index 641500fa09d..b5568109763 100644
--- a/tests/baselines/reference/exportArrayBindingPattern.js
+++ b/tests/baselines/reference/exportArrayBindingPattern.js
@@ -5,8 +5,8 @@ export { a, b };
 
 //// [exportArrayBindingPattern.js]
 "use strict";
+exports.__esModule = true;
 // issue: https://github.com/Microsoft/TypeScript/issues/10778
 var _a = [1, 2, 3], a = _a[0], b = _a[2];
 exports.a = a;
 exports.b = b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js
index f557bc5d9a4..9f3eaf78480 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.js
+++ b/tests/baselines/reference/exportAssignClassAndModule.js
@@ -28,7 +28,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [exportAssignClassAndModule_1.js]
 "use strict";
+exports.__esModule = true;
 var z;
 var zz;
 zz.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js
index a39a7aa04cd..592d97dbaa0 100644
--- a/tests/baselines/reference/exportAssignDottedName.js
+++ b/tests/baselines/reference/exportAssignDottedName.js
@@ -12,11 +12,11 @@ export = foo1.x; // Ok
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 function x() {
     return true;
 }
 exports.x = x;
-exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js
index 09daa469ef4..208df4eff63 100644
--- a/tests/baselines/reference/exportAssignImportedIdentifier.js
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.js
@@ -16,11 +16,11 @@ var x = foo2(); // should be boolean
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 function x() {
     return true;
 }
 exports.x = x;
-exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
@@ -28,6 +28,6 @@ var x = foo1.x;
 module.exports = x;
 //// [foo3.js]
 "use strict";
+exports.__esModule = true;
 var foo2 = require("./foo2");
 var x = foo2(); // should be boolean
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js
index 645f44545fe..bed4480f393 100644
--- a/tests/baselines/reference/exportAssignTypes.js
+++ b/tests/baselines/reference/exportAssignTypes.js
@@ -85,6 +85,7 @@ function x(a) {
 module.exports = x;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var iString = require("./expString");
 var v1 = iString;
 var iNumber = require("./expNumber");
@@ -99,4 +100,3 @@ var iAny = require("./expAny");
 var v6 = iAny;
 var iGeneric = require("./expGeneric");
 var v7 = iGeneric;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
index e1bdf0d544f..d4b6961cfe9 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
@@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignedTypeAsTypeAnnotation_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var t2; // should not raise a 'container type' error
     exports.__esModule = true;
+    var t2; // should not raise a 'container type' error
 });
diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js
index 265afdfd041..549ad5bbd4d 100644
--- a/tests/baselines/reference/exportAssignmentClass.js
+++ b/tests/baselines/reference/exportAssignmentClass.js
@@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentClass_B.js]
 define(["require", "exports", "exportAssignmentClass_A"], function (require, exports, D) {
     "use strict";
+    exports.__esModule = true;
     var d = new D();
     var x = d.p;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
index 003927c2511..eddbddf8d6d 100644
--- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
+++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
@@ -24,8 +24,8 @@ var Foo = (function () {
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var x = new foo(true); // Should error
 var y = new foo({ a: "test", b: 42 }); // Should be OK
 var z = y.test.b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js
index a30868a18e5..a32da0a2e3f 100644
--- a/tests/baselines/reference/exportAssignmentEnum.js
+++ b/tests/baselines/reference/exportAssignmentEnum.js
@@ -27,8 +27,8 @@ var E;
 module.exports = E;
 //// [exportAssignmentEnum_B.js]
 "use strict";
+exports.__esModule = true;
 var EnumE = require("./exportAssignmentEnum_A");
 var a = EnumE.A;
 var b = EnumE.B;
 var c = EnumE.C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js
index 5743490fec3..775bb6b1af1 100644
--- a/tests/baselines/reference/exportAssignmentFunction.js
+++ b/tests/baselines/reference/exportAssignmentFunction.js
@@ -19,6 +19,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentFunction_B.js]
 define(["require", "exports", "exportAssignmentFunction_A"], function (require, exports, fooFunc) {
     "use strict";
-    var n = fooFunc();
     exports.__esModule = true;
+    var n = fooFunc();
 });
diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js
index 3ef295639fd..95563aa36a9 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.js
+++ b/tests/baselines/reference/exportAssignmentGenericType.js
@@ -22,7 +22,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var x = new foo();
 var y = x.test;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentInterface.js b/tests/baselines/reference/exportAssignmentInterface.js
index 8f4403cf40a..f3cc9ae9bbe 100644
--- a/tests/baselines/reference/exportAssignmentInterface.js
+++ b/tests/baselines/reference/exportAssignmentInterface.js
@@ -22,7 +22,7 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentInterface_B.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var i;
     var n = i.p1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js
index e4ba7a9f7d8..b5c45785f8f 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.js
+++ b/tests/baselines/reference/exportAssignmentInternalModule.js
@@ -23,6 +23,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentInternalModule_B.js]
 define(["require", "exports", "exportAssignmentInternalModule_A"], function (require, exports, modM) {
     "use strict";
-    var n = modM.x;
     exports.__esModule = true;
+    var n = modM.x;
 });
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js
index ba77f90557f..3ee760dedfa 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.js
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     x("test");
     x(42);
@@ -37,5 +38,4 @@ define(["require", "exports"], function (require, exports) {
     if (!!x.c) { }
     var z = { x: 1, y: 2 };
     z = x.d;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js
index 59008dfc370..ef48895b5cb 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.js
+++ b/tests/baselines/reference/exportAssignmentMergedModule.js
@@ -47,9 +47,9 @@ var Foo;
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var a = foo.a();
 if (!!foo.b) {
     foo.Test.answer = foo.c(42);
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
index 280e93f8c01..6c61eeedfc1 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
@@ -21,9 +21,9 @@ var b = z(); // call signature - no error
 exports.__esModule = true;
 //// [exportAssignmentOfDeclaredExternalModule_1.js]
 "use strict";
+exports.__esModule = true;
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
 var y = Sammy(); // error to use interface name as call target
 var z; // no error - z is of type interface Sammy from module 'M'
 var a = new z(); // constructor - no error
 var b = z(); // call signature - no error
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js
index f4417f871e9..9cd15ec01a4 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -36,6 +36,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (require, exports, q) {
     "use strict";
+    exports.__esModule = true;
     var M = (function (_super) {
         __extends(M, _super);
         function M() {
@@ -45,5 +46,4 @@ define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (req
     }(q));
     var m;
     var r = m.foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
index 44afbca1f69..f4001e5ab15 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
@@ -33,8 +33,8 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
         var x = new foo();
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
index a6abc6aa37d..7ba5a655c20 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
@@ -34,9 +34,9 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     var color;
     if (color === foo.green) {
         color = foo.answer;
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
index 4c0abd1d650..f122b8fbe8b 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
@@ -30,8 +30,8 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
         var x = foo();
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
index 0d31a25623c..a7acbaf3496 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
@@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js
index 8f9c02ecfbb..e6ccdb46f9a 100644
--- a/tests/baselines/reference/exportAssignmentVariable.js
+++ b/tests/baselines/reference/exportAssignmentVariable.js
@@ -16,6 +16,6 @@ var x = 0;
 module.exports = x;
 //// [exportAssignmentVariable_B.js]
 "use strict";
+exports.__esModule = true;
 var y = require("./exportAssignmentVariable_A");
 var n = y;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
index 6c3a951841d..e0165098b20 100644
--- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
+++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
@@ -22,23 +22,23 @@ export { x as a, } from
 
 //// [t1.js]
 "use strict";
-exports.x = "x";
 exports.__esModule = true;
+exports.x = "x";
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.x = t1_1.x;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
 exports.__esModule = true;
 //// [t4.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
-exports.__esModule = true;
 //// [t5.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js
index 23ce59f2402..950b3db26e5 100644
--- a/tests/baselines/reference/exportDeclareClass1.js
+++ b/tests/baselines/reference/exportDeclareClass1.js
@@ -12,7 +12,7 @@
 //// [exportDeclareClass1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    ;
-    ;
     exports.__esModule = true;
+    ;
+    ;
 });
diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js
index 08d62eb3782..473ebaa0492 100644
--- a/tests/baselines/reference/exportDeclaredModule.js
+++ b/tests/baselines/reference/exportDeclaredModule.js
@@ -17,6 +17,6 @@ var x: number = foo1.b();
 module.exports = M1;
 //// [foo2.js]
 "use strict";
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var x = foo1.b();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js
index 04ad89f9dc0..dddea6a6b73 100644
--- a/tests/baselines/reference/exportDefaultProperty.js
+++ b/tests/baselines/reference/exportDefaultProperty.js
@@ -43,6 +43,7 @@ fooLength + 1;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var A;
 (function (A) {
     var B = (function () {
@@ -56,13 +57,13 @@ var A;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 exports["default"] = A.B;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
-exports["default"] = "foo".length;
 exports.__esModule = true;
+exports["default"] = "foo".length;
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="declarations.d.ts" />
 var foobar_1 = require("foobar");
 var X = foobar_1["default"].X;
@@ -73,4 +74,3 @@ var a_1 = require("./a");
 var b = new a_1["default"](a_1["default"].b);
 var b_1 = require("./b");
 b_1["default"] + 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js
index 861acb7347c..4922738430a 100644
--- a/tests/baselines/reference/exportDefaultProperty2.js
+++ b/tests/baselines/reference/exportDefaultProperty2.js
@@ -20,15 +20,15 @@ const x: B = { c: B };
 //// [a.js]
 // This test is just like exportEqualsProperty2, but with `export default`.
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports["default"] = C.B;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var x = { c: a_1["default"] };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js
index d8347b62944..177e3943ac7 100644
--- a/tests/baselines/reference/exportEqualCallable.js
+++ b/tests/baselines/reference/exportEqualCallable.js
@@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportEqualCallable_1.js]
 define(["require", "exports", "exportEqualCallable_0"], function (require, exports, connect) {
     "use strict";
-    connect();
     exports.__esModule = true;
+    connect();
 });
diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js
index f8d0afe95da..4a65ce5fd49 100644
--- a/tests/baselines/reference/exportEqualErrorType.js
+++ b/tests/baselines/reference/exportEqualErrorType.js
@@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportEqualErrorType_1.js]
 define(["require", "exports", "exportEqualErrorType_0"], function (require, exports, connect) {
     "use strict";
-    connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
     exports.__esModule = true;
+    connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
 });
diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js
index 3a4982a7434..68ac9485f5f 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.js
+++ b/tests/baselines/reference/exportEqualMemberMissing.js
@@ -27,7 +27,7 @@ var server;
 module.exports = server;
 //// [exportEqualMemberMissing_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='exportEqualMemberMissing_0.ts'/>
 var connect = require("./exportEqualMemberMissing_0");
 connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js
index 3cf45681807..9cf7a7b2ee8 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.js
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.js
@@ -23,6 +23,6 @@ var x = {
 module.exports = x;
 //// [imp.js]
 "use strict";
+exports.__esModule = true;
 var exp_1 = require("./exp");
 exp_1["default"].toExponential(2);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsProperty.js b/tests/baselines/reference/exportEqualsProperty.js
index feb5e563903..e6bd09d5367 100644
--- a/tests/baselines/reference/exportEqualsProperty.js
+++ b/tests/baselines/reference/exportEqualsProperty.js
@@ -60,6 +60,7 @@ module.exports = A.B;
 module.exports = "foo".length;
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="declarations.d.ts" />
 var foobar_1 = require("foobar");
 var X2 = require("foobarx");
@@ -69,4 +70,3 @@ var B = require("./a");
 var b = new B(B.b);
 var fooLength = require("./b");
 fooLength + 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsProperty2.js b/tests/baselines/reference/exportEqualsProperty2.js
index f51a130e572..36fcbdf3446 100644
--- a/tests/baselines/reference/exportEqualsProperty2.js
+++ b/tests/baselines/reference/exportEqualsProperty2.js
@@ -28,6 +28,6 @@ var C = (function () {
 module.exports = C.B;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var B = require("./a");
 var x = { c: B };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js
index d947393c05f..615f3d266ab 100644
--- a/tests/baselines/reference/exportImport.js
+++ b/tests/baselines/reference/exportImport.js
@@ -29,17 +29,17 @@ define(["require", "exports"], function (require, exports) {
 //// [exporter.js]
 define(["require", "exports", "./w1"], function (require, exports, w) {
     "use strict";
-    exports.w = w;
     exports.__esModule = true;
+    exports.w = w;
 });
 //// [consumer.js]
 define(["require", "exports", "./exporter"], function (require, exports, e) {
     "use strict";
+    exports.__esModule = true;
     function w() {
         return new e.w();
     }
     exports.w = w;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js
index 7defcbac044..31f5f218d65 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.js
+++ b/tests/baselines/reference/exportImportMultipleFiles.js
@@ -15,20 +15,20 @@ lib.math.add(3, 4); // Shouldnt be error
 //// [exportImportMultipleFiles_math.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function add(a, b) { return a + b; }
     exports.add = add;
-    exports.__esModule = true;
 });
 //// [exportImportMultipleFiles_library.js]
 define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) {
     "use strict";
+    exports.__esModule = true;
     exports.math = math;
     exports.math.add(3, 4); // OK
-    exports.__esModule = true;
 });
 //// [exportImportMultipleFiles_userCode.js]
 define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) {
     "use strict";
-    lib.math.add(3, 4); // Shouldnt be error
     exports.__esModule = true;
+    lib.math.add(3, 4); // Shouldnt be error
 });
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
index 77eb0c35ce6..1394d7492dd 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
@@ -28,11 +28,11 @@ define(["require", "exports"], function (require, exports) {
 //// [consumer.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function w() {
         return { name: 'value' };
     }
     exports.w = w;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
index ba7f9380865..f7ee0b8d4d8 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
@@ -37,6 +37,7 @@ export let h1: D = new D;
 //// [exportNonInitializedVariablesAMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ;
     let;
     var ;
@@ -67,5 +68,4 @@ define(["require", "exports"], function (require, exports) {
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
index bf30e45f1ca..7623127aee8 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
@@ -36,6 +36,7 @@ export let h1: D = new D;
 
 //// [exportNonInitializedVariablesCommonJS.js]
 "use strict";
+exports.__esModule = true;
 var ;
 let;
 var ;
@@ -66,4 +67,3 @@ exports.e1 = new D;
 exports.f1 = new D;
 exports.g1 = new D;
 exports.h1 = new D;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
index 1b26cfe3c1a..504c6e70084 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
@@ -45,6 +45,7 @@ export let h1: D = new D;
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ;
     let;
     var ;
@@ -75,5 +76,4 @@ export let h1: D = new D;
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js
index a9ec4591c6c..c3e97cf3e10 100644
--- a/tests/baselines/reference/exportRedeclarationTypeAliases.js
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js
@@ -5,6 +5,6 @@ export function Foo(): any {}
 
 //// [exportRedeclarationTypeAliases.js]
 "use strict";
+exports.__esModule = true;
 function Foo() { }
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js
index e5fa8913ffd..dc0b24b98c3 100644
--- a/tests/baselines/reference/exportSameNameFuncVar.js
+++ b/tests/baselines/reference/exportSameNameFuncVar.js
@@ -6,9 +6,9 @@ export function a() {
 //// [exportSameNameFuncVar.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
     function a() {
     }
     exports.a = a;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js
index b117972450e..fe59f5071f2 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.js
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.js
@@ -14,12 +14,12 @@ export function f() {
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 function f() {
     var x;
     return x;
 }
 exports.f = f;
-exports.__esModule = true;
 
 
 //// [b.d.ts]
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index 9a4def0dd78..f25a68a5aa6 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -32,28 +32,28 @@ foo;
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = 1;
     exports.y = 2;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = "hello";
     function foo() { }
     exports.foo = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var x = "x";
     exports.x = x;
     var y = "y";
     exports.y = y;
     var z = "z";
     exports.z = z;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t4.js]
 define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) {
@@ -61,18 +61,18 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
     __export(t1_1);
     __export(t2_1);
     __export(t3_1);
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [main.js]
 define(["require", "exports", "./t4"], function (require, exports, t4_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     t4_1.default;
     t4_1.x;
     t4_1.y;
     t4_1.z;
     t4_1.foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
index 4b9ec28f6aa..a188cefd8b6 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -31,39 +31,39 @@ foo;
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = 1;
 exports.y = 2;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 function foo() { }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var x = "x";
 exports.x = x;
 var y = "y";
 exports.y = y;
 var z = "z";
 exports.z = z;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t4.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./t1"));
 __export(require("./t2"));
 __export(require("./t3"));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t4_1 = require("./t4");
 t4_1.default;
 t4_1.x;
 t4_1.y;
 t4_1.z;
 t4_1.foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js
index 3b74564d4d1..8376ec1927e 100644
--- a/tests/baselines/reference/exportStarForValues.js
+++ b/tests/baselines/reference/exportStarForValues.js
@@ -16,6 +16,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x;
     exports.__esModule = true;
+    var x;
 });
diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js
index 74b28ef6d00..f18f9f1c587 100644
--- a/tests/baselines/reference/exportStarForValues2.js
+++ b/tests/baselines/reference/exportStarForValues2.js
@@ -20,12 +20,12 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js
index 52e18851fc9..5ccd12f8a37 100644
--- a/tests/baselines/reference/exportStarForValues3.js
+++ b/tests/baselines/reference/exportStarForValues3.js
@@ -32,24 +32,24 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file5.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js
index 7697100842e..e06b5e26207 100644
--- a/tests/baselines/reference/exportStarForValues4.js
+++ b/tests/baselines/reference/exportStarForValues4.js
@@ -24,12 +24,12 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js
index 1311e215fce..1f5163dd9cd 100644
--- a/tests/baselines/reference/exportStarForValues7.js
+++ b/tests/baselines/reference/exportStarForValues7.js
@@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports, file2_1) {
@@ -29,7 +29,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js
index b6ee3c56ae7..6f52bce89f9 100644
--- a/tests/baselines/reference/exportStarForValues8.js
+++ b/tests/baselines/reference/exportStarForValues8.js
@@ -32,14 +32,14 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file4.js]
 define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) {
@@ -47,10 +47,10 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     __export(file3_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
 //// [file5.js]
 define(["require", "exports", "file4"], function (require, exports, file4_1) {
@@ -58,7 +58,7 @@ define(["require", "exports", "file4"], function (require, exports, file4_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file4_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js
index 5d24c558ec0..3c34bb1afdb 100644
--- a/tests/baselines/reference/exportStarForValues9.js
+++ b/tests/baselines/reference/exportStarForValues9.js
@@ -27,9 +27,9 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "file3"], function (require, exports, file3_1) {
@@ -37,7 +37,7 @@ define(["require", "exports", "file3"], function (require, exports, file3_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file3_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index 44ece871874..4fcac9312b9 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -25,13 +25,13 @@ X.A.r; // Error
 
 //// [exportStarFromEmptyModule_module1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module2.js]
 // empty
 //// [exportStarFromEmptyModule_module3.js]
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./exportStarFromEmptyModule_module2"));
 __export(require("./exportStarFromEmptyModule_module1"));
 var A = (function () {
@@ -47,14 +48,13 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var X = require("./exportStarFromEmptyModule_module3");
 var s;
 X.A.q;
 X.A.r; // Error
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [exportStarFromEmptyModule_module1.d.ts]
diff --git a/tests/baselines/reference/exportToString.js b/tests/baselines/reference/exportToString.js
index ee9482c655f..d527a02741c 100644
--- a/tests/baselines/reference/exportToString.js
+++ b/tests/baselines/reference/exportToString.js
@@ -5,6 +5,6 @@ export { toString };
 
 //// [exportToString.js]
 "use strict";
+exports.__esModule = true;
 var toString = 0;
 exports.toString = toString;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js
index d66cf543124..fbb2555d54b 100644
--- a/tests/baselines/reference/exportVisibility.js
+++ b/tests/baselines/reference/exportVisibility.js
@@ -11,6 +11,7 @@ export function test(foo: Foo) {
 
 //// [exportVisibility.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -22,4 +23,3 @@ function test(foo) {
     return true;
 }
 exports.test = test;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
index 357e7dc25f4..068ac5db23b 100644
--- a/tests/baselines/reference/exportedBlockScopedDeclarations.js
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -20,6 +20,7 @@ namespace NS1 {
 //// [exportedBlockScopedDeclarations.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var foo = foo; // compile error
     exports.bar = exports.bar; // should be compile error
     function f() {
@@ -38,5 +39,4 @@ define(["require", "exports"], function (require, exports) {
     (function (NS1) {
         NS1.bar1 = NS1.bar1; // should be compile error
     })(NS1 || (NS1 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js
index 11737e21e73..80a7fc6a391 100644
--- a/tests/baselines/reference/exportedVariable1.js
+++ b/tests/baselines/reference/exportedVariable1.js
@@ -6,7 +6,7 @@ var upper = foo.name.toUpperCase();
 //// [exportedVariable1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.foo = { name: "Bill" };
     var upper = exports.foo.name.toUpperCase();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js
index 5e9d0f2edf2..d50a2a35f06 100644
--- a/tests/baselines/reference/exportingContainingVisibleType.js
+++ b/tests/baselines/reference/exportingContainingVisibleType.js
@@ -13,6 +13,7 @@ export var x = 5;
 //// [exportingContainingVisibleType.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
@@ -27,5 +28,4 @@ define(["require", "exports"], function (require, exports) {
         return Foo;
     }());
     exports.x = 5;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js
index f6456368e33..87761c779fa 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.js
+++ b/tests/baselines/reference/exportsAndImports1-amd.js
@@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var v = 1;
     exports.v = v;
     function f() { }
@@ -60,27 +61,26 @@ define(["require", "exports"], function (require, exports) {
     exports.M = M;
     var a = M.x;
     exports.a = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v;
     exports.f = t1_1.f;
     exports.C = t1_1.C;
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v;
     exports.f = t1_1.f;
     exports.C = t1_1.C;
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js
index 968cd185378..6b9a40f0ea2 100644
--- a/tests/baselines/reference/exportsAndImports1-es6.js
+++ b/tests/baselines/reference/exportsAndImports1-es6.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var v = 1;
 exports.v = v;
 function f() { }
@@ -56,9 +57,9 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -66,9 +67,9 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -76,4 +77,3 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js
index a6f97be0677..56f74d27473 100644
--- a/tests/baselines/reference/exportsAndImports1.js
+++ b/tests/baselines/reference/exportsAndImports1.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 var v = 1;
 exports.v = v;
 function f() { }
@@ -59,9 +60,9 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
-exports.__esModule = true;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -69,9 +70,9 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -79,4 +80,3 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js
index d67dd92707d..5154751b21e 100644
--- a/tests/baselines/reference/exportsAndImports2-amd.js
+++ b/tests/baselines/reference/exportsAndImports2-amd.js
@@ -16,21 +16,21 @@ export { x as y, y as x };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = "x";
     exports.y = "y";
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.y = t1_1.x;
     exports.x = t1_1.y;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.y = t1_1.x;
     exports.x = t1_1.y;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js
index 59ee55defd8..b0714b83c39 100644
--- a/tests/baselines/reference/exportsAndImports2-es6.js
+++ b/tests/baselines/reference/exportsAndImports2-es6.js
@@ -15,18 +15,18 @@ export { x as y, y as x };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = "x";
 exports.y = "y";
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js
index 672d7161e74..5b3fe689d90 100644
--- a/tests/baselines/reference/exportsAndImports2.js
+++ b/tests/baselines/reference/exportsAndImports2.js
@@ -15,18 +15,18 @@ export { x as y, y as x };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = "x";
 exports.y = "y";
-exports.__esModule = true;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js
index 1f74addddec..a6af4adb5f4 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.js
+++ b/tests/baselines/reference/exportsAndImports3-amd.js
@@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = 1;
     exports.v1 = exports.v;
     function f() { }
@@ -62,27 +63,26 @@ define(["require", "exports"], function (require, exports) {
     exports.M1 = M;
     exports.a = M.x;
     exports.a1 = exports.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v1;
     exports.f = t1_1.f1;
     exports.C = t1_1.C1;
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v1;
     exports.f = t1_1.f1;
     exports.C = t1_1.C1;
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js
index b4152cab778..1ac23446807 100644
--- a/tests/baselines/reference/exportsAndImports3-es6.js
+++ b/tests/baselines/reference/exportsAndImports3-es6.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.v = 1;
 exports.v1 = exports.v;
 function f() { }
@@ -58,9 +59,9 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -68,9 +69,9 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -78,4 +79,3 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js
index 2bc4c828fe1..4dfa0411946 100644
--- a/tests/baselines/reference/exportsAndImports3.js
+++ b/tests/baselines/reference/exportsAndImports3.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.v = 1;
 exports.v1 = exports.v;
 function f() { }
@@ -61,9 +62,9 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
-exports.__esModule = true;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -71,9 +72,9 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -81,4 +82,3 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js
index ddacb1eec94..ed31f42ebc7 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.js
+++ b/tests/baselines/reference/exportsAndImports4-amd.js
@@ -42,12 +42,13 @@ export { a, b, c, d, e1, e2, f1, f2 };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.default = "hello";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.default = "hello";
 });
 //// [t3.js]
 define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.a = a;
     a.default;
     exports.b = t1_1.default;
@@ -65,5 +66,4 @@ define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], f
     exports.f2 = t1_4.default;
     t1_4.default;
     t1_4.default;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js
index 5f0c37ab04f..d8c51d03bb1 100644
--- a/tests/baselines/reference/exportsAndImports4-es6.js
+++ b/tests/baselines/reference/exportsAndImports4-es6.js
@@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-exports.default = "hello";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = "hello";
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const a = require("./t1");
 exports.a = a;
 a.default;
@@ -67,4 +68,3 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js
index 6a78862e55e..99f81a6b875 100644
--- a/tests/baselines/reference/exportsAndImports4.js
+++ b/tests/baselines/reference/exportsAndImports4.js
@@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-exports.default = "hello";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = "hello";
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = require("./t1");
 exports.a = a;
 a.default;
@@ -67,4 +68,3 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
index 0a2ee7d3183..068afdc346b 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
@@ -21,6 +21,7 @@ import { get } from "./t1";
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var set = {
     set foo(x) {
     }
@@ -28,7 +29,6 @@ var set = {
 exports.set = set;
 var get = 10;
 exports.get = get;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
index ea7f554d1b3..8b1deff064f 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
@@ -19,16 +19,16 @@ import { as } from "./t1";
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var as = 100;
 exports.return = as;
 exports.as = as;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var as = require("./t1");
 var x = as.as;
 var y = as.return;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
index 2b3e9d36f33..207d2948fa4 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
@@ -16,15 +16,15 @@ const { __, _, ___ } = R;
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 var R;
 exports["default"] = R = {
     "__": 20,
     "_": 10,
     "___": 30
 };
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var __ = m1_1["default"].__, _ = m1_1["default"]._, ___ = m1_1["default"].___;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
index 3555148f755..a53d4662e97 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
@@ -15,14 +15,14 @@ const { __esmodule, __proto__ } = R;
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 var R;
 exports["default"] = R = {
     "__esmodule": true,
     "__proto__": {}
 };
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var __esmodule = m1_1["default"].__esmodule, __proto__ = m1_1["default"].__proto__;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
index 028ca80400f..3a5bba1deed 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
@@ -16,15 +16,15 @@ const { ___, ___hello, _hi } = R;
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 var R;
 exports["default"] = R = {
     "___": 30,
     "___hello": 21,
     "_hi": 40
 };
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var ___ = m1_1["default"].___, ___hello = m1_1["default"].___hello, _hi = m1_1["default"]._hi;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
index fa643c5e7e2..718d048b9a2 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
@@ -36,6 +36,7 @@ _hi();
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 function _() {
     console.log("_");
 }
@@ -64,9 +65,9 @@ function ___hello() {
     console.log("___hello");
 }
 exports.___hello = ___hello;
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 m1_1._();
 m1_1.__();
@@ -74,4 +75,3 @@ m1_1.___hello();
 m1_1.__esmodule();
 m1_1.__proto();
 m1_1._hi();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js
index a5900c588ba..28c9488f7fa 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var x = foo1;
 var y = (function (_super) {
@@ -40,4 +41,3 @@ var y = (function (_super) {
     }
     return y;
 }(x));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index 4f0d5ced7b5..c8f7719faf0 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -34,13 +34,13 @@ var visModel = new moduleMap[moduleName].VisualizationModel();
 
 //// [extendingClassFromAliasAndUsageInIndexer_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -53,6 +53,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -62,7 +63,6 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -75,6 +75,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -84,9 +85,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
 var moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
 var moduleATyped = moduleA;
@@ -96,4 +97,3 @@ var moduleMap = {
 };
 var moduleName;
 var visModel = new moduleMap[moduleName].VisualizationModel();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js
index 41ec58a467d..70ce2281ad3 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.js
+++ b/tests/baselines/reference/externalModuleAssignToVar.js
@@ -29,13 +29,13 @@ y3 = ext3; // ok
 //// [externalModuleAssignToVar_core_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
 //// [externalModuleAssignToVar_core_require2.js]
 define(["require", "exports"], function (require, exports) {
@@ -60,11 +60,11 @@ define(["require", "exports"], function (require, exports) {
 //// [externalModuleAssignToVar_core.js]
 define(["require", "exports", "externalModuleAssignToVar_core_require", "externalModuleAssignToVar_core_require2", "externalModuleAssignToVar_ext"], function (require, exports, ext, ext2, ext3) {
     "use strict";
+    exports.__esModule = true;
     var y1 = ext;
     y1 = ext; // ok
     var y2 = ext2;
     y2 = ext2; // ok
     var y3 = ext3;
     y3 = ext3; // ok
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js
index ca51181ec3b..33aa1776e94 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.js
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.js
@@ -25,8 +25,8 @@ var C = (function () {
 module.exports = C;
 //// [externalModuleExportingGenericClass_file1.js]
 "use strict";
+exports.__esModule = true;
 var a = require("./externalModuleExportingGenericClass_file0");
 var v; // this should report error
 var v2 = (new a()).foo;
 var v3 = (new a()).foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index bd811cd8b58..7e2a78a4728 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -53,10 +53,11 @@ for ((stuff[n]) of []) {}
 
 //// [f1.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 // all mutations below are illegal and should be fixed
 var stuff = require("./f1");
 var n = 'baz';
@@ -108,4 +109,3 @@ for ((stuff[n]) in []) { }
 for (var _p = 0, _q = []; _p < _q.length; _p++) {
     (stuff[n]) = _q[_p];
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js
index 353af42a408..0402847a13a 100644
--- a/tests/baselines/reference/externalModuleQualification.js
+++ b/tests/baselines/reference/externalModuleQualification.js
@@ -13,6 +13,7 @@ class NavigateAction {
 
 //// [externalModuleQualification.js]
 "use strict";
+exports.__esModule = true;
 exports.ID = "test";
 var DiffEditor = (function () {
     function DiffEditor(id) {
@@ -28,4 +29,3 @@ var NavigateAction = (function () {
     };
     return NavigateAction;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
index 75d719670d1..e5a854077c5 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
@@ -11,15 +11,15 @@ file1.foo();
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() { }
     exports.foo = foo;
     ;
-    exports.__esModule = true;
 });
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js]
 define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExportModifier_0"], function (require, exports, file1) {
     "use strict";
+    exports.__esModule = true;
     exports.file1 = file1;
     exports.file1.foo();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
index a012d0d37b6..3a930d8e03a 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
@@ -20,14 +20,14 @@ file1.bar();
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file2.js]
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file1.js]
 "use strict";
+exports.__esModule = true;
 function foo() { }
 exports.foo = foo;
 ;
-exports.__esModule = true;
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
 var file1 = require("./externalModuleRefernceResolutionOrderInImportDeclaration_file1");
 file1.foo();
 file1.bar();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js
index 3d1fe11f88f..1ef5be53883 100644
--- a/tests/baselines/reference/externalModuleResolution.js
+++ b/tests/baselines/reference/externalModuleResolution.js
@@ -25,6 +25,6 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./foo");
 x.Y; // .ts should be picked
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js
index 96fb493090f..2c3c9facff1 100644
--- a/tests/baselines/reference/externalModuleResolution2.js
+++ b/tests/baselines/reference/externalModuleResolution2.js
@@ -26,6 +26,6 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./foo");
 x.X; // .ts should be picked
-exports.__esModule = true;
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js
index 959a3ffffcf..673a0372f05 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -7,6 +7,7 @@ export class C {
 //// [fieldAndGetterWithSameName.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
@@ -18,5 +19,4 @@ define(["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
index 793f4ab6c06..9b48439ad56 100644
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
+++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
@@ -12,13 +12,13 @@ function foo() {
 //// [a.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c = (function () {
         function c() {
         }
         return c;
     }());
     exports.c = c;
-    exports.__esModule = true;
 });
 function foo() {
 }
diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js
index 3b1644e7ac1..2bc6d91b2c3 100644
--- a/tests/baselines/reference/functionAndImportNameConflict.js
+++ b/tests/baselines/reference/functionAndImportNameConflict.js
@@ -11,13 +11,13 @@ export function f() {
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 function f() {
 }
 exports.f = f;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 function f() {
 }
 exports.f = f;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.js b/tests/baselines/reference/functionLikeInParameterInitializer.js
index d794cded0f4..9bf71aff1ea 100644
--- a/tests/baselines/reference/functionLikeInParameterInitializer.js
+++ b/tests/baselines/reference/functionLikeInParameterInitializer.js
@@ -21,6 +21,7 @@ export function baz3(func = class { x = foo }) {
 
 //// [functionLikeInParameterInitializer.js]
 "use strict";
+exports.__esModule = true;
 // error
 function bar(func) {
     if (func === void 0) { func = function () { return foo; }; }
@@ -50,4 +51,3 @@ function baz3(func) {
     var foo = "in";
 }
 exports.baz3 = baz3;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js
index 426697dfa8d..b7e460af9b1 100644
--- a/tests/baselines/reference/generatorES6InAMDModule.js
+++ b/tests/baselines/reference/generatorES6InAMDModule.js
@@ -6,9 +6,9 @@ export function* foo() {
 //// [generatorES6InAMDModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function* foo() {
         yield;
     }
     exports.foo = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js
index 1b008c90860..738fa996cf7 100644
--- a/tests/baselines/reference/genericClassesInModule2.js
+++ b/tests/baselines/reference/genericClassesInModule2.js
@@ -23,6 +23,7 @@ export class B<T2> {
 //// [genericClassesInModule2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A(callback) {
             this.callback = callback;
@@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
index 2cbb4485e31..83b100f4837 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
@@ -10,9 +10,9 @@ export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
 //// [genericInterfaceFunctionTypeParameter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo(fn) {
         foo(fn); // Invocation is necessary to repro (!)
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js
index 9704fe5d148..61a9298eb7f 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -25,6 +25,7 @@ export class BuildResult<A, B, C>{
 //// [genericMemberFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var BuildError = (function () {
         function BuildError() {
         }
@@ -59,5 +60,4 @@ define(["require", "exports"], function (require, exports) {
         return BuildResult;
     }());
     exports.BuildResult = BuildResult;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 457158faee1..728d81dd147 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -11,6 +11,7 @@ export class DbSet<T> {
 //// [genericReturnTypeFromGetter1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var DbSet = (function () {
         function DbSet() {
         }
@@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) {
         return DbSet;
     }());
     exports.DbSet = DbSet;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.js b/tests/baselines/reference/genericTypeWithMultipleBases1.js
index 3201344c0de..a958516dfa0 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases1.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases1.js
@@ -21,8 +21,8 @@ x.m2();
 
 //// [genericTypeWithMultipleBases1.js]
 "use strict";
+exports.__esModule = true;
 var x;
 x.p1;
 x.m1();
 x.m2();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.js b/tests/baselines/reference/genericTypeWithMultipleBases2.js
index a4457144000..43651ec8278 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases2.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases2.js
@@ -21,9 +21,9 @@ x.m2();
 //// [genericTypeWithMultipleBases2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     x.p1;
     x.m1();
     x.m2();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
index 0ed35307d2d..3f5e3dcfe8e 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -27,6 +27,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Collection = (function () {
         function Collection() {
         }
@@ -56,5 +57,4 @@ define(["require", "exports"], function (require, exports) {
         return ListItem;
     }(CollectionItem));
     exports.ListItem = ListItem;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
index 783ec2bf947..5739596a8f0 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
@@ -3,13 +3,13 @@ EmitSkipped: false
 EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile2.js
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile3.js
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
index 74cf137ef37..50e80f94831 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
@@ -4,6 +4,7 @@ Diagnostics:
 FileName : /tests/cases/fourslash/inputFile.js
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C = (function () {
         function C() {
         }
@@ -13,6 +14,5 @@ define(["require", "exports"], function (require, exports) {
     (function (M) {
         M.foo = new C();
     })(M = exports.M || (exports.M = {}));
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index 434835a59d3..ce4df039932 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -684,6 +684,7 @@ export declare module eaM {
 //// [giant.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     /*
         Prefixes
         p -> public
@@ -1107,7 +1108,6 @@ define(["require", "exports"], function (require, exports) {
         ;
     })(eM = exports.eM || (exports.eM = {}));
     ;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
index 040bdccd515..60bea32e305 100644
--- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
@@ -16,14 +16,15 @@ module m_private {
 
 //// [importAliasAnExternalModuleInsideAnInternalModule_file0.js]
 "use strict";
+exports.__esModule = true;
 var m;
 (function (m) {
     function foo() { }
     m.foo = foo;
 })(m = exports.m || (exports.m = {}));
-exports.__esModule = true;
 //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js]
 "use strict";
+exports.__esModule = true;
 var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0");
 var m_private;
 (function (m_private) {
@@ -31,4 +32,3 @@ var m_private;
     m_private.C = r; // no error
     m_private.C.m.foo();
 })(m_private || (m_private = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index a626d034c75..725390825c6 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -12,6 +12,7 @@ class Hello extends Greeter { }
 
 //// [importAsBaseClass_0.js]
 "use strict";
+exports.__esModule = true;
 var Greeter = (function () {
     function Greeter() {
     }
@@ -19,7 +20,6 @@ var Greeter = (function () {
     return Greeter;
 }());
 exports.Greeter = Greeter;
-exports.__esModule = true;
 //// [importAsBaseClass_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Greeter = require("./importAsBaseClass_0");
 var Hello = (function (_super) {
     __extends(Hello, _super);
@@ -40,4 +41,3 @@ var Hello = (function (_super) {
     }
     return Hello;
 }(Greeter));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index a33b758df7d..1e5e5d0ec71 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -83,6 +83,7 @@ export var useMultiImport_m4_f4 = multiImport_m4.foo();
 
 //// [importDecl_require.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -91,9 +92,9 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require1.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -103,9 +104,9 @@ exports.d = d;
 var x;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require2.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -114,9 +115,9 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require3.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -125,14 +126,14 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require4.js]
 "use strict";
+exports.__esModule = true;
 function foo2() { return null; }
 exports.foo2 = foo2;
-exports.__esModule = true;
 //// [importDecl_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='importDecl_require.ts'/>
 ///<reference path='importDecl_require1.ts'/>
 ///<reference path='importDecl_require2.ts'/>
@@ -174,7 +175,6 @@ var multiImport_m4 = require("./importDecl_require"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-exports.__esModule = true;
 
 
 //// [importDecl_require.d.ts]
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js
index 98e322fb619..00e5dae1f95 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.js
+++ b/tests/baselines/reference/importDeclWithClassModifiers.js
@@ -12,9 +12,9 @@ var b: a;
 //// [importDeclWithClassModifiers.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = x.c;
     exports.b = x.c;
     exports.c = x.c;
     var b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js
index 05c40739a82..e7929ac27fc 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifier.js
+++ b/tests/baselines/reference/importDeclWithDeclareModifier.js
@@ -9,6 +9,6 @@ var b: a;
 
 //// [importDeclWithDeclareModifier.js]
 "use strict";
+exports.__esModule = true;
 exports.a = x.c;
 var b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js
index c23fae40749..26076c2630e 100644
--- a/tests/baselines/reference/importDeclWithExportModifier.js
+++ b/tests/baselines/reference/importDeclWithExportModifier.js
@@ -10,7 +10,7 @@ var b: a;
 //// [importDeclWithExportModifier.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = x.c;
     var b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
index a4102cbfff4..ce5069c335e 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
@@ -8,5 +8,5 @@ export = x;
 
 //// [importDeclWithExportModifierAndExportAssignment.js]
 "use strict";
-exports.a = x.c;
 exports.__esModule = true;
+exports.a = x.c;
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
index ee4e8f1dc8c..cce30fd8b85 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
@@ -13,13 +13,13 @@ export var x: typeof a;
 
 //// [importDeclarationUsedAsTypeQuery_require.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [importDeclarationUsedAsTypeQuery_1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js
index 7f2c4ad4036..bf66829a435 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -66,7 +67,6 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js
index 03a4e6393d7..b756355921d 100644
--- a/tests/baselines/reference/importHelpersAmd.js
+++ b/tests/baselines/reference/importHelpersAmd.js
@@ -19,17 +19,18 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         tslib_1.__extends(B, _super);
         function B() {
@@ -38,5 +39,4 @@ define(["require", "exports", "tslib", "./a"], function (require, exports, tslib
         return B;
     }(a_1.A));
     exports.B = B;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js
index 828c1a5a360..72a91ac365e 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.js
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -66,9 +67,9 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -98,4 +99,3 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 2883a7aaa53..330b8623f69 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -21,9 +21,9 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 exports.x = React.createElement("span", tslib_1.__assign({}, o));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __assign = (this && this.__assign) || Object.assign || function(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
index 4747e017ff5..5b98b61da20 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -34,6 +34,7 @@ export {}
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -68,7 +69,6 @@ C = tslib_1.__decorate([
 var o = { a: 1 };
 var y = tslib_1.__assign({}, o);
 var x = tslib_1.__rest(y, []);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js
index efcd4827257..36a326e124d 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -27,6 +27,7 @@ class C {
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -58,7 +59,6 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js
index 233b12208c1..55bf2ea9d46 100644
--- a/tests/baselines/reference/importHelpersOutFile.js
+++ b/tests/baselines/reference/importHelpersOutFile.js
@@ -23,16 +23,17 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 //// [out.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         tslib_1.__extends(B, _super);
         function B() {
@@ -41,10 +42,10 @@ define("b", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return B;
     }(a_1.A));
     exports.B = B;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C = (function (_super) {
         tslib_2.__extends(C, _super);
         function C() {
@@ -53,5 +54,4 @@ define("c", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return C;
     }(a_2.A));
     exports.C = C;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 917c50f3fee..0c6f0540354 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -18,6 +18,7 @@ var x = foo; // Cause a runtime dependency
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
             this.m1 = 42;
@@ -26,17 +27,16 @@ define(["require", "exports"], function (require, exports) {
     }());
     C1.s1 = true;
     exports.C1 = C1;
-    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var answer = 42; // No exports
     exports.__esModule = true;
+    var answer = 42; // No exports
 });
 //// [foo_2.js]
 define(["require", "exports", "./foo_1"], function (require, exports, foo) {
     "use strict";
-    var x = foo; // Cause a runtime dependency
     exports.__esModule = true;
+    var x = foo; // Cause a runtime dependency
 });
diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js
index cfc63f83551..da492a7103d 100644
--- a/tests/baselines/reference/importInsideModule.js
+++ b/tests/baselines/reference/importInsideModule.js
@@ -11,8 +11,8 @@ export module myModule {
 
 //// [importInsideModule_file2.js]
 "use strict";
+exports.__esModule = true;
 var myModule;
 (function (myModule) {
     var a = foo.x;
 })(myModule = exports.myModule || (exports.myModule = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js
index 8af20d4be36..0340bcd35cb 100644
--- a/tests/baselines/reference/importNonExternalModule.js
+++ b/tests/baselines/reference/importNonExternalModule.js
@@ -21,8 +21,8 @@ var foo;
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     // Import should fail.  foo_0 not an external module
     if (foo.answer === 42) {
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js
index e5785d92866..eb76621f7c0 100644
--- a/tests/baselines/reference/importNonStringLiteral.js
+++ b/tests/baselines/reference/importNonStringLiteral.js
@@ -5,5 +5,5 @@ import foo = require(x); // invalid
 
 //// [foo_0.js]
 "use strict";
-var x = "filename";
 exports.__esModule = true;
+var x = "filename";
diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js
index 658b464983a..40213ce9968 100644
--- a/tests/baselines/reference/importTsBeforeDTs.js
+++ b/tests/baselines/reference/importTsBeforeDTs.js
@@ -15,11 +15,11 @@ var z2 = foo.y + 10; // Should resolve
 
 //// [foo_0.js]
 "use strict";
-exports.y = 42;
 exports.__esModule = true;
+exports.y = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var z1 = foo.x + 10; // Should error, as .ts preferred over .d.ts
 var z2 = foo.y + 10; // Should resolve
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index d44239cec11..15bf907ddd5 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -13,13 +13,13 @@ var r: string = s.foo;
 
 //// [importUsedInExtendsList1_require.js]
 "use strict";
+exports.__esModule = true;
 var Super = (function () {
     function Super() {
     }
     return Super;
 }());
 exports.Super = Super;
-exports.__esModule = true;
 //// [importUsedInExtendsList1_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 ///<reference path='importUsedInExtendsList1_require.ts'/>
 var foo = require("./importUsedInExtendsList1_require");
 var Sub = (function (_super) {
@@ -43,4 +44,3 @@ var Sub = (function (_super) {
 }(foo.Super));
 var s;
 var r = s.foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js
index c5e502f3fdc..9450fc5d7b2 100644
--- a/tests/baselines/reference/importWithTrailingSlash.js
+++ b/tests/baselines/reference/importWithTrailingSlash.js
@@ -22,23 +22,23 @@ aIndex.aIndex;
 
 //// [a.js]
 "use strict";
-exports["default"] = { a: 0 };
 exports.__esModule = true;
+exports["default"] = { a: 0 };
 //// [index.js]
 "use strict";
-exports["default"] = { aIndex: 0 };
 exports.__esModule = true;
+exports["default"] = { aIndex: 0 };
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var _1 = require(".");
 var _2 = require("./");
 _1["default"].a;
 _2["default"].aIndex;
-exports.__esModule = true;
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var __1 = require("..");
 var _1 = require("../");
 __1["default"].a;
 _1["default"].aIndex;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js
index 16c6f2b95c7..b3d607a6943 100644
--- a/tests/baselines/reference/import_reference-exported-alias.js
+++ b/tests/baselines/reference/import_reference-exported-alias.js
@@ -45,8 +45,8 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {
     "use strict";
+    exports.__esModule = true;
     var Services = appJs.Services;
     var UserServices = Services.UserServices;
     var x = new UserServices().getUserName();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js
index 5934d9b2f5e..c6771d47bae 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.js
+++ b/tests/baselines/reference/import_reference-to-type-alias.js
@@ -20,6 +20,7 @@ var x = new Services.UserServices().getUserName();
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var App;
     (function (App) {
         var Services;
@@ -35,12 +36,11 @@ define(["require", "exports"], function (require, exports) {
             Services.UserServices = UserServices;
         })(Services = App.Services || (App.Services = {}));
     })(App = exports.App || (exports.App = {}));
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {
     "use strict";
+    exports.__esModule = true;
     var Services = appJs.App.Services;
     var x = new Services.UserServices().getUserName();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
index 7fb4e02d9fd..1cd0376dded 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
@@ -19,7 +19,7 @@ var p = testData[0].name;
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var testData;
     var p = testData[0].name;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
index c2ac2416806..9b5e518804c 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
@@ -13,18 +13,18 @@ var v = new hostVar.Host();
 //// [host.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Host = (function () {
         function Host() {
         }
         return Host;
     }());
     exports.Host = Host;
-    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports", "host"], function (require, exports, host) {
     "use strict";
+    exports.__esModule = true;
     var hostVar = host;
     var v = new hostVar.Host();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js
index 61b411ea571..b82ac22f4ed 100644
--- a/tests/baselines/reference/importedAliasesInTypePositions.js
+++ b/tests/baselines/reference/importedAliasesInTypePositions.js
@@ -21,6 +21,7 @@ export module ImportingModule {
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var elaborate;
     (function (elaborate) {
         var nested;
@@ -41,11 +42,11 @@ define(["require", "exports"], function (require, exports) {
             })(mod = nested.mod || (nested.mod = {}));
         })(nested = elaborate.nested || (elaborate.nested = {}));
     })(elaborate = exports.elaborate || (exports.elaborate = {}));
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ImportingModule;
     (function (ImportingModule) {
         var UsesReferredType = (function () {
@@ -55,5 +56,4 @@ define(["require", "exports"], function (require, exports) {
             return UsesReferredType;
         }());
     })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js
index 52761e7e9db..5f4f9677dcd 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.js
+++ b/tests/baselines/reference/importedModuleClassNameClash.js
@@ -9,10 +9,10 @@ class foo { }
 //// [importedModuleClassNameClash.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var foo = (function () {
         function foo() {
         }
         return foo;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js
index b85c7145a47..dd45d4db89c 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.js
+++ b/tests/baselines/reference/importsImplicitlyReadonly.js
@@ -23,12 +23,13 @@ a3.y = 1;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 var y = 1;
 exports.y = y;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var a1 = require("./a");
 var a2 = require("./a");
@@ -41,4 +42,3 @@ a2.x = 1;
 a2.y = 1;
 a3.x = 1;
 a3.y = 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
index bc20008c2fa..997cbcd5b79 100644
--- a/tests/baselines/reference/inferenceLimit.js
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -53,6 +53,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class BrokenClass {
     constructor() { }
     brokenMethod(field, value) {
@@ -80,4 +81,3 @@ class BrokenClass {
     }
 }
 exports.BrokenClass = BrokenClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js
index 9fe669911b2..293be662a4d 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.js
+++ b/tests/baselines/reference/instanceOfInExternalModules.js
@@ -14,19 +14,19 @@ function IsFoo(value: any): boolean {
 //// [instanceOfInExternalModules_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
         return Foo;
     }());
     exports.Foo = Foo;
-    exports.__esModule = true;
 });
 //// [instanceOfInExternalModules_1.js]
 define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) {
     "use strict";
+    exports.__esModule = true;
     function IsFoo(value) {
         return value instanceof Bar.Foo;
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js
index 7fb7b08a881..ec502725925 100644
--- a/tests/baselines/reference/interfaceContextualType.js
+++ b/tests/baselines/reference/interfaceContextualType.js
@@ -23,6 +23,7 @@ class Bug {
 
 //// [interfaceContextualType.js]
 "use strict";
+exports.__esModule = true;
 var Bug = (function () {
     function Bug() {
     }
@@ -37,4 +38,3 @@ var Bug = (function () {
     };
     return Bug;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js
index 01a64805530..41f12dbac05 100644
--- a/tests/baselines/reference/interfaceDeclaration3.js
+++ b/tests/baselines/reference/interfaceDeclaration3.js
@@ -58,6 +58,7 @@ interface I2 extends I1 { item:string; }
 //// [interfaceDeclaration3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var M1;
     (function (M1) {
         var C1 = (function () {
@@ -119,5 +120,4 @@ define(["require", "exports"], function (require, exports) {
         }
         return C3;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js
index dde6b1632f1..318e8903c36 100644
--- a/tests/baselines/reference/interfaceDeclaration5.js
+++ b/tests/baselines/reference/interfaceDeclaration5.js
@@ -6,11 +6,11 @@ export class C1 { }
 //// [interfaceDeclaration5.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
         return C1;
     }());
     exports.C1 = C1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js
index 5fb3996134b..0bc759f6cda 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -27,6 +27,7 @@ export class Test {
 //// [interfaceImplementation6.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
@@ -50,5 +51,4 @@ define(["require", "exports"], function (require, exports) {
         return Test;
     }());
     exports.Test = Test;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index 20ce33035e6..0b333ac1830 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -19,6 +19,7 @@ export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -41,7 +42,6 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
index 6868a0511a6..cf2eb41662b 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
@@ -17,6 +17,7 @@ export module m2 {
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -38,7 +39,6 @@ var m2;
         var cReturnVal = m3.cProp.foo(10);
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
index d9f47a05d9e..1de7fe25407 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
@@ -19,6 +19,7 @@ export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -41,4 +42,3 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
index 52a2e0b3fed..e224b40c9f3 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
@@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -28,7 +29,6 @@ var x;
 exports.xc = x.c;
 exports.cProp = new exports.xc();
 var cReturnVal = exports.cProp.foo(10);
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
index 640b533f151..16f53fe3e8b 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
@@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -28,7 +29,6 @@ var x;
 var xc = x.c;
 exports.cProp = new xc();
 var cReturnVal = exports.cProp.foo(10);
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
index de2582debef..c387fa6e2c4 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasEnumInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
@@ -29,7 +30,6 @@ var c;
     c.b = a.weekend;
     c.bVal = c.b.Sunday;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasEnumInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
index 6e54ed79afc..717652283cf 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
@@ -29,7 +30,6 @@ var c;
     var b = a.weekend;
     c.bVal = b.Sunday;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
index c7b5180fd93..a84ebf0b9ad 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
@@ -16,6 +16,7 @@ var happyFriday = c.b.Friday;
 
 //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
@@ -31,4 +32,3 @@ var c;
     c.bVal = b.Sunday;
 })(c = exports.c || (exports.c = {}));
 var happyFriday = c.b.Friday;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
index d3e9fdf8349..ad07b9bd33f 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
@@ -14,6 +14,7 @@ export var bVal: b = b.Sunday;
 //// [internalAliasEnumInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var weekend;
@@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     exports.b = a.weekend;
     exports.bVal = exports.b.Sunday;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
index 99b9156c0c9..6b5f5b17a26 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
@@ -14,6 +14,7 @@ export var bVal: b = b.Sunday;
 //// [internalAliasEnumInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var weekend;
@@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.weekend;
     exports.bVal = b.Sunday;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
index 4138970da0b..95bb936bc75 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
@@ -14,6 +14,7 @@ export module c {
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -27,7 +28,6 @@ var c;
     c.bVal = c.b(10);
     c.bVal2 = c.b;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
index 83cab3c05bb..50de6b470ee 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
@@ -14,6 +14,7 @@ export module c {
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -27,7 +28,6 @@ var c;
     var bVal = b(10);
     c.bVal2 = b;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
index 67239e40b1d..543e9952f23 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
@@ -14,6 +14,7 @@ var d = c.b(11);
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -28,4 +29,3 @@ var c;
     c.bVal2 = b;
 })(c = exports.c || (exports.c = {}));
 var d = c.b(11);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
index 88765f267e6..267045b625d 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
@@ -13,6 +13,7 @@ export var bVal2 = b;
 //// [internalAliasFunctionInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         function foo(x) {
@@ -23,7 +24,6 @@ define(["require", "exports"], function (require, exports) {
     exports.b = a.foo;
     exports.bVal = exports.b(10);
     exports.bVal2 = exports.b;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
index 160b4047849..bb3b0e244d2 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
@@ -12,6 +12,7 @@ export var bVal2 = b;
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -22,7 +23,6 @@ var a;
 var b = a.foo;
 exports.bVal = b(10);
 exports.bVal2 = b;
-exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
index 904c7171818..85335a0fb7f 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
@@ -14,6 +14,7 @@ export module c {
 //// [internalAliasInitializedModuleInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var b;
@@ -31,7 +32,6 @@ define(["require", "exports"], function (require, exports) {
         c.b = a.b;
         c.x = new c.b.c();
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
index eb59627a4cb..c39e6cfd168 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
@@ -13,6 +13,7 @@ export module c {
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
@@ -30,7 +31,6 @@ var c;
     var b = a.b;
     c.x = new b.c();
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 77dbbab235a..6e66118f5b9 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -15,6 +15,7 @@ export var d = new c.b.c();
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
@@ -33,4 +34,3 @@ var c;
     c.x = new b.c();
 })(c = exports.c || (exports.c = {}));
 exports.d = new c.b.c();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
index 05fe46f1eb5..86d9f88cee3 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
@@ -11,6 +11,7 @@ export var x: b.c = new b.c();
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
@@ -25,7 +26,6 @@ var a;
 })(a = exports.a || (exports.a = {}));
 exports.b = a.b;
 exports.x = new exports.b.c();
-exports.__esModule = true;
 
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
index 63f6b8c1422..79185fed228 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -12,6 +12,7 @@ export var x: b.c = new b.c();
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var b;
@@ -26,7 +27,6 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.b;
     exports.x = new b.c();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
index e2cbdc3b54d..bd50cd8bbc2 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
@@ -13,10 +13,10 @@ export module c {
 //// [internalAliasInterfaceInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
index 15e03818d84..f7b08e6c170 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
@@ -13,10 +13,10 @@ export module c {
 //// [internalAliasInterfaceInsideLocalModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
index ed4c6714196..19163ff1f66 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
@@ -14,9 +14,9 @@ var x: c.b;
 //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
     var x;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
index 1b74ded4656..7ca966e90b2 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
@@ -15,11 +15,11 @@ export module c {
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var c;
 (function (c) {
     c.x.foo();
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
index a46d7629ae9..22793f8aef5 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
@@ -15,11 +15,11 @@ export module c {
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var c;
 (function (c) {
     c.x.foo();
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
index efbb156bed8..a6b4f83de8e 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -19,9 +19,9 @@ export var z: c.b.I;
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
         c.x.foo();
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
index ac52f94db72..eccbd9a45bd 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
@@ -15,8 +15,8 @@ x.foo();
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x.foo();
     exports.__esModule = true;
+    exports.x.foo();
 });
 
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
index 45af4536151..27de6bbfd98 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -14,8 +14,8 @@ x.foo();
 
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js]
 "use strict";
-exports.x.foo();
 exports.__esModule = true;
+exports.x.foo();
 
 
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
index 5cd431470f5..34f044721c4 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
@@ -12,6 +12,7 @@ export module c {
 //// [internalAliasVarInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
@@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) {
         c.b = a.x;
         c.bVal = c.b;
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
index 956c70d7cbb..161dc0bf973 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
@@ -12,6 +12,7 @@ export module c {
 //// [internalAliasVarInsideLocalModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
@@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) {
         var b = a.x;
         c.bVal = b;
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
index 962e34c4a3e..a0192fc9daa 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
@@ -12,6 +12,7 @@ export var z = c.b;
 
 //// [internalAliasVarInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     a.x = 10;
@@ -22,4 +23,3 @@ var c;
     c.bVal = b;
 })(c = exports.c || (exports.c = {}));
 exports.z = c.b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
index 732257b93e5..d27b4e3188d 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
@@ -11,13 +11,13 @@ export var bVal = b;
 //// [internalAliasVarInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
     })(a = exports.a || (exports.a = {}));
     exports.b = a.x;
     exports.bVal = exports.b;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
index f0d02aa709c..65c9204ed3c 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
@@ -10,13 +10,13 @@ export var bVal = b;
 
 //// [internalAliasVarInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     a.x = 10;
 })(a = exports.a || (exports.a = {}));
 var b = a.x;
 exports.bVal = b;
-exports.__esModule = true;
 
 
 //// [internalAliasVarInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/intersectionTypeInference1.js b/tests/baselines/reference/intersectionTypeInference1.js
index 27a75a64be6..32ddedae2b3 100644
--- a/tests/baselines/reference/intersectionTypeInference1.js
+++ b/tests/baselines/reference/intersectionTypeInference1.js
@@ -11,8 +11,8 @@ export const Form3 = brokenFunction(parameterFn)({store: "hello"})
 //// [intersectionTypeInference1.js]
 // Repro from #8801
 "use strict";
+exports.__esModule = true;
 function alert(s) { }
 var parameterFn = function (props) { return alert(props.store); };
 var brokenFunction = function (f) { return function (o) { return o; }; };
 exports.Form3 = brokenFunction(parameterFn)({ store: "hello" });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index f9590d70dd3..5aac4a64186 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -25,6 +25,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 module_1 = require("module");
 var module_2 = require("module");
 var ns = require("module");
@@ -40,4 +41,3 @@ var y = ns.value;
 var module_3 = require("module");
 exports.c1 = module_3.c1;
 exports.z = x;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
index 0d4e00b2593..4ed1fdf2c77 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
@@ -7,6 +7,6 @@ run(1);
 //// [isolatedModulesPlainFile-AMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    run(1);
     Object.defineProperty(exports, "__esModule", { value: true });
+    run(1);
 });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
index 5cf8d277597..38739a700ef 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
@@ -6,5 +6,5 @@ run(1);
 
 //// [isolatedModulesPlainFile-CommonJS.js]
 "use strict";
-run(1);
 Object.defineProperty(exports, "__esModule", { value: true });
+run(1);
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
index 5886a1908a6..f37962a84ab 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
@@ -15,6 +15,6 @@ run(1);
     }
 })(function (require, exports) {
     "use strict";
-    run(1);
     Object.defineProperty(exports, "__esModule", { value: true });
+    run(1);
 });
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
index cbb97e43d72..088b40e97ad 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
@@ -26,6 +26,7 @@ export default apply;
 //// [apply.js]
 define("_apply", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     /**
      * A faster alternative to `Function#apply`, this function invokes `func`
      * with the `this` binding of `thisArg` and the arguments of `args`.
@@ -47,5 +48,4 @@ define("_apply", ["require", "exports"], function (require, exports) {
         return func.apply(thisArg, args);
     }
     exports["default"] = apply;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js
index a3259d55cd3..dd4d326268b 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.js
+++ b/tests/baselines/reference/jsxEmitWithAttributes.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
@@ -80,4 +81,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
index 32ebf4d5d54..a864da65dbb 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
@@ -80,4 +81,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
index 36b16c62f49..9beff01d707 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let createElement = Element_1.Element.createElement;
 let c;
@@ -81,5 +82,4 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js.map b/tests/baselines/reference/jsxFactoryIdentifier.js.map
index cad196b8ba5..57ff760b8a8 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js.map
@@ -1,3 +1,3 @@
 //// [Element.js.map]
-{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
index 71dbb45a155..6101ee1d5e7 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js
 sourceFile:Element.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>var Element;
 1 >
 2 >^^^^
@@ -42,10 +43,10 @@ sourceFile:Element.ts
   >                   }
   >               }
   >           }
-1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
-3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
-4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0)
 ---
 >>>(function (Element) {
 1->
@@ -55,9 +56,9 @@ sourceFile:Element.ts
 1->
 2 >export namespace 
 3 >           Element
-1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
-3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+1->Emitted(4, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0)
 ---
 >>>    function isElement(el) {
 1->^^^^
@@ -68,9 +69,9 @@ sourceFile:Element.ts
   >    
 2 >    export function isElement(
 3 >                       el: any
-1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
-2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
-3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+1->Emitted(5, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0)
 ---
 >>>        return el.markAsChildOfRootElement !== undefined;
 1->^^^^^^^^
@@ -92,15 +93,15 @@ sourceFile:Element.ts
 7 >                                           !== 
 8 >                                               undefined
 9 >                                                        ;
-1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
-2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
-3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
-4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
-5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
-6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
-7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
-8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
-9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+1->Emitted(6, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -109,8 +110,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
-2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0)
 ---
 >>>    Element.isElement = isElement;
 1->^^^^
@@ -124,10 +125,10 @@ sourceFile:Element.ts
   >                             return el.markAsChildOfRootElement !== undefined;
   >                         }
 4 >                                 
-1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
-2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
-3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
-4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+1->Emitted(8, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0)
 ---
 >>>    function createElement(args) {
 1->^^^^
@@ -138,9 +139,9 @@ sourceFile:Element.ts
   >    
 2 >    export function createElement(
 3 >                           args: any[]
-1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
-3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+1->Emitted(9, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0)
 ---
 >>>        return {};
 1 >^^^^^^^^
@@ -156,11 +157,11 @@ sourceFile:Element.ts
 4 >               {
   >                       }
 5 >                 
-1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
-2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
-3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
-4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
-5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -169,8 +170,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
-2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0)
 ---
 >>>    Element.createElement = createElement;
 1->^^^^
@@ -186,10 +187,10 @@ sourceFile:Element.ts
   >                                 }
   >                             }
 4 >                                         
-1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
-2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
-3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
-4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+1->Emitted(12, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0)
 ---
 >>>})(Element = exports.Element || (exports.Element = {}));
 1->
@@ -221,15 +222,15 @@ sourceFile:Element.ts
   >                                                        }
   >                                                    }
   >                                                }
-1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
-3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
-4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
-5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
-6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
-7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
-8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
-9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+1->Emitted(13, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0)
 ---
 >>>exports.createElement = Element.createElement;
 1 >
@@ -250,14 +251,14 @@ sourceFile:Element.ts
 6 >                               .
 7 >                                createElement
 8 >                                             ;
-1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
-2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
-3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
-4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
-5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
-6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
-7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
-8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0)
 ---
 >>>function toCamelCase(text) {
 1 >
@@ -269,9 +270,9 @@ sourceFile:Element.ts
   >
 2 >function toCamelCase(
 3 >                     text: string
-1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
-2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0)
 ---
 >>>    return text[0].toLowerCase() + text.substring(1);
 1->^^^^
@@ -311,36 +312,35 @@ sourceFile:Element.ts
 16>                                                  1
 17>                                                   )
 18>                                                    ;
-1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
-2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
-3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
-4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
-5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
-6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
-7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
-8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
-9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
-10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
-11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
-12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
-13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
-14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
-15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
-16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
-17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
-18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+1->Emitted(16, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(16, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(16, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(16, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(16, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(16, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(16, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(16, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(16, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(16, 54) Source(29, 54) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
-2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
@@ -352,14 +352,15 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>const Element_1 = require("./Element");
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                       ^^^^^^^^^^^^^^->
 1 >
 2 >import { Element} from './Element';
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0)
 ---
 >>>let createElement = Element_1.Element.createElement;
 1->
@@ -379,14 +380,14 @@ sourceFile:test.tsx
 6 >                                     .
 7 >                                      createElement
 8 >                                                   ;
-1->Emitted(3, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(3, 5) Source(2, 5) + SourceIndex(0)
-3 >Emitted(3, 18) Source(2, 18) + SourceIndex(0)
-4 >Emitted(3, 21) Source(2, 21) + SourceIndex(0)
-5 >Emitted(3, 38) Source(2, 28) + SourceIndex(0)
-6 >Emitted(3, 39) Source(2, 29) + SourceIndex(0)
-7 >Emitted(3, 52) Source(2, 42) + SourceIndex(0)
-8 >Emitted(3, 53) Source(2, 43) + SourceIndex(0)
+1->Emitted(4, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(4, 18) Source(2, 18) + SourceIndex(0)
+4 >Emitted(4, 21) Source(2, 21) + SourceIndex(0)
+5 >Emitted(4, 38) Source(2, 28) + SourceIndex(0)
+6 >Emitted(4, 39) Source(2, 29) + SourceIndex(0)
+7 >Emitted(4, 52) Source(2, 42) + SourceIndex(0)
+8 >Emitted(4, 53) Source(2, 43) + SourceIndex(0)
 ---
 >>>let c;
 1 >
@@ -403,10 +404,10 @@ sourceFile:test.tsx
   >    	}
   >    }
 4 >     ;
-1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0)
-3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0)
-4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0)
+1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(5, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(5, 7) Source(7, 3) + SourceIndex(0)
 ---
 >>>class A {
 1->
@@ -414,7 +415,7 @@ sourceFile:test.tsx
 1->
   >
   >
-1->Emitted(5, 1) Source(9, 1) + SourceIndex(0)
+1->Emitted(6, 1) Source(9, 1) + SourceIndex(0)
 ---
 >>>    view() {
 1->^^^^
@@ -423,8 +424,8 @@ sourceFile:test.tsx
 1->class A {
   >	
 2 >    view
-1->Emitted(6, 5) Source(10, 2) + SourceIndex(0)
-2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0)
+1->Emitted(7, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(7, 9) Source(10, 6) + SourceIndex(0)
 ---
 >>>        return [
 1->^^^^^^^^
@@ -435,9 +436,9 @@ sourceFile:test.tsx
   >		
 2 >        return
 3 >               
-1->Emitted(7, 9) Source(11, 3) + SourceIndex(0)
-2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0)
-3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0)
+1->Emitted(8, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(8, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(8, 16) Source(11, 10) + SourceIndex(0)
 ---
 >>>            createElement("meta", { content: "helloworld" }),
 1->^^^^^^^^^^^^
@@ -453,12 +454,12 @@ sourceFile:test.tsx
 4 >                                           =
 5 >                                             "helloworld"
 6 >                                                         ></meta>
-1->Emitted(8, 13) Source(12, 4) + SourceIndex(0)
-2 >Emitted(8, 37) Source(12, 10) + SourceIndex(0)
-3 >Emitted(8, 44) Source(12, 17) + SourceIndex(0)
-4 >Emitted(8, 46) Source(12, 18) + SourceIndex(0)
-5 >Emitted(8, 58) Source(12, 30) + SourceIndex(0)
-6 >Emitted(8, 61) Source(12, 38) + SourceIndex(0)
+1->Emitted(9, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(9, 37) Source(12, 10) + SourceIndex(0)
+3 >Emitted(9, 44) Source(12, 17) + SourceIndex(0)
+4 >Emitted(9, 46) Source(12, 18) + SourceIndex(0)
+5 >Emitted(9, 58) Source(12, 30) + SourceIndex(0)
+6 >Emitted(9, 61) Source(12, 38) + SourceIndex(0)
 ---
 >>>            createElement("meta", { content: c.a.b })
 1 >^^^^^^^^^^^^
@@ -482,16 +483,16 @@ sourceFile:test.tsx
 8 >                                                .
 9 >                                                 b
 10>                                                  }></meta>
-1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0)
-2 >Emitted(9, 37) Source(13, 10) + SourceIndex(0)
-3 >Emitted(9, 44) Source(13, 17) + SourceIndex(0)
-4 >Emitted(9, 46) Source(13, 19) + SourceIndex(0)
-5 >Emitted(9, 47) Source(13, 20) + SourceIndex(0)
-6 >Emitted(9, 48) Source(13, 21) + SourceIndex(0)
-7 >Emitted(9, 49) Source(13, 23) + SourceIndex(0)
-8 >Emitted(9, 50) Source(13, 24) + SourceIndex(0)
-9 >Emitted(9, 51) Source(13, 25) + SourceIndex(0)
-10>Emitted(9, 54) Source(13, 34) + SourceIndex(0)
+1 >Emitted(10, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(10, 37) Source(13, 10) + SourceIndex(0)
+3 >Emitted(10, 44) Source(13, 17) + SourceIndex(0)
+4 >Emitted(10, 46) Source(13, 19) + SourceIndex(0)
+5 >Emitted(10, 47) Source(13, 20) + SourceIndex(0)
+6 >Emitted(10, 48) Source(13, 21) + SourceIndex(0)
+7 >Emitted(10, 49) Source(13, 23) + SourceIndex(0)
+8 >Emitted(10, 50) Source(13, 24) + SourceIndex(0)
+9 >Emitted(10, 51) Source(13, 25) + SourceIndex(0)
+10>Emitted(10, 54) Source(13, 34) + SourceIndex(0)
 ---
 >>>        ];
 1 >^^^^^^^^^
@@ -499,8 +500,8 @@ sourceFile:test.tsx
 1 >
   >		]
 2 >         ;
-1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0)
-2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0)
+1 >Emitted(11, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(11, 11) Source(14, 5) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -508,15 +509,14 @@ sourceFile:test.tsx
 1 >
   >	
 2 >    }
-1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0)
-2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0)
+1 >Emitted(12, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(12, 6) Source(15, 3) + SourceIndex(0)
 ---
 >>>}
 1 >^
-2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
+1 >Emitted(13, 2) Source(16, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
index 3ab40dee5eb..05da89d0d85 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
@@ -15,11 +15,11 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render(createElement) {
         return createElement("div", null);
     }
 }
 exports.AppComponent = AppComponent;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
index c108b93a913..c72e1bf8057 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
index 68f39e67ddd..b2d30177b1d 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render(createElement) {
 1->^^^^
@@ -33,10 +34,10 @@ sourceFile:test.tsx
 2 >    render
 3 >          (
 4 >           createElement
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
-3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
-4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0)
 ---
 >>>        return createElement("div", null);
 1->^^^^^^^^
@@ -50,11 +51,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                         ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -62,28 +63,26 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
index 12ea8b96602..c9f5f3465e3 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
@@ -15,11 +15,11 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render() {
         return createElement("div", null);
     }
 }
 exports.AppComponent = AppComponent;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
index 715014ff53f..66666a526d6 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
index b1b8db46eaa..1a77ab3eae1 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render() {
 1->^^^^
@@ -29,8 +30,8 @@ sourceFile:test.tsx
 1->export class AppComponent {
   >    
 2 >    render
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
 ---
 >>>        return createElement("div", null);
 1->^^^^^^^^
@@ -44,11 +45,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                         ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -56,28 +57,26 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render() {
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
index 9f408e4db7a..9fc5799b11d 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let c;
 class A {
     view() {
@@ -79,4 +80,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
index 331c7a65d73..aa90c74cce5 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let c;
 class A {
     view() {
@@ -79,4 +80,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index 0a7b7f8d387..ee747733799 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
@@ -80,5 +81,4 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js.map b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
index f8cef24a0f0..6c5dd8abf56 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js.map
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
@@ -1,3 +1,3 @@
 //// [Element.js.map]
-{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
index 86ed94197d6..9831a9ab5fd 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js
 sourceFile:Element.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>var Element;
 1 >
 2 >^^^^
@@ -42,10 +43,10 @@ sourceFile:Element.ts
   >                   }
   >               }
   >           }
-1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
-3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
-4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0)
 ---
 >>>(function (Element) {
 1->
@@ -55,9 +56,9 @@ sourceFile:Element.ts
 1->
 2 >export namespace 
 3 >           Element
-1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
-3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+1->Emitted(4, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0)
 ---
 >>>    function isElement(el) {
 1->^^^^
@@ -68,9 +69,9 @@ sourceFile:Element.ts
   >    
 2 >    export function isElement(
 3 >                       el: any
-1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
-2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
-3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+1->Emitted(5, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0)
 ---
 >>>        return el.markAsChildOfRootElement !== undefined;
 1->^^^^^^^^
@@ -92,15 +93,15 @@ sourceFile:Element.ts
 7 >                                           !== 
 8 >                                               undefined
 9 >                                                        ;
-1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
-2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
-3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
-4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
-5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
-6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
-7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
-8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
-9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+1->Emitted(6, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -109,8 +110,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
-2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0)
 ---
 >>>    Element.isElement = isElement;
 1->^^^^
@@ -124,10 +125,10 @@ sourceFile:Element.ts
   >                             return el.markAsChildOfRootElement !== undefined;
   >                         }
 4 >                                 
-1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
-2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
-3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
-4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+1->Emitted(8, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0)
 ---
 >>>    function createElement(args) {
 1->^^^^
@@ -138,9 +139,9 @@ sourceFile:Element.ts
   >    
 2 >    export function createElement(
 3 >                           args: any[]
-1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
-3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+1->Emitted(9, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0)
 ---
 >>>        return {};
 1 >^^^^^^^^
@@ -156,11 +157,11 @@ sourceFile:Element.ts
 4 >               {
   >                       }
 5 >                 
-1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
-2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
-3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
-4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
-5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -169,8 +170,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
-2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0)
 ---
 >>>    Element.createElement = createElement;
 1->^^^^
@@ -186,10 +187,10 @@ sourceFile:Element.ts
   >                                 }
   >                             }
 4 >                                         
-1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
-2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
-3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
-4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+1->Emitted(12, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0)
 ---
 >>>})(Element = exports.Element || (exports.Element = {}));
 1->
@@ -221,15 +222,15 @@ sourceFile:Element.ts
   >                                                        }
   >                                                    }
   >                                                }
-1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
-3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
-4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
-5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
-6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
-7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
-8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
-9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+1->Emitted(13, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0)
 ---
 >>>exports.createElement = Element.createElement;
 1 >
@@ -250,14 +251,14 @@ sourceFile:Element.ts
 6 >                               .
 7 >                                createElement
 8 >                                             ;
-1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
-2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
-3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
-4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
-5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
-6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
-7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
-8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0)
 ---
 >>>function toCamelCase(text) {
 1 >
@@ -269,9 +270,9 @@ sourceFile:Element.ts
   >
 2 >function toCamelCase(
 3 >                     text: string
-1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
-2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0)
 ---
 >>>    return text[0].toLowerCase() + text.substring(1);
 1->^^^^
@@ -311,36 +312,35 @@ sourceFile:Element.ts
 16>                                                  1
 17>                                                   )
 18>                                                    ;
-1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
-2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
-3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
-4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
-5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
-6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
-7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
-8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
-9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
-10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
-11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
-12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
-13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
-14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
-15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
-16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
-17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
-18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+1->Emitted(16, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(16, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(16, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(16, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(16, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(16, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(16, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(16, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(16, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(16, 54) Source(29, 54) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
-2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
@@ -352,13 +352,14 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>const Element_1 = require("./Element");
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >import { Element} from './Element';
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0)
 ---
 >>>let c;
 1 >
@@ -376,10 +377,10 @@ sourceFile:test.tsx
   >    	}
   >    }
 4 >     ;
-1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-3 >Emitted(3, 6) Source(7, 2) + SourceIndex(0)
-4 >Emitted(3, 7) Source(7, 3) + SourceIndex(0)
+1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0)
 ---
 >>>class A {
 1->
@@ -387,7 +388,7 @@ sourceFile:test.tsx
 1->
   >
   >
-1->Emitted(4, 1) Source(9, 1) + SourceIndex(0)
+1->Emitted(5, 1) Source(9, 1) + SourceIndex(0)
 ---
 >>>    view() {
 1->^^^^
@@ -396,8 +397,8 @@ sourceFile:test.tsx
 1->class A {
   >	
 2 >    view
-1->Emitted(5, 5) Source(10, 2) + SourceIndex(0)
-2 >Emitted(5, 9) Source(10, 6) + SourceIndex(0)
+1->Emitted(6, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0)
 ---
 >>>        return [
 1->^^^^^^^^
@@ -408,9 +409,9 @@ sourceFile:test.tsx
   >		
 2 >        return
 3 >               
-1->Emitted(6, 9) Source(11, 3) + SourceIndex(0)
-2 >Emitted(6, 15) Source(11, 9) + SourceIndex(0)
-3 >Emitted(6, 16) Source(11, 10) + SourceIndex(0)
+1->Emitted(7, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0)
 ---
 >>>            Element_1.Element.createElement("meta", { content: "helloworld" }),
 1->^^^^^^^^^^^^
@@ -426,12 +427,12 @@ sourceFile:test.tsx
 4 >                                                             =
 5 >                                                               "helloworld"
 6 >                                                                           ></meta>
-1->Emitted(7, 13) Source(12, 4) + SourceIndex(0)
-2 >Emitted(7, 55) Source(12, 10) + SourceIndex(0)
-3 >Emitted(7, 62) Source(12, 17) + SourceIndex(0)
-4 >Emitted(7, 64) Source(12, 18) + SourceIndex(0)
-5 >Emitted(7, 76) Source(12, 30) + SourceIndex(0)
-6 >Emitted(7, 79) Source(12, 38) + SourceIndex(0)
+1->Emitted(8, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(8, 55) Source(12, 10) + SourceIndex(0)
+3 >Emitted(8, 62) Source(12, 17) + SourceIndex(0)
+4 >Emitted(8, 64) Source(12, 18) + SourceIndex(0)
+5 >Emitted(8, 76) Source(12, 30) + SourceIndex(0)
+6 >Emitted(8, 79) Source(12, 38) + SourceIndex(0)
 ---
 >>>            Element_1.Element.createElement("meta", { content: c.a.b })
 1 >^^^^^^^^^^^^
@@ -455,16 +456,16 @@ sourceFile:test.tsx
 8 >                                                                  .
 9 >                                                                   b
 10>                                                                    }></meta>
-1 >Emitted(8, 13) Source(13, 4) + SourceIndex(0)
-2 >Emitted(8, 55) Source(13, 10) + SourceIndex(0)
-3 >Emitted(8, 62) Source(13, 17) + SourceIndex(0)
-4 >Emitted(8, 64) Source(13, 19) + SourceIndex(0)
-5 >Emitted(8, 65) Source(13, 20) + SourceIndex(0)
-6 >Emitted(8, 66) Source(13, 21) + SourceIndex(0)
-7 >Emitted(8, 67) Source(13, 23) + SourceIndex(0)
-8 >Emitted(8, 68) Source(13, 24) + SourceIndex(0)
-9 >Emitted(8, 69) Source(13, 25) + SourceIndex(0)
-10>Emitted(8, 72) Source(13, 34) + SourceIndex(0)
+1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(9, 55) Source(13, 10) + SourceIndex(0)
+3 >Emitted(9, 62) Source(13, 17) + SourceIndex(0)
+4 >Emitted(9, 64) Source(13, 19) + SourceIndex(0)
+5 >Emitted(9, 65) Source(13, 20) + SourceIndex(0)
+6 >Emitted(9, 66) Source(13, 21) + SourceIndex(0)
+7 >Emitted(9, 67) Source(13, 23) + SourceIndex(0)
+8 >Emitted(9, 68) Source(13, 24) + SourceIndex(0)
+9 >Emitted(9, 69) Source(13, 25) + SourceIndex(0)
+10>Emitted(9, 72) Source(13, 34) + SourceIndex(0)
 ---
 >>>        ];
 1 >^^^^^^^^^
@@ -472,8 +473,8 @@ sourceFile:test.tsx
 1 >
   >		]
 2 >         ;
-1 >Emitted(9, 10) Source(14, 4) + SourceIndex(0)
-2 >Emitted(9, 11) Source(14, 5) + SourceIndex(0)
+1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -481,15 +482,14 @@ sourceFile:test.tsx
 1 >
   >	
 2 >    }
-1 >Emitted(10, 5) Source(15, 2) + SourceIndex(0)
-2 >Emitted(10, 6) Source(15, 3) + SourceIndex(0)
+1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0)
 ---
 >>>}
 1 >^
-2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(11, 2) Source(16, 2) + SourceIndex(0)
+1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
index 60c8ca80212..510efc97f4a 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
@@ -14,11 +14,11 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render(createElement) {
         return MyElement.createElement("div", null);
     }
 }
 exports.AppComponent = AppComponent;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
index ac54c9638cd..1af641eb351 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
index 0e8d7ec51f3..2f5270f3705 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render(createElement) {
 1->^^^^
@@ -33,10 +34,10 @@ sourceFile:test.tsx
 2 >    render
 3 >          (
 4 >           createElement
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
-3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
-4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0)
 ---
 >>>        return MyElement.createElement("div", null);
 1->^^^^^^^^
@@ -50,11 +51,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                                   ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 52) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 53) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 52) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 53) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -62,28 +63,26 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
index 72200aee75c..267f3eaee50 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
@@ -13,6 +13,7 @@ class Component {
 
 //// [index.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("./jsx");
 var skate;
 var React = { createElement: skate.h };
@@ -25,4 +26,3 @@ var Component = (function () {
     return Component;
 }());
 ;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js
index 59bde766a35..4b42ebe812d 100644
--- a/tests/baselines/reference/jsxImportInAttribute.js
+++ b/tests/baselines/reference/jsxImportInAttribute.js
@@ -16,8 +16,8 @@ let x = Test; // emit test_1.default
 
 //// [consumer.jsx]
 "use strict";
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var Test_1 = require("Test");
 var x = Test_1["default"]; // emit test_1.default
 <anything attr={Test_1["default"]}/>; // ?
-exports.__esModule = true;
diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js
index 626a48d191e..187ba545fb3 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var BaseComponent_1 = require("BaseComponent");
 var TestComponent = (function (_super) {
@@ -47,4 +48,3 @@ var TestComponent = (function (_super) {
     };
     return TestComponent;
 }(React.Component));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js
index 9040455be56..3b291a34774 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var BaseComponent = require("BaseComponent");
 var TestComponent = (function (_super) {
@@ -47,4 +48,3 @@ var TestComponent = (function (_super) {
     };
     return TestComponent;
 }(React.Component));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js
index 3e6b396184f..f198c0f9ea7 100644
--- a/tests/baselines/reference/localAliasExportAssignment.js
+++ b/tests/baselines/reference/localAliasExportAssignment.js
@@ -22,7 +22,7 @@ var server;
 module.exports = server;
 //// [localAliasExportAssignment_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='localAliasExportAssignment_0.ts'/>
 var connect = require("./localAliasExportAssignment_0");
 connect();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/mapOnTupleTypes01.js b/tests/baselines/reference/mapOnTupleTypes01.js
index 731e0e2e70b..9f22aa63753 100644
--- a/tests/baselines/reference/mapOnTupleTypes01.js
+++ b/tests/baselines/reference/mapOnTupleTypes01.js
@@ -44,6 +44,7 @@ export let h = numNumNumNumNum.map(n => n * n);
 
 //// [mapOnTupleTypes01.js]
 "use strict";
+exports.__esModule = true;
 exports.mapOnLooseArrayLiteral = [1, 2, 3, 4].map(function (n) { return n * n; });
 // Length 1
 var numTuple = [1];
@@ -67,7 +68,6 @@ exports.g = numNumNumNumNum.map(function (n) { return n * n; });
 // Length 6
 var numNumNumNumNumNum = [1, 2, 3, 4, 5, 6];
 exports.h = numNumNumNumNum.map(function (n) { return n * n; });
-exports.__esModule = true;
 
 
 //// [mapOnTupleTypes01.d.ts]
diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js
index 0906c6df189..ca835751a7a 100644
--- a/tests/baselines/reference/mapOnTupleTypes02.js
+++ b/tests/baselines/reference/mapOnTupleTypes02.js
@@ -8,11 +8,11 @@ export function increment(point: Point) {
 
 //// [mapOnTupleTypes02.js]
 "use strict";
+exports.__esModule = true;
 function increment(point) {
     return point.map(function (d) { return d + 1; });
 }
 exports.increment = increment;
-exports.__esModule = true;
 
 
 //// [mapOnTupleTypes02.d.ts]
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
index b3c51e66c4b..2ba05b016be 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
@@ -17,6 +17,7 @@ WinJS.Promise.timeout(10);
 //// [memberAccessMustUseModuleInstances_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Promise = (function () {
         function Promise() {
         }
@@ -26,11 +27,10 @@ define(["require", "exports"], function (require, exports) {
         return Promise;
     }());
     exports.Promise = Promise;
-    exports.__esModule = true;
 });
 //// [memberAccessMustUseModuleInstances_1.js]
 define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) {
     "use strict";
-    WinJS.Promise.timeout(10);
     exports.__esModule = true;
+    WinJS.Promise.timeout(10);
 });
diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js
index c27c5ef8615..ec2eb4a1087 100644
--- a/tests/baselines/reference/mergeWithImportedNamespace.js
+++ b/tests/baselines/reference/mergeWithImportedNamespace.js
@@ -12,11 +12,11 @@ export namespace N {
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var N;
 (function (N) {
     N.x = 1;
 })(N = exports.N || (exports.N = {}));
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js
index 21e457b1361..efa95d77630 100644
--- a/tests/baselines/reference/mergeWithImportedType.js
+++ b/tests/baselines/reference/mergeWithImportedType.js
@@ -10,11 +10,11 @@ export type E = E;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var E;
 (function (E) {
     E[E["X"] = 0] = "X";
 })(E = exports.E || (exports.E = {}));
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js
index 17aeccbc769..83173f35752 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -26,6 +26,7 @@ export class B extends A {
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -35,7 +36,6 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [b.js]
 var __extends = (this && this.__extends) || (function () {
@@ -50,6 +50,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports", "./a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
@@ -60,5 +61,4 @@ define(["require", "exports", "./a"], function (require, exports, a_1) {
         return B;
     }(a_1.A));
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js
index d1becde5240..8fa3f2d0731 100644
--- a/tests/baselines/reference/mergedDeclarations7.js
+++ b/tests/baselines/reference/mergedDeclarations7.js
@@ -24,6 +24,6 @@ let p: Passport = passport.use();
 
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var passport = require("passport");
 var p = passport.use();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
index c4e5c8dfa10..8d5f55b6801 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
@@ -17,6 +17,7 @@ export module X {
 
 //// [mergedModuleDeclarationCodeGen.js]
 "use strict";
+exports.__esModule = true;
 var X;
 (function (X) {
     var Y;
@@ -40,4 +41,3 @@ var X;
         Y.B = B;
     })(Y = X.Y || (X.Y = {}));
 })(X = exports.X || (exports.X = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js
index ace3445911c..40cbc87cdcb 100644
--- a/tests/baselines/reference/metadataOfEventAlias.js
+++ b/tests/baselines/reference/metadataOfEventAlias.js
@@ -13,8 +13,8 @@ export class SomeClass {
 
 //// [event.js]
 "use strict";
-;
 Object.defineProperty(exports, "__esModule", { value: true });
+;
 //// [test.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -26,6 +26,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 function Input(target, key) { }
 var SomeClass = (function () {
     function SomeClass() {
@@ -37,4 +38,3 @@ __decorate([
     __metadata("design:type", Object)
 ], SomeClass.prototype, "event", void 0);
 exports.SomeClass = SomeClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js
index 87e1fdd8f58..23bb2356640 100644
--- a/tests/baselines/reference/missingFunctionImplementation.js
+++ b/tests/baselines/reference/missingFunctionImplementation.js
@@ -82,6 +82,7 @@ namespace N12 {
 
 //// [missingFunctionImplementation.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
     }
@@ -162,4 +163,3 @@ var N12;
     function m(a) { }
     N12.m = m;
 })(N12 || (N12 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
index 2d33c5b9768..d4a8b12d2a6 100644
--- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
+++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
@@ -10,9 +10,9 @@ import {x} from "./a"
 
 //// [a.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [b.js]
 "use strict";
-(function () { return 1; }());
 exports.__esModule = true;
+(function () { return 1; }());
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
index 95ef30bb8d6..16eb962a863 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
@@ -22,9 +22,9 @@ define(["require", "exports"], function (require, exports) {
 //// [moduleAliasAsFunctionArgument_1.js]
 define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) {
     "use strict";
+    exports.__esModule = true;
     function fn(arg) {
     }
     a.x; // OK
     fn(a); // Error: property 'x' is missing from 'a'
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
index 76eb8237cc6..a92cf5093e3 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
@@ -41,20 +41,20 @@ define(["require", "exports"], function (require, exports) {
 //// [map1.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
-    observable_1.Observable.prototype.map = function () { };
     exports.__esModule = true;
+    observable_1.Observable.prototype.map = function () { };
 });
 //// [map2.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
-    observable_1.Observable.prototype.map = function () { };
     exports.__esModule = true;
+    observable_1.Observable.prototype.map = function () { };
 });
 //// [main.js]
 define(["require", "exports", "./map1", "./map2"], function (require, exports) {
     "use strict";
-    var x;
     exports.__esModule = true;
+    var x;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
index 92bb6cd1d99..77759306845 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
@@ -34,22 +34,22 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
 
 
 //// [observable.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
index 02d461e642d..15ca6aaf806 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
@@ -36,24 +36,24 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
-exports.__esModule = true;
 
 
 //// [observable.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
index cae38270898..c29bed68e51 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
@@ -49,24 +49,24 @@ import "./x";
 
 //// [x0.js]
 "use strict";
-exports.a = 1;
 exports.__esModule = true;
+exports.a = 1;
 //// [x.js]
 "use strict";
+exports.__esModule = true;
 var N1;
 (function (N1) {
     N1.x = 1;
 })(N1 || (N1 = {}));
-exports.__esModule = true;
 //// [observable.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [test.js]
 "use strict";
-exports.b = 1;
 exports.__esModule = true;
+exports.b = 1;
 //// [main.js]
 "use strict";
-require("./x");
 exports.__esModule = true;
+require("./x");
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
index 5dc02dc3082..d6857a28ef1 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
@@ -36,12 +36,12 @@ let y = x.map(x => x + 1);
 
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
index 28461511dff..eee03576336 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
@@ -38,11 +38,12 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="observable.d.ts"/>
 var observable_1 = require("observable");
 require("./map");
@@ -50,7 +51,6 @@ var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
-exports.__esModule = true;
 
 
 //// [map.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
index 0becae3f0ff..9d15f3fe387 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
@@ -34,19 +34,19 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
index cdad871ac21..072c62862e3 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
@@ -36,21 +36,21 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js
index 6569631a8d7..2ef6441692f 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.js
@@ -20,18 +20,18 @@ let y = x.getA().x;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var x = [1];
 var y = x.getA().x;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js
index 222e337dd64..1806ceae9a1 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.js
@@ -20,6 +20,7 @@ let y = x.getCountAsString().toLowerCase();
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -27,12 +28,11 @@ var A = (function () {
 }());
 exports.A = A;
 ;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js
index 88e6b2c204d..9cb08f2b866 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.js
@@ -23,6 +23,7 @@ let y = x.getCountAsString().toLowerCase();
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -30,16 +31,15 @@ var A = (function () {
 }());
 exports.A = A;
 ;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
 exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 require("./f2");
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js
index 6d9d76f8aaf..194d06aeb80 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal4.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal4.js
@@ -26,9 +26,9 @@ exports.__esModule = true;
 exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 require("./f1");
 require("./f2");
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js
index f25dffba5e8..43d8c6b958b 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.js
@@ -23,11 +23,11 @@ import "B";
 
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="f1.d.ts"/>
 /// <reference path="f2.d.ts"/>
 require("A");
 require("B");
-exports.__esModule = true;
 
 
 //// [f3.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
index 6a825dcf34c..66ce39e8d84 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
@@ -29,33 +29,33 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index 4f30d1210ff..e79f2e58484 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -41,33 +41,33 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index 66de9f1c596..c7c13ea7861 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -39,33 +39,33 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
index 0729457fc51..9cdf76b90a5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
@@ -41,32 +41,32 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
index 7970f65f412..c7f7990608e 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -41,35 +41,35 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
index 3b290b82975..0f19e737ec5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
@@ -41,35 +41,35 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
index 852d50f8d01..4cdef37a4f7 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
@@ -31,9 +31,9 @@ x.foo().x;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 var x;
 x.foo().x;
-exports.__esModule = true;
 
 
 //// [main.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
index 1fdb32a55b5..536931ee61f 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
@@ -31,7 +31,7 @@ x.foo().x;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
index aa6b33baef3..37253ab7e5b 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
@@ -41,8 +41,8 @@ x.foo2().x2;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
 x.foo2().x2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
index 5f209f753cf..0c861447b46 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
@@ -44,8 +44,8 @@ x.foo2().x2;
 /// <reference path="O.d.ts" />
 /// <reference path="O2.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
 x.foo2().x2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
index 55226da5ee9..ac202784f43 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
@@ -25,11 +25,11 @@ let y = x.getA().x;
 
 //// [f.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="array.d.ts"/>
 require("array");
 var x = [1];
 var y = x.getA().x;
-exports.__esModule = true;
 
 
 //// [f.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInDependency.js b/tests/baselines/reference/moduleAugmentationInDependency.js
index 757b71754d6..31c82ad18e8 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency.js
@@ -10,5 +10,5 @@ import "A"
 
 //// [app.js]
 "use strict";
-require("A");
 exports.__esModule = true;
+require("A");
diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.js b/tests/baselines/reference/moduleAugmentationInDependency2.js
index 53d2e6ede71..e7a964650bd 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency2.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency2.js
@@ -13,5 +13,5 @@ import "A"
 exports.__esModule = true;
 //// [app.js]
 "use strict";
-require("A");
 exports.__esModule = true;
+require("A");
diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.js b/tests/baselines/reference/moduleAugmentationNoNewNames.js
index 6edaf5b9fca..4376c23a7f8 100644
--- a/tests/baselines/reference/moduleAugmentationNoNewNames.js
+++ b/tests/baselines/reference/moduleAugmentationNoNewNames.js
@@ -33,12 +33,12 @@ let y = x.map(x => x + 1);
 exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
index d41be369917..9ad2aa842d0 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
@@ -58,22 +58,23 @@ c.baz2().x.toLowerCase();
 //// [out.js]
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var Cls = (function () {
         function Cls() {
         }
         return Cls;
     }());
     exports.Cls = Cls;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     m1_1.Cls.prototype.foo = function () { return 1; };
     m1_1.Cls.prototype.bar = function () { return "1"; };
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m3", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C1 = (function () {
         function C1() {
         }
@@ -86,22 +87,21 @@ define("m3", ["require", "exports"], function (require, exports) {
         return C2;
     }());
     exports.C2 = C2;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     m1_2.Cls.prototype.baz1 = function () { return undefined; };
     m1_2.Cls.prototype.baz2 = function () { return undefined; };
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("test", ["require", "exports", "m2", "m4"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var c;
     c.foo().toExponential();
     c.bar().toLowerCase();
     c.baz1().x.toExponential();
     c.baz2().x.toLowerCase();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
index 4f93e976dfc..116c5c5e830 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.js
+++ b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -45,37 +45,37 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     a_1.A.prototype.getB = function () { return undefined; };
     a_1.A.prototype.getCls = function () { return undefined; };
-    exports.__esModule = true;
 });
 define("main", ["require", "exports", "d"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
index 94d418c7fc7..e13cbd8f3dd 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.js
+++ b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -50,41 +50,41 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
-    a_1.A.prototype.getB = function () { return undefined; };
     exports.__esModule = true;
+    a_1.A.prototype.getB = function () { return undefined; };
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_2) {
     "use strict";
-    a_2.A.prototype.getCls = function () { return undefined; };
     exports.__esModule = true;
+    a_2.A.prototype.getCls = function () { return undefined; };
 });
 define("main", ["require", "exports", "d", "e"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 71f96df940c..a4a6ccea849 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -49,35 +49,35 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
-    a_1.A.prototype.getCls = function () { return undefined; };
     exports.__esModule = true;
+    a_1.A.prototype.getCls = function () { return undefined; };
 });
 define("main", ["require", "exports", "D", "e"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index 2883d91d03c..4be17a61edb 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -50,30 +50,30 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 define("main", ["require", "exports", "D", "E"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js
index 8c396d4fcdd..ee6fd2ab317 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.js
+++ b/tests/baselines/reference/moduleCodeGenTest5.js
@@ -23,6 +23,7 @@ var v = E2.B;
 
 //// [moduleCodeGenTest5.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 0;
 var y = 0;
 function f1() { }
@@ -53,4 +54,3 @@ var E2;
     E2[E2["B"] = 0] = "B";
 })(E2 || (E2 = {}));
 var v = E2.B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js
index e66235ca2bc..f877ad74bc3 100644
--- a/tests/baselines/reference/moduleCodegenTest4.js
+++ b/tests/baselines/reference/moduleCodegenTest4.js
@@ -6,10 +6,10 @@ void 0;
 
 //// [moduleCodegenTest4.js]
 "use strict";
+exports.__esModule = true;
 var Baz;
 (function (Baz) {
     Baz.x = "hello";
 })(Baz = exports.Baz || (exports.Baz = {}));
 Baz.x = "goodbye";
 void 0;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js
index 1af231a9a62..a2a099fca1d 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.js
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js
@@ -42,6 +42,7 @@ export enum Utensils { // Shouldn't error
 
 //// [moduleDuplicateIdentifiers.js]
 "use strict";
+exports.__esModule = true;
 exports.Foo = 2;
 exports.Foo = 42; // Should error
 var FooBar;
@@ -76,4 +77,3 @@ var Utensils;
 (function (Utensils) {
     Utensils[Utensils["Spork"] = 3] = "Spork";
 })(Utensils = exports.Utensils || (exports.Utensils = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js
index 7db2ce416dd..66c746c5f51 100644
--- a/tests/baselines/reference/moduleExports1.js
+++ b/tests/baselines/reference/moduleExports1.js
@@ -16,6 +16,7 @@ if (!module.exports) module.exports = "";
 //// [moduleExports1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TypeScript;
     (function (TypeScript) {
         var Strasse;
@@ -36,5 +37,4 @@ define(["require", "exports"], function (require, exports) {
     void 0;
     if (!module.exports)
         module.exports = "";
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
index 9e79d8d81b2..2ed22cfa4f0 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
@@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) {
         }
         return Test1;
     }(C1));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js
index 314460661b2..7408db5c291 100644
--- a/tests/baselines/reference/moduleInTypePosition1.js
+++ b/tests/baselines/reference/moduleInTypePosition1.js
@@ -13,14 +13,14 @@ var x = (w1: WinJS) => { };
 
 //// [moduleInTypePosition1_0.js]
 "use strict";
+exports.__esModule = true;
 var Promise = (function () {
     function Promise() {
     }
     return Promise;
 }());
 exports.Promise = Promise;
-exports.__esModule = true;
 //// [moduleInTypePosition1_1.js]
 "use strict";
-var x = function (w1) { };
 exports.__esModule = true;
+var x = function (w1) { };
diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js
index edf18bb7d58..88531532acc 100644
--- a/tests/baselines/reference/moduleMergeConstructor.js
+++ b/tests/baselines/reference/moduleMergeConstructor.js
@@ -30,11 +30,11 @@ class Test {
 //// [index.js]
 define(["require", "exports", "foo"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     var Test = (function () {
         function Test() {
             this.bar = new foo.Foo();
         }
         return Test;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js
index 3ed09d2cd7a..7be89f236be 100644
--- a/tests/baselines/reference/moduleNoneErrors.js
+++ b/tests/baselines/reference/moduleNoneErrors.js
@@ -6,10 +6,10 @@ export class Foo {
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js
index cb53b78f038..b38e5d95f2c 100644
--- a/tests/baselines/reference/modulePrologueAMD.js
+++ b/tests/baselines/reference/modulePrologueAMD.js
@@ -6,11 +6,11 @@ export class Foo {}
 //// [modulePrologueAMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
         return Foo;
     }());
     exports.Foo = Foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js
index 2f2cf9d9148..4f465a2ae2f 100644
--- a/tests/baselines/reference/modulePrologueCommonjs.js
+++ b/tests/baselines/reference/modulePrologueCommonjs.js
@@ -5,10 +5,10 @@ export class Foo {}
 
 //// [modulePrologueCommonjs.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js
index 7b39a9d12e3..c9b8c331bcf 100644
--- a/tests/baselines/reference/modulePrologueUmd.js
+++ b/tests/baselines/reference/modulePrologueUmd.js
@@ -14,11 +14,11 @@ export class Foo {}
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
         return Foo;
     }());
     exports.Foo = Foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js
index 685a2ac0233..86f681fa27a 100644
--- a/tests/baselines/reference/moduleResolutionNoResolve.js
+++ b/tests/baselines/reference/moduleResolutionNoResolve.js
@@ -13,5 +13,5 @@ export var c = '';
 exports.__esModule = true;
 //// [b.js]
 "use strict";
-exports.c = '';
 exports.__esModule = true;
+exports.c = '';
diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js
index 39217292117..33f692396fa 100644
--- a/tests/baselines/reference/moduleResolutionNoTs.js
+++ b/tests/baselines/reference/moduleResolutionNoTs.js
@@ -23,12 +23,12 @@ import z2 from "./z";
 
 //// [x.js]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 //// [y.jsx]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 //// [user.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js
index d2ee65a508a..b9a644a7209 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions.js
@@ -27,8 +27,8 @@ import j from "./jquery.js"
 
 //// [a.js]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 // No extension: '.ts' added 
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
index fb8904c5748..a9dc91d9a55 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
@@ -12,8 +12,8 @@ import b from "./b";
 
 //// [index.js]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 //// [a.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
index 014207d2400..7d67bde6509 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
@@ -14,5 +14,5 @@ import "normalize.css";
 
 //// [a.js]
 "use strict";
-require("normalize.css");
 exports.__esModule = true;
+require("normalize.css");
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
index c53efeb0961..0a04d8a9077 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
@@ -14,5 +14,5 @@ import "foo";
 
 //// [a.js]
 "use strict";
-require("foo");
 exports.__esModule = true;
+require("foo");
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js
index e0aebb04d76..520324cb222 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js
@@ -43,25 +43,25 @@ tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js
 // When symlinked files are in node_modules, they are resolved with realpath;
 // so a linked file does not create a duplicate SourceFile of the real one.
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
     return MyClass;
 }());
 exports.MyClass = MyClass;
-exports.__esModule = true;
 //// [/src/library-b/index.js]
 "use strict";
+exports.__esModule = true;
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
-exports.__esModule = true;
 //// [/src/app.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var y;
 x = y;
 y = x;
-exports.__esModule = true;
 /*
 # To reproduce in a real project:
 
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
index 55317e413bf..cde63e0604d 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
@@ -18,18 +18,18 @@ x + x2;
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
-exports.x = 0;
 exports.__esModule = true;
+exports.x = 0;
 //// [/src/bin/shared2/abc.js]
 // When symlinked files are not in node_modules, realpath is not used.
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
-exports.x = 0;
 exports.__esModule = true;
+exports.x = 0;
 //// [/src/bin/app.js]
 "use strict";
+exports.__esModule = true;
 var abc_1 = require("./shared/abc");
 var abc_2 = require("./shared2/abc");
 abc_1.x + abc_2.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
index d4fb798e8c7..0bd77a1dcc7 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
@@ -22,22 +22,22 @@ y = x;
 //// [/src/bin/library-a/index.js]
 // Same as moduleResolutionWithSymlinks.ts, but with outDir
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
     return MyClass;
 }());
 exports.MyClass = MyClass;
-exports.__esModule = true;
 //// [/src/bin/library-b/index.js]
 "use strict";
+exports.__esModule = true;
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
-exports.__esModule = true;
 //// [/src/bin/app.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var y;
 x = y;
 y = x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
index 0b50be0e5e4..c4d451ba9f9 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
@@ -12,20 +12,20 @@ export var foo = 42;
 
 //// [c.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [b.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("./c"));
 exports.__esModule = true;
+__export(require("./c"));
 //// [a.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("./b"));
 __export(require("./c"));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
index 7caaf1e55f6..d1f6dc7abc7 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
@@ -15,23 +15,23 @@ export enum Animals {
 
 //// [c.js]
 "use strict";
+exports.__esModule = true;
 var Animals;
 (function (Animals) {
     Animals[Animals["Cat"] = 0] = "Cat";
     Animals[Animals["Dog"] = 1] = "Dog";
 })(Animals = exports.Animals || (exports.Animals = {}));
 ;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var c_1 = require("./c");
 exports.Animals = c_1.Animals;
-exports.__esModule = true;
 //// [a.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("./b"));
 __export(require("./c"));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js
index bee7a06ce6f..601d7e41fcd 100644
--- a/tests/baselines/reference/moduleScoping.js
+++ b/tests/baselines/reference/moduleScoping.js
@@ -29,16 +29,16 @@ var v2 = 42; // Global scope
 var v4 = function () { return 5; };
 //// [file3.js]
 "use strict";
+exports.__esModule = true;
 exports.v3 = true;
 var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope
-exports.__esModule = true;
 //// [file4.js]
 "use strict";
+exports.__esModule = true;
 var file3 = require("./file3");
 var t1 = v1;
 var t2 = v2;
 var t3 = file3.v3;
 var v4 = { a: true, b: NaN }; // Should shadow global v2 in this module
-exports.__esModule = true;
 //// [file5.js]
 var x = v2; // Should be global v2 of type number again
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
index afc2fa1f5bd..07e353cb301 100644
--- a/tests/baselines/reference/multiImportExport.js
+++ b/tests/baselines/reference/multiImportExport.js
@@ -44,13 +44,13 @@ var Math = {
 module.exports = Math;
 //// [Drawing.js]
 "use strict";
-exports.Math = require("./Math/Math");
 exports.__esModule = true;
+exports.Math = require("./Math/Math");
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var Drawing = require("./Drawing");
 var addr = new Drawing.Math.Adder();
-exports.__esModule = true;
 
 
 //// [Adder.d.ts]
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index 4ea2e7cb8f0..98c17051809 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -20,6 +20,7 @@ Entity();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var foo = (function () {
     function foo() {
     }
@@ -31,9 +32,8 @@ function bar() {
 exports.default = bar;
 var x = 10;
 exports.default = x;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 m1_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index 5fe294d1939..b129dba0392 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -17,15 +17,15 @@ Entity();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() {
 }
 exports.default = foo;
 function bar() {
 }
 exports.default = bar;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 m1_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js
index 436232c145e..897a3f00eb4 100644
--- a/tests/baselines/reference/multipleDefaultExports03.js
+++ b/tests/baselines/reference/multipleDefaultExports03.js
@@ -8,16 +8,16 @@ export default class C {
 
 //// [multipleDefaultExports03.js]
 "use strict";
-var C = (function () {
-    function C() {
-    }
-    return C;
-}());
-exports.default = C;
-var C = (function () {
-    function C() {
-    }
-    return C;
-}());
-exports.default = C;
 Object.defineProperty(exports, "__esModule", { value: true });
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.default = C;
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.default = C;
diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js
index b2c37ec5f0e..341f6f41c62 100644
--- a/tests/baselines/reference/multipleDefaultExports04.js
+++ b/tests/baselines/reference/multipleDefaultExports04.js
@@ -8,10 +8,10 @@ export default function f() {
 
 //// [multipleDefaultExports04.js]
 "use strict";
-function f() {
-}
-exports.default = f;
-function f() {
-}
-exports.default = f;
 Object.defineProperty(exports, "__esModule", { value: true });
+function f() {
+}
+exports.default = f;
+function f() {
+}
+exports.default = f;
diff --git a/tests/baselines/reference/multipleExportDefault1.js b/tests/baselines/reference/multipleExportDefault1.js
index 4817012ab75..8375c2f9e6f 100644
--- a/tests/baselines/reference/multipleExportDefault1.js
+++ b/tests/baselines/reference/multipleExportDefault1.js
@@ -10,10 +10,10 @@ export default {
 
 //// [multipleExportDefault1.js]
 "use strict";
+exports.__esModule = true;
 function Foo() {
 }
 exports["default"] = Foo;
 exports["default"] = {
     uhoh: "another default"
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault2.js b/tests/baselines/reference/multipleExportDefault2.js
index e979b96fe71..0c06385f9af 100644
--- a/tests/baselines/reference/multipleExportDefault2.js
+++ b/tests/baselines/reference/multipleExportDefault2.js
@@ -9,9 +9,9 @@ export default function Foo() { }
 
 //// [multipleExportDefault2.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
 function Foo() { }
 exports["default"] = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault3.js b/tests/baselines/reference/multipleExportDefault3.js
index e889edc907a..1091af16301 100644
--- a/tests/baselines/reference/multipleExportDefault3.js
+++ b/tests/baselines/reference/multipleExportDefault3.js
@@ -9,6 +9,7 @@ export default class C { }
 
 //// [multipleExportDefault3.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
@@ -18,4 +19,3 @@ var C = (function () {
     return C;
 }());
 exports["default"] = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault4.js b/tests/baselines/reference/multipleExportDefault4.js
index d46cda4d8b3..b3e0ef3e870 100644
--- a/tests/baselines/reference/multipleExportDefault4.js
+++ b/tests/baselines/reference/multipleExportDefault4.js
@@ -7,6 +7,7 @@ export default {
 
 //// [multipleExportDefault4.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -16,4 +17,3 @@ exports["default"] = C;
 exports["default"] = {
     uhoh: "another default"
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault5.js b/tests/baselines/reference/multipleExportDefault5.js
index 5c10a1be95a..a5032e45244 100644
--- a/tests/baselines/reference/multipleExportDefault5.js
+++ b/tests/baselines/reference/multipleExportDefault5.js
@@ -4,6 +4,7 @@ export default class C {}
 
 //// [multipleExportDefault5.js]
 "use strict";
+exports.__esModule = true;
 function bar() { }
 exports["default"] = bar;
 var C = (function () {
@@ -12,4 +13,3 @@ var C = (function () {
     return C;
 }());
 exports["default"] = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault6.js b/tests/baselines/reference/multipleExportDefault6.js
index 3d990277993..aa372e4d410 100644
--- a/tests/baselines/reference/multipleExportDefault6.js
+++ b/tests/baselines/reference/multipleExportDefault6.js
@@ -9,10 +9,10 @@ export default {
 
 //// [multipleExportDefault6.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = {
     lol: 1
 };
 exports["default"] = {
     lol: 2
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js
index 75a4e125f21..05276591447 100644
--- a/tests/baselines/reference/multipleExports.js
+++ b/tests/baselines/reference/multipleExports.js
@@ -14,6 +14,7 @@ export module M {
 
 //// [multipleExports.js]
 "use strict";
+exports.__esModule = true;
 var M;
 (function (M) {
     M.v = 0;
@@ -22,4 +23,3 @@ var x = 0;
 (function (M) {
     M.v;
 })(M = exports.M || (exports.M = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js
index 4677da0df7b..149b6a0d59f 100644
--- a/tests/baselines/reference/nameDelimitedBySlashes.js
+++ b/tests/baselines/reference/nameDelimitedBySlashes.js
@@ -10,10 +10,10 @@ var x = foo.foo + 42;
 
 //// [foo_0.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./test/foo_0");
 var x = foo.foo + 42;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js
index de42c5ed60c..3c1cf8dce66 100644
--- a/tests/baselines/reference/nameWithFileExtension.js
+++ b/tests/baselines/reference/nameWithFileExtension.js
@@ -10,10 +10,10 @@ var x = foo.foo + 42;
 
 //// [foo_0.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0.js");
 var x = foo.foo + 42;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js
index e7c85322317..d070638417b 100644
--- a/tests/baselines/reference/nameWithRelativePaths.js
+++ b/tests/baselines/reference/nameWithRelativePaths.js
@@ -25,28 +25,28 @@ if(foo2.M2.x){
 
 //// [foo_0.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 function f() {
     return 42;
 }
 exports.f = f;
-exports.__esModule = true;
 //// [foo_2.js]
 "use strict";
+exports.__esModule = true;
 var M2;
 (function (M2) {
     M2.x = true;
 })(M2 = exports.M2 || (exports.M2 = {}));
-exports.__esModule = true;
 //// [foo_3.js]
 "use strict";
+exports.__esModule = true;
 var foo0 = require("../foo_0");
 var foo1 = require("./test/foo_1");
 var foo2 = require("./.././test/foo_2");
 if (foo2.M2.x) {
     var x = foo0.foo + foo1.f();
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js
index a8a506f23c3..1e03f7745d2 100644
--- a/tests/baselines/reference/project/baseline/amd/decl.js
+++ b/tests/baselines/reference/project/baseline/amd/decl.js
@@ -1,9 +1,9 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     ;
     function point(x, y) {
         return { x: x, y: y };
     }
     exports.point = point;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js
index 5daa1879628..b4d6d12445b 100644
--- a/tests/baselines/reference/project/baseline/amd/emit.js
+++ b/tests/baselines/reference/project/baseline/amd/emit.js
@@ -1,5 +1,5 @@
 define(["require", "exports", "./decl"], function (require, exports, g) {
     "use strict";
-    var p = g.point(10, 20);
     exports.__esModule = true;
+    var p = g.point(10, 20);
 });
diff --git a/tests/baselines/reference/project/baseline/node/decl.js b/tests/baselines/reference/project/baseline/node/decl.js
index 998ffaa5592..b7047c3f047 100644
--- a/tests/baselines/reference/project/baseline/node/decl.js
+++ b/tests/baselines/reference/project/baseline/node/decl.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 ;
 function point(x, y) {
     return { x: x, y: y };
 }
 exports.point = point;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js
index 17c96719d0b..9410f82bc32 100644
--- a/tests/baselines/reference/project/baseline/node/emit.js
+++ b/tests/baselines/reference/project/baseline/node/emit.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var g = require("./decl");
 var p = g.point(10, 20);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js
index a8a506f23c3..1e03f7745d2 100644
--- a/tests/baselines/reference/project/baseline2/amd/decl.js
+++ b/tests/baselines/reference/project/baseline2/amd/decl.js
@@ -1,9 +1,9 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     ;
     function point(x, y) {
         return { x: x, y: y };
     }
     exports.point = point;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
index 859d262e9c6..18dae0f6420 100644
--- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
@@ -1,5 +1,5 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var p = { x: 10, y: 20 };
     exports.__esModule = true;
+    var p = { x: 10, y: 20 };
 });
diff --git a/tests/baselines/reference/project/baseline2/node/decl.js b/tests/baselines/reference/project/baseline2/node/decl.js
index 998ffaa5592..b7047c3f047 100644
--- a/tests/baselines/reference/project/baseline2/node/decl.js
+++ b/tests/baselines/reference/project/baseline2/node/decl.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 ;
 function point(x, y) {
     return { x: x, y: y };
 }
 exports.point = point;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js
index c172dcd312f..ce766eee086 100644
--- a/tests/baselines/reference/project/baseline2/node/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js
@@ -1,3 +1,3 @@
 "use strict";
-var p = { x: 10, y: 20 };
 exports.__esModule = true;
+var p = { x: 10, y: 20 };
diff --git a/tests/baselines/reference/project/baseline3/amd/nestedModule.js b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
index 3fa69311ffa..c4f4e37489d 100644
--- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var outer;
     (function (outer) {
         var inner;
@@ -8,5 +9,4 @@ define(["require", "exports"], function (require, exports) {
             inner.a = local;
         })(inner = outer.inner || (outer.inner = {}));
     })(outer = exports.outer || (exports.outer = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js
index 9596b38253a..345fd8914cc 100644
--- a/tests/baselines/reference/project/baseline3/node/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var outer;
 (function (outer) {
     var inner;
@@ -7,4 +8,3 @@ var outer;
         inner.a = local;
     })(inner = outer.inner || (outer.inner = {}));
 })(outer = exports.outer || (exports.outer = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js
index 30c63965136..4db463a7966 100644
--- a/tests/baselines/reference/project/declarationDir/amd/a.js
+++ b/tests/baselines/reference/project/declarationDir/amd/a.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
index 14c0c78edb8..bdae3c44b0a 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
index b62647beae0..ff657652a4a 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js
index 7480c269a05..2139e86c811 100644
--- a/tests/baselines/reference/project/declarationDir/node/a.js
+++ b/tests/baselines/reference/project/declarationDir/node/a.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
index 3c9a75de66e..df27fec56d1 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
index 6f1ce11cdc6..385b6df7591 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports.C = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
index 30c63965136..4db463a7966 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
index 14c0c78edb8..bdae3c44b0a 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
index b62647beae0..ff657652a4a 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js
index 7480c269a05..2139e86c811 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/a.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
index 3c9a75de66e..df27fec56d1 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
index 6f1ce11cdc6..385b6df7591 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports.C = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js
index d190c7a5767..b90d4415806 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/out.js
+++ b/tests/baselines/reference/project/declarationDir3/amd/out.js
@@ -1,30 +1,30 @@
 define("subfolder/b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("subfolder/c", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
index 44111609dca..1610052986d 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
@@ -1,7 +1,7 @@
 define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) {
     "use strict";
+    exports.__esModule = true;
     exports.useGlo_m4_x4 = glo_m4.x;
     exports.useGlo_m4_d4 = glo_m4.d;
     exports.useGlo_m4_f4 = glo_m4.foo();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
index b3ee7499e44..b7ddd253b1a 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
@@ -1,6 +1,6 @@
 "use strict";
+exports.__esModule = true;
 var glo_m4 = require("glo_m4");
 exports.useGlo_m4_x4 = glo_m4.x;
 exports.useGlo_m4_d4 = glo_m4.d;
 exports.useGlo_m4_f4 = glo_m4.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
index a6563ac4f73..6ecb0c59793 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
@@ -1,10 +1,10 @@
 define(["require", "exports", "private_m4"], function (require, exports, private_m4) {
     "use strict";
+    exports.__esModule = true;
     var usePrivate_m4_m1;
     (function (usePrivate_m4_m1) {
         var x3 = private_m4.x;
         var d3 = private_m4.d;
         var f3 = private_m4.foo();
     })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
index 24526ded58b..79310d89c02 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 // only used privately no need to emit
 var private_m4 = require("private_m4");
 var usePrivate_m4_m1;
@@ -7,4 +8,3 @@ var usePrivate_m4_m1;
     var d3 = private_m4.d;
     var f3 = private_m4.foo();
 })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
index b3dc7cc82f2..c6c57dabc81 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
@@ -1,5 +1,5 @@
 define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) {
     "use strict";
-    exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
     exports.__esModule = true;
+    exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
 });
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
index 8d74ebb2b6e..991afa567cf 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var fncOnly_m4 = require("fncOnly_m4");
 exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
index 6f282e26147..1a0305591cc 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     function foo2() {
         return new m4.d();
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
index e9c49cd4ddc..6f962bd42e5 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
@@ -1,10 +1,10 @@
 define(["require", "exports", "m5"], function (require, exports, m5) {
     "use strict";
+    exports.__esModule = true;
     exports.d = m5.foo2();
     exports.x = m5.foo2;
     function n() {
         return m5.foo2();
     }
     exports.n = n;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
index fd0ae21091e..db280e7fd8e 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 function foo2() {
     return new m4.d();
 }
 exports.foo2 = foo2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
index f06725c1068..7cc88b54ff3 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 // Do not emit unused import
 var m5 = require("m5");
 exports.d = m5.foo2();
@@ -7,4 +8,3 @@ function n() {
     return m5.foo2();
 }
 exports.n = n;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
index 8af4110011c..5375f44c013 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4", "m4"], function (require, exports, m4, multiImport_m4) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
@@ -15,5 +16,4 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi
     exports.useMultiImport_m4_x4 = multiImport_m4.x;
     exports.useMultiImport_m4_d4 = multiImport_m4.d;
     exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
index fc6900da8d5..395cbeee966 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
@@ -17,4 +18,3 @@ var multiImport_m4 = require("m4"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
index 6f282e26147..1a0305591cc 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     function foo2() {
         return new m4.d();
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
index 7221b9e2e8f..b8a22cfdc1f 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
@@ -13,5 +14,4 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
         var f3 = m4.foo();
     })(m1 = exports.m1 || (exports.m1 = {}));
     exports.d = m5.foo2();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
index fd0ae21091e..db280e7fd8e 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 function foo2() {
     return new m4.d();
 }
 exports.foo2 = foo2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
index 7e7a43ce145..49958bb9814 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
@@ -15,4 +16,3 @@ var m1;
 // Do not emit unused import
 var m5 = require("m5");
 exports.d = m5.foo2();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
index 1c8e3a5a308..af5fcb7d874 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
@@ -12,5 +13,4 @@ define(["require", "exports", "m4"], function (require, exports, m4) {
         var d3 = m4.d;
         var f3 = m4.foo();
     })(m1 = exports.m1 || (exports.m1 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
index ea2836708d2..3a5602a2166 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
@@ -12,4 +13,3 @@ var m1;
     var d3 = m4.d;
     var f3 = m4.foo();
 })(m1 = exports.m1 || (exports.m1 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 2ef457654e2..7eeee43049b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 891c03b13f2..c44e24a081e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index b12b9bfe9bb..d393dda0c57 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 30f6e242bc8..436eab5db94 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 2ef457654e2..7eeee43049b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 891c03b13f2..c44e24a081e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index b12b9bfe9bb..d393dda0c57 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 30f6e242bc8..436eab5db94 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 225b233f3e1..1c199b7384a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index e9248099943..df6d2c811c0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index ee9fb6673be..749fbd732a5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 9d5330f5c81..0c75dbb2b00 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 5db5f8f1bfb..b49f0a04b53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 62dc8a8d83f..c67e35d1b89 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 2d386326fcd..1935dadfdb3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index 944360ae9cc..fa9c5691047 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index dd409b9f2c3..b3b4c42289f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 78b4b9fcfe1..80d6ba438ba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index e7e1070403f..dabe72d2787 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index bd73b1912c2..d28465d805e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index aff7400b20f..46d82346a37 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index 6ba04afda9e..3813e4b2cca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 2d386326fcd..1935dadfdb3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 944360ae9cc..fa9c5691047 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index dd409b9f2c3..b3b4c42289f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 62dc8a8d83f..c67e35d1b89 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 5db5f8f1bfb..b49f0a04b53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bd73b1912c2..d28465d805e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index aff7400b20f..46d82346a37 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 6ba04afda9e..3813e4b2cca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index e7e1070403f..dabe72d2787 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 78b4b9fcfe1..80d6ba438ba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 4b75cfaa754..371d873f345 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d65b73465ef..783691c52ed 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index dd98ae30d59..1f3b6d7a6dc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index 43b1caa625e..16e1f512923 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index c8ece24eda3..a112cba6d0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 27d3a9788c4..a6a299a8a7e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index 02f7bbcbb67..d16575e8a97 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index 058f9c4c3a5..94e4facb645 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 766ff607b54..47915c9660b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index dd98ae30d59..1f3b6d7a6dc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 43b1caa625e..16e1f512923 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c8ece24eda3..a112cba6d0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 27d3a9788c4..a6a299a8a7e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 02f7bbcbb67..d16575e8a97 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 058f9c4c3a5..94e4facb645 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 766ff607b54..47915c9660b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 00530261d76..c5e2f0c04bf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a30b607676c..293a1478989 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 1d0559224b8..8359b4472ee 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index a6d24f0f020..9cef03b0711 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index cb628091e33..32cd3e8915e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 99859780314..39f0b136568 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index a23c1871126..de654530492 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index 541d8dc4c26..61925246a0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index a758d2a1cd0..4a1329681e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1d0559224b8..8359b4472ee 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index a6d24f0f020..9cef03b0711 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index cb628091e33..32cd3e8915e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 99859780314..39f0b136568 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index a23c1871126..de654530492 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 541d8dc4c26..61925246a0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index a758d2a1cd0..4a1329681e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 0f5938617e2..11d40e4d23b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 173790ea042..61dfeeeb8d3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 30cf48ae0ef..c467f0b8be0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 0dab1514706..7c959ab9408 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index f7a19e1fa14..d43267b1c9a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 14104ec68b9..15c5c91190e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 744aff01a08..9a46a37deb8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 0dab1514706..7c959ab9408 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index edf0e169c56..727afdc29fd 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 14104ec68b9..15c5c91190e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 3f4ebdb1911..2a89c0fc929 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index b2efc9bf3d4..0b7f01fdec5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index f1ed00eb139..62af54d3700 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 95830bd2c25..d4bfc447280 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 4f51d470c82..59de6353786 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 9cdad10a966..6cf63b567ba 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 2df791f04e8..2a191801c43 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index ee8a26cafcf..301f83dab55 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index 1d1c53b36cf..2dcea15d050 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index e60e0fbfa7a..6c74ce312be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 3c653ded700..97b03befa22 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index a889d6f19b3..28edf754650 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 83cb52c7f14..9a8f5b77498 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index 5f97087307d..bd9b5d0051a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 9ef0d252f05..603b29da7fa 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 8c64bacf533..3821a46478a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f50e1837a86..4090486a730 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index ee8a26cafcf..301f83dab55 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 1222f92a7d2..f637a581e13 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index e60e0fbfa7a..6c74ce312be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index edafd9055b2..fa97d15a89a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 4f51d470c82..59de6353786 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3cfb1b4c030..8de8d6f84b6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 5f97087307d..bd9b5d0051a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 4e054f32699..ca070c2062f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 8c64bacf533..3821a46478a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 931971b3f84..6ce6e73202e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 3c653ded700..97b03befa22 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 44a6d536eed..e4a7bb40897 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index b4f33f056d6..83050ce43fe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index 8151fed382b..b890ae8232a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index 611b73c5c7d..df737e96f26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
index fe1308aca7e..2cbff5fc156 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index a6d5cebe7f1..84f19710abc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
index b1a971bd89f..a0cc81f5af9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index 733fa0fc069..ea360554f92 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
index e4c81cdfc8e..2cce36f74c2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index 86cfbeb5b63..e395bf8648f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index df8c82915fb..f5001a6551e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 611b73c5c7d..df737e96f26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index f361c1c0917..2fb4fbfd5c3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a6d5cebe7f1..84f19710abc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 7479c4aebee..0110f9dce16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 733fa0fc069..ea360554f92 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 7e4f77c1c69..4849c53d0c4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 86cfbeb5b63..e395bf8648f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 37af60df3ea..587721fb87a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 5721a33f4a5..5e9e5c8593d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 29a43275b49..b99a41c8c3c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index dbfe0b5d927..dcfdb34145e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index 62ec7868d70..c4c2a04f642 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index a8d6293492c..2df46e6835c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index debe15abde9..9574bd33b83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 172c4d4804a..44556b78663 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
index 461809c985f..4ac58aea856 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index ef62267d957..47558364d4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 09f9886020e..2885a499091 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index dbfe0b5d927..dcfdb34145e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 5eab5555cbe..0ee63c42070 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a8d6293492c..2df46e6835c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 81956eb2903..fa9502d4d64 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 172c4d4804a..44556b78663 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index fd86ae84059..cabfd9f98d6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index ef62267d957..47558364d4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 708517a1d95..d6d12689721 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a7416c83297..aa198a56dbe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index c657ed8edce..4d37c4456a3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 56f12c22903..6ba684e3841 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index c657ed8edce..4d37c4456a3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 56f12c22903..6ba684e3841 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 62e49557aab..d9f0f5b1531 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 7618a616fa3..e84545ade77 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5df712534f6..cc3f604524f 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 6a226fbc86c..e115b1ebd64 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 3c1c9b64dc2..0b4d12cead1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9bdc7ad5504..fa0bcf94a5d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 3a4d618044a..6a2bfc777e9 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 4103e499cbd..29b98b193fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 49f97b88a38..f4de6b06e49 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
index 830a0ddd3e5..842d34fe73d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9bdc7ad5504..fa0bcf94a5d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 3a4d618044a..6a2bfc777e9 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 3c1c9b64dc2..0b4d12cead1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 49f97b88a38..f4de6b06e49 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 830a0ddd3e5..842d34fe73d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 4103e499cbd..29b98b193fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 058227b1276..1ea95ed9ba0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index f80ee7e3208..cd6a7fab377 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
index eceec7b450a..f0cb61b0632 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
index d68dbf6eb9e..ed2f67c585b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
index b9de639cb1d..da3b77ba146 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
index 826729aba87..f4d0ecfe24b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index eceec7b450a..f0cb61b0632 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d68dbf6eb9e..ed2f67c585b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index b9de639cb1d..da3b77ba146 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 826729aba87..f4d0ecfe24b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 16cec87f1e7..d19b9195685 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index c7b114195f2..ba2950b1a5e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 755cc1d0aaf..2f6470b65ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 957a73c648a..a88a706d9b1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index f7e43883048..5b58a2ee571 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
index 8baefdad92b..d4034d62c4a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 755cc1d0aaf..2f6470b65ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 957a73c648a..a88a706d9b1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index f7e43883048..5b58a2ee571 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 8baefdad92b..d4034d62c4a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index cf6d4730e19..63e58be27dc 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index d1ea7163910..12f2439e6f5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 62e49557aab..d9f0f5b1531 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 33f8f550fbd..92315bfcacc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5df712534f6..cc3f604524f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index a60954292ba..c98b66faded 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 058227b1276..1ea95ed9ba0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 9ca8e953224..5d14898713d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 16cec87f1e7..d19b9195685 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 714b2137400..f5849debd83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index cf6d4730e19..63e58be27dc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a2fff6d9c90..6f4defc3e4c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
index b5c401da717..65e3b33be1a 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
@@ -1,7 +1,7 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
index fb163c512b8..4fc36cd0222 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
@@ -1,6 +1,6 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
index 432701235d5..493e1b9636e 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = "10"; // Error: Should be number
     m1.rel = 42; // Error: Should be boolean
     m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
index 12d17b60709..51370836837 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = "10"; // Error: Should be number
 m1.rel = 42; // Error: Should be boolean
 m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
index 81c077dfd9c..948a6d68b83 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m1", "m4"], function (require, exports, m1, m4) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
     var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
index 0d06a91c2a6..50feab5d27f 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 var m4 = require("m4");
 m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
 var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js
index 11da1c899c1..a6bce0ab2c6 100644
--- a/tests/baselines/reference/project/nonRelative/amd/consume.js
+++ b/tests/baselines/reference/project/nonRelative/amd/consume.js
@@ -1,10 +1,10 @@
 define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (require, exports, mod, x, y) {
     "use strict";
+    exports.__esModule = true;
     x.hello();
     y.hello();
     var str = mod.call();
     if (str !== "success") {
         fail();
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/decl.js b/tests/baselines/reference/project/nonRelative/amd/decl.js
index 90d387773d3..d22c3ced24e 100644
--- a/tests/baselines/reference/project/nonRelative/amd/decl.js
+++ b/tests/baselines/reference/project/nonRelative/amd/decl.js
@@ -1,8 +1,8 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function call() {
         return "success";
     }
     exports.call = call;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
index 4731ff335a3..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
index 4731ff335a3..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
index 4731ff335a3..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js
index d4f9f6e288d..51d811bb72a 100644
--- a/tests/baselines/reference/project/nonRelative/node/consume.js
+++ b/tests/baselines/reference/project/nonRelative/node/consume.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var mod = require("decl");
 var x = require("lib/foo/a");
 var y = require("lib/bar/a");
@@ -8,4 +9,3 @@ var str = mod.call();
 if (str !== "success") {
     fail();
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/decl.js b/tests/baselines/reference/project/nonRelative/node/decl.js
index 9bb5f2ac6ed..7cde1400c60 100644
--- a/tests/baselines/reference/project/nonRelative/node/decl.js
+++ b/tests/baselines/reference/project/nonRelative/node/decl.js
@@ -1,6 +1,6 @@
 "use strict";
+exports.__esModule = true;
 function call() {
     return "success";
 }
 exports.call = call;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
index 819723f9833..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
index 819723f9833..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
index 819723f9833..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index bc27e650743..ef652b9e929 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index bc27e650743..ef652b9e929 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
index 87b3e0b6856..fb9329a59b4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
index 313682ec06c..18fccdca8bb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,4 +16,3 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 87b3e0b6856..fb9329a59b4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 313682ec06c..18fccdca8bb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,4 +16,3 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 5c65bc4968b..adb1b5061b5 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,5 +47,4 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
index 39ac64cda82..c062c0ac6d4 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
index e12a028abc0..2e50e0b7989 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 39ac64cda82..c062c0ac6d4 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index e12a028abc0..2e50e0b7989 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 4c036fa59a1..0a1f6b523c9 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,5 +30,4 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
index 865896d2602..0fdf8d91b32 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
index 8d4d683ff7c..33f201ce9d5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 865896d2602..0fdf8d91b32 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 8d4d683ff7c..33f201ce9d5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 7c40db25bb7..2ddfb9277a3 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,5 +30,4 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index e9a80c428b2..67693560dfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9f1206b5b14..d188f8a16bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index e9a80c428b2..67693560dfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9f1206b5b14..d188f8a16bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 57114f145bd..3520f3c0a5f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 132d98cd87f..ed2de159383 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index ab7082a2e8e..bed0bf9b3e2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 6bebdd113b6..616307fc2aa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index 21c996978fd..ac1540d3d7c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 06c30f32eaf..4281eb94fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index b757263c866..20f34963221 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index b123ccf13c8..e794023608c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 6bebdd113b6..616307fc2aa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 21c996978fd..ac1540d3d7c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index ab7082a2e8e..bed0bf9b3e2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index b757263c866..20f34963221 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index b123ccf13c8..e794023608c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 06c30f32eaf..4281eb94fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index bd89a9514f2..5970dfad43e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index ffc39be8044..101e0b07546 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index 6366b8c2d85..5194b89b4a5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index 04bd4e10a3b..6316b37945c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 9dc457a0167..ec26fbe336a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index ffc39be8044..101e0b07546 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6366b8c2d85..5194b89b4a5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 04bd4e10a3b..6316b37945c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 9dc457a0167..ec26fbe336a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 8718a3a9350..64a56e71714 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index cd798e72d89..a8d5da3a201 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index 6738a871942..1628374eef4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 81d64320d78..f43884731e0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index b2ea9133dfc..649377c06fc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index cd798e72d89..a8d5da3a201 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6738a871942..1628374eef4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 81d64320d78..f43884731e0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index b2ea9133dfc..649377c06fc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index af3b647fcab..bbf9b58c64f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 560075530f1..d65693aee66 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 27abb47a45b..5d1100e38fa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 560075530f1..d65693aee66 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 27abb47a45b..5d1100e38fa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 5378b914fc7..544b444f69a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index cd6b23ddc0f..39cc19f0b09 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 6b4ece94c15..7571615de41 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 8271bf25be1..ad01eacc00c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index 8be239f3553..343b30f743a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index c7ae549832a..a7121ab0fb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index 37adc61e54f..ddd49759374 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 79b428ca3a1..34026638960 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 8271bf25be1..ad01eacc00c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 8be239f3553..343b30f743a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 6b4ece94c15..7571615de41 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 37adc61e54f..ddd49759374 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 79b428ca3a1..34026638960 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index c7ae549832a..a7121ab0fb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 66fd3cfe867..12697408ddd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index 29c8533aded..f9a2fd1d740 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index 8086d9c04da..70db4f7545c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index 0d24a0e332a..0e6c49a9aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 29c8533aded..f9a2fd1d740 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 8086d9c04da..70db4f7545c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 0d24a0e332a..0e6c49a9aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a5dcbdc600a..1132db08bd0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 91793ab1002..07643a2c9dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 00e388b171e..a9e9284e21d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index 07178ab519f..9b21b166c37 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 91793ab1002..07643a2c9dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 00e388b171e..a9e9284e21d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 07178ab519f..9b21b166c37 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index d9e63184a83..5121f5c6a1e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
index c4bc3c32708..a7a1fecb87f 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
index 208dd329040..ba1b40abf87 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index c0b56df8d90..35edbb3cd9c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 5e34d4494dd..3c66628ccf7 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index e9248099943..df6d2c811c0 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 9d5330f5c81..0c75dbb2b00 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
index c4bc3c32708..a7a1fecb87f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
index 096386e968d..99618a3d6a7 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
index 208dd329040..ba1b40abf87 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
index a9dba1be1dd..308a0083438 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 2293c1a7c96..8ba69854427 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index d21a585cc41..1179d812037 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 5d8cf325d52..14fbdd65f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 49bb95f32d5..a42c40521a1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a48d929a860..86d72e20c93 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index b9e5ddb335f..18103b0a8b1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d65b73465ef..783691c52ed 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
index 9a899efce64..80722609800 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
index 57b2f0a9935..90f1d966b1c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 128c9957bf4..2eb15ca540b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 50263c64897..742f4f4a9af 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 40d0111893e..c819ff2c52c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index cc2b2e9b918..b94230beb69 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a30b607676c..293a1478989 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
index 9a899efce64..80722609800 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
index 6f71fb82f4c..6f61cbbee19 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 50263c64897..742f4f4a9af 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 9c9d3ffec92..ab37fc26b40 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 173790ea042..61dfeeeb8d3 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 33f8f550fbd..92315bfcacc 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index a60954292ba..c98b66faded 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 9ca8e953224..5d14898713d 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 714b2137400..f5849debd83 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a2fff6d9c90..6f4defc3e4c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
index d80da6d9e1b..66facecde7f 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var RM = (function () {
         function RM() {
         }
@@ -15,5 +16,4 @@ define(["require", "exports"], function (require, exports) {
         return RM;
     }());
     exports.RM = RM;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
index a07a323df50..221c2322227 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var RM = (function () {
     function RM() {
     }
@@ -14,4 +15,3 @@ var RM = (function () {
     return RM;
 }());
 exports.RM = RM;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
index a4356e562e7..cd4ce3c862e 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -20,5 +21,4 @@ MyClass1 = __decorate([
     __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
 ], MyClass1);
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js
index 7e30c98d6e8..4571caffa31 100644
--- a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js
index f350f205d5a..4d133b7655c 100644
--- a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
@@ -1,5 +1,5 @@
 "use strict";
+exports.__esModule = true;
 a;
 b;
-exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js
index 12a13d2aebf..2c7bb7add09 100644
--- a/tests/baselines/reference/transpile/Generates module output.js	
+++ b/tests/baselines/reference/transpile/Generates module output.js	
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 0;
     exports.__esModule = true;
+    var x = 0;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js
index 0b3dcfad991..04ba1d12e5e 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
@@ -1,5 +1,5 @@
 "use strict";
+exports.__esModule = true;
 /// <reference path="file2.ts" />
 var x = 0;
-exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js
index 7e30c98d6e8..4571caffa31 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js
index 7e30c98d6e8..4571caffa31 100644
--- a/tests/baselines/reference/transpile/No extra errors for file without extension.js	
+++ b/tests/baselines/reference/transpile/No extra errors for file without extension.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js
index 4f5beb97d2c..c5ffb86a1aa 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
@@ -1,6 +1,6 @@
 define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) {
     "use strict";
-    use(SomeName_1.foo);
     exports.__esModule = true;
+    use(SomeName_1.foo);
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js
index 97215e27b98..0ecfbce2397 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
@@ -8,8 +8,8 @@
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var SomeName_1 = require("SomeOtherName");
     use(SomeName_1.foo);
-    exports.__esModule = true;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with lib values.js b/tests/baselines/reference/transpile/Support options with lib values.js
index 1ac09c54ab8..72e077de381 100644
--- a/tests/baselines/reference/transpile/Support options with lib values.js	
+++ b/tests/baselines/reference/transpile/Support options with lib values.js	
@@ -1,4 +1,4 @@
 "use strict";
-var a = 10;
 exports.__esModule = true;
+var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with types values.js b/tests/baselines/reference/transpile/Support options with types values.js
index 1ac09c54ab8..72e077de381 100644
--- a/tests/baselines/reference/transpile/Support options with types values.js	
+++ b/tests/baselines/reference/transpile/Support options with types values.js	
@@ -1,4 +1,4 @@
 "use strict";
-var a = 10;
 exports.__esModule = true;
+var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js
index e109ef9014f..8ef38d2b617 100644
--- a/tests/baselines/reference/transpile/Supports backslashes in file name.js	
+++ b/tests/baselines/reference/transpile/Supports backslashes in file name.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x;
 exports.__esModule = true;
+var x;
 //# sourceMappingURL=b.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowJs.js b/tests/baselines/reference/transpile/Supports setting allowJs.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowJs.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowJs.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.js b/tests/baselines/reference/transpile/Supports setting baseUrl.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting baseUrl.js	
+++ b/tests/baselines/reference/transpile/Supports setting baseUrl.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting charset.js b/tests/baselines/reference/transpile/Supports setting charset.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting charset.js	
+++ b/tests/baselines/reference/transpile/Supports setting charset.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declaration.js b/tests/baselines/reference/transpile/Supports setting declaration.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting declaration.js	
+++ b/tests/baselines/reference/transpile/Supports setting declaration.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declarationDir.js b/tests/baselines/reference/transpile/Supports setting declarationDir.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting declarationDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting declarationDir.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitBOM.js b/tests/baselines/reference/transpile/Supports setting emitBOM.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting emitBOM.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitBOM.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
+++ b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
+++ b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting isolatedModules.js b/tests/baselines/reference/transpile/Supports setting isolatedModules.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
+++ b/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsx.js b/tests/baselines/reference/transpile/Supports setting jsx.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting jsx.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsx.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsxFactory.js b/tests/baselines/reference/transpile/Supports setting jsxFactory.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting lib.js b/tests/baselines/reference/transpile/Supports setting lib.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting lib.js	
+++ b/tests/baselines/reference/transpile/Supports setting lib.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting locale.js b/tests/baselines/reference/transpile/Supports setting locale.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting locale.js	
+++ b/tests/baselines/reference/transpile/Supports setting locale.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting module.js b/tests/baselines/reference/transpile/Supports setting module.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting module.js	
+++ b/tests/baselines/reference/transpile/Supports setting module.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.js b/tests/baselines/reference/transpile/Supports setting moduleResolution.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
+++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting newLine.js b/tests/baselines/reference/transpile/Supports setting newLine.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting newLine.js	
+++ b/tests/baselines/reference/transpile/Supports setting newLine.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmit.js b/tests/baselines/reference/transpile/Supports setting noEmit.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmit.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmit.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
+++ b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
+++ b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js
index 5233b2a8e48..8124d51fde3 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
@@ -1,3 +1,3 @@
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noLib.js b/tests/baselines/reference/transpile/Supports setting noLib.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noLib.js	
+++ b/tests/baselines/reference/transpile/Supports setting noLib.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noResolve.js b/tests/baselines/reference/transpile/Supports setting noResolve.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noResolve.js	
+++ b/tests/baselines/reference/transpile/Supports setting noResolve.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting out.js b/tests/baselines/reference/transpile/Supports setting out.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting out.js	
+++ b/tests/baselines/reference/transpile/Supports setting out.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outDir.js b/tests/baselines/reference/transpile/Supports setting outDir.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting outDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting outDir.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outFile.js b/tests/baselines/reference/transpile/Supports setting outFile.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting outFile.js	
+++ b/tests/baselines/reference/transpile/Supports setting outFile.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting paths.js b/tests/baselines/reference/transpile/Supports setting paths.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting paths.js	
+++ b/tests/baselines/reference/transpile/Supports setting paths.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
+++ b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting reactNamespace.js b/tests/baselines/reference/transpile/Supports setting reactNamespace.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
+++ b/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting removeComments.js b/tests/baselines/reference/transpile/Supports setting removeComments.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting removeComments.js	
+++ b/tests/baselines/reference/transpile/Supports setting removeComments.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDir.js b/tests/baselines/reference/transpile/Supports setting rootDir.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDir.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDirs.js b/tests/baselines/reference/transpile/Supports setting rootDirs.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDirs.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDirs.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
+++ b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting stripInternal.js b/tests/baselines/reference/transpile/Supports setting stripInternal.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting stripInternal.js	
+++ b/tests/baselines/reference/transpile/Supports setting stripInternal.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting typeRoots.js b/tests/baselines/reference/transpile/Supports setting typeRoots.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting typeRoots.js	
+++ b/tests/baselines/reference/transpile/Supports setting typeRoots.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting types.js b/tests/baselines/reference/transpile/Supports setting types.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting types.js	
+++ b/tests/baselines/reference/transpile/Supports setting types.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports urls in file name.js b/tests/baselines/reference/transpile/Supports urls in file name.js
index 071466dd65f..933981306d2 100644
--- a/tests/baselines/reference/transpile/Supports urls in file name.js	
+++ b/tests/baselines/reference/transpile/Supports urls in file name.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x;
 exports.__esModule = true;
+var x;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
index 54ceb0250e1..0b3bbaa8d73 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -16,5 +17,4 @@ MyClass = __decorate([
 ], MyClass);
 exports.MyClass = MyClass;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js
index 2c2e8563d24..04042012d18 100644
--- a/tests/baselines/reference/transpile/Uses correct newLine character.js	
+++ b/tests/baselines/reference/transpile/Uses correct newLine character.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js
index 54832b95928..b9048bd515d 100644
--- a/tests/baselines/reference/transpile/transpile .js files.js	
+++ b/tests/baselines/reference/transpile/transpile .js files.js	
@@ -1,4 +1,4 @@
 "use strict";
-var a = 10;
 exports.__esModule = true;
+var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js
index ff03528b3e5..2a73615e476 100644
--- a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
+++ b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = React.createElement("div", null);
 exports.__esModule = true;
+var x = React.createElement("div", null);
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js
index 49cac46d212..97d528ecd62 100644
--- a/tests/baselines/reference/withExportDecl.js
+++ b/tests/baselines/reference/withExportDecl.js
@@ -61,6 +61,7 @@ export var eVar3 = 10, eVar4, eVar5;
 //// [withExportDecl.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var simpleVar;
     var anotherVar;
     var varWithSimpleType;
@@ -99,7 +100,6 @@ define(["require", "exports"], function (require, exports) {
     exports.eVar2 = 10;
     var eVar22;
     exports.eVar3 = 10;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js
index feb48648252..f0a1a2d2f14 100644
--- a/tests/baselines/reference/withImportDecl.js
+++ b/tests/baselines/reference/withImportDecl.js
@@ -46,17 +46,18 @@ b.foo;
 //// [withImportDecl_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [withImportDecl_1.js]
 define(["require", "exports", "withImportDecl_0"], function (require, exports, m3) {
     "use strict";
+    exports.__esModule = true;
     ///<reference path='withImportDecl_0.ts'/>
     var simpleVar;
     var anotherVar;
@@ -81,7 +82,6 @@ define(["require", "exports", "withImportDecl_0"], function (require, exports, m
     })(m1 || (m1 = {}));
     var b = new m3.A();
     b.foo;
-    exports.__esModule = true;
 });
 
 

From dc1ac131ff9a4c4d09e1806488ff291b9de7cf0b Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Fri, 10 Feb 2017 12:48:14 -0800
Subject: [PATCH 125/127] Emit "__esModule" before other statments

---
 src/compiler/transformers/module/module.ts    |   17 +-
 .../baselines/reference/APISample_compile.js  |    2 +-
 tests/baselines/reference/APISample_linter.js |    2 +-
 .../reference/APISample_parseConfig.js        |    2 +-
 .../reference/APISample_transform.js          |    2 +-
 .../baselines/reference/APISample_watcher.js  |    2 +-
 ...eEachWithExportedLocalVarsOfTheSameName.js |    4 +-
 tests/baselines/reference/aliasAssignments.js |    4 +-
 .../reference/aliasOnMergedModuleInterface.js |    2 +-
 .../reference/aliasUsageInAccessorsOfClass.js |    6 +-
 .../baselines/reference/aliasUsageInArray.js  |    6 +-
 .../aliasUsageInFunctionExpression.js         |    6 +-
 .../reference/aliasUsageInGenericFunction.js  |    6 +-
 .../reference/aliasUsageInIndexerOfClass.js   |    6 +-
 .../reference/aliasUsageInObjectLiteral.js    |    6 +-
 .../reference/aliasUsageInOrExpression.js     |    6 +-
 ...aliasUsageInTypeArgumentOfExtendsClause.js |    6 +-
 .../reference/aliasUsageInVarAssignment.js    |    6 +-
 .../reference/aliasUsedAsNameValue.js         |    4 +-
 ...aceExportAssignmentUsedInVarInitializer.js |    2 +-
 .../allowSyntheticDefaultImports1.js          |    4 +-
 .../allowSyntheticDefaultImports10.js         |    2 +-
 .../allowSyntheticDefaultImports4.js          |    2 +-
 .../allowSyntheticDefaultImports9.js          |    2 +-
 .../reference/alwaysStrictModule4.js          |    2 +-
 .../reference/alwaysStrictModule6.js          |    2 +-
 .../reference/ambientDeclarationsExternal.js  |    2 +-
 .../reference/ambientDeclarationsPatterns.js  |    2 +-
 .../reference/ambientExternalModuleMerging.js |    2 +-
 ...rnalModuleWithInternalImportDeclaration.js |    2 +-
 ...lModuleWithoutInternalImportDeclaration.js |    2 +-
 tests/baselines/reference/ambientShorthand.js |    2 +-
 .../reference/ambientShorthand_reExport.js    |    6 +-
 .../reference/amdDependencyComment1.js        |    2 +-
 .../reference/amdDependencyComment2.js        |    2 +-
 .../reference/amdDependencyCommentName1.js    |    2 +-
 .../reference/amdDependencyCommentName2.js    |    2 +-
 .../reference/amdDependencyCommentName3.js    |    2 +-
 .../reference/amdDependencyCommentName4.js    |    2 +-
 .../reference/amdImportAsPrimaryExpression.js |    4 +-
 .../amdImportNotAsPrimaryExpression.js        |    4 +-
 .../reference/anonymousDefaultExportsAmd.js   |    4 +-
 .../anonymousDefaultExportsCommonjs.js        |    4 +-
 .../reference/anonymousDefaultExportsUmd.js   |    4 +-
 tests/baselines/reference/asOperator4.js      |    4 +-
 .../asyncAwaitIsolatedModules_es5.js          |    2 +-
 .../reference/asyncImportedPromise_es5.js     |    4 +-
 .../reference/asyncImportedPromise_es6.js     |    4 +-
 .../reference/augmentExportEquals1.js         |    2 +-
 .../reference/augmentExportEquals1_1.js       |    2 +-
 .../reference/augmentExportEquals2.js         |    2 +-
 .../reference/augmentExportEquals2_1.js       |    2 +-
 .../reference/augmentExportEquals3.js         |    4 +-
 .../reference/augmentExportEquals3_1.js       |    4 +-
 .../reference/augmentExportEquals4.js         |    4 +-
 .../reference/augmentExportEquals4_1.js       |    4 +-
 .../reference/augmentExportEquals5.js         |    2 +-
 .../reference/augmentExportEquals6.js         |    4 +-
 .../reference/augmentExportEquals6_1.js       |    2 +-
 .../augmentedTypesExternalModule1.js          |    2 +-
 tests/baselines/reference/cacheResolutions.js |    6 +-
 .../baselines/reference/chainedImportAlias.js |    4 +-
 .../baselines/reference/circularReference.js  |    4 +-
 .../reference/circularReferenceInImport.js    |    2 +-
 .../reference/classAbstractManyKeywords.js    |    2 +-
 .../reference/classExtendsAcrossFiles.js      |    4 +-
 ...classMemberInitializerWithLamdaScoping3.js |    2 +-
 ...classMemberInitializerWithLamdaScoping4.js |    2 +-
 .../collisionExportsRequireAndAlias.js        |    6 +-
 .../collisionExportsRequireAndAmbientClass.js |    2 +-
 .../collisionExportsRequireAndAmbientEnum.js  |    2 +-
 ...llisionExportsRequireAndAmbientFunction.js |    2 +-
 ...collisionExportsRequireAndAmbientModule.js |    2 +-
 .../collisionExportsRequireAndAmbientVar.js   |    2 +-
 .../collisionExportsRequireAndClass.js        |    2 +-
 .../collisionExportsRequireAndEnum.js         |    2 +-
 .../collisionExportsRequireAndFunction.js     |    2 +-
 ...ionExportsRequireAndInternalModuleAlias.js |    2 +-
 .../collisionExportsRequireAndModule.js       |    2 +-
 ...onExportsRequireAndUninstantiatedModule.js |    2 +-
 .../collisionExportsRequireAndVar.js          |    2 +-
 .../commentOnExportEnumDeclaration.js         |    2 +-
 .../reference/commentsDottedModuleName.js     |    2 +-
 .../reference/commentsExternalModules.js      |    4 +-
 .../reference/commentsExternalModules2.js     |    4 +-
 .../reference/commentsExternalModules3.js     |    4 +-
 .../reference/commentsMultiModuleMultiFile.js |    4 +-
 .../reference/commentsOnRequireStatement.js   |    6 +-
 .../commonJSImportAsPrimaryExpression.js      |    4 +-
 .../commonJSImportNotAsPrimaryExpression.js   |    4 +-
 tests/baselines/reference/commonSourceDir5.js |    6 +-
 tests/baselines/reference/commonSourceDir6.js |    6 +-
 .../reference/commonSourceDirectory.js        |    2 +-
 .../reference/commonSourceDirectory.js.map    |    2 +-
 .../commonSourceDirectory.sourcemap.txt       |   26 +-
 .../reference/commonSourceDirectory_dts.js    |    2 +-
 .../commonSourceDirectory_dts.js.map          |    2 +-
 .../commonSourceDirectory_dts.sourcemap.txt   |   20 +-
 .../baselines/reference/commonjsSafeImport.js |    4 +-
 .../reference/complexNarrowingWithAny.js      |    2 +-
 .../reference/constDeclarations-access5.js    |    4 +-
 .../reference/constEnumExternalModule.js      |    2 +-
 .../controlFlowBinaryOrExpression.js          |    2 +-
 .../controlFlowPropertyDeclarations.js        |    2 +-
 .../controlFlowSelfReferentialLoop.js         |    2 +-
 .../reference/copyrightWithNewLine1.js        |    2 +-
 .../reference/copyrightWithoutNewLine1.js     |    2 +-
 .../crashIntypeCheckInvocationExpression.js   |    2 +-
 ...rashIntypeCheckObjectCreationExpression.js |    2 +-
 .../baselines/reference/declFileAccessors.js  |    2 +-
 .../declFileAliasUseBeforeDeclaration.js      |    4 +-
 ...assWithStaticMethodReturningConstructor.js |    2 +-
 .../reference/declFileConstructors.js         |    2 +-
 ...lFileExportAssignmentOfGenericInterface.js |    2 +-
 .../reference/declFileExportImportChain.js    |    4 +-
 .../reference/declFileExportImportChain2.js   |    2 +-
 .../reference/declFileForExportedImport.js    |    2 +-
 .../baselines/reference/declFileFunctions.js  |    2 +-
 .../reference/declFileGenericType.js          |    2 +-
 ...eclFileImportModuleWithExportAssignment.js |    2 +-
 tests/baselines/reference/declFileMethods.js  |    2 +-
 .../declarationEmitClassMemberNameConflict.js |    2 +-
 .../declarationEmitExportAssignment.js        |    2 +-
 .../declarationEmitExportDeclaration.js       |    4 +-
 .../declarationEmitExpressionInExtends3.js    |    2 +-
 .../declarationEmitIdentifierPredicates01.js  |    2 +-
 ...itIdentifierPredicatesWithPrivateName01.js |    2 +-
 ...declarationEmitInferedDefaultExportType.js |    2 +-
 .../declarationEmitInferedTypeAlias1.js       |    4 +-
 .../declarationEmitInferedTypeAlias2.js       |    4 +-
 .../declarationEmitInferedTypeAlias3.js       |    4 +-
 .../declarationEmitInferedTypeAlias5.js       |    4 +-
 .../declarationEmitInferedTypeAlias6.js       |    4 +-
 .../declarationEmitInferedTypeAlias7.js       |    4 +-
 .../declarationEmitInferedTypeAlias9.js       |    2 +-
 .../reference/declarationEmitInvalidExport.js |    2 +-
 .../reference/declarationEmitNameConflicts.js |    2 +-
 .../declarationEmitNameConflictsWithAlias.js  |    2 +-
 .../reference/declarationEmitPromise.js       |    2 +-
 .../declarationEmitThisPredicates01.js        |    2 +-
 .../declarationEmitThisPredicates02.js        |    2 +-
 ...tionEmitThisPredicatesWithPrivateName01.js |    2 +-
 ...tionEmitThisPredicatesWithPrivateName02.js |    2 +-
 ...arationEmitTypeAliasWithTypeParameters1.js |    2 +-
 ...arationEmitTypeAliasWithTypeParameters2.js |    2 +-
 ...arationEmitTypeAliasWithTypeParameters5.js |    2 +-
 .../reference/declarationEmitUnknownImport.js |    2 +-
 .../declarationEmitUnknownImport2.js          |    2 +-
 .../reference/declarationMerging2.js          |    2 +-
 .../decoratedClassExportsCommonJS1.js         |    2 +-
 .../decoratedClassExportsCommonJS2.js         |    2 +-
 .../decoratedDefaultExportsGetExportedAmd.js  |    4 +-
 ...oratedDefaultExportsGetExportedCommonjs.js |    4 +-
 .../decoratedDefaultExportsGetExportedUmd.js  |    4 +-
 ...ratorInstantiateModulesInFunctionBodies.js |    4 +-
 .../baselines/reference/decoratorMetadata.js  |    4 +-
 .../decoratorMetadataOnInferredType.js        |    2 +-
 ...orMetadataRestParameterWithImportedType.js |    8 +-
 .../decoratorMetadataWithConstructorType.js   |    2 +-
 ...adataWithImportDeclarationNameCollision.js |    4 +-
 ...dataWithImportDeclarationNameCollision2.js |    4 +-
 ...dataWithImportDeclarationNameCollision3.js |    4 +-
 ...dataWithImportDeclarationNameCollision4.js |    4 +-
 ...dataWithImportDeclarationNameCollision5.js |    4 +-
 ...dataWithImportDeclarationNameCollision6.js |    4 +-
 ...dataWithImportDeclarationNameCollision7.js |    4 +-
 ...dataWithImportDeclarationNameCollision8.js |    4 +-
 .../baselines/reference/decoratorOnClass2.js  |    2 +-
 .../reference/decoratorOnClassConstructor2.js |    4 +-
 .../reference/decoratorOnClassConstructor3.js |    4 +-
 .../defaultExportInAwaitExpression01.js       |    4 +-
 .../defaultExportInAwaitExpression02.js       |    4 +-
 .../reference/defaultExportWithOverloads01.js |    2 +-
 .../reference/defaultExportsCannotMerge01.js  |    4 +-
 .../reference/defaultExportsCannotMerge02.js  |    4 +-
 .../reference/defaultExportsCannotMerge03.js  |    4 +-
 .../reference/defaultExportsCannotMerge04.js  |    2 +-
 .../reference/defaultExportsGetExportedAmd.js |    4 +-
 .../defaultExportsGetExportedCommonjs.js      |    4 +-
 .../reference/defaultExportsGetExportedUmd.js |    4 +-
 .../reference/dependencyViaImportAlias.js     |    2 +-
 .../destructuringInVariableDeclarations1.js   |    2 +-
 .../destructuringInVariableDeclarations2.js   |    2 +-
 .../destructuringInVariableDeclarations3.js   |    2 +-
 .../destructuringInVariableDeclarations4.js   |    2 +-
 .../destructuringInVariableDeclarations5.js   |    2 +-
 .../destructuringInVariableDeclarations6.js   |    2 +-
 .../reference/downlevelLetConst13.js          |    2 +-
 .../reference/duplicateLocalVariable1.js      |    2 +-
 .../reference/duplicateLocalVariable2.js      |    2 +-
 .../duplicateSymbolsExportMatching.js         |    2 +-
 .../reference/dynamicModuleTypecheckError.js  |    2 +-
 .../baselines/reference/elidingImportNames.js |    6 +-
 tests/baselines/reference/emptyModuleName.js  |    2 +-
 .../reference/enumFromExternalModule.js       |    4 +-
 .../reference/errorsOnImportedSymbol.js       |    2 +-
 .../reference/es3defaultAliasIsQuoted.js      |    4 +-
 tests/baselines/reference/es5-commonjs.js     |    2 +-
 tests/baselines/reference/es5-commonjs2.js    |    2 +-
 tests/baselines/reference/es5-commonjs3.js    |    2 +-
 tests/baselines/reference/es5-commonjs4.js    |    2 +-
 tests/baselines/reference/es5-commonjs5.js    |    2 +-
 tests/baselines/reference/es5-commonjs6.js    |    2 +-
 .../es5-importHelpersAsyncFunctions.js        |    2 +-
 tests/baselines/reference/es5-umd2.js         |    2 +-
 tests/baselines/reference/es5-umd3.js         |    2 +-
 .../es5ExportDefaultClassDeclaration.js       |    2 +-
 .../es5ExportDefaultClassDeclaration2.js      |    2 +-
 .../es5ExportDefaultClassDeclaration3.js      |    2 +-
 .../reference/es5ExportDefaultExpression.js   |    2 +-
 .../es5ExportDefaultFunctionDeclaration.js    |    2 +-
 .../es5ExportDefaultFunctionDeclaration2.js   |    2 +-
 .../es5ExportDefaultFunctionDeclaration3.js   |    2 +-
 .../reference/es5ExportDefaultIdentifier.js   |    2 +-
 .../es5ModuleInternalNamedImports.js          |    2 +-
 .../reference/es5ModuleWithModuleGenAmd.js    |    2 +-
 .../es5ModuleWithModuleGenCommonjs.js         |    2 +-
 .../es5ModuleWithoutModuleGenTarget.js        |    2 +-
 tests/baselines/reference/es6-umd2.js         |    2 +-
 .../baselines/reference/es6ExportAllInEs5.js  |    4 +-
 .../reference/es6ExportClauseInEs5.js         |    2 +-
 .../es6ExportClauseWithAssignmentInEs5.js     |    2 +-
 ...ExportClauseWithoutModuleSpecifierInEs5.js |    4 +-
 .../reference/es6ExportEqualsInterop.js       |    2 +-
 .../reference/es6ImportDefaultBindingAmd.js   |    4 +-
 .../reference/es6ImportDefaultBindingDts.js   |    4 +-
 ...rtDefaultBindingFollowedWithNamedImport.js |    4 +-
 ...ultBindingFollowedWithNamedImport1InEs5.js |    4 +-
 ...ndingFollowedWithNamedImport1WithExport.js |    4 +-
 ...efaultBindingFollowedWithNamedImportDts.js |    4 +-
 ...faultBindingFollowedWithNamedImportDts1.js |    4 +-
 ...aultBindingFollowedWithNamedImportInEs5.js |    4 +-
 ...indingFollowedWithNamedImportWithExport.js |    4 +-
 ...ndingFollowedWithNamespaceBinding1InEs5.js |    4 +-
 ...FollowedWithNamespaceBinding1WithExport.js |    4 +-
 ...tBindingFollowedWithNamespaceBindingDts.js |    4 +-
 ...BindingFollowedWithNamespaceBindingDts1.js |    4 +-
 ...indingFollowedWithNamespaceBindingInEs5.js |    4 +-
 ...gFollowedWithNamespaceBindingWithExport.js |    4 +-
 .../es6ImportDefaultBindingMergeErrors.js     |    4 +-
 ...s6ImportDefaultBindingNoDefaultProperty.js |    2 +-
 .../es6ImportDefaultBindingWithExport.js      |    4 +-
 .../reference/es6ImportNameSpaceImport.js     |    4 +-
 .../reference/es6ImportNameSpaceImportAmd.js  |    4 +-
 .../reference/es6ImportNameSpaceImportDts.js  |    4 +-
 .../es6ImportNameSpaceImportInEs5.js          |    4 +-
 .../es6ImportNameSpaceImportMergeErrors.js    |    4 +-
 .../es6ImportNameSpaceImportWithExport.js     |    4 +-
 .../reference/es6ImportNamedImport.js         |    4 +-
 .../reference/es6ImportNamedImportAmd.js      |    4 +-
 .../reference/es6ImportNamedImportDts.js      |    4 +-
 .../reference/es6ImportNamedImportInEs5.js    |    4 +-
 .../es6ImportNamedImportInExportAssignment.js |    2 +-
 ...rtNamedImportInIndirectExportAssignment.js |    2 +-
 .../es6ImportNamedImportMergeErrors.js        |    4 +-
 .../es6ImportNamedImportNoExportMember.js     |    2 +-
 .../es6ImportNamedImportWithExport.js         |    4 +-
 .../es6ImportNamedImportWithTypesAndValues.js |    4 +-
 .../es6ImportWithoutFromClauseAmd.js          |    6 +-
 .../es6ImportWithoutFromClauseInEs5.js        |    4 +-
 .../es6ImportWithoutFromClauseWithExport.js   |    4 +-
 .../es6ModuleWithModuleGenTargetAmd.js        |    2 +-
 .../es6ModuleWithModuleGenTargetCommonjs.js   |    2 +-
 .../reference/exportAndImport-es3-amd.js      |    4 +-
 .../reference/exportAndImport-es3.js          |    4 +-
 .../reference/exportAndImport-es5-amd.js      |    4 +-
 .../reference/exportAndImport-es5.js          |    4 +-
 .../reference/exportArrayBindingPattern.js    |    2 +-
 .../reference/exportAssignClassAndModule.js   |    2 +-
 .../reference/exportAssignDottedName.js       |    2 +-
 .../exportAssignImportedIdentifier.js         |    4 +-
 .../baselines/reference/exportAssignTypes.js  |    2 +-
 .../exportAssignedTypeAsTypeAnnotation.js     |    2 +-
 .../reference/exportAssignmentClass.js        |    2 +-
 .../exportAssignmentConstrainedGenericType.js |    2 +-
 .../reference/exportAssignmentEnum.js         |    2 +-
 .../reference/exportAssignmentFunction.js     |    2 +-
 .../reference/exportAssignmentGenericType.js  |    2 +-
 .../reference/exportAssignmentInterface.js    |    2 +-
 .../exportAssignmentInternalModule.js         |    2 +-
 .../exportAssignmentMergedInterface.js        |    2 +-
 .../reference/exportAssignmentMergedModule.js |    2 +-
 ...xportAssignmentOfDeclaredExternalModule.js |    2 +-
 .../exportAssignmentOfGenericType1.js         |    2 +-
 .../exportAssignmentTopLevelClodule.js        |    2 +-
 .../exportAssignmentTopLevelEnumdule.js       |    2 +-
 .../exportAssignmentTopLevelFundule.js        |    2 +-
 .../exportAssignmentTopLevelIdentifier.js     |    2 +-
 .../reference/exportAssignmentVariable.js     |    2 +-
 ...ationWithModuleSpecifierNameOnNextLine1.js |    8 +-
 .../reference/exportDeclareClass1.js          |    4 +-
 .../reference/exportDeclaredModule.js         |    2 +-
 .../reference/exportDefaultProperty.js        |    6 +-
 .../reference/exportDefaultProperty2.js       |    4 +-
 .../reference/exportEqualCallable.js          |    2 +-
 .../reference/exportEqualErrorType.js         |    2 +-
 .../reference/exportEqualMemberMissing.js     |    2 +-
 .../reference/exportEqualsDefaultProperty.js  |    2 +-
 .../reference/exportEqualsProperty.js         |    2 +-
 .../reference/exportEqualsProperty2.js        |    2 +-
 tests/baselines/reference/exportImport.js     |    4 +-
 .../reference/exportImportMultipleFiles.js    |    6 +-
 .../exportImportNonInstantiatedModule2.js     |    2 +-
 .../exportNonInitializedVariablesAMD.js       |    2 +-
 .../exportNonInitializedVariablesCommonJS.js  |    2 +-
 .../exportNonInitializedVariablesUMD.js       |    2 +-
 .../exportRedeclarationTypeAliases.js         |    2 +-
 .../reference/exportSameNameFuncVar.js        |    2 +-
 .../reference/exportSpecifierForAGlobal.js    |    2 +-
 tests/baselines/reference/exportStar-amd.js   |   10 +-
 tests/baselines/reference/exportStar.js       |   10 +-
 .../reference/exportStarForValues.js          |    2 +-
 .../reference/exportStarForValues2.js         |    4 +-
 .../reference/exportStarForValues3.js         |    8 +-
 .../reference/exportStarForValues4.js         |    4 +-
 .../reference/exportStarForValues7.js         |    4 +-
 .../reference/exportStarForValues8.js         |    8 +-
 .../reference/exportStarForValues9.js         |    4 +-
 .../reference/exportStarFromEmptyModule.js    |    6 +-
 tests/baselines/reference/exportToString.js   |    2 +-
 tests/baselines/reference/exportVisibility.js |    2 +-
 .../exportedBlockScopedDeclarations.js        |    2 +-
 .../baselines/reference/exportedVariable1.js  |    2 +-
 .../exportingContainingVisibleType.js         |    2 +-
 .../reference/exportsAndImports1-amd.js       |    6 +-
 .../reference/exportsAndImports1-es6.js       |    6 +-
 .../baselines/reference/exportsAndImports1.js |    6 +-
 .../reference/exportsAndImports2-amd.js       |    6 +-
 .../reference/exportsAndImports2-es6.js       |    6 +-
 .../baselines/reference/exportsAndImports2.js |    6 +-
 .../reference/exportsAndImports3-amd.js       |    6 +-
 .../reference/exportsAndImports3-es6.js       |    6 +-
 .../baselines/reference/exportsAndImports3.js |    6 +-
 .../reference/exportsAndImports4-amd.js       |    4 +-
 .../reference/exportsAndImports4-es6.js       |    4 +-
 .../baselines/reference/exportsAndImports4.js |    4 +-
 ...sAndImportsWithContextualKeywordNames01.js |    2 +-
 ...sAndImportsWithContextualKeywordNames02.js |    4 +-
 .../exportsAndImportsWithUnderscores1.js      |    4 +-
 .../exportsAndImportsWithUnderscores2.js      |    4 +-
 .../exportsAndImportsWithUnderscores3.js      |    4 +-
 .../exportsAndImportsWithUnderscores4.js      |    4 +-
 .../extendClassExpressionFromModule.js        |    2 +-
 ...xtendingClassFromAliasAndUsageInIndexer.js |    8 +-
 .../reference/externalModuleAssignToVar.js    |    4 +-
 .../externalModuleExportingGenericClass.js    |    2 +-
 .../externalModuleImmutableBindings.js        |    4 +-
 .../reference/externalModuleQualification.js  |    2 +-
 ...ceOfImportDeclarationWithExportModifier.js |    4 +-
 ...ernceResolutionOrderInImportDeclaration.js |    4 +-
 .../reference/externalModuleResolution.js     |    2 +-
 .../reference/externalModuleResolution2.js    |    2 +-
 .../reference/fieldAndGetterWithSameName.js   |    2 +-
 ...ilesEmittingIntoSameOutputWithOutOption.js |    2 +-
 .../functionAndImportNameConflict.js          |    4 +-
 .../functionLikeInParameterInitializer.js     |    2 +-
 .../reference/generatorES6InAMDModule.js      |    2 +-
 .../reference/genericClassesInModule2.js      |    2 +-
 .../genericInterfaceFunctionTypeParameter.js  |    2 +-
 .../reference/genericMemberFunction.js        |    2 +-
 .../reference/genericReturnTypeFromGetter1.js |    2 +-
 .../genericTypeWithMultipleBases1.js          |    2 +-
 .../genericTypeWithMultipleBases2.js          |    2 +-
 .../genericWithIndexerOfTypeParameterType2.js |    2 +-
 ...getEmitOutputWithDeclarationFile2.baseline |    2 +-
 .../getEmitOutputWithEmitterErrors2.baseline  |    2 +-
 tests/baselines/reference/giant.js            |    2 +-
 ...sAnExternalModuleInsideAnInternalModule.js |    4 +-
 .../baselines/reference/importAsBaseClass.js  |    4 +-
 tests/baselines/reference/importDecl.js       |   12 +-
 .../reference/importDeclWithClassModifiers.js |    2 +-
 .../importDeclWithDeclareModifier.js          |    2 +-
 .../reference/importDeclWithExportModifier.js |    2 +-
 ...clWithExportModifierAndExportAssignment.js |    2 +-
 .../importDeclarationUsedAsTypeQuery.js       |    2 +-
 tests/baselines/reference/importHelpers.js    |    2 +-
 tests/baselines/reference/importHelpersAmd.js |    4 +-
 .../importHelpersInIsolatedModules.js         |    4 +-
 .../baselines/reference/importHelpersInTsx.js |    2 +-
 .../reference/importHelpersNoHelpers.js       |    2 +-
 .../reference/importHelpersNoModule.js        |    2 +-
 .../reference/importHelpersOutFile.js         |    6 +-
 .../reference/importImportOnlyModule.js       |    6 +-
 .../baselines/reference/importInsideModule.js |    2 +-
 .../reference/importNonExternalModule.js      |    2 +-
 .../reference/importNonStringLiteral.js       |    2 +-
 .../baselines/reference/importTsBeforeDTs.js  |    4 +-
 .../reference/importUsedInExtendsList1.js     |    4 +-
 .../reference/importWithTrailingSlash.js      |    8 +-
 .../import_reference-exported-alias.js        |    2 +-
 .../import_reference-to-type-alias.js         |    4 +-
 ...-referenecing-aliased-type-throug-array.js |    2 +-
 ...ar-referencing-an-imported-module-alias.js |    4 +-
 .../importedAliasesInTypePositions.js         |    4 +-
 .../reference/importedModuleClassNameClash.js |    2 +-
 .../reference/importsImplicitlyReadonly.js    |    4 +-
 tests/baselines/reference/inferenceLimit.js   |    2 +-
 .../reference/instanceOfInExternalModules.js  |    4 +-
 .../reference/interfaceContextualType.js      |    2 +-
 .../reference/interfaceDeclaration3.js        |    2 +-
 .../reference/interfaceDeclaration5.js        |    2 +-
 .../reference/interfaceImplementation6.js     |    2 +-
 ...alAliasClassInsideLocalModuleWithExport.js |    2 +-
 ...liasClassInsideLocalModuleWithoutExport.js |    2 +-
 ...sideLocalModuleWithoutExportAccessError.js |    2 +-
 ...liasClassInsideTopLevelModuleWithExport.js |    2 +-
 ...sClassInsideTopLevelModuleWithoutExport.js |    2 +-
 ...nalAliasEnumInsideLocalModuleWithExport.js |    2 +-
 ...AliasEnumInsideLocalModuleWithoutExport.js |    2 +-
 ...sideLocalModuleWithoutExportAccessError.js |    2 +-
 ...AliasEnumInsideTopLevelModuleWithExport.js |    2 +-
 ...asEnumInsideTopLevelModuleWithoutExport.js |    2 +-
 ...liasFunctionInsideLocalModuleWithExport.js |    2 +-
 ...sFunctionInsideLocalModuleWithoutExport.js |    2 +-
 ...sideLocalModuleWithoutExportAccessError.js |    2 +-
 ...sFunctionInsideTopLevelModuleWithExport.js |    2 +-
 ...nctionInsideTopLevelModuleWithoutExport.js |    2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |    2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |    2 +-
 ...sideLocalModuleWithoutExportAccessError.js |    2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |    2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |    2 +-
 ...iasInterfaceInsideLocalModuleWithExport.js |    2 +-
 ...InterfaceInsideLocalModuleWithoutExport.js |    2 +-
 ...sideLocalModuleWithoutExportAccessError.js |    2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |    2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |    2 +-
 ...sideLocalModuleWithoutExportAccessError.js |    2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |    2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |    2 +-
 ...rnalAliasVarInsideLocalModuleWithExport.js |    2 +-
 ...lAliasVarInsideLocalModuleWithoutExport.js |    2 +-
 ...sideLocalModuleWithoutExportAccessError.js |    2 +-
 ...lAliasVarInsideTopLevelModuleWithExport.js |    2 +-
 ...iasVarInsideTopLevelModuleWithoutExport.js |    2 +-
 .../reference/intersectionTypeInference1.js   |    2 +-
 .../isolatedModulesImportExportElision.js     |    2 +-
 .../reference/isolatedModulesPlainFile-AMD.js |    2 +-
 .../isolatedModulesPlainFile-CommonJS.js      |    2 +-
 .../reference/isolatedModulesPlainFile-UMD.js |    2 +-
 ...jsFileCompilationRestParamJsDocFunction.js |    2 +-
 .../reference/jsxEmitWithAttributes.js        |    4 +-
 .../reference/jsxFactoryAndReactNamespace.js  |    4 +-
 .../reference/jsxFactoryIdentifier.js         |    4 +-
 .../reference/jsxFactoryIdentifier.js.map     |    4 +-
 .../jsxFactoryIdentifier.sourcemap.txt        |  248 ++--
 .../jsxFactoryIdentifierAsParameter.js        |    2 +-
 .../jsxFactoryIdentifierAsParameter.js.map    |    2 +-
 ...FactoryIdentifierAsParameter.sourcemap.txt |   33 +-
 ...jsxFactoryIdentifierWithAbsentParameter.js |    2 +-
 ...actoryIdentifierWithAbsentParameter.js.map |    2 +-
 ...dentifierWithAbsentParameter.sourcemap.txt |   29 +-
 .../jsxFactoryNotIdentifierOrQualifiedName.js |    4 +-
 ...jsxFactoryNotIdentifierOrQualifiedName2.js |    4 +-
 .../reference/jsxFactoryQualifiedName.js      |    4 +-
 .../reference/jsxFactoryQualifiedName.js.map  |    4 +-
 .../jsxFactoryQualifiedName.sourcemap.txt     |  232 ++--
 .../jsxFactoryQualifiedNameResolutionError.js |    2 +-
 ...FactoryQualifiedNameResolutionError.js.map |    2 +-
 ...QualifiedNameResolutionError.sourcemap.txt |   33 +-
 .../jsxFactoryQualifiedNameWithEs5.js         |    2 +-
 .../reference/jsxImportInAttribute.js         |    2 +-
 tests/baselines/reference/jsxViaImport.2.js   |    2 +-
 tests/baselines/reference/jsxViaImport.js     |    2 +-
 .../reference/localAliasExportAssignment.js   |    2 +-
 .../baselines/reference/mapOnTupleTypes01.js  |    2 +-
 .../baselines/reference/mapOnTupleTypes02.js  |    2 +-
 .../memberAccessMustUseModuleInstances.js     |    4 +-
 .../reference/mergeWithImportedNamespace.js   |    2 +-
 .../reference/mergeWithImportedType.js        |    2 +-
 .../reference/mergedDeclarations6.js          |    4 +-
 .../reference/mergedDeclarations7.js          |    2 +-
 .../mergedModuleDeclarationCodeGen.js         |    2 +-
 .../reference/metadataOfEventAlias.js         |    4 +-
 .../missingFunctionImplementation.js          |    2 +-
 .../missingSemicolonInModuleSpecifier.js      |    4 +-
 .../moduleAliasAsFunctionArgument.js          |    2 +-
 ...gmentationCollidingNamesInAugmentation1.js |    6 +-
 .../moduleAugmentationDeclarationEmit1.js     |    6 +-
 .../moduleAugmentationDeclarationEmit2.js     |    6 +-
 .../moduleAugmentationDisallowedExtensions.js |   10 +-
 .../moduleAugmentationExtendAmbientModule1.js |    4 +-
 .../moduleAugmentationExtendAmbientModule2.js |    4 +-
 .../moduleAugmentationExtendFileModule1.js    |    6 +-
 .../moduleAugmentationExtendFileModule2.js    |    6 +-
 .../reference/moduleAugmentationGlobal1.js    |    4 +-
 .../reference/moduleAugmentationGlobal2.js    |    4 +-
 .../reference/moduleAugmentationGlobal3.js    |    4 +-
 .../reference/moduleAugmentationGlobal4.js    |    2 +-
 .../reference/moduleAugmentationGlobal5.js    |    2 +-
 .../moduleAugmentationImportsAndExports1.js   |    8 +-
 .../moduleAugmentationImportsAndExports2.js   |    8 +-
 .../moduleAugmentationImportsAndExports3.js   |    8 +-
 .../moduleAugmentationImportsAndExports4.js   |    8 +-
 .../moduleAugmentationImportsAndExports5.js   |    8 +-
 .../moduleAugmentationImportsAndExports6.js   |    8 +-
 .../moduleAugmentationInAmbientModule1.js     |    2 +-
 .../moduleAugmentationInAmbientModule2.js     |    2 +-
 .../moduleAugmentationInAmbientModule3.js     |    2 +-
 .../moduleAugmentationInAmbientModule4.js     |    2 +-
 .../moduleAugmentationInAmbientModule5.js     |    2 +-
 .../moduleAugmentationInDependency.js         |    2 +-
 .../moduleAugmentationInDependency2.js        |    2 +-
 .../reference/moduleAugmentationNoNewNames.js |    4 +-
 .../moduleAugmentationsBundledOutput1.js      |   10 +-
 .../reference/moduleAugmentationsImports1.js  |    8 +-
 .../reference/moduleAugmentationsImports2.js  |   10 +-
 .../reference/moduleAugmentationsImports3.js  |    8 +-
 .../reference/moduleAugmentationsImports4.js  |    6 +-
 .../baselines/reference/moduleCodeGenTest5.js |    2 +-
 .../baselines/reference/moduleCodegenTest4.js |    2 +-
 .../reference/moduleDuplicateIdentifiers.js   |    2 +-
 tests/baselines/reference/moduleExports1.js   |    2 +-
 .../moduleImportedForTypeArgumentPosition.js  |    2 +-
 .../reference/moduleInTypePosition1.js        |    4 +-
 .../reference/moduleMergeConstructor.js       |    2 +-
 tests/baselines/reference/moduleNoneErrors.js |    2 +-
 .../baselines/reference/modulePrologueAMD.js  |    2 +-
 .../reference/modulePrologueCommonjs.js       |    2 +-
 .../baselines/reference/modulePrologueUmd.js  |    2 +-
 .../reference/moduleResolutionNoResolve.js    |    2 +-
 .../reference/moduleResolutionNoTs.js         |    4 +-
 .../moduleResolutionWithExtensions.js         |    2 +-
 ...moduleResolutionWithExtensions_preferTs.js |    2 +-
 ...duleResolutionWithExtensions_unexpected.js |    2 +-
 ...uleResolutionWithExtensions_unexpected2.js |    2 +-
 .../reference/moduleResolutionWithSymlinks.js |    6 +-
 ...ResolutionWithSymlinks_notInNodeModules.js |    6 +-
 ...moduleResolutionWithSymlinks_withOutDir.js |    6 +-
 ...duleSameValueDuplicateExportedBindings1.js |    6 +-
 ...duleSameValueDuplicateExportedBindings2.js |    6 +-
 tests/baselines/reference/moduleScoping.js    |    4 +-
 .../baselines/reference/multiImportExport.js  |    4 +-
 .../reference/multipleDefaultExports01.js     |    4 +-
 .../reference/multipleDefaultExports02.js     |    4 +-
 .../reference/multipleDefaultExports03.js     |   24 +-
 .../reference/multipleDefaultExports04.js     |   12 +-
 .../reference/multipleExportDefault1.js       |    2 +-
 .../reference/multipleExportDefault2.js       |    2 +-
 .../reference/multipleExportDefault3.js       |    2 +-
 .../reference/multipleExportDefault4.js       |    2 +-
 .../reference/multipleExportDefault5.js       |    2 +-
 .../reference/multipleExportDefault6.js       |    2 +-
 tests/baselines/reference/multipleExports.js  |    2 +-
 .../reference/nameDelimitedBySlashes.js       |    4 +-
 .../reference/nameWithFileExtension.js        |    4 +-
 .../reference/nameWithRelativePaths.js        |    8 +-
 .../narrowingConstrainedTypeParameter.js      |    2 +-
 tests/baselines/reference/nestedLoops.js      |    2 +-
 ...ortModuleAugmentationInDeclarationFile2.js |    2 +-
 ...ortModuleAugmentationInDeclarationFile3.js |    2 +-
 ...ImplicitAnyDestructuringInPrivateMethod.js |    2 +-
 .../reference/noImplicitUseStrict_amd.js      |    2 +-
 .../reference/noImplicitUseStrict_commonjs.js |    2 +-
 .../reference/noImplicitUseStrict_umd.js      |    2 +-
 tests/baselines/reference/nodeResolution1.js  |    2 +-
 .../baselines/reference/nonMergedOverloads.js |    2 +-
 tests/baselines/reference/objectIndexer.js    |    2 +-
 .../reference/outFilerootDirModuleNamesAmd.js |    4 +-
 .../baselines/reference/outModuleConcatAmd.js |    4 +-
 .../reference/outModuleConcatAmd.js.map       |    2 +-
 .../outModuleConcatAmd.sourcemap.txt          |   66 +-
 .../reference/outModuleTripleSlashRefs.js     |    4 +-
 .../reference/outModuleTripleSlashRefs.js.map |    2 +-
 .../outModuleTripleSlashRefs.sourcemap.txt    |   70 +-
 .../reference/overloadModifiersMustAgree.js   |    2 +-
 tests/baselines/reference/parser0_004152.js   |    2 +-
 tests/baselines/reference/parser509546.js     |    2 +-
 tests/baselines/reference/parser509546_1.js   |    2 +-
 tests/baselines/reference/parser509546_2.js   |    2 +-
 tests/baselines/reference/parser618973.js     |    2 +-
 .../reference/parserArgumentList1.js          |    2 +-
 tests/baselines/reference/parserClass1.js     |    2 +-
 tests/baselines/reference/parserClass2.js     |    2 +-
 tests/baselines/reference/parserEnum1.js      |    2 +-
 tests/baselines/reference/parserEnum2.js      |    2 +-
 tests/baselines/reference/parserEnum3.js      |    2 +-
 tests/baselines/reference/parserEnum4.js      |    2 +-
 .../parserModifierOnStatementInBlock1.js      |    2 +-
 .../parserModifierOnStatementInBlock3.js      |    2 +-
 tests/baselines/reference/parserModule1.js    |    2 +-
 ...thMappingBasedModuleResolution1_classic.js |    2 +-
 .../pathMappingBasedModuleResolution1_node.js |    2 +-
 ...thMappingBasedModuleResolution2_classic.js |    2 +-
 .../pathMappingBasedModuleResolution2_node.js |    2 +-
 ...thMappingBasedModuleResolution3_classic.js |    8 +-
 .../pathMappingBasedModuleResolution3_node.js |    6 +-
 ...thMappingBasedModuleResolution4_classic.js |    8 +-
 .../pathMappingBasedModuleResolution4_node.js |    6 +-
 ...thMappingBasedModuleResolution5_classic.js |   10 +-
 .../pathMappingBasedModuleResolution5_node.js |    8 +-
 ...thMappingBasedModuleResolution6_classic.js |    4 +-
 .../pathMappingBasedModuleResolution6_node.js |    4 +-
 ...thMappingBasedModuleResolution7_classic.js |    4 +-
 .../pathMappingBasedModuleResolution7_node.js |    4 +-
 ...pingBasedModuleResolution_withExtension.js |    4 +-
 .../prespecializedGenericMembers1.js          |    2 +-
 .../reference/privacyAccessorDeclFile.js      |    2 +-
 .../privacyCannotNameAccessorDeclFile.js      |    6 +-
 .../privacyCannotNameVarTypeDeclFile.js       |    6 +-
 .../privacyCheckAnonymousFunctionParameter.js |    2 +-
 ...privacyCheckAnonymousFunctionParameter2.js |    2 +-
 ...arameterReferenceInConstructorParameter.js |    2 +-
 .../reference/privacyCheckTypeOfFunction.js   |    2 +-
 tests/baselines/reference/privacyClass.js     |    2 +-
 .../privacyClassExtendsClauseDeclFile.js      |    2 +-
 .../privacyClassImplementsClauseDeclFile.js   |    2 +-
 ...FunctionCannotNameParameterTypeDeclFile.js |    6 +-
 ...acyFunctionCannotNameReturnTypeDeclFile.js |    6 +-
 .../privacyFunctionParameterDeclFile.js       |    2 +-
 .../privacyFunctionReturnTypeDeclFile.js      |    2 +-
 tests/baselines/reference/privacyGetter.js    |    2 +-
 tests/baselines/reference/privacyGloFunc.js   |    2 +-
 tests/baselines/reference/privacyImport.js    |    2 +-
 .../reference/privacyImportParseErrors.js     |    2 +-
 tests/baselines/reference/privacyInterface.js |    2 +-
 ...yLocalInternalReferenceImportWithExport.js |    2 +-
 ...calInternalReferenceImportWithoutExport.js |    2 +-
 ...elAmbientExternalModuleImportWithExport.js |    6 +-
 ...mbientExternalModuleImportWithoutExport.js |    6 +-
 ...pLevelInternalReferenceImportWithExport.js |    2 +-
 ...velInternalReferenceImportWithoutExport.js |    2 +-
 .../privacyTypeParameterOfFunction.js         |    2 +-
 .../privacyTypeParameterOfFunctionDeclFile.js |    2 +-
 .../reference/privacyTypeParametersOfClass.js |    2 +-
 .../privacyTypeParametersOfClassDeclFile.js   |    2 +-
 .../privacyTypeParametersOfInterface.js       |    2 +-
 ...rivacyTypeParametersOfInterfaceDeclFile.js |    2 +-
 tests/baselines/reference/privacyVar.js       |    2 +-
 .../baselines/reference/privacyVarDeclFile.js |    2 +-
 .../privatePropertyUsingObjectType.js         |    2 +-
 .../reference/project/baseline/amd/decl.js    |    2 +-
 .../reference/project/baseline/amd/emit.js    |    2 +-
 .../reference/project/baseline/node/decl.js   |    2 +-
 .../reference/project/baseline/node/emit.js   |    2 +-
 .../reference/project/baseline2/amd/decl.js   |    2 +-
 .../project/baseline2/amd/dont_emit.js        |    2 +-
 .../reference/project/baseline2/node/decl.js  |    2 +-
 .../project/baseline2/node/dont_emit.js       |    2 +-
 .../project/baseline3/amd/nestedModule.js     |    2 +-
 .../project/baseline3/node/nestedModule.js    |    2 +-
 .../reference/project/declarationDir/amd/a.js |    2 +-
 .../project/declarationDir/amd/subfolder/b.js |    2 +-
 .../project/declarationDir/amd/subfolder/c.js |    2 +-
 .../project/declarationDir/node/a.js          |    2 +-
 .../declarationDir/node/subfolder/b.js        |    2 +-
 .../declarationDir/node/subfolder/c.js        |    2 +-
 .../project/declarationDir2/amd/out/a.js      |    2 +-
 .../declarationDir2/amd/out/subfolder/b.js    |    2 +-
 .../declarationDir2/amd/out/subfolder/c.js    |    2 +-
 .../project/declarationDir2/node/out/a.js     |    2 +-
 .../declarationDir2/node/out/subfolder/b.js   |    2 +-
 .../declarationDir2/node/out/subfolder/c.js   |    2 +-
 .../project/declarationDir3/amd/out.js        |    6 +-
 .../declarationsCascadingImports/amd/m4.js    |    2 +-
 .../declarationsCascadingImports/node/m4.js   |    2 +-
 .../declarationsGlobalImport/amd/glo_m4.js    |    2 +-
 .../declarationsGlobalImport/amd/useModule.js |    2 +-
 .../declarationsGlobalImport/node/glo_m4.js   |    2 +-
 .../node/useModule.js                         |    2 +-
 .../amd/private_m4.js                         |    2 +-
 .../amd/useModule.js                          |    2 +-
 .../node/private_m4.js                        |    2 +-
 .../node/useModule.js                         |    2 +-
 .../amd/fncOnly_m4.js                         |    2 +-
 .../amd/useModule.js                          |    2 +-
 .../node/fncOnly_m4.js                        |    2 +-
 .../node/useModule.js                         |    2 +-
 .../amd/m4.js                                 |    2 +-
 .../amd/m5.js                                 |    2 +-
 .../amd/useModule.js                          |    2 +-
 .../node/m4.js                                |    2 +-
 .../node/m5.js                                |    2 +-
 .../node/useModule.js                         |    2 +-
 .../declarationsMultipleTimesImport/amd/m4.js |    2 +-
 .../amd/useModule.js                          |    2 +-
 .../node/m4.js                                |    2 +-
 .../node/useModule.js                         |    2 +-
 .../amd/m4.js                                 |    2 +-
 .../amd/m5.js                                 |    2 +-
 .../amd/useModule.js                          |    2 +-
 .../node/m4.js                                |    2 +-
 .../node/m5.js                                |    2 +-
 .../node/useModule.js                         |    2 +-
 .../declarationsSimpleImport/amd/m4.js        |    2 +-
 .../declarationsSimpleImport/amd/useModule.js |    2 +-
 .../declarationsSimpleImport/node/m4.js       |    2 +-
 .../node/useModule.js                         |    2 +-
 .../amd/main.js                               |    2 +-
 .../node/main.js                              |    2 +-
 .../amd/main.js                               |    2 +-
 .../node/main.js                              |    2 +-
 .../emitDecoratorMetadataSystemJS/amd/main.js |    2 +-
 .../node/main.js                              |    2 +-
 .../amd/main.js                               |    2 +-
 .../node/main.js                              |    2 +-
 .../amd/main.js                               |    2 +-
 .../node/main.js                              |    2 +-
 .../amd/ref/m2.js                             |    2 +-
 .../amd/ref/m2.js.map                         |    2 +-
 .../node/ref/m2.js                            |    2 +-
 .../node/ref/m2.js.map                        |    2 +-
 .../amd/outdir/simple/ref/m2.js               |    2 +-
 .../amd/outdir/simple/ref/m2.js.map           |    2 +-
 .../node/outdir/simple/ref/m2.js              |    2 +-
 .../node/outdir/simple/ref/m2.js.map          |    2 +-
 .../amd/bin/test.js                           |    2 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/bin/outAndOutDirFile.js               |    2 +-
 .../amd/bin/outAndOutDirFile.js.map           |    2 +-
 .../amd/diskFile0.js.map                      |    2 +-
 .../amd/diskFile1.js                          |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/diskFile0.js.map                     |    2 +-
 .../node/diskFile1.js                         |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../amd/bin/test.js                           |    6 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/m1.js                                 |    2 +-
 .../amd/m1.js.map                             |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/m1.js                                |    2 +-
 .../node/m1.js.map                            |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/m1.js                   |    2 +-
 .../amd/outdir/simple/m1.js.map               |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/m1.js                  |    2 +-
 .../node/outdir/simple/m1.js.map              |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/ref/m1.js               |    2 +-
 .../amd/outdir/simple/ref/m1.js.map           |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/ref/m1.js              |    2 +-
 .../node/outdir/simple/ref/m1.js.map          |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m2.js                             |    2 +-
 .../amd/ref/m2.js.map                         |    2 +-
 .../node/ref/m2.js                            |    2 +-
 .../node/ref/m2.js.map                        |    2 +-
 .../amd/outdir/simple/ref/m2.js               |    2 +-
 .../amd/outdir/simple/ref/m2.js.map           |    2 +-
 .../node/outdir/simple/ref/m2.js              |    2 +-
 .../node/outdir/simple/ref/m2.js.map          |    2 +-
 .../amd/bin/test.js                           |    2 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/bin/outAndOutDirFile.js               |    2 +-
 .../amd/bin/outAndOutDirFile.js.map           |    2 +-
 .../amd/diskFile0.js.map                      |    2 +-
 .../amd/diskFile1.js                          |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/diskFile0.js.map                     |    2 +-
 .../node/diskFile1.js                         |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../amd/bin/test.js                           |    6 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/m1.js                                 |    2 +-
 .../amd/m1.js.map                             |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/m1.js                                |    2 +-
 .../node/m1.js.map                            |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/m1.js                   |    2 +-
 .../amd/outdir/simple/m1.js.map               |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/m1.js                  |    2 +-
 .../node/outdir/simple/m1.js.map              |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/ref/m1.js               |    2 +-
 .../amd/outdir/simple/ref/m1.js.map           |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/ref/m1.js              |    2 +-
 .../node/outdir/simple/ref/m1.js.map          |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m2.js                             |    2 +-
 .../amd/ref/m2.js.map                         |    2 +-
 .../node/ref/m2.js                            |    2 +-
 .../node/ref/m2.js.map                        |    2 +-
 .../amd/outdir/simple/ref/m2.js               |    2 +-
 .../amd/outdir/simple/ref/m2.js.map           |    2 +-
 .../node/outdir/simple/ref/m2.js              |    2 +-
 .../node/outdir/simple/ref/m2.js.map          |    2 +-
 .../amd/bin/test.js                           |    2 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/bin/outAndOutDirFile.js               |    2 +-
 .../amd/bin/outAndOutDirFile.js.map           |    2 +-
 .../amd/diskFile0.js.map                      |    2 +-
 .../amd/diskFile1.js                          |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/diskFile0.js.map                     |    2 +-
 .../node/diskFile1.js                         |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../amd/bin/test.js                           |    6 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../maprootUrlModuleSimpleNoOutdir/amd/m1.js  |    2 +-
 .../amd/m1.js.map                             |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../maprootUrlModuleSimpleNoOutdir/node/m1.js |    2 +-
 .../node/m1.js.map                            |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/m1.js                   |    2 +-
 .../amd/outdir/simple/m1.js.map               |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/m1.js                  |    2 +-
 .../node/outdir/simple/m1.js.map              |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/ref/m1.js               |    2 +-
 .../amd/outdir/simple/ref/m1.js.map           |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/ref/m1.js              |    2 +-
 .../node/outdir/simple/ref/m1.js.map          |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m2.js                             |    2 +-
 .../amd/ref/m2.js.map                         |    2 +-
 .../node/ref/m2.js                            |    2 +-
 .../node/ref/m2.js.map                        |    2 +-
 .../amd/outdir/simple/ref/m2.js               |    2 +-
 .../amd/outdir/simple/ref/m2.js.map           |    2 +-
 .../node/outdir/simple/ref/m2.js              |    2 +-
 .../node/outdir/simple/ref/m2.js.map          |    2 +-
 .../amd/bin/test.js                           |    2 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/bin/outAndOutDirFile.js               |    2 +-
 .../amd/bin/outAndOutDirFile.js.map           |    2 +-
 .../amd/diskFile0.js.map                      |    2 +-
 .../amd/diskFile1.js                          |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/diskFile0.js.map                     |    2 +-
 .../node/diskFile1.js                         |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../amd/bin/test.js                           |    6 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/m1.js                                 |    2 +-
 .../amd/m1.js.map                             |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/m1.js                                |    2 +-
 .../node/m1.js.map                            |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/m1.js                   |    2 +-
 .../amd/outdir/simple/m1.js.map               |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/m1.js                  |    2 +-
 .../node/outdir/simple/m1.js.map              |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/ref/m1.js               |    2 +-
 .../amd/outdir/simple/ref/m1.js.map           |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/ref/m1.js              |    2 +-
 .../node/outdir/simple/ref/m1.js.map          |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/importHigher/root.js                  |    2 +-
 .../node/importHigher/root.js                 |    2 +-
 .../amd/maxDepthExceeded/built/root.js        |    2 +-
 .../node/maxDepthExceeded/built/root.js       |    2 +-
 .../amd/maxDepthIncreased/root.js             |    2 +-
 .../node/maxDepthIncreased/root.js            |    2 +-
 .../project/nonRelative/amd/consume.js        |    2 +-
 .../reference/project/nonRelative/amd/decl.js |    2 +-
 .../project/nonRelative/amd/lib/bar/a.js      |    2 +-
 .../project/nonRelative/amd/lib/foo/a.js      |    2 +-
 .../project/nonRelative/amd/lib/foo/b.js      |    2 +-
 .../project/nonRelative/node/consume.js       |    2 +-
 .../project/nonRelative/node/decl.js          |    2 +-
 .../project/nonRelative/node/lib/bar/a.js     |    2 +-
 .../project/nonRelative/node/lib/foo/a.js     |    2 +-
 .../project/nonRelative/node/lib/foo/b.js     |    2 +-
 .../outMixedSubfolderNoOutdir/amd/ref/m2.js   |    2 +-
 .../outMixedSubfolderNoOutdir/node/ref/m2.js  |    2 +-
 .../amd/outdir/simple/ref/m2.js               |    2 +-
 .../node/outdir/simple/ref/m2.js              |    2 +-
 .../amd/bin/test.js                           |    2 +-
 .../amd/bin/outAndOutDirFile.js               |    2 +-
 .../amd/diskFile0.js                          |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../outModuleMultifolderNoOutdir/amd/test.js  |    2 +-
 .../node/diskFile0.js                         |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../outModuleMultifolderNoOutdir/node/test.js |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../amd/bin/test.js                           |    6 +-
 .../project/outModuleSimpleNoOutdir/amd/m1.js |    2 +-
 .../outModuleSimpleNoOutdir/amd/test.js       |    2 +-
 .../outModuleSimpleNoOutdir/node/m1.js        |    2 +-
 .../outModuleSimpleNoOutdir/node/test.js      |    2 +-
 .../amd/outdir/simple/m1.js                   |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../node/outdir/simple/m1.js                  |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../outModuleSubfolderNoOutdir/amd/ref/m1.js  |    2 +-
 .../outModuleSubfolderNoOutdir/amd/test.js    |    2 +-
 .../outModuleSubfolderNoOutdir/node/ref/m1.js |    2 +-
 .../outModuleSubfolderNoOutdir/node/test.js   |    2 +-
 .../amd/outdir/simple/ref/m1.js               |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../node/outdir/simple/ref/m1.js              |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/ref/m2.js                             |    2 +-
 .../amd/ref/m2.js.map                         |    2 +-
 .../node/ref/m2.js                            |    2 +-
 .../node/ref/m2.js.map                        |    2 +-
 .../amd/outdir/simple/ref/m2.js               |    2 +-
 .../amd/outdir/simple/ref/m2.js.map           |    2 +-
 .../node/outdir/simple/ref/m2.js              |    2 +-
 .../node/outdir/simple/ref/m2.js.map          |    2 +-
 .../amd/bin/test.js                           |    2 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/bin/outAndOutDirFile.js               |    2 +-
 .../amd/bin/outAndOutDirFile.js.map           |    2 +-
 .../amd/diskFile0.js.map                      |    2 +-
 .../amd/diskFile1.js                          |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/diskFile0.js.map                     |    2 +-
 .../node/diskFile1.js                         |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../amd/bin/test.js                           |    6 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/m1.js                                 |    2 +-
 .../amd/m1.js.map                             |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/m1.js                                |    2 +-
 .../node/m1.js.map                            |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/m1.js                   |    2 +-
 .../amd/outdir/simple/m1.js.map               |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/m1.js                  |    2 +-
 .../node/outdir/simple/m1.js.map              |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/ref/m1.js               |    2 +-
 .../amd/outdir/simple/ref/m1.js.map           |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/ref/m1.js              |    2 +-
 .../node/outdir/simple/ref/m1.js.map          |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m2.js                             |    2 +-
 .../amd/ref/m2.js.map                         |    2 +-
 .../node/ref/m2.js                            |    2 +-
 .../node/ref/m2.js.map                        |    2 +-
 .../amd/outdir/simple/ref/m2.js               |    2 +-
 .../amd/outdir/simple/ref/m2.js.map           |    2 +-
 .../node/outdir/simple/ref/m2.js              |    2 +-
 .../node/outdir/simple/ref/m2.js.map          |    2 +-
 .../amd/bin/test.js                           |    2 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/bin/outAndOutDirFile.js               |    2 +-
 .../amd/bin/outAndOutDirFile.js.map           |    2 +-
 .../amd/diskFile0.js.map                      |    2 +-
 .../amd/diskFile1.js                          |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/diskFile0.js.map                     |    2 +-
 .../node/diskFile1.js                         |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../amd/bin/test.js                           |    6 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/m1.js                                 |    2 +-
 .../amd/m1.js.map                             |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/m1.js                                |    2 +-
 .../node/m1.js.map                            |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/m1.js                   |    2 +-
 .../amd/outdir/simple/m1.js.map               |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/m1.js                  |    2 +-
 .../node/outdir/simple/m1.js.map              |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/ref/m1.js               |    2 +-
 .../amd/outdir/simple/ref/m1.js.map           |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/ref/m1.js              |    2 +-
 .../node/outdir/simple/ref/m1.js.map          |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m2.js                             |    2 +-
 .../amd/ref/m2.js.map                         |    2 +-
 .../node/ref/m2.js                            |    2 +-
 .../node/ref/m2.js.map                        |    2 +-
 .../amd/outdir/simple/ref/m2.js               |    2 +-
 .../amd/outdir/simple/ref/m2.js.map           |    2 +-
 .../node/outdir/simple/ref/m2.js              |    2 +-
 .../node/outdir/simple/ref/m2.js.map          |    2 +-
 .../amd/bin/test.js                           |    2 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/bin/outAndOutDirFile.js               |    2 +-
 .../amd/bin/outAndOutDirFile.js.map           |    2 +-
 .../amd/diskFile0.js.map                      |    2 +-
 .../amd/diskFile1.js                          |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/diskFile0.js.map                     |    2 +-
 .../node/diskFile1.js                         |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../amd/bin/test.js                           |    6 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../sourcemapModuleSimpleNoOutdir/amd/m1.js   |    2 +-
 .../amd/m1.js.map                             |    2 +-
 .../sourcemapModuleSimpleNoOutdir/amd/test.js |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../sourcemapModuleSimpleNoOutdir/node/m1.js  |    2 +-
 .../node/m1.js.map                            |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/m1.js                   |    2 +-
 .../amd/outdir/simple/m1.js.map               |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/m1.js                  |    2 +-
 .../node/outdir/simple/m1.js.map              |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/ref/m1.js               |    2 +-
 .../amd/outdir/simple/ref/m1.js.map           |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/ref/m1.js              |    2 +-
 .../node/outdir/simple/ref/m1.js.map          |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m2.js                             |    2 +-
 .../amd/ref/m2.js.map                         |    2 +-
 .../node/ref/m2.js                            |    2 +-
 .../node/ref/m2.js.map                        |    2 +-
 .../amd/outdir/simple/ref/m2.js               |    2 +-
 .../amd/outdir/simple/ref/m2.js.map           |    2 +-
 .../node/outdir/simple/ref/m2.js              |    2 +-
 .../node/outdir/simple/ref/m2.js.map          |    2 +-
 .../amd/bin/test.js                           |    2 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/bin/outAndOutDirFile.js               |    2 +-
 .../amd/bin/outAndOutDirFile.js.map           |    2 +-
 .../amd/diskFile0.js.map                      |    2 +-
 .../amd/diskFile1.js                          |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/diskFile0.js.map                     |    2 +-
 .../node/diskFile1.js                         |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../outputdir_module_multifolder/ref/m1.js    |    2 +-
 .../ref/m1.js.map                             |    2 +-
 .../outputdir_module_multifolder/test.js      |    2 +-
 .../outputdir_module_multifolder/test.js.map  |    2 +-
 .../outputdir_module_multifolder_ref/m2.js    |    2 +-
 .../m2.js.map                                 |    2 +-
 .../amd/bin/test.js                           |    6 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/m1.js                                 |    2 +-
 .../amd/m1.js.map                             |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/m1.js                                |    2 +-
 .../node/m1.js.map                            |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/m1.js                   |    2 +-
 .../amd/outdir/simple/m1.js.map               |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/m1.js                  |    2 +-
 .../node/outdir/simple/m1.js.map              |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/ref/m1.js                             |    2 +-
 .../amd/ref/m1.js.map                         |    2 +-
 .../amd/test.js                               |    2 +-
 .../amd/test.js.map                           |    2 +-
 .../node/ref/m1.js                            |    2 +-
 .../node/ref/m1.js.map                        |    2 +-
 .../node/test.js                              |    2 +-
 .../node/test.js.map                          |    2 +-
 .../amd/outdir/simple/ref/m1.js               |    2 +-
 .../amd/outdir/simple/ref/m1.js.map           |    2 +-
 .../amd/outdir/simple/test.js                 |    2 +-
 .../amd/outdir/simple/test.js.map             |    2 +-
 .../node/outdir/simple/ref/m1.js              |    2 +-
 .../node/outdir/simple/ref/m1.js.map          |    2 +-
 .../node/outdir/simple/test.js                |    2 +-
 .../node/outdir/simple/test.js.map            |    2 +-
 .../amd/bin/test.js                           |    4 +-
 .../amd/bin/test.js.map                       |    2 +-
 .../amd/fs.js                                 |    2 +-
 .../node/fs.js                                |    2 +-
 .../propertyIdentityWithPrivacyMismatch.js    |    2 +-
 .../reference/reExportDefaultExport.js        |    4 +-
 .../baselines/reference/reExportUndefined2.js |    4 +-
 .../reactNamespaceImportPresevation.js        |    2 +-
 tests/baselines/reference/recursiveMods.js    |    2 +-
 .../reference/reexportClassDefinition.js      |    2 +-
 .../relativeNamesInClassicResolution.js       |    2 +-
 .../reference/relativePathMustResolve.js      |    2 +-
 .../relativePathToDeclarationFile.js          |    2 +-
 .../requireAsFunctionInExternalModule.js      |    6 +-
 .../reference/requireEmitSemicolon.js         |    4 +-
 tests/baselines/reference/reservedWords2.js   |    2 +-
 .../reference/reuseInnerModuleMember.js       |    2 +-
 tests/baselines/reference/scannerClass2.js    |    2 +-
 tests/baselines/reference/scannerEnum1.js     |    2 +-
 .../reference/shebangBeforeReferences.js      |    2 +-
 .../reference/shorthand-property-es6-amd.js   |    2 +-
 ...fExportedEntity01_targetES2015_CommonJS.js |    2 +-
 ...ndOfExportedEntity02_targetES5_CommonJS.js |    2 +-
 .../shorthandPropertyAssignmentInES6Module.js |    4 +-
 .../reference/sourceMapValidationImport.js    |    2 +-
 .../sourceMapValidationImport.js.map          |    2 +-
 .../sourceMapValidationImport.sourcemap.txt   |  128 +-
 .../reference/staticInstanceResolution3.js    |    4 +-
 .../reference/staticInstanceResolution5.js    |    4 +-
 ...dWithTypeParameterExtendsClauseDeclFile.js |    2 +-
 .../reference/topLevelAmbientModule.js        |    2 +-
 tests/baselines/reference/topLevelExports.js  |    2 +-
 .../baselines/reference/topLevelFileModule.js |    2 +-
 .../reference/topLevelFileModuleMissing.js    |    2 +-
 tests/baselines/reference/topLevelLambda4.js  |    2 +-
 .../topLevelModuleDeclarationAndFile.js       |    2 +-
 .../transformNestedGeneratorsWithTry.js       |    2 +-
 ...ata when transpile with CommonJS option.js |    2 +-
 .../Does not generate semantic diagnostics.js |    2 +-
 ...enerates expected syntactic diagnostics.js |    2 +-
 .../transpile/Generates module output.js      |    2 +-
 ...diagnostics for missing file references.js |    2 +-
 ...erates no diagnostics with valid inputs.js |    2 +-
 ...extra errors for file without extension.js |    2 +-
 .../transpile/Rename dependencies - AMD.js    |    2 +-
 .../transpile/Rename dependencies - UMD.js    |    2 +-
 .../Support options with lib values.js        |    2 +-
 .../Support options with types values.js      |    2 +-
 .../Supports backslashes in file name.js      |    2 +-
 .../transpile/Supports setting allowJs.js     |    2 +-
 ...ts setting allowSyntheticDefaultImports.js |    2 +-
 .../Supports setting allowUnreachableCode.js  |    2 +-
 .../Supports setting allowUnusedLabels.js     |    2 +-
 .../Supports setting alwaysStrict.js          |    2 +-
 .../transpile/Supports setting baseUrl.js     |    2 +-
 .../transpile/Supports setting charset.js     |    2 +-
 .../transpile/Supports setting declaration.js |    2 +-
 .../Supports setting declarationDir.js        |    2 +-
 .../transpile/Supports setting emitBOM.js     |    2 +-
 .../Supports setting emitDecoratorMetadata.js |    2 +-
 ...Supports setting experimentalDecorators.js |    2 +-
 ...etting forceConsistentCasingInFileNames.js |    2 +-
 .../Supports setting isolatedModules.js       |    2 +-
 .../transpile/Supports setting jsx.js         |    2 +-
 .../transpile/Supports setting jsxFactory.js  |    2 +-
 .../transpile/Supports setting lib.js         |    2 +-
 .../transpile/Supports setting locale.js      |    2 +-
 .../transpile/Supports setting module.js      |    2 +-
 .../Supports setting moduleResolution.js      |    2 +-
 .../transpile/Supports setting newLine.js     |    2 +-
 .../transpile/Supports setting noEmit.js      |    2 +-
 .../Supports setting noEmitHelpers.js         |    2 +-
 .../Supports setting noEmitOnError.js         |    2 +-
 .../Supports setting noErrorTruncation.js     |    2 +-
 ...orts setting noFallthroughCasesInSwitch.js |    2 +-
 .../Supports setting noImplicitAny.js         |    2 +-
 .../Supports setting noImplicitReturns.js     |    2 +-
 .../Supports setting noImplicitThis.js        |    2 +-
 .../Supports setting noImplicitUseStrict.js   |    2 +-
 .../transpile/Supports setting noLib.js       |    2 +-
 .../transpile/Supports setting noResolve.js   |    2 +-
 .../transpile/Supports setting out.js         |    2 +-
 .../transpile/Supports setting outDir.js      |    2 +-
 .../transpile/Supports setting outFile.js     |    2 +-
 .../transpile/Supports setting paths.js       |    2 +-
 .../Supports setting preserveConstEnums.js    |    2 +-
 .../Supports setting reactNamespace.js        |    2 +-
 .../Supports setting removeComments.js        |    2 +-
 .../transpile/Supports setting rootDir.js     |    2 +-
 .../transpile/Supports setting rootDirs.js    |    2 +-
 .../Supports setting skipDefaultLibCheck.js   |    2 +-
 .../Supports setting skipLibCheck.js          |    2 +-
 .../Supports setting strictNullChecks.js      |    2 +-
 .../Supports setting stripInternal.js         |    2 +-
 ...ts setting suppressExcessPropertyErrors.js |    2 +-
 ... setting suppressImplicitAnyIndexErrors.js |    2 +-
 .../transpile/Supports setting typeRoots.js   |    2 +-
 .../transpile/Supports setting types.js       |    2 +-
 .../transpile/Supports urls in file name.js   |    2 +-
 ... with emit decorators and emit metadata.js |    2 +-
 .../Uses correct newLine character.js         |    2 +-
 .../transpile/transpile .js files.js          |    2 +-
 ...anspile file as tsx if jsx is specified.js |    2 +-
 .../reference/tsxAttributeResolution10.js     |    2 +-
 .../reference/tsxAttributeResolution9.js      |    2 +-
 .../tsxCorrectlyParseLessThanComparison1.js   |    2 +-
 .../baselines/reference/tsxDefaultImports.js  |    4 +-
 .../baselines/reference/tsxDynamicTagName5.js |    2 +-
 .../baselines/reference/tsxDynamicTagName7.js |    2 +-
 .../baselines/reference/tsxDynamicTagName8.js |    2 +-
 .../baselines/reference/tsxDynamicTagName9.js |    2 +-
 .../reference/tsxElementResolution17.js       |    2 +-
 .../reference/tsxElementResolution19.js       |    4 +-
 .../reference/tsxExternalModuleEmit1.js       |    4 +-
 .../reference/tsxExternalModuleEmit2.js       |    2 +-
 tests/baselines/reference/tsxPreserveEmit1.js |    2 +-
 tests/baselines/reference/tsxReactEmit5.js    |    2 +-
 .../tsxStatelessFunctionComponents2.js        |    2 +-
 .../tsxStatelessFunctionComponents3.js        |    2 +-
 .../reference/tsxUnionTypeComponent1.js       |    2 +-
 .../reference/tsxUnionTypeComponent2.js       |    2 +-
 ...pressionWithUndefinedCallResolutionData.js |    4 +-
 .../reference/typeGuardsAsAssertions.js       |    2 +-
 .../reference/typeGuardsInExternalModule.js   |    2 +-
 .../reference/typeInferenceLiteralUnion.js    |    2 +-
 ...rameterCompatibilityAccrossDeclarations.js |    2 +-
 .../reference/typePredicateInLoop.js          |    2 +-
 .../reference/typeReferenceDirectives7.js     |    2 +-
 .../reference/typeReferenceDirectives8.js     |    4 +-
 .../reference/typeReferenceDirectives9.js     |    6 +-
 tests/baselines/reference/typeResolution.js   |    2 +-
 .../baselines/reference/typeResolution.js.map |    2 +-
 .../reference/typeResolution.sourcemap.txt    | 1180 ++++++++---------
 ...RootsFromMultipleNodeModulesDirectories.js |    2 +-
 ...peRootsFromNodeModulesInParentDirectory.js |    2 +-
 .../reference/typeUsedAsValueError2.js        |    2 +-
 .../reference/typeofANonExportedType.js       |    2 +-
 .../reference/typeofAmbientExternalModules.js |    4 +-
 .../reference/typeofAnExportedType.js         |    2 +-
 .../reference/typeofExternalModules.js        |    4 +-
 ...typesOnlyExternalModuleStillHasInstance.js |    2 +-
 tests/baselines/reference/typingsLookup4.js   |    4 +-
 .../baselines/reference/umd-augmentation-1.js |    2 +-
 .../baselines/reference/umd-augmentation-3.js |    2 +-
 tests/baselines/reference/umd3.js             |    2 +-
 tests/baselines/reference/umd4.js             |    2 +-
 tests/baselines/reference/umd5.js             |    2 +-
 tests/baselines/reference/umd8.js             |    2 +-
 .../reference/umdDependencyComment2.js        |    2 +-
 .../reference/umdDependencyCommentName1.js    |    2 +-
 .../reference/umdDependencyCommentName2.js    |    2 +-
 .../reference/unclosedExportClause01.js       |   10 +-
 .../reference/unclosedExportClause02.js       |   10 +-
 .../reference/undeclaredModuleError.js        |    2 +-
 .../reference/untypedModuleImport.js          |    6 +-
 .../reference/untypedModuleImport_allowJs.js  |    2 +-
 .../untypedModuleImport_vsAmbient.js          |    2 +-
 .../untypedModuleImport_withAugmentation.js   |    2 +-
 .../reference/unusedImportDeclaration.js      |    2 +-
 tests/baselines/reference/unusedImports1.js   |    2 +-
 tests/baselines/reference/unusedImports11.js  |    4 +-
 tests/baselines/reference/unusedImports12.js  |    2 +-
 tests/baselines/reference/unusedImports13.js  |    2 +-
 tests/baselines/reference/unusedImports14.js  |    2 +-
 tests/baselines/reference/unusedImports15.js  |    2 +-
 tests/baselines/reference/unusedImports16.js  |    2 +-
 tests/baselines/reference/unusedImports2.js   |    4 +-
 tests/baselines/reference/unusedImports3.js   |    4 +-
 tests/baselines/reference/unusedImports4.js   |    4 +-
 tests/baselines/reference/unusedImports5.js   |    4 +-
 tests/baselines/reference/unusedImports6.js   |    2 +-
 tests/baselines/reference/unusedImports7.js   |    2 +-
 tests/baselines/reference/unusedImports8.js   |    4 +-
 tests/baselines/reference/unusedImports9.js   |    2 +-
 .../reference/unusedLocalsAndObjectSpread2.js |    2 +-
 .../reference/unusedLocalsAndParameters.js    |    2 +-
 .../unusedLocalsAndParametersDeferred.js      |    2 +-
 ...edLocalsAndParametersOverloadSignatures.js |    2 +-
 .../unusedLocalsAndParametersTypeAliases.js   |    2 +-
 .../unusedLocalsAndParametersTypeAliases2.js  |    2 +-
 .../reference/unusedVariablesinModules1.js    |    2 +-
 .../useStrictLikePrologueString01.js          |    2 +-
 .../reference/varArgsOnConstructorTypes.js    |    2 +-
 .../visibilityOfCrossModuleTypeUsage.js       |    2 +-
 .../reference/visibilityOfTypeParameters.js   |    2 +-
 .../reference/voidAsNonAmbiguousReturnType.js |    4 +-
 tests/baselines/reference/withExportDecl.js   |    2 +-
 tests/baselines/reference/withImportDecl.js   |    4 +-
 1529 files changed, 2994 insertions(+), 3000 deletions(-)

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index cdd3380b3b7..bf963bdc0e5 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/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
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 37383082983..0315fd516b5 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/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;
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index cc57b184960..57ebd64c4e2 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/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;
diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js
index d97acbdc14f..77f0a07c1df 100644
--- a/tests/baselines/reference/APISample_parseConfig.js
+++ b/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;
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index 1156d643354..0716e59edb7 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/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;
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index d877071a228..f4400ccda4c 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/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;
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
index 8fa171ed05a..a68614c0ed4 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
@@ -31,6 +31,7 @@ export module A {
 
 //// [part1.js]
 "use strict";
+exports.__esModule = true;
 var A;
 (function (A) {
     var Utils;
@@ -42,9 +43,9 @@ var A;
     })(Utils = A.Utils || (A.Utils = {}));
     A.Origin = { x: 0, y: 0 };
 })(A = exports.A || (exports.A = {}));
-exports.__esModule = true;
 //// [part2.js]
 "use strict";
+exports.__esModule = true;
 var A;
 (function (A) {
     // collision with 'Origin' var in other part of merged module
@@ -61,4 +62,3 @@ var A;
         Utils.Plane = Plane;
     })(Utils = A.Utils || (A.Utils = {}));
 })(A = exports.A || (exports.A = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js
index 84e20daa7c7..c21fe575e76 100644
--- a/tests/baselines/reference/aliasAssignments.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js
index 8fbeaf78d95..d3d312e53bb 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
index 03888704e70..883cbb84ee3 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/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 });
diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js
index 5be50e00f30..1ccbc958aec 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js
index 0f15ecda6ac..de661ae803e 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index 8c61ddeefb8..2ca49ea8dfc 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index acd4dd1f533..81084b8b92f 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index 10dcc50083c..6f4adfae58c 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index 07dea7ea22d..178ccaaee23 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index 509797bd260..5ac28396fba 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index e5c7af13078..a85d61fd34c 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js
index b86051d7b19..168567eb80f 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.js
+++ b/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;
diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
index 9cc8372a0bb..58565bbb916 100644
--- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
+++ b/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;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js
index dceecdd4001..a659eb60151 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.js
+++ b/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;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.js b/tests/baselines/reference/allowSyntheticDefaultImports10.js
index 09e80cc799f..ad3ed5715c0 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports10.js
+++ b/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;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js
index 69bfedadc49..762c032b812 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports4.js
+++ b/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;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.js b/tests/baselines/reference/allowSyntheticDefaultImports9.js
index a455f0e7570..2d8ab463d83 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports9.js
+++ b/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;
diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js
index 7ca68d85000..dcaafdfeee6 100644
--- a/tests/baselines/reference/alwaysStrictModule4.js
+++ b/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;
diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js
index 161e341ba79..cd97b55b67b 100644
--- a/tests/baselines/reference/alwaysStrictModule6.js
+++ b/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 });
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js
index 7f8741d3baf..dfff030b78f 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.js
+++ b/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;
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js
index fac34990e5e..84088d11d4e 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.js
+++ b/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;
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.js b/tests/baselines/reference/ambientExternalModuleMerging.js
index 0dddb3a307c..6c2de62c90a 100644
--- a/tests/baselines/reference/ambientExternalModuleMerging.js
+++ b/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]
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
index 537c765a482..9efd9e4ada9 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
index 692c5707332..98d3d46912a 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js
index 5dd15c8e0ef..a7513e7eb58 100644
--- a/tests/baselines/reference/ambientShorthand.js
+++ b/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;
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
index 6818cca28d3..6842d0f7554 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/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;
diff --git a/tests/baselines/reference/amdDependencyComment1.js b/tests/baselines/reference/amdDependencyComment1.js
index 1c5594ea7c3..6be26909f3a 100644
--- a/tests/baselines/reference/amdDependencyComment1.js
+++ b/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;
diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js
index db87e4e9422..222093cf159 100644
--- a/tests/baselines/reference/amdDependencyComment2.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js
index e886d4b1579..d0e4d73fb7a 100644
--- a/tests/baselines/reference/amdDependencyCommentName1.js
+++ b/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;
diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js
index bb2fc9a2389..c39902371a0 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js
index dafbe2463f9..f842ad0cbf8 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.js
+++ b/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();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
index d82eab0d12f..6542aa14fa2 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js
index b1275322069..7819c0c7205 100644
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index 7f75124dba7..651ae7a6d39 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.js b/tests/baselines/reference/anonymousDefaultExportsAmd.js
index a3b8b7cd98a..24e833b7542 100644
--- a/tests/baselines/reference/anonymousDefaultExportsAmd.js
+++ b/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 });
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
index dbfdfd0f420..e22000856d6 100644
--- a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
+++ b/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 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js
index a8984434c9c..484238b8722 100644
--- a/tests/baselines/reference/anonymousDefaultExportsUmd.js
+++ b/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 });
 });
diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js
index b19fa3ca14c..3a43f328f35 100644
--- a/tests/baselines/reference/asOperator4.js
+++ b/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;
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
index 06b9fd14682..bd05f90a26e 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
+++ b/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 });
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index 25a771ffbfb..550f0d2357e 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/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 });
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js
index b3fa2c4b491..6b84f5615b3 100644
--- a/tests/baselines/reference/asyncImportedPromise_es6.js
+++ b/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 });
diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js
index ef176ac90da..7b0bfcf7335 100644
--- a/tests/baselines/reference/augmentExportEquals1.js
+++ b/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
 });
diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js
index 1e094701f79..51bc67e7fa4 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.js
+++ b/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
 });
diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js
index fe55906b657..efdce1bc0cf 100644
--- a/tests/baselines/reference/augmentExportEquals2.js
+++ b/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
 });
diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js
index 5b80ef1d512..322ab3b36bf 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.js
+++ b/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
 });
diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js
index 3e12c9968d2..387ef86ff79 100644
--- a/tests/baselines/reference/augmentExportEquals3.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js
index 9fd08cb8f7f..e91ca4498dd 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js
index 1a83e86f3fc..37be30731de 100644
--- a/tests/baselines/reference/augmentExportEquals4.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js
index e039e7dcda6..71d39aedb1f 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js
index ee26ddda90e..7bc5102ca9d 100644
--- a/tests/baselines/reference/augmentExportEquals5.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js
index 2db5bc66e3c..4299f8653dd 100644
--- a/tests/baselines/reference/augmentExportEquals6.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentExportEquals6_1.js b/tests/baselines/reference/augmentExportEquals6_1.js
index 6ba35346109..e69728a766b 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js
index 32111846162..0a8b7404bd1 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/cacheResolutions.js b/tests/baselines/reference/cacheResolutions.js
index 1c8c6ec0168..6b28c90e321 100644
--- a/tests/baselines/reference/cacheResolutions.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js
index 3af2cc7a5f9..8fcdd501707 100644
--- a/tests/baselines/reference/chainedImportAlias.js
+++ b/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;
diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js
index 8d3419f1db6..198a886f026 100644
--- a/tests/baselines/reference/circularReference.js
+++ b/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;
diff --git a/tests/baselines/reference/circularReferenceInImport.js b/tests/baselines/reference/circularReferenceInImport.js
index 28f43fa7985..8b49f45dbd2 100644
--- a/tests/baselines/reference/circularReferenceInImport.js
+++ b/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]
diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js
index 298395a232c..8ba50dcee1c 100644
--- a/tests/baselines/reference/classAbstractManyKeywords.js
+++ b/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;
diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js
index 8a648cc62cd..933f92cad64 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/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 });
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
index ce46e75bed8..d4df05f2ea3 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
+++ b/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;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
index 890d2bbd500..76835e757e0 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js
index b6d3159b0f9..487553bb004 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
index cbe0104ebce..1a16f4a2d5f 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
index b931a6210cf..0e717b01d3b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
index 5d462fb1ce2..050799d4c2b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
index 045e7dcb796..2eb5ea74f92 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
index a75732a65ba..8454248845a 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js
index ca16128e9cd..0bc56b97cf1 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.js
+++ b/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 () {
diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js
index d6fb21ba60a..4bb6614ffe7 100644
--- a/tests/baselines/reference/collisionExportsRequireAndEnum.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js
index 7e538d462b2..1da8cf29d66 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
index 7ac6ba06ed6..9cb3c4e797e 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js
index d1ca4d3a75c..42820955004 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.js
+++ b/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;
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
index ba1926dd965..b9552c16223 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js
index 9c7a24b176f..9a20472ea68 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.js
+++ b/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;
diff --git a/tests/baselines/reference/commentOnExportEnumDeclaration.js b/tests/baselines/reference/commentOnExportEnumDeclaration.js
index 33ea3d7fcfb..353b70f4d3c 100644
--- a/tests/baselines/reference/commentOnExportEnumDeclaration.js
+++ b/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;
diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js
index cdba9542f54..1c1df104039 100644
--- a/tests/baselines/reference/commentsDottedModuleName.js
+++ b/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 });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index 57cc701941a..39002f90d91 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/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 });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
index 6ee40426994..d06c588425f 100644
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ b/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 });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index ee48cfde328..81e90a159d5 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/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]
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js
index 2c26b93b82d..25dd8a90780 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.js
+++ b/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 });
 });
 
 
diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js
index 6feff1bd813..eee05c80493 100644
--- a/tests/baselines/reference/commentsOnRequireStatement.js
+++ b/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 });
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index c1d2a303d7a..ee2846d4a60 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/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;
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index 1f37d83c815..5ac0e3fcc64 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/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;
diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js
index f1ec275cf73..ef6e97f4d5e 100644
--- a/tests/baselines/reference/commonSourceDir5.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js
index d52fde52cf2..071953afcdc 100644
--- a/tests/baselines/reference/commonSourceDir6.js
+++ b/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;
 });
diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js
index 08e628cac2a..5569ae6d52b 100644
--- a/tests/baselines/reference/commonSourceDirectory.js
+++ b/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]
diff --git a/tests/baselines/reference/commonSourceDirectory.js.map b/tests/baselines/reference/commonSourceDirectory.js.map
index 8e3f925eee9..fd88719859b 100644
--- a/tests/baselines/reference/commonSourceDirectory.js.map
+++ b/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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
index 5675c05e34b..c880d2d0059 100644
--- a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
+++ b/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
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js
index e49192dbe2f..249edeceddd 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js
+++ b/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]
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js.map b/tests/baselines/reference/commonSourceDirectory_dts.js.map
index b33518dd04c..552da577884 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js.map
+++ b/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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
index ccbbc89465d..925a3d30ed4 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
+++ b/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
\ No newline at end of file
diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js
index da7c5710610..e7a251e9cee 100644
--- a/tests/baselines/reference/commonjsSafeImport.js
+++ b/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]
diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js
index 5c665a52cb3..4408d64acbf 100644
--- a/tests/baselines/reference/complexNarrowingWithAny.js
+++ b/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;
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 9c7c78ad626..f02b9611541 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/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 });
 });
diff --git a/tests/baselines/reference/constEnumExternalModule.js b/tests/baselines/reference/constEnumExternalModule.js
index e658dc17347..8ea5625ac07 100644
--- a/tests/baselines/reference/constEnumExternalModule.js
+++ b/tests/baselines/reference/constEnumExternalModule.js
@@ -18,6 +18,6 @@ define(["require", "exports"], function (require, exports) {
 //// [m2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var v = 100 /* V */;
     exports.__esModule = true;
+    var v = 100 /* V */;
 });
diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.js b/tests/baselines/reference/controlFlowBinaryOrExpression.js
index 8b65f916dfa..752479cf4e9 100644
--- a/tests/baselines/reference/controlFlowBinaryOrExpression.js
+++ b/tests/baselines/reference/controlFlowBinaryOrExpression.js
@@ -38,6 +38,7 @@ if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
 
 //// [controlFlowBinaryOrExpression.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var cond;
 (x = "") || (x = 0);
@@ -55,4 +56,3 @@ if (isHTMLCollection(sourceObj)) {
 if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
     sourceObj.length;
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.js b/tests/baselines/reference/controlFlowPropertyDeclarations.js
index be61fc2c75a..27fce9a9a12 100644
--- a/tests/baselines/reference/controlFlowPropertyDeclarations.js
+++ b/tests/baselines/reference/controlFlowPropertyDeclarations.js
@@ -151,6 +151,7 @@ export class StyleParser {
 //// [controlFlowPropertyDeclarations.js]
 // Repro from ##8913
 "use strict";
+exports.__esModule = true;
 var HTMLDOMPropertyConfig = require('react/lib/HTMLDOMPropertyConfig');
 // Populate property map with ReactJS's attribute and property mappings
 // TODO handle/use .Properties value eg: MUST_USE_PROPERTY is not HTML attr
@@ -289,4 +290,3 @@ var StyleParser = (function () {
     return StyleParser;
 }());
 exports.StyleParser = StyleParser;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
index d1422112fff..0a7eff198ff 100644
--- a/tests/baselines/reference/controlFlowSelfReferentialLoop.js
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
@@ -104,6 +104,7 @@ export default md5;
 //// [controlFlowSelfReferentialLoop.js]
 // Repro from #12319
 "use strict";
+exports.__esModule = true;
 function md5(string) {
     function FF(a, b, c, d, x, s, ac) {
         return 0;
@@ -204,4 +205,3 @@ function md5(string) {
     }
 }
 exports["default"] = md5;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js
index 7fa40a63a10..f7c1ac602dd 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.js
+++ b/tests/baselines/reference/copyrightWithNewLine1.js
@@ -15,9 +15,9 @@ greeter.start();
 ****************************/
 define(["require", "exports", "./greeter"], function (require, exports, model) {
     "use strict";
+    exports.__esModule = true;
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
     greeter.start();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js
index 4b31d599713..0f479c3db7f 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.js
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.js
@@ -11,9 +11,9 @@ greeter.start();
 //// [copyrightWithoutNewLine1.js]
 define(["require", "exports", "./greeter"], function (require, exports, model) {
     "use strict";
+    exports.__esModule = true;
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
     greeter.start();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
index 67eba038d46..d555d3f3bca 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
@@ -15,6 +15,7 @@ export var compileServer = task<number, number, any>(<P0, P1, P2>() => {
 //// [crashIntypeCheckInvocationExpression.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var nake;
     function doCompile(fileset, moduleType) {
         return undefined;
@@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) {
         var folder = path.join(), fileset = nake.fileSetSync(folder);
         return doCompile(fileset, moduleType);
     });
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
index 48fe4dad45f..a115e7ab0a3 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
@@ -11,6 +11,7 @@ export class BuildWorkspaceService {
 //// [crashIntypeCheckObjectCreationExpression.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var BuildWorkspaceService = (function () {
         function BuildWorkspaceService() {
         }
@@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) {
         return BuildWorkspaceService;
     }());
     exports.BuildWorkspaceService = BuildWorkspaceService;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
index b0cc0c8fbaa..64a99bb8438 100644
--- a/tests/baselines/reference/declFileAccessors.js
+++ b/tests/baselines/reference/declFileAccessors.js
@@ -103,6 +103,7 @@ class c2 {
 
 //// [declFileAccessors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** This is comment for c1*/
 var c1 = (function () {
     function c1() {
@@ -185,7 +186,6 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileAccessors_1.js]
 /** This is comment for c2 - the global class*/
 var c2 = (function () {
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
index f89863a3029..56b8992811b 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
@@ -10,18 +10,18 @@ import foo = require("./declFileAliasUseBeforeDeclaration_foo");
 
 //// [declFileAliasUseBeforeDeclaration_foo.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
 //// [declFileAliasUseBeforeDeclaration_test.js]
 "use strict";
+exports.__esModule = true;
 function bar(a) { }
 exports.bar = bar;
-exports.__esModule = true;
 
 
 //// [declFileAliasUseBeforeDeclaration_foo.d.ts]
diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
index 218157185af..ee1964415c9 100644
--- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
+++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
@@ -8,6 +8,7 @@ export class Enhancement {
 
 //// [declFileClassWithStaticMethodReturningConstructor.js]
 "use strict";
+exports.__esModule = true;
 var Enhancement = (function () {
     function Enhancement() {
     }
@@ -17,7 +18,6 @@ var Enhancement = (function () {
     return Enhancement;
 }());
 exports.Enhancement = Enhancement;
-exports.__esModule = true;
 
 
 //// [declFileClassWithStaticMethodReturningConstructor.d.ts]
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
index 87cf77e733e..214620193b7 100644
--- a/tests/baselines/reference/declFileConstructors.js
+++ b/tests/baselines/reference/declFileConstructors.js
@@ -99,6 +99,7 @@ class GlobalConstructorWithParameterInitializer {
 
 //// [declFileConstructors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SimpleConstructor = (function () {
     /** This comment should appear for foo*/
     function SimpleConstructor() {
@@ -162,7 +163,6 @@ var ConstructorWithParameterInitializer = (function () {
     return ConstructorWithParameterInitializer;
 }());
 exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileConstructors_1.js]
 var GlobalSimpleConstructor = (function () {
     /** This comment should appear for foo*/
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
index e9d140ae2e2..1caa9207193 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
@@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) {
 //// [declFileExportAssignmentOfGenericInterface_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x.a;
     exports.__esModule = true;
+    exports.x.a;
 });
 
 
diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js
index a03fa43afff..2af2103b62a 100644
--- a/tests/baselines/reference/declFileExportImportChain.js
+++ b/tests/baselines/reference/declFileExportImportChain.js
@@ -44,8 +44,8 @@ define(["require", "exports"], function (require, exports) {
 //// [declFileExportImportChain_b.js]
 define(["require", "exports", "declFileExportImportChain_a"], function (require, exports, a) {
     "use strict";
-    exports.a = a;
     exports.__esModule = true;
+    exports.a = a;
 });
 //// [declFileExportImportChain_b1.js]
 define(["require", "exports", "declFileExportImportChain_b"], function (require, exports, b) {
@@ -55,8 +55,8 @@ define(["require", "exports", "declFileExportImportChain_b"], function (require,
 //// [declFileExportImportChain_c.js]
 define(["require", "exports", "declFileExportImportChain_b1"], function (require, exports, b1) {
     "use strict";
-    exports.b1 = b1;
     exports.__esModule = true;
+    exports.b1 = b1;
 });
 //// [declFileExportImportChain_d.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js
index c7feeec7e8c..70478fdf430 100644
--- a/tests/baselines/reference/declFileExportImportChain2.js
+++ b/tests/baselines/reference/declFileExportImportChain2.js
@@ -46,8 +46,8 @@ define(["require", "exports", "declFileExportImportChain2_a"], function (require
 //// [declFileExportImportChain2_c.js]
 define(["require", "exports", "declFileExportImportChain2_b"], function (require, exports, b) {
     "use strict";
-    exports.b = b;
     exports.__esModule = true;
+    exports.b = b;
 });
 //// [declFileExportImportChain2_d.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js
index 0bb2c7dfe55..809f01878d4 100644
--- a/tests/baselines/reference/declFileForExportedImport.js
+++ b/tests/baselines/reference/declFileForExportedImport.js
@@ -16,12 +16,12 @@ var z = b.x;
 exports.__esModule = true;
 //// [declFileForExportedImport_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='declFileForExportedImport_0.ts'/>
 exports.a = require("./declFileForExportedImport_0");
 var y = exports.a.x;
 exports.b = exports.a;
 var z = exports.b.x;
-exports.__esModule = true;
 
 
 //// [declFileForExportedImport_0.d.ts]
diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js
index c93dee4e30e..f62b7772b41 100644
--- a/tests/baselines/reference/declFileFunctions.js
+++ b/tests/baselines/reference/declFileFunctions.js
@@ -79,6 +79,7 @@ function globalfooWithOverloads(a: any): any {
 
 //// [declFileFunctions_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** This comment should appear for foo*/
 function foo() {
 }
@@ -145,7 +146,6 @@ function nonExportedFooWithRestParameters(a) {
 function nonExportedFooWithOverloads(a) {
     return a;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileFunctions_1.js]
 /** This comment should appear for foo*/
 function globalfoo() {
diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js
index ab3fc63f450..f56abaf6b97 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -51,6 +51,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C;
 (function (C) {
     var A = (function () {
@@ -102,7 +103,6 @@ var h = (function (_super) {
 }(C.A));
 exports.h = h;
 exports.j = C.F6;
-exports.__esModule = true;
 
 
 //// [declFileGenericType.d.ts]
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
index d1d9589e8c7..110539774df 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
@@ -32,11 +32,11 @@ var m2;
 module.exports = m2;
 //// [declFileImportModuleWithExportAssignment_1.js]
 "use strict";
+exports.__esModule = true;
 /**This is on import declaration*/
 var a1 = require("./declFileImportModuleWithExportAssignment_0");
 exports.a = a1;
 exports.a.test1(null, null, null);
-exports.__esModule = true;
 
 
 //// [declFileImportModuleWithExportAssignment_0.d.ts]
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
index dee10473f2c..61e2bfab700 100644
--- a/tests/baselines/reference/declFileMethods.js
+++ b/tests/baselines/reference/declFileMethods.js
@@ -192,6 +192,7 @@ interface I2 {
 
 //// [declFileMethods_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c1 = (function () {
     function c1() {
     }
@@ -274,7 +275,6 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileMethods_1.js]
 var c2 = (function () {
     function c2() {
diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
index 35a861a6046..698622a8650 100644
--- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
+++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
@@ -38,6 +38,7 @@ export class C4 {
 
 //// [declarationEmitClassMemberNameConflict.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C1 = (function () {
     function C1() {
     }
@@ -91,7 +92,6 @@ var C4 = (function () {
     return C4;
 }());
 exports.C4 = C4;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitClassMemberNameConflict.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js
index 5557ff71020..223376ef8ff 100644
--- a/tests/baselines/reference/declarationEmitExportAssignment.js
+++ b/tests/baselines/reference/declarationEmitExportAssignment.js
@@ -12,11 +12,11 @@ export = foo;
 
 //// [utils.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
 var utils_1 = require("./utils");
diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js
index e019203030e..57c39b95e64 100644
--- a/tests/baselines/reference/declarationEmitExportDeclaration.js
+++ b/tests/baselines/reference/declarationEmitExportDeclaration.js
@@ -15,18 +15,18 @@ export {bar};
 
 //// [utils.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("./utils");
 exports.bar = utils_1.bar;
 utils_1.foo();
 var obj;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [utils.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
index a1e3aac8823..a02eac46dba 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -55,6 +55,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var ExportedClass = (function () {
     function ExportedClass() {
     }
@@ -104,4 +105,3 @@ var MyClass4 = (function (_super) {
     return MyClass4;
 }(getExportedClass(undefined)));
 exports.MyClass4 = MyClass4;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
index 87141cfb699..08208c2435d 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
@@ -6,11 +6,11 @@ export function f(x: any): x is number {
 
 //// [declarationEmitIdentifierPredicates01.js]
 "use strict";
+exports.__esModule = true;
 function f(x) {
     return typeof x === "number";
 }
 exports.f = f;
-exports.__esModule = true;
 
 
 //// [declarationEmitIdentifierPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
index f20654d508c..5829e9b4427 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
@@ -10,8 +10,8 @@ export function f(x: any): x is I {
 
 //// [declarationEmitIdentifierPredicatesWithPrivateName01.js]
 "use strict";
+exports.__esModule = true;
 function f(x) {
     return typeof x.a === "number";
 }
 exports.f = f;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
index 55500652830..608f172cd1f 100644
--- a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
+++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
@@ -9,13 +9,13 @@ export default {
 
 //// [declarationEmitInferedDefaultExportType.js]
 "use strict";
+exports.__esModule = true;
 // test.ts
 exports["default"] = {
     foo: [],
     bar: undefined,
     baz: null
 };
-exports.__esModule = true;
 
 
 //// [declarationEmitInferedDefaultExportType.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
index dca7f142dc9..4e41c8558c6 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
@@ -14,15 +14,15 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
index 9228b766d3f..601026ab6f3 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
@@ -17,19 +17,19 @@ export { v, bar }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
 function bar() {
     return v;
 }
 exports.bar = bar;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
index 8b2783a73fd..30df7e38b01 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
@@ -14,15 +14,15 @@ export default x;
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var x = "hi" || 5;
 exports["default"] = x;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
index 3020721dfc8..24f2a52c5d8 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
@@ -13,14 +13,14 @@ export { v }
 
 //// [0.js]
 "use strict";
-var obj = true;
 exports.__esModule = true;
+var obj = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 //let v2: Z.Data;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
index c7be3aca6b4..5b14a3738e4 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
@@ -14,15 +14,15 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
index 2177a17efa5..9a9b1247e24 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
@@ -11,13 +11,13 @@ export { v }
 
 //// [0.js]
 "use strict";
-var obj = true;
 exports.__esModule = true;
+var obj = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
index 70560f5a54d..cddb4630740 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
@@ -9,12 +9,12 @@ export function returnSomeGlobalValue() {
 
 //// [declarationEmitInferedTypeAlias9.js]
 "use strict";
+exports.__esModule = true;
 var x;
 function returnSomeGlobalValue() {
     return x;
 }
 exports.returnSomeGlobalValue = returnSomeGlobalValue;
-exports.__esModule = true;
 
 
 //// [declarationEmitInferedTypeAlias9.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInvalidExport.js b/tests/baselines/reference/declarationEmitInvalidExport.js
index 4188b673b0b..d4280cd00c6 100644
--- a/tests/baselines/reference/declarationEmitInvalidExport.js
+++ b/tests/baselines/reference/declarationEmitInvalidExport.js
@@ -9,7 +9,7 @@ export type MyClass = typeof myClass;
 
 //// [declarationEmitInvalidExport.js]
 "use strict";
+exports.__esModule = true;
 if (false) {
     export var myClass = 0;
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js
index 08747bbe198..5440f3d3584 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts.js
@@ -63,6 +63,7 @@ var f;
 module.exports = f;
 //// [declarationEmit_nameConflicts_0.js]
 "use strict";
+exports.__esModule = true;
 var im = require("./declarationEmit_nameConflicts_1");
 var M;
 (function (M) {
@@ -129,7 +130,6 @@ var M;
         })(N = Q.N || (Q.N = {}));
     })(Q = M.Q || (M.Q = {}));
 })(M = exports.M || (exports.M = {}));
-exports.__esModule = true;
 
 
 //// [declarationEmit_nameConflicts_1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
index e5c10ab3484..4b4aca4f4b2 100644
--- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
+++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
@@ -8,10 +8,10 @@ export module M {
 
 //// [declarationEmitNameConflictsWithAlias.js]
 "use strict";
+exports.__esModule = true;
 var M;
 (function (M) {
 })(M = exports.M || (exports.M = {}));
-exports.__esModule = true;
 
 
 //// [declarationEmitNameConflictsWithAlias.d.ts]
diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js
index 4f56ad91864..7444a956a2a 100644
--- a/tests/baselines/reference/declarationEmitPromise.js
+++ b/tests/baselines/reference/declarationEmitPromise.js
@@ -32,6 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class bluebird {
 }
 exports.bluebird = bluebird;
@@ -53,7 +54,6 @@ function runSampleBreaks(a, b, c, d, e) {
     });
 }
 exports.runSampleBreaks = runSampleBreaks;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitPromise.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js
index 2845a120b74..e95a7db05ed 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -38,7 +39,6 @@ var D = (function (_super) {
     return D;
 }(C));
 exports.D = D;
-exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js
index b9a81b2fb8e..0e7c99df1f3 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates02.js
@@ -15,13 +15,13 @@ export const obj = {
 
 //// [declarationEmitThisPredicates02.js]
 "use strict";
+exports.__esModule = true;
 exports.obj = {
     m: function () {
         var dis = this;
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
-exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates02.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
index 16ae267bc3c..a0f611d2d29 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -37,4 +38,3 @@ var D = (function (_super) {
     }
     return D;
 }(C));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
index fcc373ccbe8..7ec7ba5dec8 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
@@ -15,10 +15,10 @@ export const obj = {
 
 //// [declarationEmitThisPredicatesWithPrivateName02.js]
 "use strict";
+exports.__esModule = true;
 exports.obj = {
     m: function () {
         var dis = this;
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
index 303959f5504..84b55a9792f 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
@@ -6,8 +6,8 @@ export const y = (x: Foo<string>) => 1
 
 //// [declarationEmitTypeAliasWithTypeParameters1.js]
 "use strict";
-exports.y = function (x) { return 1; };
 exports.__esModule = true;
+exports.y = function (x) { return 1; };
 
 
 //// [declarationEmitTypeAliasWithTypeParameters1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
index 52f696a9448..1bb6beac9e1 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
@@ -7,8 +7,8 @@ export const y = (x: Baa<number>) => 1
 
 //// [declarationEmitTypeAliasWithTypeParameters2.js]
 "use strict";
-exports.y = function (x) { return 1; };
 exports.__esModule = true;
+exports.y = function (x) { return 1; };
 
 
 //// [declarationEmitTypeAliasWithTypeParameters2.d.ts]
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
index e6ef1234c3a..28997a75496 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
@@ -12,7 +12,7 @@ function foo() {
 
 //// [declarationEmitTypeAliasWithTypeParameters5.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     return {};
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitUnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js
index 686ed8dce2c..1ac1e934578 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport.js
@@ -5,6 +5,6 @@ export {Foo}
 
 //// [declarationEmitUnknownImport.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = SomeNonExistingName;
 exports.Foo = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js
index 10b8b1b9886..1f291312913 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport2.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport2.js
@@ -5,7 +5,7 @@ export default Foo
 
 //// [declarationEmitUnknownImport2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = From;
 './Foo'; // Syntax error
 exports.default = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js
index a08b36e2781..64a6cf2d849 100644
--- a/tests/baselines/reference/declarationMerging2.js
+++ b/tests/baselines/reference/declarationMerging2.js
@@ -18,6 +18,7 @@ declare module "./a" {
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
index d0e8504713d..b624c11e79d 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
@@ -14,6 +14,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 let Testing123 = Testing123_1 = class Testing123 {
 };
 Testing123.prop1 = Testing123_1.prop0;
@@ -22,4 +23,3 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
index 3e24af5f427..978d8f18402 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
@@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 let Testing123 = Testing123_1 = class Testing123 {
 };
 Testing123 = Testing123_1 = __decorate([
@@ -20,4 +21,3 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
index bf5e9e5dcfc..dadaa5ed6df 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
@@ -22,6 +22,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let Foo = class Foo {
     };
@@ -29,7 +30,6 @@ define(["require", "exports"], function (require, exports) {
         decorator
     ], Foo);
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -40,6 +40,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let default_1 = class {
     };
@@ -47,5 +48,4 @@ define(["require", "exports"], function (require, exports) {
         decorator
     ], default_1);
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
index fe62d15c27f..f6c7b7cbc8b 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
@@ -21,6 +21,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
 let Foo = class Foo {
 };
@@ -28,7 +29,6 @@ Foo = __decorate([
     decorator
 ], Foo);
 exports.default = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -37,6 +37,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
 let default_1 = class {
 };
@@ -44,4 +45,3 @@ default_1 = __decorate([
     decorator
 ], default_1);
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
index e6f4773df7d..beb5fa26755 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
@@ -30,6 +30,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let Foo = class Foo {
     };
@@ -37,7 +38,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
         decorator
     ], Foo);
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -56,6 +56,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let default_1 = class {
     };
@@ -63,5 +64,4 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
         decorator
     ], default_1);
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index 8c4bb8c1266..22e4a448f1e 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -23,9 +23,9 @@ class Wat {
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // from #3108
 exports.test = 'abc';
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -34,6 +34,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 function filter(handler) {
     return function (target, propertyKey) {
@@ -51,4 +52,3 @@ var Wat = (function () {
 __decorate([
     filter(function () { return a_1.test == 'abc'; })
 ], Wat, "whatever", null);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index 50dbe2cafdc..9998ae3d08a 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -20,13 +20,13 @@ class MyComponent {
 
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Service = (function () {
     function Service() {
     }
     return Service;
 }());
 exports.default = Service;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [component.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -38,6 +38,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var service_1 = require("./service");
 var MyComponent = (function () {
     function MyComponent(Service) {
@@ -57,4 +58,3 @@ MyComponent = __decorate([
     decorator,
     __metadata("design:paramtypes", [service_1.default])
 ], MyComponent);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js
index 653bc911ed4..6f247637729 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.js
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js
@@ -19,6 +19,7 @@ export class B {
 
 //// [decoratorMetadataOnInferredType.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
         console.log('new A');
@@ -38,4 +39,3 @@ __decorate([
     __metadata("design:type", Object)
 ], B.prototype, "x", void 0);
 exports.B = B;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
index 9cbc514d932..a65ba5b2f73 100644
--- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
+++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
@@ -42,31 +42,31 @@ export class ClassA {
 
 //// [aux.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass = (function () {
     function SomeClass() {
     }
     return SomeClass;
 }());
 exports.SomeClass = SomeClass;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass1 = (function () {
     function SomeClass1() {
     }
     return SomeClass1;
 }());
 exports.SomeClass1 = SomeClass1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass2 = (function () {
     function SomeClass2() {
     }
     return SomeClass2;
 }());
 exports.SomeClass2 = SomeClass2;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -78,6 +78,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var aux_1 = require("./aux");
 var aux1_1 = require("./aux1");
 function annotation() {
@@ -113,4 +114,3 @@ ClassA = __decorate([
     __metadata("design:paramtypes", [aux_1.SomeClass])
 ], ClassA);
 exports.ClassA = ClassA;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
index 91c3814774c..10aa42ddce7 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
@@ -19,6 +19,7 @@ export class B {
 
 //// [decoratorMetadataWithConstructorType.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
         console.log('new A');
@@ -38,4 +39,3 @@ __decorate([
     __metadata("design:type", A)
 ], B.prototype, "x", void 0);
 exports.B = B;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index e2cd357f14a..b0e23a78971 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index 19c8bafa4c1..f03190cff0c 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index 63177201f1d..c1eca081527 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 1979adf9c82..7d78cf7adbe 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db"); // error no default export
 function someDecorator(target) {
     return target;
@@ -53,4 +54,3 @@ MyClass = __decorate([
 ], MyClass);
 exports.MyClass = MyClass;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index f3f82342fad..3f7069902ce 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.default = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 34f63af38ea..66eb30dc710 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.default = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 4b0d77b9d2f..1dd09c3a177 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.default = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index a587baf1d05..830e6bc80ee 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var database = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [database.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index 6ec7a58da66..77020e7cb77 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var C = (function () {
     function C() {
     }
@@ -22,4 +23,3 @@ C = __decorate([
     dec
 ], C);
 exports.C = C;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
index 0e289d51c71..2af3b0426dc 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -16,6 +16,7 @@ export class C  extends base{
 
 //// [0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var base = (function () {
     function base() {
     }
@@ -24,7 +25,6 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -46,6 +46,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var _0_ts_1 = require("./0.ts");
 var _0_ts_2 = require("./0.ts");
 var C = (function (_super) {
@@ -59,4 +60,3 @@ C = __decorate([
     __param(0, _0_ts_2.foo)
 ], C);
 exports.C = C;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
index 518ddee0a81..4ed401284a9 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -18,6 +18,7 @@ export class C  extends base{
 
 //// [0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var base = (function () {
     function base() {
     }
@@ -26,7 +27,6 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -48,6 +48,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var _0_1 = require("./0");
 var _0_2 = require("./0");
 /* Comment on the Class Declaration */
@@ -62,4 +63,3 @@ C = __decorate([
     __param(0, _0_2.foo)
 ], C);
 exports.C = C;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index cba3d6e115c..6a31461fe3c 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -23,9 +23,9 @@ import x from './a';
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     const x = new Promise((resolve, reject) => { resolve({}); });
     exports.default = x;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -46,11 +46,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     const a_1 = require("./a");
     (function () {
         return __awaiter(this, void 0, void 0, function* () {
             const value = yield a_1.default;
         });
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index ea597359a03..565cfb41617 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -14,9 +14,9 @@ import x from './a';
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const x = new Promise((resolve, reject) => { resolve({}); });
 exports.default = x;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -27,10 +27,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const a_1 = require("./a");
 (function () {
     return __awaiter(this, void 0, void 0, function* () {
         const value = yield a_1.default;
     });
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js
index d74cc416e28..a273b891679 100644
--- a/tests/baselines/reference/defaultExportWithOverloads01.js
+++ b/tests/baselines/reference/defaultExportWithOverloads01.js
@@ -7,6 +7,7 @@ export default function f(...args: any[]) {
 
 //// [defaultExportWithOverloads01.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -14,4 +15,3 @@ function f() {
     }
 }
 exports.default = f;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js
index bd186fa279d..aaadfaefebb 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.js
@@ -32,6 +32,7 @@ Entity.y;
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Decl() {
     return 0;
 }
@@ -41,13 +42,12 @@ var Decl;
     Decl.x = 10;
     Decl.y = 20;
 })(Decl = exports.Decl || (exports.Decl = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
 var y;
 m1_1.default.x;
 m1_1.default.y;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index 7b26a1aa59f..b83d54548ca 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -27,19 +27,19 @@ var sum = z.p1 + z.p2
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Decl = (function () {
     function Decl() {
     }
     return Decl;
 }());
 exports.default = Decl;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
 var y;
 var z = new m1_1.default();
 var sum = z.p1 + z.p2;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js
index 1b2e53f0304..254723ec5f1 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -27,19 +27,19 @@ var sum = z.p1 + z.p2
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Decl = (function () {
     function Decl() {
     }
     return Decl;
 }());
 exports.default = Decl;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
 var y;
 var z = new m1_1.default();
 var sum = z.p1 + z.p2;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js
index baade857296..38ab4861c62 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge04.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge04.js
@@ -15,10 +15,10 @@ export interface Foo {
 
 //// [defaultExportsCannotMerge04.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Foo() {
 }
 exports.default = Foo;
 var Foo;
 (function (Foo) {
 })(Foo || (Foo = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js
index 214522a56c8..c5037364b00 100644
--- a/tests/baselines/reference/defaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js
@@ -10,15 +10,15 @@ export default function foo() {}
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function foo() { }
     exports.default = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
index c31174a5acd..051ab7bbf03 100644
--- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
@@ -9,12 +9,12 @@ export default function foo() {}
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class Foo {
 }
 exports.default = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.default = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js
index 8eb92f872bb..5417b9b9a96 100644
--- a/tests/baselines/reference/defaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js
@@ -18,10 +18,10 @@ export default function foo() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 (function (factory) {
@@ -34,7 +34,7 @@ export default function foo() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function foo() { }
     exports.default = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js
index fd2f277c71a..285cfbcda16 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.js
+++ b/tests/baselines/reference/dependencyViaImportAlias.js
@@ -13,13 +13,13 @@ export = A;
 //// [A.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [B.js]
 define(["require", "exports", "A"], function (require, exports, a) {
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js
index 37eed711067..a7645ceabe9 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations1.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js
@@ -7,8 +7,8 @@ export let { toString } = 1;
 
 //// [destructuringInVariableDeclarations1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.toString = (1).toString;
 {
     let { toFixed } = 1;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.js b/tests/baselines/reference/destructuringInVariableDeclarations2.js
index 21f272d22a6..43a2f740c94 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations2.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations2.js
@@ -8,8 +8,8 @@ export {};
 
 //// [destructuringInVariableDeclarations2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let { toString } = 1;
 {
     let { toFixed } = 1;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js
index 11e242da1a2..2522a704e18 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations3.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js
@@ -8,9 +8,9 @@ export let { toString } = 1;
 //// [destructuringInVariableDeclarations3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.toString = (1).toString;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.js b/tests/baselines/reference/destructuringInVariableDeclarations4.js
index 0f25ca3827f..867417cf01f 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations4.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations4.js
@@ -9,9 +9,9 @@ export {};
 //// [destructuringInVariableDeclarations4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     let { toString } = 1;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js
index 6c799d10803..20a094a0375 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations5.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js
@@ -16,9 +16,9 @@ export let { toString } = 1;
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.toString = (1).toString;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js
index fcdefe72df6..583a2cd1f1d 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations6.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js
@@ -17,9 +17,9 @@ export {};
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     let { toString } = 1;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js
index b1983c82d15..324c0cd9293 100644
--- a/tests/baselines/reference/downlevelLetConst13.js
+++ b/tests/baselines/reference/downlevelLetConst13.js
@@ -21,6 +21,7 @@ export module M {
 
 //// [downlevelLetConst13.js]
 'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
 // exported let\const bindings should not be renamed
 exports.foo = 10;
 exports.bar = "123";
@@ -37,4 +38,3 @@ var M;
     M.bar7 = { a: 1 }.a;
     M.bar8 = { a: 1 }.a;
 })(M = exports.M || (exports.M = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index c348443fb29..0deb672456c 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -347,6 +347,7 @@ export var tests: TestRunner = (function () {
 
 //// [duplicateLocalVariable1.js]
 "use strict";
+exports.__esModule = true;
 / /;
 commonjs;
 var TestFileDir = ".\\TempTestFiles";
@@ -636,4 +637,3 @@ exports.tests = (function () {
     }, "Codepoint at index: 3 has control value: 8"));
     return testRunner;
 })();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js
index 3e89e88fd3c..2962e544b9b 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -38,6 +38,7 @@ export var tests: TestRunner = (function () {
 //// [duplicateLocalVariable2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TestCase = (function () {
         function TestCase(name, test, errorMessageRegEx) {
             this.name = name;
@@ -77,5 +78,4 @@ define(["require", "exports"], function (require, exports) {
         }));
         return testRunner;
     })();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index 05af7a2bac8..5f5590e2b41 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -68,6 +68,7 @@ export interface D { }
 //// [duplicateSymbolsExportMatching.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // Should report error only once for instantiated module
     var M;
     (function (M) {
@@ -103,5 +104,4 @@ define(["require", "exports"], function (require, exports) {
             var t;
         })(C = M.C || (M.C = {}));
     })(M || (M = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js
index 9fc3f440414..2c94e692dd0 100644
--- a/tests/baselines/reference/dynamicModuleTypecheckError.js
+++ b/tests/baselines/reference/dynamicModuleTypecheckError.js
@@ -10,8 +10,8 @@ for(var i = 0; i < 30; i++) {
 
 //// [dynamicModuleTypecheckError.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 for (var i = 0; i < 30; i++) {
     exports.x = i * 1000; // should not be an error here
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js
index ee6fbd2b07f..f878c5044ea 100644
--- a/tests/baselines/reference/elidingImportNames.js
+++ b/tests/baselines/reference/elidingImportNames.js
@@ -17,17 +17,17 @@ export var main = 10;
 
 //// [elidingImportNames_main.js]
 "use strict";
-exports.main = 10;
 exports.__esModule = true;
+exports.main = 10;
 //// [elidingImportNames_main1.js]
 "use strict";
-exports.main = 10;
 exports.__esModule = true;
+exports.main = 10;
 //// [elidingImportNames_test.js]
 "use strict";
+exports.__esModule = true;
 var a = require("./elidingImportNames_main"); // alias used in typeof
 var b = a;
 var x;
 var a2 = require("./elidingImportNames_main1"); // alias not used in typeof
 var b2 = a2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js
index e8915e406af..d98359d94bb 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var A = require("");
 var B = (function (_super) {
     __extends(B, _super);
@@ -23,4 +24,3 @@ var B = (function (_super) {
     }
     return B;
 }(A));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js
index 9125b5126b2..2a1865d3ccd 100644
--- a/tests/baselines/reference/enumFromExternalModule.js
+++ b/tests/baselines/reference/enumFromExternalModule.js
@@ -12,14 +12,14 @@ var x = f.Mode.Open;
 
 //// [enumFromExternalModule_0.js]
 "use strict";
+exports.__esModule = true;
 var Mode;
 (function (Mode) {
     Mode[Mode["Open"] = 0] = "Open";
 })(Mode = exports.Mode || (exports.Mode = {}));
-exports.__esModule = true;
 //// [enumFromExternalModule_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='enumFromExternalModule_0.ts'/>
 var f = require("./enumFromExternalModule_0");
 var x = f.Mode.Open;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js
index 52d144c1e49..15ae0c90bd1 100644
--- a/tests/baselines/reference/errorsOnImportedSymbol.js
+++ b/tests/baselines/reference/errorsOnImportedSymbol.js
@@ -20,6 +20,6 @@ var y = Sammy.Sammy();
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [errorsOnImportedSymbol_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var x = new Sammy.Sammy();
 var y = Sammy.Sammy();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index 0ad02c848fd..d3bb3d006e5 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -16,6 +16,7 @@ assert(Foo.CONSTANT === "Foo");
 
 //// [es3defaultAliasQuoted_file0.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -28,9 +29,8 @@ function assert(value) {
         throw new Error("Assertion failed!");
 }
 exports["default"] = assert;
-exports.__esModule = true;
 //// [es3defaultAliasQuoted_file1.js]
 "use strict";
+exports.__esModule = true;
 var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0");
 es3defaultAliasQuoted_file0_1["default"](es3defaultAliasQuoted_file0_1.Foo.CONSTANT === "Foo");
-exports.__esModule = true;
diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js
index 72c954b02f2..8ebcfb01be6 100644
--- a/tests/baselines/reference/es5-commonjs.js
+++ b/tests/baselines/reference/es5-commonjs.js
@@ -16,6 +16,7 @@ export default class A
 
 //// [es5-commonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -25,4 +26,3 @@ var A = (function () {
     return A;
 }());
 exports.default = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs2.js b/tests/baselines/reference/es5-commonjs2.js
index ce15d3a5ce4..2c38edef6ae 100644
--- a/tests/baselines/reference/es5-commonjs2.js
+++ b/tests/baselines/reference/es5-commonjs2.js
@@ -5,5 +5,5 @@ export default 1;
 
 //// [es5-commonjs2.js]
 "use strict";
-exports.default = 1;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = 1;
diff --git a/tests/baselines/reference/es5-commonjs3.js b/tests/baselines/reference/es5-commonjs3.js
index 5fc9462b955..15c11b189a3 100644
--- a/tests/baselines/reference/es5-commonjs3.js
+++ b/tests/baselines/reference/es5-commonjs3.js
@@ -6,6 +6,6 @@ export var __esModule = 1;
 
 //// [es5-commonjs3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "test";
 exports.__esModule = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js
index bf28e064500..d2530d1bdf2 100644
--- a/tests/baselines/reference/es5-commonjs4.js
+++ b/tests/baselines/reference/es5-commonjs4.js
@@ -17,6 +17,7 @@ export var __esModule = 1;
 
 //// [es5-commonjs4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -27,4 +28,3 @@ var A = (function () {
 }());
 exports.default = A;
 exports.__esModule = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js
index 93a0ed94a5c..bbc9bbba7c2 100644
--- a/tests/baselines/reference/es5-commonjs5.js
+++ b/tests/baselines/reference/es5-commonjs5.js
@@ -7,8 +7,8 @@ export default function () {
 
 //// [es5-commonjs5.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function default_1() {
     return "test";
 }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs6.js b/tests/baselines/reference/es5-commonjs6.js
index 33015271d7a..87d2f7d62a6 100644
--- a/tests/baselines/reference/es5-commonjs6.js
+++ b/tests/baselines/reference/es5-commonjs6.js
@@ -6,6 +6,6 @@ var __esModule = 1;
 
 //// [es5-commonjs6.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "test";
 var __esModule = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
index 5bb6f87e4e5..f62c861b7c9 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
@@ -19,6 +19,7 @@ export declare function __generator(body: Function): any;
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 function foo() {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -28,7 +29,6 @@ function foo() {
     });
 }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js
index 6f129f5e58d..b55422ca7b1 100644
--- a/tests/baselines/reference/es5-umd2.js
+++ b/tests/baselines/reference/es5-umd2.js
@@ -25,6 +25,7 @@ export class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -34,5 +35,4 @@ export class A
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js
index 1291c739fcb..37b19ece1ac 100644
--- a/tests/baselines/reference/es5-umd3.js
+++ b/tests/baselines/reference/es5-umd3.js
@@ -25,6 +25,7 @@ export default class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -34,5 +35,4 @@ export default class A
         return A;
     }());
     exports.default = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
index f6817129fb3..25a1db0a25f 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
@@ -7,6 +7,7 @@ export default class C {
 
 //// [es5ExportDefaultClassDeclaration.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C = (function () {
     function C() {
     }
@@ -14,7 +15,6 @@ var C = (function () {
     return C;
 }());
 exports.default = C;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
index 5cf3405c437..931eab75c72 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
@@ -7,6 +7,7 @@ export default class {
 
 //// [es5ExportDefaultClassDeclaration2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var default_1 = (function () {
     function default_1() {
     }
@@ -14,7 +15,6 @@ var default_1 = (function () {
     return default_1;
 }());
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
index d28148d1416..927536114ef 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
@@ -16,6 +16,7 @@ var t: typeof C = C;
 
 //// [es5ExportDefaultClassDeclaration3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var before = new C();
 var C = (function () {
     function C() {
@@ -28,7 +29,6 @@ var C = (function () {
 exports.default = C;
 var after = new C();
 var t = C;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultExpression.js b/tests/baselines/reference/es5ExportDefaultExpression.js
index 6ebab2a4b0d..0821543134c 100644
--- a/tests/baselines/reference/es5ExportDefaultExpression.js
+++ b/tests/baselines/reference/es5ExportDefaultExpression.js
@@ -5,8 +5,8 @@ export default (1 + 2);
 
 //// [es5ExportDefaultExpression.js]
 "use strict";
-exports.default = (1 + 2);
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (1 + 2);
 
 
 //// [es5ExportDefaultExpression.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
index 1060607886a..068a966faa2 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
@@ -5,9 +5,9 @@ export default function f() { }
 
 //// [es5ExportDefaultFunctionDeclaration.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() { }
 exports.default = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
index 13f9e014be6..ab44c4cb584 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
@@ -5,9 +5,9 @@ export default function () { }
 
 //// [es5ExportDefaultFunctionDeclaration2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function default_1() { }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
index 47ed66880e6..c4bbcd4373e 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
@@ -10,13 +10,13 @@ var after: typeof func = func();
 
 //// [es5ExportDefaultFunctionDeclaration3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var before = func();
 function func() {
     return func;
 }
 exports.default = func;
 var after = func();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js
index 1102eab997d..d60fba590ac 100644
--- a/tests/baselines/reference/es5ExportDefaultIdentifier.js
+++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js
@@ -7,10 +7,10 @@ export default f;
 
 //// [es5ExportDefaultIdentifier.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() { }
 exports.f = f;
 exports.default = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultIdentifier.d.ts]
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index 28516a541f5..abc81b3dc94 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -39,6 +39,7 @@ import M3 from "M3";
 //// [es5ModuleInternalNamedImports.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var M;
     (function (M) {
         // variable
@@ -65,5 +66,4 @@ define(["require", "exports"], function (require, exports) {
         // alias
         M.M_A = M_M;
     })(M = exports.M || (exports.M = {}));
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
index 02774139add..dc55545617d 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
@@ -14,6 +14,7 @@ export class A
 //// [es5ModuleWithModuleGenAmd.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
index 4c58c0bd20f..93056203f9b 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es5ModuleWithModuleGenCommonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -22,4 +23,3 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
index 4479259a523..89d11045dda 100644
--- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es5ModuleWithoutModuleGenTarget.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -22,4 +23,3 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js
index 6f1d083ebe8..c0707b869cc 100644
--- a/tests/baselines/reference/es6-umd2.js
+++ b/tests/baselines/reference/es6-umd2.js
@@ -24,6 +24,7 @@ export class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class A {
         constructor() {
         }
@@ -32,5 +33,4 @@ export class A
         }
     }
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js
index 80d31b41695..91910ba2616 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.js
+++ b/tests/baselines/reference/es6ExportAllInEs5.js
@@ -18,6 +18,7 @@ export * from "./server";
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -29,14 +30,13 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("./server"));
 Object.defineProperty(exports, "__esModule", { value: true });
+__export(require("./server"));
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js
index 98940523143..3d3625aad18 100644
--- a/tests/baselines/reference/es6ExportClauseInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseInEs5.js
@@ -18,6 +18,7 @@ export { x };
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -32,7 +33,6 @@ var m;
 exports.instantiatedModule = m;
 var x = 10;
 exports.x = x;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
index f1cb97ad0f6..d8aa8e607e3 100644
--- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
@@ -19,6 +19,7 @@ export { foo, baz, baz as quux, buzz, bizz };
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var foo = 2;
 exports.foo = foo;
 exports.foo = foo = 3;
@@ -34,4 +35,3 @@ exports.bizz = bizz;
 exports.bizz = bizz += 1; // compiles to exports.bizz = bizz += 1
 exports.bizz = bizz -= 1; // similarly
 exports.bizz = ++bizz; // compiles to exports.bizz = ++bizz
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index 5891de57310..ecfccd5d843 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -22,6 +22,7 @@ export { x } from "./server";
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -33,9 +34,9 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.c = server_1.c;
 var server_2 = require("./server");
@@ -44,7 +45,6 @@ var server_3 = require("./server");
 exports.instantiatedModule = server_3.m;
 var server_4 = require("./server");
 exports.x = server_4.x;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index c84c76839ee..d1f8de5faa7 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -213,6 +213,7 @@ export * from "class-module";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 var z2 = require("variable");
 var z3 = require("interface-variable");
 var z4 = require("module");
@@ -304,4 +305,3 @@ __export(require("function"));
 __export(require("function-module"));
 __export(require("class"));
 __export(require("class-module"));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index 035a8c0be25..977b94f8790 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -14,15 +14,15 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import
 //// [es6ImportDefaultBindingAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = 10;
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [es6ImportDefaultBindingAmd_1.js]
 define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) {
     "use strict";
-    var x = es6ImportDefaultBindingAmd_0_1.default;
     Object.defineProperty(exports, "__esModule", { value: true });
+    var x = es6ImportDefaultBindingAmd_0_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index 6f4836a6680..94b824a3766 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -13,18 +13,18 @@ import defaultBinding2 from "./server"; // elide this import since defaultBindin
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
     return c;
 }());
 exports.default = c;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x = new server_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
index 66be06536f0..8335a1953de 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
@@ -24,13 +24,14 @@ var x1: number = m;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
 exports.default = {};
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_1.a;
 const es6ImportDefaultBindingFollowedWithNamedImport_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
@@ -42,7 +43,6 @@ const es6ImportDefaultBindingFollowedWithNamedImport_0_4 = require("./es6ImportD
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_4.x;
 const es6ImportDefaultBindingFollowedWithNamedImport_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_5.m;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index 4712a432503..8eb76b487f8 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -22,11 +22,12 @@ var x: number = defaultBinding6;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default;
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
@@ -39,7 +40,6 @@ var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6Imp
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default;
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index 5d2518bb774..d72751c7610 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -22,11 +22,12 @@ export var x1: number = defaultBinding6;
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x1 = server_1.default;
 var server_2 = require("./server");
@@ -39,7 +40,6 @@ var server_5 = require("./server");
 exports.x1 = server_5.default;
 var server_6 = require("./server");
 exports.x1 = server_6.default;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
index 0556d872480..5bf268709d3 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
@@ -26,6 +26,7 @@ export var x6 = new m();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
@@ -62,9 +63,9 @@ var x11 = (function () {
     return x11;
 }());
 exports.x11 = x11;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.x1 = new server_1.a();
 var server_2 = require("./server");
@@ -76,7 +77,6 @@ var server_4 = require("./server");
 exports.x3 = new server_4.x11();
 var server_5 = require("./server");
 exports.x6 = new server_5.m();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index f52c590f44e..307dcc92f46 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -21,15 +21,16 @@ export var x6 = new defaultBinding6();
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = (function () {
     function a() {
     }
     return a;
 }());
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x1 = new server_1.default();
 var server_2 = require("./server");
@@ -42,7 +43,6 @@ var server_5 = require("./server");
 exports.x5 = new server_5.default();
 var server_6 = require("./server");
 exports.x6 = new server_6.default();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
index dcc2ec2c785..2e9d8104a39 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
@@ -23,12 +23,13 @@ var x1: number = m;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a;
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
@@ -40,7 +41,6 @@ var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("./es6Impo
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x;
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
index 247c64c3e7f..77266084bda 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
@@ -25,22 +25,22 @@ export var x1: number = m;
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
     exports.default = {};
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x1 = server_1.a;
     exports.x1 = server_2.a;
     exports.x1 = server_3.x;
     exports.x1 = server_3.a;
     exports.x1 = server_4.x;
     exports.x1 = server_5.m;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index db922cb2200..c1c41968934 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -11,14 +11,14 @@ var x: number = defaultBinding;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index fbd045e81de..b82fb9aeee9 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -12,15 +12,15 @@ export var x: number = defaultBinding;
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = 10;
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
-    exports.x = server_1.default;
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = server_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index 8b430e2cf46..8d033c69536 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -10,18 +10,18 @@ export var x = new nameSpaceBinding.a();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
     return a;
 }());
 exports.a = a;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.a();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 09caf0db18a..c488db3e88e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -12,19 +12,19 @@ export var x = new defaultBinding();
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = (function () {
         function a() {
         }
         return a;
     }());
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
-    exports.x = new server_1.default();
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = new server_1.default();
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 92e3fe0a33f..0db21dfd064 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -10,13 +10,13 @@ var x: number = nameSpaceBinding.a;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = nameSpaceBinding.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index 0b5670b18a9..96720294a8a 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -10,13 +10,13 @@ export var x: number = nameSpaceBinding.a;
 
 //// [server.js]
 "use strict";
-exports.a = 10;
 exports.__esModule = true;
+exports.a = 10;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = nameSpaceBinding.a;
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index b9f73ac47eb..4c51a54462d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -18,12 +18,12 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould
 
 //// [es6ImportDefaultBindingMergeErrors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingMergeErrors_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0");
 var x = es6ImportDefaultBindingMergeErrors_0_1.default;
 var defaultBinding2 = "hello world";
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
index 265be908b85..e294c08befa 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
@@ -10,8 +10,8 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0";
 
 //// [es6ImportDefaultBindingNoDefaultProperty_0.js]
 "use strict";
-exports.a = 10;
 exports.__esModule = true;
+exports.a = 10;
 //// [es6ImportDefaultBindingNoDefaultProperty_1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index 6ea0812d40b..a9f760f1278 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -13,15 +13,15 @@ export import defaultBinding2 from "server"; // non referenced
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = 10;
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
-    exports.x = server_1.default;
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = server_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 510750edc50..b5296d15f9b 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this
 
 //// [es6ImportNameSpaceImport_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNameSpaceImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const nameSpaceBinding = require("./es6ImportNameSpaceImport_0");
 var x = nameSpaceBinding.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNameSpaceImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
index ea240338316..200f49a2986 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
@@ -13,14 +13,14 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi
 //// [es6ImportNameSpaceImportAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.a = 10;
     exports.__esModule = true;
+    exports.a = 10;
 });
 //// [es6ImportNameSpaceImportAmd_1.js]
 define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) {
     "use strict";
-    var x = nameSpaceBinding.a;
     exports.__esModule = true;
+    var x = nameSpaceBinding.a;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index 20b9d3af20b..cae90885ce2 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -11,6 +11,7 @@ import * as nameSpaceBinding2 from "./server"; // unreferenced
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var c = (function () {
     function c() {
     }
@@ -18,12 +19,11 @@ var c = (function () {
 }());
 exports.c = c;
 ;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index 88bf937c69c..ee00df9a2cc 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide
 
 //// [es6ImportNameSpaceImportInEs5_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNameSpaceImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0");
 var x = nameSpaceBinding.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNameSpaceImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
index 696659cb1f7..39594102007 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
@@ -17,9 +17,9 @@ var nameSpaceBinding3 = 10;
 
 //// [es6ImportNameSpaceImportMergeErrors_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNameSpaceImportMergeErrors_1.js]
 "use strict";
-var nameSpaceBinding3 = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+var nameSpaceBinding3 = 10;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
index 1663d7ec923..3c8b40f550e 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
@@ -13,14 +13,14 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.a = 10;
     exports.__esModule = true;
+    exports.a = 10;
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) {
     "use strict";
-    exports.x = nameSpaceBinding.a;
     exports.__esModule = true;
+    exports.x = nameSpaceBinding.a;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index 9719305e62b..a9fcb861ec5 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImport_0";
 
 //// [es6ImportNamedImport_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -51,9 +52,9 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0");
 var xxxx = es6ImportNamedImport_0_1.a;
 const es6ImportNamedImport_0_2 = require("./es6ImportNamedImport_0");
@@ -75,7 +76,6 @@ const es6ImportNamedImport_0_8 = require("./es6ImportNamedImport_0");
 var z111 = es6ImportNamedImport_0_8.z1;
 const es6ImportNamedImport_0_9 = require("./es6ImportNamedImport_0");
 var z2 = es6ImportNamedImport_0_9.z2; // z2 shouldn't give redeclare error
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNamedImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js
index 31582223c52..bd6213f259f 100644
--- a/tests/baselines/reference/es6ImportNamedImportAmd.js
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.js
@@ -44,6 +44,7 @@ import { aaaa as bbbb } from "es6ImportNamedImportAmd_0";
 //// [es6ImportNamedImportAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
@@ -52,11 +53,11 @@ define(["require", "exports"], function (require, exports) {
     exports.z1 = 10;
     exports.z2 = 10;
     exports.aaaa = 10;
-    exports.__esModule = true;
 });
 //// [es6ImportNamedImportAmd_1.js]
 define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, es6ImportNamedImportAmd_0_1, es6ImportNamedImportAmd_0_2, es6ImportNamedImportAmd_0_3, es6ImportNamedImportAmd_0_4, es6ImportNamedImportAmd_0_5, es6ImportNamedImportAmd_0_6, es6ImportNamedImportAmd_0_7, es6ImportNamedImportAmd_0_8, es6ImportNamedImportAmd_0_9) {
     "use strict";
+    exports.__esModule = true;
     var xxxx = es6ImportNamedImportAmd_0_1.a;
     var xxxx = es6ImportNamedImportAmd_0_2.a;
     var xxxx = es6ImportNamedImportAmd_0_3.x;
@@ -69,7 +70,6 @@ define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImport
     var xxxx = es6ImportNamedImportAmd_0_7.x1;
     var z111 = es6ImportNamedImportAmd_0_8.z1;
     var z2 = es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js
index f8fdf461644..d68ffd794a7 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportNamedImportDts.js
@@ -48,6 +48,7 @@ import { aaaa1 as bbbb } from "./server";
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
@@ -132,9 +133,9 @@ var aaaa1 = (function () {
     return aaaa1;
 }());
 exports.aaaa1 = aaaa1;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.xxxx = new server_1.a();
 var server_2 = require("./server");
@@ -156,7 +157,6 @@ var server_8 = require("./server");
 exports.z111 = new server_8.z1();
 var server_9 = require("./server");
 exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index 5c6f3573c7f..9e025dca61b 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0";
 
 //// [es6ImportNamedImportInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -51,9 +52,9 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_1.a;
 var es6ImportNamedImportInEs5_0_2 = require("./es6ImportNamedImportInEs5_0");
@@ -75,7 +76,6 @@ var es6ImportNamedImportInEs5_0_8 = require("./es6ImportNamedImportInEs5_0");
 var z111 = es6ImportNamedImportInEs5_0_8.z1;
 var es6ImportNamedImportInEs5_0_9 = require("./es6ImportNamedImportInEs5_0");
 var z2 = es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
index 0743f1658b4..d64b517c50f 100644
--- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
@@ -10,8 +10,8 @@ export = a;
 
 //// [es6ImportNamedImportInExportAssignment_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNamedImportInExportAssignment_1.js]
 "use strict";
 const es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
index ce878ca0216..38cda17bd7e 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
@@ -14,6 +14,7 @@ export = x;
 
 //// [es6ImportNamedImportInIndirectExportAssignment_0.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var c = (function () {
@@ -23,7 +24,6 @@ var a;
     }());
     a.c = c;
 })(a = exports.a || (exports.a = {}));
-exports.__esModule = true;
 //// [es6ImportNamedImportInIndirectExportAssignment_1.js]
 "use strict";
 var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
index 11bd3b73a9e..261039bcc10 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
@@ -22,13 +22,13 @@ import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be erro
 
 //// [es6ImportNamedImportMergeErrors_0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
 exports.z = exports.a;
 exports.z1 = exports.a;
-exports.__esModule = true;
 //// [es6ImportNamedImportMergeErrors_1.js]
 "use strict";
+exports.__esModule = true;
 var x = 10;
 var x44 = 10;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
index 87f3c1d5d07..4e78df34b6d 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
@@ -11,9 +11,9 @@ import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
 
 //// [es6ImportNamedImportNoExportMember_0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
-exports.__esModule = true;
 //// [es6ImportNamedImport_1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js
index 7377f737e47..13e2d40144b 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js
@@ -42,6 +42,7 @@ export import { aaaa as bbbb } from "./server";
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -50,9 +51,9 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.xxxx = server_1.a;
 var server_2 = require("./server");
@@ -74,7 +75,6 @@ var server_8 = require("./server");
 exports.z111 = server_8.z1;
 var server_9 = require("./server");
 exports.z2 = server_9.z2; // z2 shouldn't give redeclare error
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index 1bbab226ae8..0aa3214e5d7 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -22,6 +22,7 @@ export var cVal = new C();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
         this.prop = "hello";
@@ -36,12 +37,11 @@ var C2 = (function () {
     return C2;
 }());
 exports.C2 = C2;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 exports.cVal = new server_1.C();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
index c90ea418f26..d83ba9370ee 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
@@ -16,21 +16,21 @@ var _b = 10;
 //// [es6ImportWithoutFromClauseAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.a = 10;
     exports.__esModule = true;
+    exports.a = 10;
 });
 //// [es6ImportWithoutFromClauseAmd_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.b = 10;
     exports.__esModule = true;
+    exports.b = 10;
 });
 //// [es6ImportWithoutFromClauseAmd_2.js]
 define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var _a = 10;
     var _b = 10;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
index 0262cfdd045..b11e2ea9a07 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
@@ -9,12 +9,12 @@ import "es6ImportWithoutFromClauseInEs5_0";
 
 //// [es6ImportWithoutFromClauseInEs5_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportWithoutFromClauseInEs5_1.js]
 "use strict";
-require("es6ImportWithoutFromClauseInEs5_0");
 Object.defineProperty(exports, "__esModule", { value: true });
+require("es6ImportWithoutFromClauseInEs5_0");
 
 
 //// [es6ImportWithoutFromClauseInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
index 71874fc7b40..99214d2a2c6 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
@@ -9,12 +9,12 @@ export import "server";
 
 //// [server.js]
 "use strict";
-exports.a = 10;
 exports.__esModule = true;
+exports.a = 10;
 //// [client.js]
 "use strict";
-require("server");
 exports.__esModule = true;
+require("server");
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
index bd45a62e2f4..4ced3a35ab2 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
@@ -14,6 +14,7 @@ export class A
 //// [es6ModuleWithModuleGenTargetAmd.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class A {
         constructor() {
         }
@@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) {
         }
     }
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
index a7cf0599e54..187ece7e718 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es6ModuleWithModuleGenTargetCommonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class A {
     constructor() {
     }
@@ -21,4 +22,3 @@ class A {
     }
 }
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js
index b2a01bbb552..d19de0c78b0 100644
--- a/tests/baselines/reference/exportAndImport-es3-amd.js
+++ b/tests/baselines/reference/exportAndImport-es3-amd.js
@@ -15,17 +15,17 @@ export default function f2() {
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function f1() {
     }
     exports["default"] = f1;
-    exports.__esModule = true;
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     "use strict";
+    exports.__esModule = true;
     function f2() {
         m1_1["default"]();
     }
     exports["default"] = f2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js
index 898261ef7fe..13b6f1eaf48 100644
--- a/tests/baselines/reference/exportAndImport-es3.js
+++ b/tests/baselines/reference/exportAndImport-es3.js
@@ -14,15 +14,15 @@ export default function f2() {
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 function f1() {
 }
 exports["default"] = f1;
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 function f2() {
     m1_1["default"]();
 }
 exports["default"] = f2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js
index fcc918bb8ce..60b1246b616 100644
--- a/tests/baselines/reference/exportAndImport-es5-amd.js
+++ b/tests/baselines/reference/exportAndImport-es5-amd.js
@@ -15,17 +15,17 @@ export default function f2() {
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function f1() {
     }
     exports.default = f1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function f2() {
         m1_1.default();
     }
     exports.default = f2;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js
index fa1652c603e..f4bc496e6b2 100644
--- a/tests/baselines/reference/exportAndImport-es5.js
+++ b/tests/baselines/reference/exportAndImport-es5.js
@@ -14,15 +14,15 @@ export default function f2() {
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f1() {
 }
 exports.default = f1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 function f2() {
     m1_1.default();
 }
 exports.default = f2;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportArrayBindingPattern.js b/tests/baselines/reference/exportArrayBindingPattern.js
index 641500fa09d..b5568109763 100644
--- a/tests/baselines/reference/exportArrayBindingPattern.js
+++ b/tests/baselines/reference/exportArrayBindingPattern.js
@@ -5,8 +5,8 @@ export { a, b };
 
 //// [exportArrayBindingPattern.js]
 "use strict";
+exports.__esModule = true;
 // issue: https://github.com/Microsoft/TypeScript/issues/10778
 var _a = [1, 2, 3], a = _a[0], b = _a[2];
 exports.a = a;
 exports.b = b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js
index f557bc5d9a4..9f3eaf78480 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.js
+++ b/tests/baselines/reference/exportAssignClassAndModule.js
@@ -28,7 +28,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [exportAssignClassAndModule_1.js]
 "use strict";
+exports.__esModule = true;
 var z;
 var zz;
 zz.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js
index a39a7aa04cd..592d97dbaa0 100644
--- a/tests/baselines/reference/exportAssignDottedName.js
+++ b/tests/baselines/reference/exportAssignDottedName.js
@@ -12,11 +12,11 @@ export = foo1.x; // Ok
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 function x() {
     return true;
 }
 exports.x = x;
-exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js
index 09daa469ef4..208df4eff63 100644
--- a/tests/baselines/reference/exportAssignImportedIdentifier.js
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.js
@@ -16,11 +16,11 @@ var x = foo2(); // should be boolean
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 function x() {
     return true;
 }
 exports.x = x;
-exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
@@ -28,6 +28,6 @@ var x = foo1.x;
 module.exports = x;
 //// [foo3.js]
 "use strict";
+exports.__esModule = true;
 var foo2 = require("./foo2");
 var x = foo2(); // should be boolean
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js
index 645f44545fe..bed4480f393 100644
--- a/tests/baselines/reference/exportAssignTypes.js
+++ b/tests/baselines/reference/exportAssignTypes.js
@@ -85,6 +85,7 @@ function x(a) {
 module.exports = x;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var iString = require("./expString");
 var v1 = iString;
 var iNumber = require("./expNumber");
@@ -99,4 +100,3 @@ var iAny = require("./expAny");
 var v6 = iAny;
 var iGeneric = require("./expGeneric");
 var v7 = iGeneric;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
index e1bdf0d544f..d4b6961cfe9 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
@@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignedTypeAsTypeAnnotation_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var t2; // should not raise a 'container type' error
     exports.__esModule = true;
+    var t2; // should not raise a 'container type' error
 });
diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js
index 265afdfd041..549ad5bbd4d 100644
--- a/tests/baselines/reference/exportAssignmentClass.js
+++ b/tests/baselines/reference/exportAssignmentClass.js
@@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentClass_B.js]
 define(["require", "exports", "exportAssignmentClass_A"], function (require, exports, D) {
     "use strict";
+    exports.__esModule = true;
     var d = new D();
     var x = d.p;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
index 003927c2511..eddbddf8d6d 100644
--- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
+++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
@@ -24,8 +24,8 @@ var Foo = (function () {
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var x = new foo(true); // Should error
 var y = new foo({ a: "test", b: 42 }); // Should be OK
 var z = y.test.b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js
index a30868a18e5..a32da0a2e3f 100644
--- a/tests/baselines/reference/exportAssignmentEnum.js
+++ b/tests/baselines/reference/exportAssignmentEnum.js
@@ -27,8 +27,8 @@ var E;
 module.exports = E;
 //// [exportAssignmentEnum_B.js]
 "use strict";
+exports.__esModule = true;
 var EnumE = require("./exportAssignmentEnum_A");
 var a = EnumE.A;
 var b = EnumE.B;
 var c = EnumE.C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js
index 5743490fec3..775bb6b1af1 100644
--- a/tests/baselines/reference/exportAssignmentFunction.js
+++ b/tests/baselines/reference/exportAssignmentFunction.js
@@ -19,6 +19,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentFunction_B.js]
 define(["require", "exports", "exportAssignmentFunction_A"], function (require, exports, fooFunc) {
     "use strict";
-    var n = fooFunc();
     exports.__esModule = true;
+    var n = fooFunc();
 });
diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js
index 3ef295639fd..95563aa36a9 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.js
+++ b/tests/baselines/reference/exportAssignmentGenericType.js
@@ -22,7 +22,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var x = new foo();
 var y = x.test;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentInterface.js b/tests/baselines/reference/exportAssignmentInterface.js
index 8f4403cf40a..f3cc9ae9bbe 100644
--- a/tests/baselines/reference/exportAssignmentInterface.js
+++ b/tests/baselines/reference/exportAssignmentInterface.js
@@ -22,7 +22,7 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentInterface_B.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var i;
     var n = i.p1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js
index e4ba7a9f7d8..b5c45785f8f 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.js
+++ b/tests/baselines/reference/exportAssignmentInternalModule.js
@@ -23,6 +23,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentInternalModule_B.js]
 define(["require", "exports", "exportAssignmentInternalModule_A"], function (require, exports, modM) {
     "use strict";
-    var n = modM.x;
     exports.__esModule = true;
+    var n = modM.x;
 });
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js
index ba77f90557f..3ee760dedfa 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.js
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     x("test");
     x(42);
@@ -37,5 +38,4 @@ define(["require", "exports"], function (require, exports) {
     if (!!x.c) { }
     var z = { x: 1, y: 2 };
     z = x.d;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js
index 59008dfc370..ef48895b5cb 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.js
+++ b/tests/baselines/reference/exportAssignmentMergedModule.js
@@ -47,9 +47,9 @@ var Foo;
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var a = foo.a();
 if (!!foo.b) {
     foo.Test.answer = foo.c(42);
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
index 280e93f8c01..6c61eeedfc1 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
@@ -21,9 +21,9 @@ var b = z(); // call signature - no error
 exports.__esModule = true;
 //// [exportAssignmentOfDeclaredExternalModule_1.js]
 "use strict";
+exports.__esModule = true;
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
 var y = Sammy(); // error to use interface name as call target
 var z; // no error - z is of type interface Sammy from module 'M'
 var a = new z(); // constructor - no error
 var b = z(); // call signature - no error
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js
index f4417f871e9..9cd15ec01a4 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -36,6 +36,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (require, exports, q) {
     "use strict";
+    exports.__esModule = true;
     var M = (function (_super) {
         __extends(M, _super);
         function M() {
@@ -45,5 +46,4 @@ define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (req
     }(q));
     var m;
     var r = m.foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
index 44afbca1f69..f4001e5ab15 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
@@ -33,8 +33,8 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
         var x = new foo();
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
index a6abc6aa37d..7ba5a655c20 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
@@ -34,9 +34,9 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     var color;
     if (color === foo.green) {
         color = foo.answer;
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
index 4c0abd1d650..f122b8fbe8b 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
@@ -30,8 +30,8 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
         var x = foo();
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
index 0d31a25623c..a7acbaf3496 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
@@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js
index 8f9c02ecfbb..e6ccdb46f9a 100644
--- a/tests/baselines/reference/exportAssignmentVariable.js
+++ b/tests/baselines/reference/exportAssignmentVariable.js
@@ -16,6 +16,6 @@ var x = 0;
 module.exports = x;
 //// [exportAssignmentVariable_B.js]
 "use strict";
+exports.__esModule = true;
 var y = require("./exportAssignmentVariable_A");
 var n = y;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
index 6c3a951841d..e0165098b20 100644
--- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
+++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
@@ -22,23 +22,23 @@ export { x as a, } from
 
 //// [t1.js]
 "use strict";
-exports.x = "x";
 exports.__esModule = true;
+exports.x = "x";
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.x = t1_1.x;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
 exports.__esModule = true;
 //// [t4.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
-exports.__esModule = true;
 //// [t5.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js
index 23ce59f2402..950b3db26e5 100644
--- a/tests/baselines/reference/exportDeclareClass1.js
+++ b/tests/baselines/reference/exportDeclareClass1.js
@@ -12,7 +12,7 @@
 //// [exportDeclareClass1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    ;
-    ;
     exports.__esModule = true;
+    ;
+    ;
 });
diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js
index 08d62eb3782..473ebaa0492 100644
--- a/tests/baselines/reference/exportDeclaredModule.js
+++ b/tests/baselines/reference/exportDeclaredModule.js
@@ -17,6 +17,6 @@ var x: number = foo1.b();
 module.exports = M1;
 //// [foo2.js]
 "use strict";
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var x = foo1.b();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js
index 04ad89f9dc0..dddea6a6b73 100644
--- a/tests/baselines/reference/exportDefaultProperty.js
+++ b/tests/baselines/reference/exportDefaultProperty.js
@@ -43,6 +43,7 @@ fooLength + 1;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var A;
 (function (A) {
     var B = (function () {
@@ -56,13 +57,13 @@ var A;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 exports["default"] = A.B;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
-exports["default"] = "foo".length;
 exports.__esModule = true;
+exports["default"] = "foo".length;
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="declarations.d.ts" />
 var foobar_1 = require("foobar");
 var X = foobar_1["default"].X;
@@ -73,4 +74,3 @@ var a_1 = require("./a");
 var b = new a_1["default"](a_1["default"].b);
 var b_1 = require("./b");
 b_1["default"] + 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js
index 861acb7347c..4922738430a 100644
--- a/tests/baselines/reference/exportDefaultProperty2.js
+++ b/tests/baselines/reference/exportDefaultProperty2.js
@@ -20,15 +20,15 @@ const x: B = { c: B };
 //// [a.js]
 // This test is just like exportEqualsProperty2, but with `export default`.
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports["default"] = C.B;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var x = { c: a_1["default"] };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js
index d8347b62944..177e3943ac7 100644
--- a/tests/baselines/reference/exportEqualCallable.js
+++ b/tests/baselines/reference/exportEqualCallable.js
@@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportEqualCallable_1.js]
 define(["require", "exports", "exportEqualCallable_0"], function (require, exports, connect) {
     "use strict";
-    connect();
     exports.__esModule = true;
+    connect();
 });
diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js
index f8d0afe95da..4a65ce5fd49 100644
--- a/tests/baselines/reference/exportEqualErrorType.js
+++ b/tests/baselines/reference/exportEqualErrorType.js
@@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportEqualErrorType_1.js]
 define(["require", "exports", "exportEqualErrorType_0"], function (require, exports, connect) {
     "use strict";
-    connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
     exports.__esModule = true;
+    connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
 });
diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js
index 3a4982a7434..68ac9485f5f 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.js
+++ b/tests/baselines/reference/exportEqualMemberMissing.js
@@ -27,7 +27,7 @@ var server;
 module.exports = server;
 //// [exportEqualMemberMissing_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='exportEqualMemberMissing_0.ts'/>
 var connect = require("./exportEqualMemberMissing_0");
 connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js
index 3cf45681807..9cf7a7b2ee8 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.js
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.js
@@ -23,6 +23,6 @@ var x = {
 module.exports = x;
 //// [imp.js]
 "use strict";
+exports.__esModule = true;
 var exp_1 = require("./exp");
 exp_1["default"].toExponential(2);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsProperty.js b/tests/baselines/reference/exportEqualsProperty.js
index feb5e563903..e6bd09d5367 100644
--- a/tests/baselines/reference/exportEqualsProperty.js
+++ b/tests/baselines/reference/exportEqualsProperty.js
@@ -60,6 +60,7 @@ module.exports = A.B;
 module.exports = "foo".length;
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="declarations.d.ts" />
 var foobar_1 = require("foobar");
 var X2 = require("foobarx");
@@ -69,4 +70,3 @@ var B = require("./a");
 var b = new B(B.b);
 var fooLength = require("./b");
 fooLength + 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsProperty2.js b/tests/baselines/reference/exportEqualsProperty2.js
index f51a130e572..36fcbdf3446 100644
--- a/tests/baselines/reference/exportEqualsProperty2.js
+++ b/tests/baselines/reference/exportEqualsProperty2.js
@@ -28,6 +28,6 @@ var C = (function () {
 module.exports = C.B;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var B = require("./a");
 var x = { c: B };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js
index d947393c05f..615f3d266ab 100644
--- a/tests/baselines/reference/exportImport.js
+++ b/tests/baselines/reference/exportImport.js
@@ -29,17 +29,17 @@ define(["require", "exports"], function (require, exports) {
 //// [exporter.js]
 define(["require", "exports", "./w1"], function (require, exports, w) {
     "use strict";
-    exports.w = w;
     exports.__esModule = true;
+    exports.w = w;
 });
 //// [consumer.js]
 define(["require", "exports", "./exporter"], function (require, exports, e) {
     "use strict";
+    exports.__esModule = true;
     function w() {
         return new e.w();
     }
     exports.w = w;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js
index 7defcbac044..31f5f218d65 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.js
+++ b/tests/baselines/reference/exportImportMultipleFiles.js
@@ -15,20 +15,20 @@ lib.math.add(3, 4); // Shouldnt be error
 //// [exportImportMultipleFiles_math.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function add(a, b) { return a + b; }
     exports.add = add;
-    exports.__esModule = true;
 });
 //// [exportImportMultipleFiles_library.js]
 define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) {
     "use strict";
+    exports.__esModule = true;
     exports.math = math;
     exports.math.add(3, 4); // OK
-    exports.__esModule = true;
 });
 //// [exportImportMultipleFiles_userCode.js]
 define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) {
     "use strict";
-    lib.math.add(3, 4); // Shouldnt be error
     exports.__esModule = true;
+    lib.math.add(3, 4); // Shouldnt be error
 });
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
index 77eb0c35ce6..1394d7492dd 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
@@ -28,11 +28,11 @@ define(["require", "exports"], function (require, exports) {
 //// [consumer.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function w() {
         return { name: 'value' };
     }
     exports.w = w;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
index ba7f9380865..f7ee0b8d4d8 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
@@ -37,6 +37,7 @@ export let h1: D = new D;
 //// [exportNonInitializedVariablesAMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ;
     let;
     var ;
@@ -67,5 +68,4 @@ define(["require", "exports"], function (require, exports) {
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
index bf30e45f1ca..7623127aee8 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
@@ -36,6 +36,7 @@ export let h1: D = new D;
 
 //// [exportNonInitializedVariablesCommonJS.js]
 "use strict";
+exports.__esModule = true;
 var ;
 let;
 var ;
@@ -66,4 +67,3 @@ exports.e1 = new D;
 exports.f1 = new D;
 exports.g1 = new D;
 exports.h1 = new D;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
index 1b26cfe3c1a..504c6e70084 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
@@ -45,6 +45,7 @@ export let h1: D = new D;
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ;
     let;
     var ;
@@ -75,5 +76,4 @@ export let h1: D = new D;
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js
index a9ec4591c6c..c3e97cf3e10 100644
--- a/tests/baselines/reference/exportRedeclarationTypeAliases.js
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js
@@ -5,6 +5,6 @@ export function Foo(): any {}
 
 //// [exportRedeclarationTypeAliases.js]
 "use strict";
+exports.__esModule = true;
 function Foo() { }
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js
index e5fa8913ffd..dc0b24b98c3 100644
--- a/tests/baselines/reference/exportSameNameFuncVar.js
+++ b/tests/baselines/reference/exportSameNameFuncVar.js
@@ -6,9 +6,9 @@ export function a() {
 //// [exportSameNameFuncVar.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
     function a() {
     }
     exports.a = a;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js
index b117972450e..fe59f5071f2 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.js
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.js
@@ -14,12 +14,12 @@ export function f() {
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 function f() {
     var x;
     return x;
 }
 exports.f = f;
-exports.__esModule = true;
 
 
 //// [b.d.ts]
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index 9a4def0dd78..f25a68a5aa6 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -32,28 +32,28 @@ foo;
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = 1;
     exports.y = 2;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = "hello";
     function foo() { }
     exports.foo = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var x = "x";
     exports.x = x;
     var y = "y";
     exports.y = y;
     var z = "z";
     exports.z = z;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t4.js]
 define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) {
@@ -61,18 +61,18 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
     __export(t1_1);
     __export(t2_1);
     __export(t3_1);
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [main.js]
 define(["require", "exports", "./t4"], function (require, exports, t4_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     t4_1.default;
     t4_1.x;
     t4_1.y;
     t4_1.z;
     t4_1.foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
index 4b9ec28f6aa..a188cefd8b6 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -31,39 +31,39 @@ foo;
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = 1;
 exports.y = 2;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 function foo() { }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var x = "x";
 exports.x = x;
 var y = "y";
 exports.y = y;
 var z = "z";
 exports.z = z;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t4.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./t1"));
 __export(require("./t2"));
 __export(require("./t3"));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t4_1 = require("./t4");
 t4_1.default;
 t4_1.x;
 t4_1.y;
 t4_1.z;
 t4_1.foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js
index 3b74564d4d1..8376ec1927e 100644
--- a/tests/baselines/reference/exportStarForValues.js
+++ b/tests/baselines/reference/exportStarForValues.js
@@ -16,6 +16,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x;
     exports.__esModule = true;
+    var x;
 });
diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js
index 74b28ef6d00..f18f9f1c587 100644
--- a/tests/baselines/reference/exportStarForValues2.js
+++ b/tests/baselines/reference/exportStarForValues2.js
@@ -20,12 +20,12 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js
index 52e18851fc9..5ccd12f8a37 100644
--- a/tests/baselines/reference/exportStarForValues3.js
+++ b/tests/baselines/reference/exportStarForValues3.js
@@ -32,24 +32,24 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file5.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js
index 7697100842e..e06b5e26207 100644
--- a/tests/baselines/reference/exportStarForValues4.js
+++ b/tests/baselines/reference/exportStarForValues4.js
@@ -24,12 +24,12 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js
index 1311e215fce..1f5163dd9cd 100644
--- a/tests/baselines/reference/exportStarForValues7.js
+++ b/tests/baselines/reference/exportStarForValues7.js
@@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports, file2_1) {
@@ -29,7 +29,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js
index b6ee3c56ae7..6f52bce89f9 100644
--- a/tests/baselines/reference/exportStarForValues8.js
+++ b/tests/baselines/reference/exportStarForValues8.js
@@ -32,14 +32,14 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file4.js]
 define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) {
@@ -47,10 +47,10 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     __export(file3_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
 //// [file5.js]
 define(["require", "exports", "file4"], function (require, exports, file4_1) {
@@ -58,7 +58,7 @@ define(["require", "exports", "file4"], function (require, exports, file4_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file4_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js
index 5d24c558ec0..3c34bb1afdb 100644
--- a/tests/baselines/reference/exportStarForValues9.js
+++ b/tests/baselines/reference/exportStarForValues9.js
@@ -27,9 +27,9 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "file3"], function (require, exports, file3_1) {
@@ -37,7 +37,7 @@ define(["require", "exports", "file3"], function (require, exports, file3_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file3_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index 44ece871874..4fcac9312b9 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -25,13 +25,13 @@ X.A.r; // Error
 
 //// [exportStarFromEmptyModule_module1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module2.js]
 // empty
 //// [exportStarFromEmptyModule_module3.js]
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./exportStarFromEmptyModule_module2"));
 __export(require("./exportStarFromEmptyModule_module1"));
 var A = (function () {
@@ -47,14 +48,13 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var X = require("./exportStarFromEmptyModule_module3");
 var s;
 X.A.q;
 X.A.r; // Error
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [exportStarFromEmptyModule_module1.d.ts]
diff --git a/tests/baselines/reference/exportToString.js b/tests/baselines/reference/exportToString.js
index ee9482c655f..d527a02741c 100644
--- a/tests/baselines/reference/exportToString.js
+++ b/tests/baselines/reference/exportToString.js
@@ -5,6 +5,6 @@ export { toString };
 
 //// [exportToString.js]
 "use strict";
+exports.__esModule = true;
 var toString = 0;
 exports.toString = toString;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js
index d66cf543124..fbb2555d54b 100644
--- a/tests/baselines/reference/exportVisibility.js
+++ b/tests/baselines/reference/exportVisibility.js
@@ -11,6 +11,7 @@ export function test(foo: Foo) {
 
 //// [exportVisibility.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -22,4 +23,3 @@ function test(foo) {
     return true;
 }
 exports.test = test;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
index 357e7dc25f4..068ac5db23b 100644
--- a/tests/baselines/reference/exportedBlockScopedDeclarations.js
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -20,6 +20,7 @@ namespace NS1 {
 //// [exportedBlockScopedDeclarations.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var foo = foo; // compile error
     exports.bar = exports.bar; // should be compile error
     function f() {
@@ -38,5 +39,4 @@ define(["require", "exports"], function (require, exports) {
     (function (NS1) {
         NS1.bar1 = NS1.bar1; // should be compile error
     })(NS1 || (NS1 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js
index 11737e21e73..80a7fc6a391 100644
--- a/tests/baselines/reference/exportedVariable1.js
+++ b/tests/baselines/reference/exportedVariable1.js
@@ -6,7 +6,7 @@ var upper = foo.name.toUpperCase();
 //// [exportedVariable1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.foo = { name: "Bill" };
     var upper = exports.foo.name.toUpperCase();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js
index 5e9d0f2edf2..d50a2a35f06 100644
--- a/tests/baselines/reference/exportingContainingVisibleType.js
+++ b/tests/baselines/reference/exportingContainingVisibleType.js
@@ -13,6 +13,7 @@ export var x = 5;
 //// [exportingContainingVisibleType.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
@@ -27,5 +28,4 @@ define(["require", "exports"], function (require, exports) {
         return Foo;
     }());
     exports.x = 5;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js
index f6456368e33..87761c779fa 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.js
+++ b/tests/baselines/reference/exportsAndImports1-amd.js
@@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var v = 1;
     exports.v = v;
     function f() { }
@@ -60,27 +61,26 @@ define(["require", "exports"], function (require, exports) {
     exports.M = M;
     var a = M.x;
     exports.a = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v;
     exports.f = t1_1.f;
     exports.C = t1_1.C;
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v;
     exports.f = t1_1.f;
     exports.C = t1_1.C;
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js
index 968cd185378..6b9a40f0ea2 100644
--- a/tests/baselines/reference/exportsAndImports1-es6.js
+++ b/tests/baselines/reference/exportsAndImports1-es6.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var v = 1;
 exports.v = v;
 function f() { }
@@ -56,9 +57,9 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -66,9 +67,9 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -76,4 +77,3 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js
index a6f97be0677..56f74d27473 100644
--- a/tests/baselines/reference/exportsAndImports1.js
+++ b/tests/baselines/reference/exportsAndImports1.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 var v = 1;
 exports.v = v;
 function f() { }
@@ -59,9 +60,9 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
-exports.__esModule = true;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -69,9 +70,9 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -79,4 +80,3 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js
index d67dd92707d..5154751b21e 100644
--- a/tests/baselines/reference/exportsAndImports2-amd.js
+++ b/tests/baselines/reference/exportsAndImports2-amd.js
@@ -16,21 +16,21 @@ export { x as y, y as x };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = "x";
     exports.y = "y";
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.y = t1_1.x;
     exports.x = t1_1.y;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.y = t1_1.x;
     exports.x = t1_1.y;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js
index 59ee55defd8..b0714b83c39 100644
--- a/tests/baselines/reference/exportsAndImports2-es6.js
+++ b/tests/baselines/reference/exportsAndImports2-es6.js
@@ -15,18 +15,18 @@ export { x as y, y as x };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = "x";
 exports.y = "y";
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js
index 672d7161e74..5b3fe689d90 100644
--- a/tests/baselines/reference/exportsAndImports2.js
+++ b/tests/baselines/reference/exportsAndImports2.js
@@ -15,18 +15,18 @@ export { x as y, y as x };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = "x";
 exports.y = "y";
-exports.__esModule = true;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js
index 1f74addddec..a6af4adb5f4 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.js
+++ b/tests/baselines/reference/exportsAndImports3-amd.js
@@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = 1;
     exports.v1 = exports.v;
     function f() { }
@@ -62,27 +63,26 @@ define(["require", "exports"], function (require, exports) {
     exports.M1 = M;
     exports.a = M.x;
     exports.a1 = exports.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v1;
     exports.f = t1_1.f1;
     exports.C = t1_1.C1;
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v1;
     exports.f = t1_1.f1;
     exports.C = t1_1.C1;
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js
index b4152cab778..1ac23446807 100644
--- a/tests/baselines/reference/exportsAndImports3-es6.js
+++ b/tests/baselines/reference/exportsAndImports3-es6.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.v = 1;
 exports.v1 = exports.v;
 function f() { }
@@ -58,9 +59,9 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -68,9 +69,9 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -78,4 +79,3 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js
index 2bc4c828fe1..4dfa0411946 100644
--- a/tests/baselines/reference/exportsAndImports3.js
+++ b/tests/baselines/reference/exportsAndImports3.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.v = 1;
 exports.v1 = exports.v;
 function f() { }
@@ -61,9 +62,9 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
-exports.__esModule = true;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -71,9 +72,9 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -81,4 +82,3 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js
index ddacb1eec94..ed31f42ebc7 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.js
+++ b/tests/baselines/reference/exportsAndImports4-amd.js
@@ -42,12 +42,13 @@ export { a, b, c, d, e1, e2, f1, f2 };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.default = "hello";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.default = "hello";
 });
 //// [t3.js]
 define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.a = a;
     a.default;
     exports.b = t1_1.default;
@@ -65,5 +66,4 @@ define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], f
     exports.f2 = t1_4.default;
     t1_4.default;
     t1_4.default;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js
index 5f0c37ab04f..d8c51d03bb1 100644
--- a/tests/baselines/reference/exportsAndImports4-es6.js
+++ b/tests/baselines/reference/exportsAndImports4-es6.js
@@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-exports.default = "hello";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = "hello";
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const a = require("./t1");
 exports.a = a;
 a.default;
@@ -67,4 +68,3 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js
index 6a78862e55e..99f81a6b875 100644
--- a/tests/baselines/reference/exportsAndImports4.js
+++ b/tests/baselines/reference/exportsAndImports4.js
@@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-exports.default = "hello";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = "hello";
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = require("./t1");
 exports.a = a;
 a.default;
@@ -67,4 +68,3 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
index 0a2ee7d3183..068afdc346b 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
@@ -21,6 +21,7 @@ import { get } from "./t1";
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var set = {
     set foo(x) {
     }
@@ -28,7 +29,6 @@ var set = {
 exports.set = set;
 var get = 10;
 exports.get = get;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
index ea7f554d1b3..8b1deff064f 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
@@ -19,16 +19,16 @@ import { as } from "./t1";
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var as = 100;
 exports.return = as;
 exports.as = as;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var as = require("./t1");
 var x = as.as;
 var y = as.return;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
index 2b3e9d36f33..207d2948fa4 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
@@ -16,15 +16,15 @@ const { __, _, ___ } = R;
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 var R;
 exports["default"] = R = {
     "__": 20,
     "_": 10,
     "___": 30
 };
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var __ = m1_1["default"].__, _ = m1_1["default"]._, ___ = m1_1["default"].___;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
index 3555148f755..a53d4662e97 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
@@ -15,14 +15,14 @@ const { __esmodule, __proto__ } = R;
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 var R;
 exports["default"] = R = {
     "__esmodule": true,
     "__proto__": {}
 };
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var __esmodule = m1_1["default"].__esmodule, __proto__ = m1_1["default"].__proto__;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
index 028ca80400f..3a5bba1deed 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
@@ -16,15 +16,15 @@ const { ___, ___hello, _hi } = R;
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 var R;
 exports["default"] = R = {
     "___": 30,
     "___hello": 21,
     "_hi": 40
 };
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var ___ = m1_1["default"].___, ___hello = m1_1["default"].___hello, _hi = m1_1["default"]._hi;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
index fa643c5e7e2..718d048b9a2 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
@@ -36,6 +36,7 @@ _hi();
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 function _() {
     console.log("_");
 }
@@ -64,9 +65,9 @@ function ___hello() {
     console.log("___hello");
 }
 exports.___hello = ___hello;
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 m1_1._();
 m1_1.__();
@@ -74,4 +75,3 @@ m1_1.___hello();
 m1_1.__esmodule();
 m1_1.__proto();
 m1_1._hi();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js
index a5900c588ba..28c9488f7fa 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var x = foo1;
 var y = (function (_super) {
@@ -40,4 +41,3 @@ var y = (function (_super) {
     }
     return y;
 }(x));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index 4f0d5ced7b5..c8f7719faf0 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -34,13 +34,13 @@ var visModel = new moduleMap[moduleName].VisualizationModel();
 
 //// [extendingClassFromAliasAndUsageInIndexer_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -53,6 +53,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -62,7 +63,6 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -75,6 +75,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -84,9 +85,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
 var moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
 var moduleATyped = moduleA;
@@ -96,4 +97,3 @@ var moduleMap = {
 };
 var moduleName;
 var visModel = new moduleMap[moduleName].VisualizationModel();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js
index 41ec58a467d..70ce2281ad3 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.js
+++ b/tests/baselines/reference/externalModuleAssignToVar.js
@@ -29,13 +29,13 @@ y3 = ext3; // ok
 //// [externalModuleAssignToVar_core_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
 //// [externalModuleAssignToVar_core_require2.js]
 define(["require", "exports"], function (require, exports) {
@@ -60,11 +60,11 @@ define(["require", "exports"], function (require, exports) {
 //// [externalModuleAssignToVar_core.js]
 define(["require", "exports", "externalModuleAssignToVar_core_require", "externalModuleAssignToVar_core_require2", "externalModuleAssignToVar_ext"], function (require, exports, ext, ext2, ext3) {
     "use strict";
+    exports.__esModule = true;
     var y1 = ext;
     y1 = ext; // ok
     var y2 = ext2;
     y2 = ext2; // ok
     var y3 = ext3;
     y3 = ext3; // ok
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js
index ca51181ec3b..33aa1776e94 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.js
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.js
@@ -25,8 +25,8 @@ var C = (function () {
 module.exports = C;
 //// [externalModuleExportingGenericClass_file1.js]
 "use strict";
+exports.__esModule = true;
 var a = require("./externalModuleExportingGenericClass_file0");
 var v; // this should report error
 var v2 = (new a()).foo;
 var v3 = (new a()).foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index bd811cd8b58..7e2a78a4728 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -53,10 +53,11 @@ for ((stuff[n]) of []) {}
 
 //// [f1.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 // all mutations below are illegal and should be fixed
 var stuff = require("./f1");
 var n = 'baz';
@@ -108,4 +109,3 @@ for ((stuff[n]) in []) { }
 for (var _p = 0, _q = []; _p < _q.length; _p++) {
     (stuff[n]) = _q[_p];
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js
index 353af42a408..0402847a13a 100644
--- a/tests/baselines/reference/externalModuleQualification.js
+++ b/tests/baselines/reference/externalModuleQualification.js
@@ -13,6 +13,7 @@ class NavigateAction {
 
 //// [externalModuleQualification.js]
 "use strict";
+exports.__esModule = true;
 exports.ID = "test";
 var DiffEditor = (function () {
     function DiffEditor(id) {
@@ -28,4 +29,3 @@ var NavigateAction = (function () {
     };
     return NavigateAction;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
index 75d719670d1..e5a854077c5 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
@@ -11,15 +11,15 @@ file1.foo();
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() { }
     exports.foo = foo;
     ;
-    exports.__esModule = true;
 });
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js]
 define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExportModifier_0"], function (require, exports, file1) {
     "use strict";
+    exports.__esModule = true;
     exports.file1 = file1;
     exports.file1.foo();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
index a012d0d37b6..3a930d8e03a 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
@@ -20,14 +20,14 @@ file1.bar();
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file2.js]
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file1.js]
 "use strict";
+exports.__esModule = true;
 function foo() { }
 exports.foo = foo;
 ;
-exports.__esModule = true;
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
 var file1 = require("./externalModuleRefernceResolutionOrderInImportDeclaration_file1");
 file1.foo();
 file1.bar();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js
index 3d1fe11f88f..1ef5be53883 100644
--- a/tests/baselines/reference/externalModuleResolution.js
+++ b/tests/baselines/reference/externalModuleResolution.js
@@ -25,6 +25,6 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./foo");
 x.Y; // .ts should be picked
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js
index 96fb493090f..2c3c9facff1 100644
--- a/tests/baselines/reference/externalModuleResolution2.js
+++ b/tests/baselines/reference/externalModuleResolution2.js
@@ -26,6 +26,6 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./foo");
 x.X; // .ts should be picked
-exports.__esModule = true;
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js
index 959a3ffffcf..673a0372f05 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -7,6 +7,7 @@ export class C {
 //// [fieldAndGetterWithSameName.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
@@ -18,5 +19,4 @@ define(["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
index 793f4ab6c06..9b48439ad56 100644
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
+++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
@@ -12,13 +12,13 @@ function foo() {
 //// [a.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c = (function () {
         function c() {
         }
         return c;
     }());
     exports.c = c;
-    exports.__esModule = true;
 });
 function foo() {
 }
diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js
index 3b1644e7ac1..2bc6d91b2c3 100644
--- a/tests/baselines/reference/functionAndImportNameConflict.js
+++ b/tests/baselines/reference/functionAndImportNameConflict.js
@@ -11,13 +11,13 @@ export function f() {
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 function f() {
 }
 exports.f = f;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 function f() {
 }
 exports.f = f;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.js b/tests/baselines/reference/functionLikeInParameterInitializer.js
index d794cded0f4..9bf71aff1ea 100644
--- a/tests/baselines/reference/functionLikeInParameterInitializer.js
+++ b/tests/baselines/reference/functionLikeInParameterInitializer.js
@@ -21,6 +21,7 @@ export function baz3(func = class { x = foo }) {
 
 //// [functionLikeInParameterInitializer.js]
 "use strict";
+exports.__esModule = true;
 // error
 function bar(func) {
     if (func === void 0) { func = function () { return foo; }; }
@@ -50,4 +51,3 @@ function baz3(func) {
     var foo = "in";
 }
 exports.baz3 = baz3;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js
index 426697dfa8d..b7e460af9b1 100644
--- a/tests/baselines/reference/generatorES6InAMDModule.js
+++ b/tests/baselines/reference/generatorES6InAMDModule.js
@@ -6,9 +6,9 @@ export function* foo() {
 //// [generatorES6InAMDModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function* foo() {
         yield;
     }
     exports.foo = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js
index 1b008c90860..738fa996cf7 100644
--- a/tests/baselines/reference/genericClassesInModule2.js
+++ b/tests/baselines/reference/genericClassesInModule2.js
@@ -23,6 +23,7 @@ export class B<T2> {
 //// [genericClassesInModule2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A(callback) {
             this.callback = callback;
@@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
index 2cbb4485e31..83b100f4837 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
@@ -10,9 +10,9 @@ export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
 //// [genericInterfaceFunctionTypeParameter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo(fn) {
         foo(fn); // Invocation is necessary to repro (!)
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js
index 9704fe5d148..61a9298eb7f 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -25,6 +25,7 @@ export class BuildResult<A, B, C>{
 //// [genericMemberFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var BuildError = (function () {
         function BuildError() {
         }
@@ -59,5 +60,4 @@ define(["require", "exports"], function (require, exports) {
         return BuildResult;
     }());
     exports.BuildResult = BuildResult;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 457158faee1..728d81dd147 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -11,6 +11,7 @@ export class DbSet<T> {
 //// [genericReturnTypeFromGetter1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var DbSet = (function () {
         function DbSet() {
         }
@@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) {
         return DbSet;
     }());
     exports.DbSet = DbSet;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.js b/tests/baselines/reference/genericTypeWithMultipleBases1.js
index 3201344c0de..a958516dfa0 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases1.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases1.js
@@ -21,8 +21,8 @@ x.m2();
 
 //// [genericTypeWithMultipleBases1.js]
 "use strict";
+exports.__esModule = true;
 var x;
 x.p1;
 x.m1();
 x.m2();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.js b/tests/baselines/reference/genericTypeWithMultipleBases2.js
index a4457144000..43651ec8278 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases2.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases2.js
@@ -21,9 +21,9 @@ x.m2();
 //// [genericTypeWithMultipleBases2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     x.p1;
     x.m1();
     x.m2();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
index 0ed35307d2d..3f5e3dcfe8e 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -27,6 +27,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Collection = (function () {
         function Collection() {
         }
@@ -56,5 +57,4 @@ define(["require", "exports"], function (require, exports) {
         return ListItem;
     }(CollectionItem));
     exports.ListItem = ListItem;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
index 783ec2bf947..5739596a8f0 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
@@ -3,13 +3,13 @@ EmitSkipped: false
 EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile2.js
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile3.js
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
index 74cf137ef37..50e80f94831 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
@@ -4,6 +4,7 @@ Diagnostics:
 FileName : /tests/cases/fourslash/inputFile.js
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C = (function () {
         function C() {
         }
@@ -13,6 +14,5 @@ define(["require", "exports"], function (require, exports) {
     (function (M) {
         M.foo = new C();
     })(M = exports.M || (exports.M = {}));
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index 434835a59d3..ce4df039932 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -684,6 +684,7 @@ export declare module eaM {
 //// [giant.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     /*
         Prefixes
         p -> public
@@ -1107,7 +1108,6 @@ define(["require", "exports"], function (require, exports) {
         ;
     })(eM = exports.eM || (exports.eM = {}));
     ;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
index 040bdccd515..60bea32e305 100644
--- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
@@ -16,14 +16,15 @@ module m_private {
 
 //// [importAliasAnExternalModuleInsideAnInternalModule_file0.js]
 "use strict";
+exports.__esModule = true;
 var m;
 (function (m) {
     function foo() { }
     m.foo = foo;
 })(m = exports.m || (exports.m = {}));
-exports.__esModule = true;
 //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js]
 "use strict";
+exports.__esModule = true;
 var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0");
 var m_private;
 (function (m_private) {
@@ -31,4 +32,3 @@ var m_private;
     m_private.C = r; // no error
     m_private.C.m.foo();
 })(m_private || (m_private = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index a626d034c75..725390825c6 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -12,6 +12,7 @@ class Hello extends Greeter { }
 
 //// [importAsBaseClass_0.js]
 "use strict";
+exports.__esModule = true;
 var Greeter = (function () {
     function Greeter() {
     }
@@ -19,7 +20,6 @@ var Greeter = (function () {
     return Greeter;
 }());
 exports.Greeter = Greeter;
-exports.__esModule = true;
 //// [importAsBaseClass_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Greeter = require("./importAsBaseClass_0");
 var Hello = (function (_super) {
     __extends(Hello, _super);
@@ -40,4 +41,3 @@ var Hello = (function (_super) {
     }
     return Hello;
 }(Greeter));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index a33b758df7d..1e5e5d0ec71 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -83,6 +83,7 @@ export var useMultiImport_m4_f4 = multiImport_m4.foo();
 
 //// [importDecl_require.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -91,9 +92,9 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require1.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -103,9 +104,9 @@ exports.d = d;
 var x;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require2.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -114,9 +115,9 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require3.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -125,14 +126,14 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require4.js]
 "use strict";
+exports.__esModule = true;
 function foo2() { return null; }
 exports.foo2 = foo2;
-exports.__esModule = true;
 //// [importDecl_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='importDecl_require.ts'/>
 ///<reference path='importDecl_require1.ts'/>
 ///<reference path='importDecl_require2.ts'/>
@@ -174,7 +175,6 @@ var multiImport_m4 = require("./importDecl_require"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-exports.__esModule = true;
 
 
 //// [importDecl_require.d.ts]
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js
index 98e322fb619..00e5dae1f95 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.js
+++ b/tests/baselines/reference/importDeclWithClassModifiers.js
@@ -12,9 +12,9 @@ var b: a;
 //// [importDeclWithClassModifiers.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = x.c;
     exports.b = x.c;
     exports.c = x.c;
     var b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js
index 05c40739a82..e7929ac27fc 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifier.js
+++ b/tests/baselines/reference/importDeclWithDeclareModifier.js
@@ -9,6 +9,6 @@ var b: a;
 
 //// [importDeclWithDeclareModifier.js]
 "use strict";
+exports.__esModule = true;
 exports.a = x.c;
 var b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js
index c23fae40749..26076c2630e 100644
--- a/tests/baselines/reference/importDeclWithExportModifier.js
+++ b/tests/baselines/reference/importDeclWithExportModifier.js
@@ -10,7 +10,7 @@ var b: a;
 //// [importDeclWithExportModifier.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = x.c;
     var b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
index a4102cbfff4..ce5069c335e 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
@@ -8,5 +8,5 @@ export = x;
 
 //// [importDeclWithExportModifierAndExportAssignment.js]
 "use strict";
-exports.a = x.c;
 exports.__esModule = true;
+exports.a = x.c;
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
index ee4e8f1dc8c..cce30fd8b85 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
@@ -13,13 +13,13 @@ export var x: typeof a;
 
 //// [importDeclarationUsedAsTypeQuery_require.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [importDeclarationUsedAsTypeQuery_1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js
index 7f2c4ad4036..bf66829a435 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -66,7 +67,6 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js
index 03a4e6393d7..b756355921d 100644
--- a/tests/baselines/reference/importHelpersAmd.js
+++ b/tests/baselines/reference/importHelpersAmd.js
@@ -19,17 +19,18 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         tslib_1.__extends(B, _super);
         function B() {
@@ -38,5 +39,4 @@ define(["require", "exports", "tslib", "./a"], function (require, exports, tslib
         return B;
     }(a_1.A));
     exports.B = B;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js
index 828c1a5a360..72a91ac365e 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.js
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -66,9 +67,9 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -98,4 +99,3 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 2883a7aaa53..330b8623f69 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -21,9 +21,9 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 exports.x = React.createElement("span", tslib_1.__assign({}, o));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __assign = (this && this.__assign) || Object.assign || function(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
index 4747e017ff5..5b98b61da20 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -34,6 +34,7 @@ export {}
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -68,7 +69,6 @@ C = tslib_1.__decorate([
 var o = { a: 1 };
 var y = tslib_1.__assign({}, o);
 var x = tslib_1.__rest(y, []);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js
index efcd4827257..36a326e124d 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -27,6 +27,7 @@ class C {
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -58,7 +59,6 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js
index 233b12208c1..55bf2ea9d46 100644
--- a/tests/baselines/reference/importHelpersOutFile.js
+++ b/tests/baselines/reference/importHelpersOutFile.js
@@ -23,16 +23,17 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 //// [out.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         tslib_1.__extends(B, _super);
         function B() {
@@ -41,10 +42,10 @@ define("b", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return B;
     }(a_1.A));
     exports.B = B;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C = (function (_super) {
         tslib_2.__extends(C, _super);
         function C() {
@@ -53,5 +54,4 @@ define("c", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return C;
     }(a_2.A));
     exports.C = C;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 917c50f3fee..0c6f0540354 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -18,6 +18,7 @@ var x = foo; // Cause a runtime dependency
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
             this.m1 = 42;
@@ -26,17 +27,16 @@ define(["require", "exports"], function (require, exports) {
     }());
     C1.s1 = true;
     exports.C1 = C1;
-    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var answer = 42; // No exports
     exports.__esModule = true;
+    var answer = 42; // No exports
 });
 //// [foo_2.js]
 define(["require", "exports", "./foo_1"], function (require, exports, foo) {
     "use strict";
-    var x = foo; // Cause a runtime dependency
     exports.__esModule = true;
+    var x = foo; // Cause a runtime dependency
 });
diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js
index cfc63f83551..da492a7103d 100644
--- a/tests/baselines/reference/importInsideModule.js
+++ b/tests/baselines/reference/importInsideModule.js
@@ -11,8 +11,8 @@ export module myModule {
 
 //// [importInsideModule_file2.js]
 "use strict";
+exports.__esModule = true;
 var myModule;
 (function (myModule) {
     var a = foo.x;
 })(myModule = exports.myModule || (exports.myModule = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js
index 8af20d4be36..0340bcd35cb 100644
--- a/tests/baselines/reference/importNonExternalModule.js
+++ b/tests/baselines/reference/importNonExternalModule.js
@@ -21,8 +21,8 @@ var foo;
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     // Import should fail.  foo_0 not an external module
     if (foo.answer === 42) {
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js
index e5785d92866..eb76621f7c0 100644
--- a/tests/baselines/reference/importNonStringLiteral.js
+++ b/tests/baselines/reference/importNonStringLiteral.js
@@ -5,5 +5,5 @@ import foo = require(x); // invalid
 
 //// [foo_0.js]
 "use strict";
-var x = "filename";
 exports.__esModule = true;
+var x = "filename";
diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js
index 658b464983a..40213ce9968 100644
--- a/tests/baselines/reference/importTsBeforeDTs.js
+++ b/tests/baselines/reference/importTsBeforeDTs.js
@@ -15,11 +15,11 @@ var z2 = foo.y + 10; // Should resolve
 
 //// [foo_0.js]
 "use strict";
-exports.y = 42;
 exports.__esModule = true;
+exports.y = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var z1 = foo.x + 10; // Should error, as .ts preferred over .d.ts
 var z2 = foo.y + 10; // Should resolve
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index d44239cec11..15bf907ddd5 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -13,13 +13,13 @@ var r: string = s.foo;
 
 //// [importUsedInExtendsList1_require.js]
 "use strict";
+exports.__esModule = true;
 var Super = (function () {
     function Super() {
     }
     return Super;
 }());
 exports.Super = Super;
-exports.__esModule = true;
 //// [importUsedInExtendsList1_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 ///<reference path='importUsedInExtendsList1_require.ts'/>
 var foo = require("./importUsedInExtendsList1_require");
 var Sub = (function (_super) {
@@ -43,4 +44,3 @@ var Sub = (function (_super) {
 }(foo.Super));
 var s;
 var r = s.foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js
index c5e502f3fdc..9450fc5d7b2 100644
--- a/tests/baselines/reference/importWithTrailingSlash.js
+++ b/tests/baselines/reference/importWithTrailingSlash.js
@@ -22,23 +22,23 @@ aIndex.aIndex;
 
 //// [a.js]
 "use strict";
-exports["default"] = { a: 0 };
 exports.__esModule = true;
+exports["default"] = { a: 0 };
 //// [index.js]
 "use strict";
-exports["default"] = { aIndex: 0 };
 exports.__esModule = true;
+exports["default"] = { aIndex: 0 };
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var _1 = require(".");
 var _2 = require("./");
 _1["default"].a;
 _2["default"].aIndex;
-exports.__esModule = true;
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var __1 = require("..");
 var _1 = require("../");
 __1["default"].a;
 _1["default"].aIndex;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js
index 16c6f2b95c7..b3d607a6943 100644
--- a/tests/baselines/reference/import_reference-exported-alias.js
+++ b/tests/baselines/reference/import_reference-exported-alias.js
@@ -45,8 +45,8 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {
     "use strict";
+    exports.__esModule = true;
     var Services = appJs.Services;
     var UserServices = Services.UserServices;
     var x = new UserServices().getUserName();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js
index 5934d9b2f5e..c6771d47bae 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.js
+++ b/tests/baselines/reference/import_reference-to-type-alias.js
@@ -20,6 +20,7 @@ var x = new Services.UserServices().getUserName();
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var App;
     (function (App) {
         var Services;
@@ -35,12 +36,11 @@ define(["require", "exports"], function (require, exports) {
             Services.UserServices = UserServices;
         })(Services = App.Services || (App.Services = {}));
     })(App = exports.App || (exports.App = {}));
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {
     "use strict";
+    exports.__esModule = true;
     var Services = appJs.App.Services;
     var x = new Services.UserServices().getUserName();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
index 7fb4e02d9fd..1cd0376dded 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
@@ -19,7 +19,7 @@ var p = testData[0].name;
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var testData;
     var p = testData[0].name;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
index c2ac2416806..9b5e518804c 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
@@ -13,18 +13,18 @@ var v = new hostVar.Host();
 //// [host.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Host = (function () {
         function Host() {
         }
         return Host;
     }());
     exports.Host = Host;
-    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports", "host"], function (require, exports, host) {
     "use strict";
+    exports.__esModule = true;
     var hostVar = host;
     var v = new hostVar.Host();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js
index 61b411ea571..b82ac22f4ed 100644
--- a/tests/baselines/reference/importedAliasesInTypePositions.js
+++ b/tests/baselines/reference/importedAliasesInTypePositions.js
@@ -21,6 +21,7 @@ export module ImportingModule {
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var elaborate;
     (function (elaborate) {
         var nested;
@@ -41,11 +42,11 @@ define(["require", "exports"], function (require, exports) {
             })(mod = nested.mod || (nested.mod = {}));
         })(nested = elaborate.nested || (elaborate.nested = {}));
     })(elaborate = exports.elaborate || (exports.elaborate = {}));
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ImportingModule;
     (function (ImportingModule) {
         var UsesReferredType = (function () {
@@ -55,5 +56,4 @@ define(["require", "exports"], function (require, exports) {
             return UsesReferredType;
         }());
     })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js
index 52761e7e9db..5f4f9677dcd 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.js
+++ b/tests/baselines/reference/importedModuleClassNameClash.js
@@ -9,10 +9,10 @@ class foo { }
 //// [importedModuleClassNameClash.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var foo = (function () {
         function foo() {
         }
         return foo;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js
index b85c7145a47..dd45d4db89c 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.js
+++ b/tests/baselines/reference/importsImplicitlyReadonly.js
@@ -23,12 +23,13 @@ a3.y = 1;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 var y = 1;
 exports.y = y;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var a1 = require("./a");
 var a2 = require("./a");
@@ -41,4 +42,3 @@ a2.x = 1;
 a2.y = 1;
 a3.x = 1;
 a3.y = 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
index bc20008c2fa..997cbcd5b79 100644
--- a/tests/baselines/reference/inferenceLimit.js
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -53,6 +53,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class BrokenClass {
     constructor() { }
     brokenMethod(field, value) {
@@ -80,4 +81,3 @@ class BrokenClass {
     }
 }
 exports.BrokenClass = BrokenClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js
index 9fe669911b2..293be662a4d 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.js
+++ b/tests/baselines/reference/instanceOfInExternalModules.js
@@ -14,19 +14,19 @@ function IsFoo(value: any): boolean {
 //// [instanceOfInExternalModules_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
         return Foo;
     }());
     exports.Foo = Foo;
-    exports.__esModule = true;
 });
 //// [instanceOfInExternalModules_1.js]
 define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) {
     "use strict";
+    exports.__esModule = true;
     function IsFoo(value) {
         return value instanceof Bar.Foo;
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js
index 7fb7b08a881..ec502725925 100644
--- a/tests/baselines/reference/interfaceContextualType.js
+++ b/tests/baselines/reference/interfaceContextualType.js
@@ -23,6 +23,7 @@ class Bug {
 
 //// [interfaceContextualType.js]
 "use strict";
+exports.__esModule = true;
 var Bug = (function () {
     function Bug() {
     }
@@ -37,4 +38,3 @@ var Bug = (function () {
     };
     return Bug;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js
index 01a64805530..41f12dbac05 100644
--- a/tests/baselines/reference/interfaceDeclaration3.js
+++ b/tests/baselines/reference/interfaceDeclaration3.js
@@ -58,6 +58,7 @@ interface I2 extends I1 { item:string; }
 //// [interfaceDeclaration3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var M1;
     (function (M1) {
         var C1 = (function () {
@@ -119,5 +120,4 @@ define(["require", "exports"], function (require, exports) {
         }
         return C3;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js
index dde6b1632f1..318e8903c36 100644
--- a/tests/baselines/reference/interfaceDeclaration5.js
+++ b/tests/baselines/reference/interfaceDeclaration5.js
@@ -6,11 +6,11 @@ export class C1 { }
 //// [interfaceDeclaration5.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
         return C1;
     }());
     exports.C1 = C1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js
index 5fb3996134b..0bc759f6cda 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -27,6 +27,7 @@ export class Test {
 //// [interfaceImplementation6.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
@@ -50,5 +51,4 @@ define(["require", "exports"], function (require, exports) {
         return Test;
     }());
     exports.Test = Test;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index 20ce33035e6..0b333ac1830 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -19,6 +19,7 @@ export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -41,7 +42,6 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
index 6868a0511a6..cf2eb41662b 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
@@ -17,6 +17,7 @@ export module m2 {
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -38,7 +39,6 @@ var m2;
         var cReturnVal = m3.cProp.foo(10);
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
index d9f47a05d9e..1de7fe25407 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
@@ -19,6 +19,7 @@ export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -41,4 +42,3 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
index 52a2e0b3fed..e224b40c9f3 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
@@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -28,7 +29,6 @@ var x;
 exports.xc = x.c;
 exports.cProp = new exports.xc();
 var cReturnVal = exports.cProp.foo(10);
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
index 640b533f151..16f53fe3e8b 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
@@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -28,7 +29,6 @@ var x;
 var xc = x.c;
 exports.cProp = new xc();
 var cReturnVal = exports.cProp.foo(10);
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
index de2582debef..c387fa6e2c4 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasEnumInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
@@ -29,7 +30,6 @@ var c;
     c.b = a.weekend;
     c.bVal = c.b.Sunday;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasEnumInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
index 6e54ed79afc..717652283cf 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
@@ -29,7 +30,6 @@ var c;
     var b = a.weekend;
     c.bVal = b.Sunday;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
index c7b5180fd93..a84ebf0b9ad 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
@@ -16,6 +16,7 @@ var happyFriday = c.b.Friday;
 
 //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
@@ -31,4 +32,3 @@ var c;
     c.bVal = b.Sunday;
 })(c = exports.c || (exports.c = {}));
 var happyFriday = c.b.Friday;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
index d3e9fdf8349..ad07b9bd33f 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
@@ -14,6 +14,7 @@ export var bVal: b = b.Sunday;
 //// [internalAliasEnumInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var weekend;
@@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     exports.b = a.weekend;
     exports.bVal = exports.b.Sunday;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
index 99b9156c0c9..6b5f5b17a26 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
@@ -14,6 +14,7 @@ export var bVal: b = b.Sunday;
 //// [internalAliasEnumInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var weekend;
@@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.weekend;
     exports.bVal = b.Sunday;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
index 4138970da0b..95bb936bc75 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
@@ -14,6 +14,7 @@ export module c {
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -27,7 +28,6 @@ var c;
     c.bVal = c.b(10);
     c.bVal2 = c.b;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
index 83cab3c05bb..50de6b470ee 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
@@ -14,6 +14,7 @@ export module c {
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -27,7 +28,6 @@ var c;
     var bVal = b(10);
     c.bVal2 = b;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
index 67239e40b1d..543e9952f23 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
@@ -14,6 +14,7 @@ var d = c.b(11);
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -28,4 +29,3 @@ var c;
     c.bVal2 = b;
 })(c = exports.c || (exports.c = {}));
 var d = c.b(11);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
index 88765f267e6..267045b625d 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
@@ -13,6 +13,7 @@ export var bVal2 = b;
 //// [internalAliasFunctionInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         function foo(x) {
@@ -23,7 +24,6 @@ define(["require", "exports"], function (require, exports) {
     exports.b = a.foo;
     exports.bVal = exports.b(10);
     exports.bVal2 = exports.b;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
index 160b4047849..bb3b0e244d2 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
@@ -12,6 +12,7 @@ export var bVal2 = b;
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -22,7 +23,6 @@ var a;
 var b = a.foo;
 exports.bVal = b(10);
 exports.bVal2 = b;
-exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
index 904c7171818..85335a0fb7f 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
@@ -14,6 +14,7 @@ export module c {
 //// [internalAliasInitializedModuleInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var b;
@@ -31,7 +32,6 @@ define(["require", "exports"], function (require, exports) {
         c.b = a.b;
         c.x = new c.b.c();
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
index eb59627a4cb..c39e6cfd168 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
@@ -13,6 +13,7 @@ export module c {
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
@@ -30,7 +31,6 @@ var c;
     var b = a.b;
     c.x = new b.c();
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 77dbbab235a..6e66118f5b9 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -15,6 +15,7 @@ export var d = new c.b.c();
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
@@ -33,4 +34,3 @@ var c;
     c.x = new b.c();
 })(c = exports.c || (exports.c = {}));
 exports.d = new c.b.c();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
index 05fe46f1eb5..86d9f88cee3 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
@@ -11,6 +11,7 @@ export var x: b.c = new b.c();
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
@@ -25,7 +26,6 @@ var a;
 })(a = exports.a || (exports.a = {}));
 exports.b = a.b;
 exports.x = new exports.b.c();
-exports.__esModule = true;
 
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
index 63f6b8c1422..79185fed228 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -12,6 +12,7 @@ export var x: b.c = new b.c();
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var b;
@@ -26,7 +27,6 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.b;
     exports.x = new b.c();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
index e2cbdc3b54d..bd50cd8bbc2 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
@@ -13,10 +13,10 @@ export module c {
 //// [internalAliasInterfaceInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
index 15e03818d84..f7b08e6c170 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
@@ -13,10 +13,10 @@ export module c {
 //// [internalAliasInterfaceInsideLocalModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
index ed4c6714196..19163ff1f66 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
@@ -14,9 +14,9 @@ var x: c.b;
 //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
     var x;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
index 1b74ded4656..7ca966e90b2 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
@@ -15,11 +15,11 @@ export module c {
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var c;
 (function (c) {
     c.x.foo();
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
index a46d7629ae9..22793f8aef5 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
@@ -15,11 +15,11 @@ export module c {
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var c;
 (function (c) {
     c.x.foo();
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
index efbb156bed8..a6b4f83de8e 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -19,9 +19,9 @@ export var z: c.b.I;
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
         c.x.foo();
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
index ac52f94db72..eccbd9a45bd 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
@@ -15,8 +15,8 @@ x.foo();
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x.foo();
     exports.__esModule = true;
+    exports.x.foo();
 });
 
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
index 45af4536151..27de6bbfd98 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -14,8 +14,8 @@ x.foo();
 
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js]
 "use strict";
-exports.x.foo();
 exports.__esModule = true;
+exports.x.foo();
 
 
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
index 5cd431470f5..34f044721c4 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
@@ -12,6 +12,7 @@ export module c {
 //// [internalAliasVarInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
@@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) {
         c.b = a.x;
         c.bVal = c.b;
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
index 956c70d7cbb..161dc0bf973 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
@@ -12,6 +12,7 @@ export module c {
 //// [internalAliasVarInsideLocalModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
@@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) {
         var b = a.x;
         c.bVal = b;
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
index 962e34c4a3e..a0192fc9daa 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
@@ -12,6 +12,7 @@ export var z = c.b;
 
 //// [internalAliasVarInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     a.x = 10;
@@ -22,4 +23,3 @@ var c;
     c.bVal = b;
 })(c = exports.c || (exports.c = {}));
 exports.z = c.b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
index 732257b93e5..d27b4e3188d 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
@@ -11,13 +11,13 @@ export var bVal = b;
 //// [internalAliasVarInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
     })(a = exports.a || (exports.a = {}));
     exports.b = a.x;
     exports.bVal = exports.b;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
index f0d02aa709c..65c9204ed3c 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
@@ -10,13 +10,13 @@ export var bVal = b;
 
 //// [internalAliasVarInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     a.x = 10;
 })(a = exports.a || (exports.a = {}));
 var b = a.x;
 exports.bVal = b;
-exports.__esModule = true;
 
 
 //// [internalAliasVarInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/intersectionTypeInference1.js b/tests/baselines/reference/intersectionTypeInference1.js
index 27a75a64be6..32ddedae2b3 100644
--- a/tests/baselines/reference/intersectionTypeInference1.js
+++ b/tests/baselines/reference/intersectionTypeInference1.js
@@ -11,8 +11,8 @@ export const Form3 = brokenFunction(parameterFn)({store: "hello"})
 //// [intersectionTypeInference1.js]
 // Repro from #8801
 "use strict";
+exports.__esModule = true;
 function alert(s) { }
 var parameterFn = function (props) { return alert(props.store); };
 var brokenFunction = function (f) { return function (o) { return o; }; };
 exports.Form3 = brokenFunction(parameterFn)({ store: "hello" });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index f9590d70dd3..5aac4a64186 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -25,6 +25,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 module_1 = require("module");
 var module_2 = require("module");
 var ns = require("module");
@@ -40,4 +41,3 @@ var y = ns.value;
 var module_3 = require("module");
 exports.c1 = module_3.c1;
 exports.z = x;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
index 0d4e00b2593..4ed1fdf2c77 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
@@ -7,6 +7,6 @@ run(1);
 //// [isolatedModulesPlainFile-AMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    run(1);
     Object.defineProperty(exports, "__esModule", { value: true });
+    run(1);
 });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
index 5cf8d277597..38739a700ef 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
@@ -6,5 +6,5 @@ run(1);
 
 //// [isolatedModulesPlainFile-CommonJS.js]
 "use strict";
-run(1);
 Object.defineProperty(exports, "__esModule", { value: true });
+run(1);
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
index 5886a1908a6..f37962a84ab 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
@@ -15,6 +15,6 @@ run(1);
     }
 })(function (require, exports) {
     "use strict";
-    run(1);
     Object.defineProperty(exports, "__esModule", { value: true });
+    run(1);
 });
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
index cbb97e43d72..088b40e97ad 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
@@ -26,6 +26,7 @@ export default apply;
 //// [apply.js]
 define("_apply", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     /**
      * A faster alternative to `Function#apply`, this function invokes `func`
      * with the `this` binding of `thisArg` and the arguments of `args`.
@@ -47,5 +48,4 @@ define("_apply", ["require", "exports"], function (require, exports) {
         return func.apply(thisArg, args);
     }
     exports["default"] = apply;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js
index a3259d55cd3..dd4d326268b 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.js
+++ b/tests/baselines/reference/jsxEmitWithAttributes.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
@@ -80,4 +81,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
index 32ebf4d5d54..a864da65dbb 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
@@ -80,4 +81,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
index 36b16c62f49..9beff01d707 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let createElement = Element_1.Element.createElement;
 let c;
@@ -81,5 +82,4 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js.map b/tests/baselines/reference/jsxFactoryIdentifier.js.map
index cad196b8ba5..57ff760b8a8 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js.map
@@ -1,3 +1,3 @@
 //// [Element.js.map]
-{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
index 71dbb45a155..6101ee1d5e7 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js
 sourceFile:Element.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>var Element;
 1 >
 2 >^^^^
@@ -42,10 +43,10 @@ sourceFile:Element.ts
   >                   }
   >               }
   >           }
-1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
-3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
-4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0)
 ---
 >>>(function (Element) {
 1->
@@ -55,9 +56,9 @@ sourceFile:Element.ts
 1->
 2 >export namespace 
 3 >           Element
-1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
-3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+1->Emitted(4, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0)
 ---
 >>>    function isElement(el) {
 1->^^^^
@@ -68,9 +69,9 @@ sourceFile:Element.ts
   >    
 2 >    export function isElement(
 3 >                       el: any
-1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
-2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
-3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+1->Emitted(5, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0)
 ---
 >>>        return el.markAsChildOfRootElement !== undefined;
 1->^^^^^^^^
@@ -92,15 +93,15 @@ sourceFile:Element.ts
 7 >                                           !== 
 8 >                                               undefined
 9 >                                                        ;
-1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
-2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
-3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
-4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
-5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
-6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
-7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
-8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
-9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+1->Emitted(6, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -109,8 +110,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
-2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0)
 ---
 >>>    Element.isElement = isElement;
 1->^^^^
@@ -124,10 +125,10 @@ sourceFile:Element.ts
   >                             return el.markAsChildOfRootElement !== undefined;
   >                         }
 4 >                                 
-1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
-2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
-3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
-4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+1->Emitted(8, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0)
 ---
 >>>    function createElement(args) {
 1->^^^^
@@ -138,9 +139,9 @@ sourceFile:Element.ts
   >    
 2 >    export function createElement(
 3 >                           args: any[]
-1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
-3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+1->Emitted(9, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0)
 ---
 >>>        return {};
 1 >^^^^^^^^
@@ -156,11 +157,11 @@ sourceFile:Element.ts
 4 >               {
   >                       }
 5 >                 
-1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
-2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
-3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
-4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
-5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -169,8 +170,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
-2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0)
 ---
 >>>    Element.createElement = createElement;
 1->^^^^
@@ -186,10 +187,10 @@ sourceFile:Element.ts
   >                                 }
   >                             }
 4 >                                         
-1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
-2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
-3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
-4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+1->Emitted(12, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0)
 ---
 >>>})(Element = exports.Element || (exports.Element = {}));
 1->
@@ -221,15 +222,15 @@ sourceFile:Element.ts
   >                                                        }
   >                                                    }
   >                                                }
-1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
-3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
-4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
-5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
-6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
-7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
-8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
-9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+1->Emitted(13, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0)
 ---
 >>>exports.createElement = Element.createElement;
 1 >
@@ -250,14 +251,14 @@ sourceFile:Element.ts
 6 >                               .
 7 >                                createElement
 8 >                                             ;
-1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
-2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
-3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
-4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
-5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
-6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
-7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
-8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0)
 ---
 >>>function toCamelCase(text) {
 1 >
@@ -269,9 +270,9 @@ sourceFile:Element.ts
   >
 2 >function toCamelCase(
 3 >                     text: string
-1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
-2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0)
 ---
 >>>    return text[0].toLowerCase() + text.substring(1);
 1->^^^^
@@ -311,36 +312,35 @@ sourceFile:Element.ts
 16>                                                  1
 17>                                                   )
 18>                                                    ;
-1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
-2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
-3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
-4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
-5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
-6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
-7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
-8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
-9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
-10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
-11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
-12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
-13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
-14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
-15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
-16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
-17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
-18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+1->Emitted(16, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(16, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(16, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(16, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(16, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(16, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(16, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(16, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(16, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(16, 54) Source(29, 54) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
-2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
@@ -352,14 +352,15 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>const Element_1 = require("./Element");
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                       ^^^^^^^^^^^^^^->
 1 >
 2 >import { Element} from './Element';
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0)
 ---
 >>>let createElement = Element_1.Element.createElement;
 1->
@@ -379,14 +380,14 @@ sourceFile:test.tsx
 6 >                                     .
 7 >                                      createElement
 8 >                                                   ;
-1->Emitted(3, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(3, 5) Source(2, 5) + SourceIndex(0)
-3 >Emitted(3, 18) Source(2, 18) + SourceIndex(0)
-4 >Emitted(3, 21) Source(2, 21) + SourceIndex(0)
-5 >Emitted(3, 38) Source(2, 28) + SourceIndex(0)
-6 >Emitted(3, 39) Source(2, 29) + SourceIndex(0)
-7 >Emitted(3, 52) Source(2, 42) + SourceIndex(0)
-8 >Emitted(3, 53) Source(2, 43) + SourceIndex(0)
+1->Emitted(4, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(4, 18) Source(2, 18) + SourceIndex(0)
+4 >Emitted(4, 21) Source(2, 21) + SourceIndex(0)
+5 >Emitted(4, 38) Source(2, 28) + SourceIndex(0)
+6 >Emitted(4, 39) Source(2, 29) + SourceIndex(0)
+7 >Emitted(4, 52) Source(2, 42) + SourceIndex(0)
+8 >Emitted(4, 53) Source(2, 43) + SourceIndex(0)
 ---
 >>>let c;
 1 >
@@ -403,10 +404,10 @@ sourceFile:test.tsx
   >    	}
   >    }
 4 >     ;
-1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0)
-3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0)
-4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0)
+1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(5, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(5, 7) Source(7, 3) + SourceIndex(0)
 ---
 >>>class A {
 1->
@@ -414,7 +415,7 @@ sourceFile:test.tsx
 1->
   >
   >
-1->Emitted(5, 1) Source(9, 1) + SourceIndex(0)
+1->Emitted(6, 1) Source(9, 1) + SourceIndex(0)
 ---
 >>>    view() {
 1->^^^^
@@ -423,8 +424,8 @@ sourceFile:test.tsx
 1->class A {
   >	
 2 >    view
-1->Emitted(6, 5) Source(10, 2) + SourceIndex(0)
-2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0)
+1->Emitted(7, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(7, 9) Source(10, 6) + SourceIndex(0)
 ---
 >>>        return [
 1->^^^^^^^^
@@ -435,9 +436,9 @@ sourceFile:test.tsx
   >		
 2 >        return
 3 >               
-1->Emitted(7, 9) Source(11, 3) + SourceIndex(0)
-2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0)
-3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0)
+1->Emitted(8, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(8, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(8, 16) Source(11, 10) + SourceIndex(0)
 ---
 >>>            createElement("meta", { content: "helloworld" }),
 1->^^^^^^^^^^^^
@@ -453,12 +454,12 @@ sourceFile:test.tsx
 4 >                                           =
 5 >                                             "helloworld"
 6 >                                                         ></meta>
-1->Emitted(8, 13) Source(12, 4) + SourceIndex(0)
-2 >Emitted(8, 37) Source(12, 10) + SourceIndex(0)
-3 >Emitted(8, 44) Source(12, 17) + SourceIndex(0)
-4 >Emitted(8, 46) Source(12, 18) + SourceIndex(0)
-5 >Emitted(8, 58) Source(12, 30) + SourceIndex(0)
-6 >Emitted(8, 61) Source(12, 38) + SourceIndex(0)
+1->Emitted(9, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(9, 37) Source(12, 10) + SourceIndex(0)
+3 >Emitted(9, 44) Source(12, 17) + SourceIndex(0)
+4 >Emitted(9, 46) Source(12, 18) + SourceIndex(0)
+5 >Emitted(9, 58) Source(12, 30) + SourceIndex(0)
+6 >Emitted(9, 61) Source(12, 38) + SourceIndex(0)
 ---
 >>>            createElement("meta", { content: c.a.b })
 1 >^^^^^^^^^^^^
@@ -482,16 +483,16 @@ sourceFile:test.tsx
 8 >                                                .
 9 >                                                 b
 10>                                                  }></meta>
-1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0)
-2 >Emitted(9, 37) Source(13, 10) + SourceIndex(0)
-3 >Emitted(9, 44) Source(13, 17) + SourceIndex(0)
-4 >Emitted(9, 46) Source(13, 19) + SourceIndex(0)
-5 >Emitted(9, 47) Source(13, 20) + SourceIndex(0)
-6 >Emitted(9, 48) Source(13, 21) + SourceIndex(0)
-7 >Emitted(9, 49) Source(13, 23) + SourceIndex(0)
-8 >Emitted(9, 50) Source(13, 24) + SourceIndex(0)
-9 >Emitted(9, 51) Source(13, 25) + SourceIndex(0)
-10>Emitted(9, 54) Source(13, 34) + SourceIndex(0)
+1 >Emitted(10, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(10, 37) Source(13, 10) + SourceIndex(0)
+3 >Emitted(10, 44) Source(13, 17) + SourceIndex(0)
+4 >Emitted(10, 46) Source(13, 19) + SourceIndex(0)
+5 >Emitted(10, 47) Source(13, 20) + SourceIndex(0)
+6 >Emitted(10, 48) Source(13, 21) + SourceIndex(0)
+7 >Emitted(10, 49) Source(13, 23) + SourceIndex(0)
+8 >Emitted(10, 50) Source(13, 24) + SourceIndex(0)
+9 >Emitted(10, 51) Source(13, 25) + SourceIndex(0)
+10>Emitted(10, 54) Source(13, 34) + SourceIndex(0)
 ---
 >>>        ];
 1 >^^^^^^^^^
@@ -499,8 +500,8 @@ sourceFile:test.tsx
 1 >
   >		]
 2 >         ;
-1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0)
-2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0)
+1 >Emitted(11, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(11, 11) Source(14, 5) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -508,15 +509,14 @@ sourceFile:test.tsx
 1 >
   >	
 2 >    }
-1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0)
-2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0)
+1 >Emitted(12, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(12, 6) Source(15, 3) + SourceIndex(0)
 ---
 >>>}
 1 >^
-2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
+1 >Emitted(13, 2) Source(16, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
index 3ab40dee5eb..05da89d0d85 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
@@ -15,11 +15,11 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render(createElement) {
         return createElement("div", null);
     }
 }
 exports.AppComponent = AppComponent;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
index c108b93a913..c72e1bf8057 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
index 68f39e67ddd..b2d30177b1d 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render(createElement) {
 1->^^^^
@@ -33,10 +34,10 @@ sourceFile:test.tsx
 2 >    render
 3 >          (
 4 >           createElement
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
-3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
-4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0)
 ---
 >>>        return createElement("div", null);
 1->^^^^^^^^
@@ -50,11 +51,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                         ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -62,28 +63,26 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
index 12ea8b96602..c9f5f3465e3 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
@@ -15,11 +15,11 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render() {
         return createElement("div", null);
     }
 }
 exports.AppComponent = AppComponent;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
index 715014ff53f..66666a526d6 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
index b1b8db46eaa..1a77ab3eae1 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render() {
 1->^^^^
@@ -29,8 +30,8 @@ sourceFile:test.tsx
 1->export class AppComponent {
   >    
 2 >    render
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
 ---
 >>>        return createElement("div", null);
 1->^^^^^^^^
@@ -44,11 +45,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                         ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -56,28 +57,26 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render() {
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
index 9f408e4db7a..9fc5799b11d 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let c;
 class A {
     view() {
@@ -79,4 +80,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
index 331c7a65d73..aa90c74cce5 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let c;
 class A {
     view() {
@@ -79,4 +80,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index 0a7b7f8d387..ee747733799 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
@@ -80,5 +81,4 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js.map b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
index f8cef24a0f0..6c5dd8abf56 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js.map
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
@@ -1,3 +1,3 @@
 //// [Element.js.map]
-{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
index 86ed94197d6..9831a9ab5fd 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js
 sourceFile:Element.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>var Element;
 1 >
 2 >^^^^
@@ -42,10 +43,10 @@ sourceFile:Element.ts
   >                   }
   >               }
   >           }
-1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
-3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
-4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0)
 ---
 >>>(function (Element) {
 1->
@@ -55,9 +56,9 @@ sourceFile:Element.ts
 1->
 2 >export namespace 
 3 >           Element
-1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
-3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+1->Emitted(4, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0)
 ---
 >>>    function isElement(el) {
 1->^^^^
@@ -68,9 +69,9 @@ sourceFile:Element.ts
   >    
 2 >    export function isElement(
 3 >                       el: any
-1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
-2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
-3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+1->Emitted(5, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0)
 ---
 >>>        return el.markAsChildOfRootElement !== undefined;
 1->^^^^^^^^
@@ -92,15 +93,15 @@ sourceFile:Element.ts
 7 >                                           !== 
 8 >                                               undefined
 9 >                                                        ;
-1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
-2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
-3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
-4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
-5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
-6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
-7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
-8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
-9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+1->Emitted(6, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -109,8 +110,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
-2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0)
 ---
 >>>    Element.isElement = isElement;
 1->^^^^
@@ -124,10 +125,10 @@ sourceFile:Element.ts
   >                             return el.markAsChildOfRootElement !== undefined;
   >                         }
 4 >                                 
-1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
-2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
-3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
-4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+1->Emitted(8, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0)
 ---
 >>>    function createElement(args) {
 1->^^^^
@@ -138,9 +139,9 @@ sourceFile:Element.ts
   >    
 2 >    export function createElement(
 3 >                           args: any[]
-1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
-3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+1->Emitted(9, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0)
 ---
 >>>        return {};
 1 >^^^^^^^^
@@ -156,11 +157,11 @@ sourceFile:Element.ts
 4 >               {
   >                       }
 5 >                 
-1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
-2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
-3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
-4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
-5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -169,8 +170,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
-2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0)
 ---
 >>>    Element.createElement = createElement;
 1->^^^^
@@ -186,10 +187,10 @@ sourceFile:Element.ts
   >                                 }
   >                             }
 4 >                                         
-1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
-2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
-3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
-4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+1->Emitted(12, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0)
 ---
 >>>})(Element = exports.Element || (exports.Element = {}));
 1->
@@ -221,15 +222,15 @@ sourceFile:Element.ts
   >                                                        }
   >                                                    }
   >                                                }
-1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
-3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
-4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
-5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
-6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
-7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
-8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
-9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+1->Emitted(13, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0)
 ---
 >>>exports.createElement = Element.createElement;
 1 >
@@ -250,14 +251,14 @@ sourceFile:Element.ts
 6 >                               .
 7 >                                createElement
 8 >                                             ;
-1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
-2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
-3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
-4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
-5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
-6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
-7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
-8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0)
 ---
 >>>function toCamelCase(text) {
 1 >
@@ -269,9 +270,9 @@ sourceFile:Element.ts
   >
 2 >function toCamelCase(
 3 >                     text: string
-1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
-2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0)
 ---
 >>>    return text[0].toLowerCase() + text.substring(1);
 1->^^^^
@@ -311,36 +312,35 @@ sourceFile:Element.ts
 16>                                                  1
 17>                                                   )
 18>                                                    ;
-1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
-2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
-3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
-4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
-5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
-6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
-7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
-8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
-9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
-10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
-11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
-12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
-13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
-14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
-15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
-16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
-17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
-18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+1->Emitted(16, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(16, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(16, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(16, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(16, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(16, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(16, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(16, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(16, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(16, 54) Source(29, 54) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
-2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
@@ -352,13 +352,14 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>const Element_1 = require("./Element");
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >import { Element} from './Element';
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0)
 ---
 >>>let c;
 1 >
@@ -376,10 +377,10 @@ sourceFile:test.tsx
   >    	}
   >    }
 4 >     ;
-1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-3 >Emitted(3, 6) Source(7, 2) + SourceIndex(0)
-4 >Emitted(3, 7) Source(7, 3) + SourceIndex(0)
+1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0)
 ---
 >>>class A {
 1->
@@ -387,7 +388,7 @@ sourceFile:test.tsx
 1->
   >
   >
-1->Emitted(4, 1) Source(9, 1) + SourceIndex(0)
+1->Emitted(5, 1) Source(9, 1) + SourceIndex(0)
 ---
 >>>    view() {
 1->^^^^
@@ -396,8 +397,8 @@ sourceFile:test.tsx
 1->class A {
   >	
 2 >    view
-1->Emitted(5, 5) Source(10, 2) + SourceIndex(0)
-2 >Emitted(5, 9) Source(10, 6) + SourceIndex(0)
+1->Emitted(6, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0)
 ---
 >>>        return [
 1->^^^^^^^^
@@ -408,9 +409,9 @@ sourceFile:test.tsx
   >		
 2 >        return
 3 >               
-1->Emitted(6, 9) Source(11, 3) + SourceIndex(0)
-2 >Emitted(6, 15) Source(11, 9) + SourceIndex(0)
-3 >Emitted(6, 16) Source(11, 10) + SourceIndex(0)
+1->Emitted(7, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0)
 ---
 >>>            Element_1.Element.createElement("meta", { content: "helloworld" }),
 1->^^^^^^^^^^^^
@@ -426,12 +427,12 @@ sourceFile:test.tsx
 4 >                                                             =
 5 >                                                               "helloworld"
 6 >                                                                           ></meta>
-1->Emitted(7, 13) Source(12, 4) + SourceIndex(0)
-2 >Emitted(7, 55) Source(12, 10) + SourceIndex(0)
-3 >Emitted(7, 62) Source(12, 17) + SourceIndex(0)
-4 >Emitted(7, 64) Source(12, 18) + SourceIndex(0)
-5 >Emitted(7, 76) Source(12, 30) + SourceIndex(0)
-6 >Emitted(7, 79) Source(12, 38) + SourceIndex(0)
+1->Emitted(8, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(8, 55) Source(12, 10) + SourceIndex(0)
+3 >Emitted(8, 62) Source(12, 17) + SourceIndex(0)
+4 >Emitted(8, 64) Source(12, 18) + SourceIndex(0)
+5 >Emitted(8, 76) Source(12, 30) + SourceIndex(0)
+6 >Emitted(8, 79) Source(12, 38) + SourceIndex(0)
 ---
 >>>            Element_1.Element.createElement("meta", { content: c.a.b })
 1 >^^^^^^^^^^^^
@@ -455,16 +456,16 @@ sourceFile:test.tsx
 8 >                                                                  .
 9 >                                                                   b
 10>                                                                    }></meta>
-1 >Emitted(8, 13) Source(13, 4) + SourceIndex(0)
-2 >Emitted(8, 55) Source(13, 10) + SourceIndex(0)
-3 >Emitted(8, 62) Source(13, 17) + SourceIndex(0)
-4 >Emitted(8, 64) Source(13, 19) + SourceIndex(0)
-5 >Emitted(8, 65) Source(13, 20) + SourceIndex(0)
-6 >Emitted(8, 66) Source(13, 21) + SourceIndex(0)
-7 >Emitted(8, 67) Source(13, 23) + SourceIndex(0)
-8 >Emitted(8, 68) Source(13, 24) + SourceIndex(0)
-9 >Emitted(8, 69) Source(13, 25) + SourceIndex(0)
-10>Emitted(8, 72) Source(13, 34) + SourceIndex(0)
+1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(9, 55) Source(13, 10) + SourceIndex(0)
+3 >Emitted(9, 62) Source(13, 17) + SourceIndex(0)
+4 >Emitted(9, 64) Source(13, 19) + SourceIndex(0)
+5 >Emitted(9, 65) Source(13, 20) + SourceIndex(0)
+6 >Emitted(9, 66) Source(13, 21) + SourceIndex(0)
+7 >Emitted(9, 67) Source(13, 23) + SourceIndex(0)
+8 >Emitted(9, 68) Source(13, 24) + SourceIndex(0)
+9 >Emitted(9, 69) Source(13, 25) + SourceIndex(0)
+10>Emitted(9, 72) Source(13, 34) + SourceIndex(0)
 ---
 >>>        ];
 1 >^^^^^^^^^
@@ -472,8 +473,8 @@ sourceFile:test.tsx
 1 >
   >		]
 2 >         ;
-1 >Emitted(9, 10) Source(14, 4) + SourceIndex(0)
-2 >Emitted(9, 11) Source(14, 5) + SourceIndex(0)
+1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -481,15 +482,14 @@ sourceFile:test.tsx
 1 >
   >	
 2 >    }
-1 >Emitted(10, 5) Source(15, 2) + SourceIndex(0)
-2 >Emitted(10, 6) Source(15, 3) + SourceIndex(0)
+1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0)
 ---
 >>>}
 1 >^
-2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(11, 2) Source(16, 2) + SourceIndex(0)
+1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
index 60c8ca80212..510efc97f4a 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
@@ -14,11 +14,11 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render(createElement) {
         return MyElement.createElement("div", null);
     }
 }
 exports.AppComponent = AppComponent;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
index ac54c9638cd..1af641eb351 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
index 0e8d7ec51f3..2f5270f3705 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render(createElement) {
 1->^^^^
@@ -33,10 +34,10 @@ sourceFile:test.tsx
 2 >    render
 3 >          (
 4 >           createElement
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
-3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
-4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0)
 ---
 >>>        return MyElement.createElement("div", null);
 1->^^^^^^^^
@@ -50,11 +51,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                                   ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 52) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 53) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 52) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 53) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -62,28 +63,26 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
index 72200aee75c..267f3eaee50 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
@@ -13,6 +13,7 @@ class Component {
 
 //// [index.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("./jsx");
 var skate;
 var React = { createElement: skate.h };
@@ -25,4 +26,3 @@ var Component = (function () {
     return Component;
 }());
 ;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js
index 59bde766a35..4b42ebe812d 100644
--- a/tests/baselines/reference/jsxImportInAttribute.js
+++ b/tests/baselines/reference/jsxImportInAttribute.js
@@ -16,8 +16,8 @@ let x = Test; // emit test_1.default
 
 //// [consumer.jsx]
 "use strict";
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var Test_1 = require("Test");
 var x = Test_1["default"]; // emit test_1.default
 <anything attr={Test_1["default"]}/>; // ?
-exports.__esModule = true;
diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js
index 626a48d191e..187ba545fb3 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var BaseComponent_1 = require("BaseComponent");
 var TestComponent = (function (_super) {
@@ -47,4 +48,3 @@ var TestComponent = (function (_super) {
     };
     return TestComponent;
 }(React.Component));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js
index 9040455be56..3b291a34774 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var BaseComponent = require("BaseComponent");
 var TestComponent = (function (_super) {
@@ -47,4 +48,3 @@ var TestComponent = (function (_super) {
     };
     return TestComponent;
 }(React.Component));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js
index 3e6b396184f..f198c0f9ea7 100644
--- a/tests/baselines/reference/localAliasExportAssignment.js
+++ b/tests/baselines/reference/localAliasExportAssignment.js
@@ -22,7 +22,7 @@ var server;
 module.exports = server;
 //// [localAliasExportAssignment_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='localAliasExportAssignment_0.ts'/>
 var connect = require("./localAliasExportAssignment_0");
 connect();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/mapOnTupleTypes01.js b/tests/baselines/reference/mapOnTupleTypes01.js
index 731e0e2e70b..9f22aa63753 100644
--- a/tests/baselines/reference/mapOnTupleTypes01.js
+++ b/tests/baselines/reference/mapOnTupleTypes01.js
@@ -44,6 +44,7 @@ export let h = numNumNumNumNum.map(n => n * n);
 
 //// [mapOnTupleTypes01.js]
 "use strict";
+exports.__esModule = true;
 exports.mapOnLooseArrayLiteral = [1, 2, 3, 4].map(function (n) { return n * n; });
 // Length 1
 var numTuple = [1];
@@ -67,7 +68,6 @@ exports.g = numNumNumNumNum.map(function (n) { return n * n; });
 // Length 6
 var numNumNumNumNumNum = [1, 2, 3, 4, 5, 6];
 exports.h = numNumNumNumNum.map(function (n) { return n * n; });
-exports.__esModule = true;
 
 
 //// [mapOnTupleTypes01.d.ts]
diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js
index 0906c6df189..ca835751a7a 100644
--- a/tests/baselines/reference/mapOnTupleTypes02.js
+++ b/tests/baselines/reference/mapOnTupleTypes02.js
@@ -8,11 +8,11 @@ export function increment(point: Point) {
 
 //// [mapOnTupleTypes02.js]
 "use strict";
+exports.__esModule = true;
 function increment(point) {
     return point.map(function (d) { return d + 1; });
 }
 exports.increment = increment;
-exports.__esModule = true;
 
 
 //// [mapOnTupleTypes02.d.ts]
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
index b3c51e66c4b..2ba05b016be 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
@@ -17,6 +17,7 @@ WinJS.Promise.timeout(10);
 //// [memberAccessMustUseModuleInstances_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Promise = (function () {
         function Promise() {
         }
@@ -26,11 +27,10 @@ define(["require", "exports"], function (require, exports) {
         return Promise;
     }());
     exports.Promise = Promise;
-    exports.__esModule = true;
 });
 //// [memberAccessMustUseModuleInstances_1.js]
 define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) {
     "use strict";
-    WinJS.Promise.timeout(10);
     exports.__esModule = true;
+    WinJS.Promise.timeout(10);
 });
diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js
index c27c5ef8615..ec2eb4a1087 100644
--- a/tests/baselines/reference/mergeWithImportedNamespace.js
+++ b/tests/baselines/reference/mergeWithImportedNamespace.js
@@ -12,11 +12,11 @@ export namespace N {
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var N;
 (function (N) {
     N.x = 1;
 })(N = exports.N || (exports.N = {}));
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js
index 21e457b1361..efa95d77630 100644
--- a/tests/baselines/reference/mergeWithImportedType.js
+++ b/tests/baselines/reference/mergeWithImportedType.js
@@ -10,11 +10,11 @@ export type E = E;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var E;
 (function (E) {
     E[E["X"] = 0] = "X";
 })(E = exports.E || (exports.E = {}));
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js
index 17aeccbc769..83173f35752 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -26,6 +26,7 @@ export class B extends A {
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -35,7 +36,6 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [b.js]
 var __extends = (this && this.__extends) || (function () {
@@ -50,6 +50,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports", "./a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
@@ -60,5 +61,4 @@ define(["require", "exports", "./a"], function (require, exports, a_1) {
         return B;
     }(a_1.A));
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js
index d1becde5240..8fa3f2d0731 100644
--- a/tests/baselines/reference/mergedDeclarations7.js
+++ b/tests/baselines/reference/mergedDeclarations7.js
@@ -24,6 +24,6 @@ let p: Passport = passport.use();
 
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var passport = require("passport");
 var p = passport.use();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
index c4e5c8dfa10..8d5f55b6801 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
@@ -17,6 +17,7 @@ export module X {
 
 //// [mergedModuleDeclarationCodeGen.js]
 "use strict";
+exports.__esModule = true;
 var X;
 (function (X) {
     var Y;
@@ -40,4 +41,3 @@ var X;
         Y.B = B;
     })(Y = X.Y || (X.Y = {}));
 })(X = exports.X || (exports.X = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js
index ace3445911c..40cbc87cdcb 100644
--- a/tests/baselines/reference/metadataOfEventAlias.js
+++ b/tests/baselines/reference/metadataOfEventAlias.js
@@ -13,8 +13,8 @@ export class SomeClass {
 
 //// [event.js]
 "use strict";
-;
 Object.defineProperty(exports, "__esModule", { value: true });
+;
 //// [test.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -26,6 +26,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 function Input(target, key) { }
 var SomeClass = (function () {
     function SomeClass() {
@@ -37,4 +38,3 @@ __decorate([
     __metadata("design:type", Object)
 ], SomeClass.prototype, "event", void 0);
 exports.SomeClass = SomeClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js
index 87e1fdd8f58..23bb2356640 100644
--- a/tests/baselines/reference/missingFunctionImplementation.js
+++ b/tests/baselines/reference/missingFunctionImplementation.js
@@ -82,6 +82,7 @@ namespace N12 {
 
 //// [missingFunctionImplementation.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
     }
@@ -162,4 +163,3 @@ var N12;
     function m(a) { }
     N12.m = m;
 })(N12 || (N12 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
index 2d33c5b9768..d4a8b12d2a6 100644
--- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
+++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
@@ -10,9 +10,9 @@ import {x} from "./a"
 
 //// [a.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [b.js]
 "use strict";
-(function () { return 1; }());
 exports.__esModule = true;
+(function () { return 1; }());
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
index 95ef30bb8d6..16eb962a863 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
@@ -22,9 +22,9 @@ define(["require", "exports"], function (require, exports) {
 //// [moduleAliasAsFunctionArgument_1.js]
 define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) {
     "use strict";
+    exports.__esModule = true;
     function fn(arg) {
     }
     a.x; // OK
     fn(a); // Error: property 'x' is missing from 'a'
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
index 76eb8237cc6..a92cf5093e3 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
@@ -41,20 +41,20 @@ define(["require", "exports"], function (require, exports) {
 //// [map1.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
-    observable_1.Observable.prototype.map = function () { };
     exports.__esModule = true;
+    observable_1.Observable.prototype.map = function () { };
 });
 //// [map2.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
-    observable_1.Observable.prototype.map = function () { };
     exports.__esModule = true;
+    observable_1.Observable.prototype.map = function () { };
 });
 //// [main.js]
 define(["require", "exports", "./map1", "./map2"], function (require, exports) {
     "use strict";
-    var x;
     exports.__esModule = true;
+    var x;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
index 92bb6cd1d99..77759306845 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
@@ -34,22 +34,22 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
 
 
 //// [observable.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
index 02d461e642d..15ca6aaf806 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
@@ -36,24 +36,24 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
-exports.__esModule = true;
 
 
 //// [observable.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
index cae38270898..c29bed68e51 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
@@ -49,24 +49,24 @@ import "./x";
 
 //// [x0.js]
 "use strict";
-exports.a = 1;
 exports.__esModule = true;
+exports.a = 1;
 //// [x.js]
 "use strict";
+exports.__esModule = true;
 var N1;
 (function (N1) {
     N1.x = 1;
 })(N1 || (N1 = {}));
-exports.__esModule = true;
 //// [observable.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [test.js]
 "use strict";
-exports.b = 1;
 exports.__esModule = true;
+exports.b = 1;
 //// [main.js]
 "use strict";
-require("./x");
 exports.__esModule = true;
+require("./x");
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
index 5dc02dc3082..d6857a28ef1 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
@@ -36,12 +36,12 @@ let y = x.map(x => x + 1);
 
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
index 28461511dff..eee03576336 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
@@ -38,11 +38,12 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="observable.d.ts"/>
 var observable_1 = require("observable");
 require("./map");
@@ -50,7 +51,6 @@ var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
-exports.__esModule = true;
 
 
 //// [map.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
index 0becae3f0ff..9d15f3fe387 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
@@ -34,19 +34,19 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
index cdad871ac21..072c62862e3 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
@@ -36,21 +36,21 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js
index 6569631a8d7..2ef6441692f 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.js
@@ -20,18 +20,18 @@ let y = x.getA().x;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var x = [1];
 var y = x.getA().x;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js
index 222e337dd64..1806ceae9a1 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.js
@@ -20,6 +20,7 @@ let y = x.getCountAsString().toLowerCase();
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -27,12 +28,11 @@ var A = (function () {
 }());
 exports.A = A;
 ;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js
index 88e6b2c204d..9cb08f2b866 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.js
@@ -23,6 +23,7 @@ let y = x.getCountAsString().toLowerCase();
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -30,16 +31,15 @@ var A = (function () {
 }());
 exports.A = A;
 ;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
 exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 require("./f2");
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js
index 6d9d76f8aaf..194d06aeb80 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal4.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal4.js
@@ -26,9 +26,9 @@ exports.__esModule = true;
 exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 require("./f1");
 require("./f2");
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js
index f25dffba5e8..43d8c6b958b 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.js
@@ -23,11 +23,11 @@ import "B";
 
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="f1.d.ts"/>
 /// <reference path="f2.d.ts"/>
 require("A");
 require("B");
-exports.__esModule = true;
 
 
 //// [f3.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
index 6a825dcf34c..66ce39e8d84 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
@@ -29,33 +29,33 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index 4f30d1210ff..e79f2e58484 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -41,33 +41,33 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index 66de9f1c596..c7c13ea7861 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -39,33 +39,33 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
index 0729457fc51..9cdf76b90a5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
@@ -41,32 +41,32 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
index 7970f65f412..c7f7990608e 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -41,35 +41,35 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
index 3b290b82975..0f19e737ec5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
@@ -41,35 +41,35 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
index 852d50f8d01..4cdef37a4f7 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
@@ -31,9 +31,9 @@ x.foo().x;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 var x;
 x.foo().x;
-exports.__esModule = true;
 
 
 //// [main.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
index 1fdb32a55b5..536931ee61f 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
@@ -31,7 +31,7 @@ x.foo().x;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
index aa6b33baef3..37253ab7e5b 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
@@ -41,8 +41,8 @@ x.foo2().x2;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
 x.foo2().x2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
index 5f209f753cf..0c861447b46 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
@@ -44,8 +44,8 @@ x.foo2().x2;
 /// <reference path="O.d.ts" />
 /// <reference path="O2.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
 x.foo2().x2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
index 55226da5ee9..ac202784f43 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
@@ -25,11 +25,11 @@ let y = x.getA().x;
 
 //// [f.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="array.d.ts"/>
 require("array");
 var x = [1];
 var y = x.getA().x;
-exports.__esModule = true;
 
 
 //// [f.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInDependency.js b/tests/baselines/reference/moduleAugmentationInDependency.js
index 757b71754d6..31c82ad18e8 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency.js
@@ -10,5 +10,5 @@ import "A"
 
 //// [app.js]
 "use strict";
-require("A");
 exports.__esModule = true;
+require("A");
diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.js b/tests/baselines/reference/moduleAugmentationInDependency2.js
index 53d2e6ede71..e7a964650bd 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency2.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency2.js
@@ -13,5 +13,5 @@ import "A"
 exports.__esModule = true;
 //// [app.js]
 "use strict";
-require("A");
 exports.__esModule = true;
+require("A");
diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.js b/tests/baselines/reference/moduleAugmentationNoNewNames.js
index 6edaf5b9fca..4376c23a7f8 100644
--- a/tests/baselines/reference/moduleAugmentationNoNewNames.js
+++ b/tests/baselines/reference/moduleAugmentationNoNewNames.js
@@ -33,12 +33,12 @@ let y = x.map(x => x + 1);
 exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
index d41be369917..9ad2aa842d0 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
@@ -58,22 +58,23 @@ c.baz2().x.toLowerCase();
 //// [out.js]
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var Cls = (function () {
         function Cls() {
         }
         return Cls;
     }());
     exports.Cls = Cls;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     m1_1.Cls.prototype.foo = function () { return 1; };
     m1_1.Cls.prototype.bar = function () { return "1"; };
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m3", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C1 = (function () {
         function C1() {
         }
@@ -86,22 +87,21 @@ define("m3", ["require", "exports"], function (require, exports) {
         return C2;
     }());
     exports.C2 = C2;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     m1_2.Cls.prototype.baz1 = function () { return undefined; };
     m1_2.Cls.prototype.baz2 = function () { return undefined; };
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("test", ["require", "exports", "m2", "m4"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var c;
     c.foo().toExponential();
     c.bar().toLowerCase();
     c.baz1().x.toExponential();
     c.baz2().x.toLowerCase();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
index 4f93e976dfc..116c5c5e830 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.js
+++ b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -45,37 +45,37 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     a_1.A.prototype.getB = function () { return undefined; };
     a_1.A.prototype.getCls = function () { return undefined; };
-    exports.__esModule = true;
 });
 define("main", ["require", "exports", "d"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
index 94d418c7fc7..e13cbd8f3dd 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.js
+++ b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -50,41 +50,41 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
-    a_1.A.prototype.getB = function () { return undefined; };
     exports.__esModule = true;
+    a_1.A.prototype.getB = function () { return undefined; };
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_2) {
     "use strict";
-    a_2.A.prototype.getCls = function () { return undefined; };
     exports.__esModule = true;
+    a_2.A.prototype.getCls = function () { return undefined; };
 });
 define("main", ["require", "exports", "d", "e"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 71f96df940c..a4a6ccea849 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -49,35 +49,35 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
-    a_1.A.prototype.getCls = function () { return undefined; };
     exports.__esModule = true;
+    a_1.A.prototype.getCls = function () { return undefined; };
 });
 define("main", ["require", "exports", "D", "e"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index 2883d91d03c..4be17a61edb 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -50,30 +50,30 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 define("main", ["require", "exports", "D", "E"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js
index 8c396d4fcdd..ee6fd2ab317 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.js
+++ b/tests/baselines/reference/moduleCodeGenTest5.js
@@ -23,6 +23,7 @@ var v = E2.B;
 
 //// [moduleCodeGenTest5.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 0;
 var y = 0;
 function f1() { }
@@ -53,4 +54,3 @@ var E2;
     E2[E2["B"] = 0] = "B";
 })(E2 || (E2 = {}));
 var v = E2.B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js
index e66235ca2bc..f877ad74bc3 100644
--- a/tests/baselines/reference/moduleCodegenTest4.js
+++ b/tests/baselines/reference/moduleCodegenTest4.js
@@ -6,10 +6,10 @@ void 0;
 
 //// [moduleCodegenTest4.js]
 "use strict";
+exports.__esModule = true;
 var Baz;
 (function (Baz) {
     Baz.x = "hello";
 })(Baz = exports.Baz || (exports.Baz = {}));
 Baz.x = "goodbye";
 void 0;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js
index 1af231a9a62..a2a099fca1d 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.js
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js
@@ -42,6 +42,7 @@ export enum Utensils { // Shouldn't error
 
 //// [moduleDuplicateIdentifiers.js]
 "use strict";
+exports.__esModule = true;
 exports.Foo = 2;
 exports.Foo = 42; // Should error
 var FooBar;
@@ -76,4 +77,3 @@ var Utensils;
 (function (Utensils) {
     Utensils[Utensils["Spork"] = 3] = "Spork";
 })(Utensils = exports.Utensils || (exports.Utensils = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js
index 7db2ce416dd..66c746c5f51 100644
--- a/tests/baselines/reference/moduleExports1.js
+++ b/tests/baselines/reference/moduleExports1.js
@@ -16,6 +16,7 @@ if (!module.exports) module.exports = "";
 //// [moduleExports1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TypeScript;
     (function (TypeScript) {
         var Strasse;
@@ -36,5 +37,4 @@ define(["require", "exports"], function (require, exports) {
     void 0;
     if (!module.exports)
         module.exports = "";
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
index 9e79d8d81b2..2ed22cfa4f0 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
@@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) {
         }
         return Test1;
     }(C1));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js
index 314460661b2..7408db5c291 100644
--- a/tests/baselines/reference/moduleInTypePosition1.js
+++ b/tests/baselines/reference/moduleInTypePosition1.js
@@ -13,14 +13,14 @@ var x = (w1: WinJS) => { };
 
 //// [moduleInTypePosition1_0.js]
 "use strict";
+exports.__esModule = true;
 var Promise = (function () {
     function Promise() {
     }
     return Promise;
 }());
 exports.Promise = Promise;
-exports.__esModule = true;
 //// [moduleInTypePosition1_1.js]
 "use strict";
-var x = function (w1) { };
 exports.__esModule = true;
+var x = function (w1) { };
diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js
index edf18bb7d58..88531532acc 100644
--- a/tests/baselines/reference/moduleMergeConstructor.js
+++ b/tests/baselines/reference/moduleMergeConstructor.js
@@ -30,11 +30,11 @@ class Test {
 //// [index.js]
 define(["require", "exports", "foo"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     var Test = (function () {
         function Test() {
             this.bar = new foo.Foo();
         }
         return Test;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js
index 3ed09d2cd7a..7be89f236be 100644
--- a/tests/baselines/reference/moduleNoneErrors.js
+++ b/tests/baselines/reference/moduleNoneErrors.js
@@ -6,10 +6,10 @@ export class Foo {
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js
index cb53b78f038..b38e5d95f2c 100644
--- a/tests/baselines/reference/modulePrologueAMD.js
+++ b/tests/baselines/reference/modulePrologueAMD.js
@@ -6,11 +6,11 @@ export class Foo {}
 //// [modulePrologueAMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
         return Foo;
     }());
     exports.Foo = Foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js
index 2f2cf9d9148..4f465a2ae2f 100644
--- a/tests/baselines/reference/modulePrologueCommonjs.js
+++ b/tests/baselines/reference/modulePrologueCommonjs.js
@@ -5,10 +5,10 @@ export class Foo {}
 
 //// [modulePrologueCommonjs.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js
index 7b39a9d12e3..c9b8c331bcf 100644
--- a/tests/baselines/reference/modulePrologueUmd.js
+++ b/tests/baselines/reference/modulePrologueUmd.js
@@ -14,11 +14,11 @@ export class Foo {}
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
         return Foo;
     }());
     exports.Foo = Foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js
index 685a2ac0233..86f681fa27a 100644
--- a/tests/baselines/reference/moduleResolutionNoResolve.js
+++ b/tests/baselines/reference/moduleResolutionNoResolve.js
@@ -13,5 +13,5 @@ export var c = '';
 exports.__esModule = true;
 //// [b.js]
 "use strict";
-exports.c = '';
 exports.__esModule = true;
+exports.c = '';
diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js
index 39217292117..33f692396fa 100644
--- a/tests/baselines/reference/moduleResolutionNoTs.js
+++ b/tests/baselines/reference/moduleResolutionNoTs.js
@@ -23,12 +23,12 @@ import z2 from "./z";
 
 //// [x.js]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 //// [y.jsx]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 //// [user.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js
index d2ee65a508a..b9a644a7209 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions.js
@@ -27,8 +27,8 @@ import j from "./jquery.js"
 
 //// [a.js]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 // No extension: '.ts' added 
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
index fb8904c5748..a9dc91d9a55 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
@@ -12,8 +12,8 @@ import b from "./b";
 
 //// [index.js]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 //// [a.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
index 014207d2400..7d67bde6509 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
@@ -14,5 +14,5 @@ import "normalize.css";
 
 //// [a.js]
 "use strict";
-require("normalize.css");
 exports.__esModule = true;
+require("normalize.css");
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
index c53efeb0961..0a04d8a9077 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
@@ -14,5 +14,5 @@ import "foo";
 
 //// [a.js]
 "use strict";
-require("foo");
 exports.__esModule = true;
+require("foo");
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js
index e0aebb04d76..520324cb222 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js
@@ -43,25 +43,25 @@ tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js
 // When symlinked files are in node_modules, they are resolved with realpath;
 // so a linked file does not create a duplicate SourceFile of the real one.
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
     return MyClass;
 }());
 exports.MyClass = MyClass;
-exports.__esModule = true;
 //// [/src/library-b/index.js]
 "use strict";
+exports.__esModule = true;
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
-exports.__esModule = true;
 //// [/src/app.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var y;
 x = y;
 y = x;
-exports.__esModule = true;
 /*
 # To reproduce in a real project:
 
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
index 55317e413bf..cde63e0604d 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
@@ -18,18 +18,18 @@ x + x2;
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
-exports.x = 0;
 exports.__esModule = true;
+exports.x = 0;
 //// [/src/bin/shared2/abc.js]
 // When symlinked files are not in node_modules, realpath is not used.
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
-exports.x = 0;
 exports.__esModule = true;
+exports.x = 0;
 //// [/src/bin/app.js]
 "use strict";
+exports.__esModule = true;
 var abc_1 = require("./shared/abc");
 var abc_2 = require("./shared2/abc");
 abc_1.x + abc_2.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
index d4fb798e8c7..0bd77a1dcc7 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
@@ -22,22 +22,22 @@ y = x;
 //// [/src/bin/library-a/index.js]
 // Same as moduleResolutionWithSymlinks.ts, but with outDir
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
     return MyClass;
 }());
 exports.MyClass = MyClass;
-exports.__esModule = true;
 //// [/src/bin/library-b/index.js]
 "use strict";
+exports.__esModule = true;
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
-exports.__esModule = true;
 //// [/src/bin/app.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var y;
 x = y;
 y = x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
index 0b50be0e5e4..c4d451ba9f9 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
@@ -12,20 +12,20 @@ export var foo = 42;
 
 //// [c.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [b.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("./c"));
 exports.__esModule = true;
+__export(require("./c"));
 //// [a.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("./b"));
 __export(require("./c"));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
index 7caaf1e55f6..d1f6dc7abc7 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
@@ -15,23 +15,23 @@ export enum Animals {
 
 //// [c.js]
 "use strict";
+exports.__esModule = true;
 var Animals;
 (function (Animals) {
     Animals[Animals["Cat"] = 0] = "Cat";
     Animals[Animals["Dog"] = 1] = "Dog";
 })(Animals = exports.Animals || (exports.Animals = {}));
 ;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var c_1 = require("./c");
 exports.Animals = c_1.Animals;
-exports.__esModule = true;
 //// [a.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("./b"));
 __export(require("./c"));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js
index bee7a06ce6f..601d7e41fcd 100644
--- a/tests/baselines/reference/moduleScoping.js
+++ b/tests/baselines/reference/moduleScoping.js
@@ -29,16 +29,16 @@ var v2 = 42; // Global scope
 var v4 = function () { return 5; };
 //// [file3.js]
 "use strict";
+exports.__esModule = true;
 exports.v3 = true;
 var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope
-exports.__esModule = true;
 //// [file4.js]
 "use strict";
+exports.__esModule = true;
 var file3 = require("./file3");
 var t1 = v1;
 var t2 = v2;
 var t3 = file3.v3;
 var v4 = { a: true, b: NaN }; // Should shadow global v2 in this module
-exports.__esModule = true;
 //// [file5.js]
 var x = v2; // Should be global v2 of type number again
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
index afc2fa1f5bd..07e353cb301 100644
--- a/tests/baselines/reference/multiImportExport.js
+++ b/tests/baselines/reference/multiImportExport.js
@@ -44,13 +44,13 @@ var Math = {
 module.exports = Math;
 //// [Drawing.js]
 "use strict";
-exports.Math = require("./Math/Math");
 exports.__esModule = true;
+exports.Math = require("./Math/Math");
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var Drawing = require("./Drawing");
 var addr = new Drawing.Math.Adder();
-exports.__esModule = true;
 
 
 //// [Adder.d.ts]
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index 4ea2e7cb8f0..98c17051809 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -20,6 +20,7 @@ Entity();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var foo = (function () {
     function foo() {
     }
@@ -31,9 +32,8 @@ function bar() {
 exports.default = bar;
 var x = 10;
 exports.default = x;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 m1_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index 5fe294d1939..b129dba0392 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -17,15 +17,15 @@ Entity();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() {
 }
 exports.default = foo;
 function bar() {
 }
 exports.default = bar;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 m1_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js
index 436232c145e..897a3f00eb4 100644
--- a/tests/baselines/reference/multipleDefaultExports03.js
+++ b/tests/baselines/reference/multipleDefaultExports03.js
@@ -8,16 +8,16 @@ export default class C {
 
 //// [multipleDefaultExports03.js]
 "use strict";
-var C = (function () {
-    function C() {
-    }
-    return C;
-}());
-exports.default = C;
-var C = (function () {
-    function C() {
-    }
-    return C;
-}());
-exports.default = C;
 Object.defineProperty(exports, "__esModule", { value: true });
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.default = C;
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.default = C;
diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js
index b2c37ec5f0e..341f6f41c62 100644
--- a/tests/baselines/reference/multipleDefaultExports04.js
+++ b/tests/baselines/reference/multipleDefaultExports04.js
@@ -8,10 +8,10 @@ export default function f() {
 
 //// [multipleDefaultExports04.js]
 "use strict";
-function f() {
-}
-exports.default = f;
-function f() {
-}
-exports.default = f;
 Object.defineProperty(exports, "__esModule", { value: true });
+function f() {
+}
+exports.default = f;
+function f() {
+}
+exports.default = f;
diff --git a/tests/baselines/reference/multipleExportDefault1.js b/tests/baselines/reference/multipleExportDefault1.js
index 4817012ab75..8375c2f9e6f 100644
--- a/tests/baselines/reference/multipleExportDefault1.js
+++ b/tests/baselines/reference/multipleExportDefault1.js
@@ -10,10 +10,10 @@ export default {
 
 //// [multipleExportDefault1.js]
 "use strict";
+exports.__esModule = true;
 function Foo() {
 }
 exports["default"] = Foo;
 exports["default"] = {
     uhoh: "another default"
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault2.js b/tests/baselines/reference/multipleExportDefault2.js
index e979b96fe71..0c06385f9af 100644
--- a/tests/baselines/reference/multipleExportDefault2.js
+++ b/tests/baselines/reference/multipleExportDefault2.js
@@ -9,9 +9,9 @@ export default function Foo() { }
 
 //// [multipleExportDefault2.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
 function Foo() { }
 exports["default"] = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault3.js b/tests/baselines/reference/multipleExportDefault3.js
index e889edc907a..1091af16301 100644
--- a/tests/baselines/reference/multipleExportDefault3.js
+++ b/tests/baselines/reference/multipleExportDefault3.js
@@ -9,6 +9,7 @@ export default class C { }
 
 //// [multipleExportDefault3.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
@@ -18,4 +19,3 @@ var C = (function () {
     return C;
 }());
 exports["default"] = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault4.js b/tests/baselines/reference/multipleExportDefault4.js
index d46cda4d8b3..b3e0ef3e870 100644
--- a/tests/baselines/reference/multipleExportDefault4.js
+++ b/tests/baselines/reference/multipleExportDefault4.js
@@ -7,6 +7,7 @@ export default {
 
 //// [multipleExportDefault4.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -16,4 +17,3 @@ exports["default"] = C;
 exports["default"] = {
     uhoh: "another default"
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault5.js b/tests/baselines/reference/multipleExportDefault5.js
index 5c10a1be95a..a5032e45244 100644
--- a/tests/baselines/reference/multipleExportDefault5.js
+++ b/tests/baselines/reference/multipleExportDefault5.js
@@ -4,6 +4,7 @@ export default class C {}
 
 //// [multipleExportDefault5.js]
 "use strict";
+exports.__esModule = true;
 function bar() { }
 exports["default"] = bar;
 var C = (function () {
@@ -12,4 +13,3 @@ var C = (function () {
     return C;
 }());
 exports["default"] = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault6.js b/tests/baselines/reference/multipleExportDefault6.js
index 3d990277993..aa372e4d410 100644
--- a/tests/baselines/reference/multipleExportDefault6.js
+++ b/tests/baselines/reference/multipleExportDefault6.js
@@ -9,10 +9,10 @@ export default {
 
 //// [multipleExportDefault6.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = {
     lol: 1
 };
 exports["default"] = {
     lol: 2
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js
index 75a4e125f21..05276591447 100644
--- a/tests/baselines/reference/multipleExports.js
+++ b/tests/baselines/reference/multipleExports.js
@@ -14,6 +14,7 @@ export module M {
 
 //// [multipleExports.js]
 "use strict";
+exports.__esModule = true;
 var M;
 (function (M) {
     M.v = 0;
@@ -22,4 +23,3 @@ var x = 0;
 (function (M) {
     M.v;
 })(M = exports.M || (exports.M = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js
index 4677da0df7b..149b6a0d59f 100644
--- a/tests/baselines/reference/nameDelimitedBySlashes.js
+++ b/tests/baselines/reference/nameDelimitedBySlashes.js
@@ -10,10 +10,10 @@ var x = foo.foo + 42;
 
 //// [foo_0.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./test/foo_0");
 var x = foo.foo + 42;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js
index de42c5ed60c..3c1cf8dce66 100644
--- a/tests/baselines/reference/nameWithFileExtension.js
+++ b/tests/baselines/reference/nameWithFileExtension.js
@@ -10,10 +10,10 @@ var x = foo.foo + 42;
 
 //// [foo_0.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0.js");
 var x = foo.foo + 42;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js
index e7c85322317..d070638417b 100644
--- a/tests/baselines/reference/nameWithRelativePaths.js
+++ b/tests/baselines/reference/nameWithRelativePaths.js
@@ -25,28 +25,28 @@ if(foo2.M2.x){
 
 //// [foo_0.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 function f() {
     return 42;
 }
 exports.f = f;
-exports.__esModule = true;
 //// [foo_2.js]
 "use strict";
+exports.__esModule = true;
 var M2;
 (function (M2) {
     M2.x = true;
 })(M2 = exports.M2 || (exports.M2 = {}));
-exports.__esModule = true;
 //// [foo_3.js]
 "use strict";
+exports.__esModule = true;
 var foo0 = require("../foo_0");
 var foo1 = require("./test/foo_1");
 var foo2 = require("./.././test/foo_2");
 if (foo2.M2.x) {
     var x = foo0.foo + foo1.f();
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/narrowingConstrainedTypeParameter.js b/tests/baselines/reference/narrowingConstrainedTypeParameter.js
index f148dc22ea1..4663e706d1b 100644
--- a/tests/baselines/reference/narrowingConstrainedTypeParameter.js
+++ b/tests/baselines/reference/narrowingConstrainedTypeParameter.js
@@ -20,6 +20,7 @@ export function speak<TPet extends Pet>(pet: TPet, voice: (pet: TPet) => string)
 //// [narrowingConstrainedTypeParameter.js]
 // Repro from #10811
 "use strict";
+exports.__esModule = true;
 function isPet(pet) {
     return typeof pet.name === "string";
 }
@@ -30,4 +31,3 @@ function speak(pet, voice) {
     return voice(pet);
 }
 exports.speak = speak;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nestedLoops.js b/tests/baselines/reference/nestedLoops.js
index f4aae6dc91c..6b01eae55cd 100644
--- a/tests/baselines/reference/nestedLoops.js
+++ b/tests/baselines/reference/nestedLoops.js
@@ -19,6 +19,7 @@ export class Test  {
 
 //// [nestedLoops.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Test = (function () {
     function Test() {
         var outerArray = [1, 2, 3];
@@ -45,4 +46,3 @@ var Test = (function () {
     return Test;
 }());
 exports.Test = Test;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
index 7c4e2185496..1e2231868a8 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js
@@ -10,5 +10,5 @@ declare var a: number;
 
 //// [1.js]
 "use strict";
-exports.j = "hello"; // error
 exports.__esModule = true;
+exports.j = "hello"; // error
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
index ed001833594..f651d4f5b18 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js
@@ -11,5 +11,5 @@ export var j = "hello";  // error
 
 //// [1.js]
 "use strict";
-exports.j = "hello"; // error
 exports.__esModule = true;
+exports.j = "hello"; // error
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
index 85553b5265f..63788fd860f 100644
--- a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
+++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
@@ -13,6 +13,7 @@ export declare class Bar2 {
 
 //// [noImplicitAnyDestructuringInPrivateMethod.js]
 "use strict";
+exports.__esModule = true;
 var Bar = (function () {
     function Bar() {
     }
@@ -23,7 +24,6 @@ var Bar = (function () {
     return Bar;
 }());
 exports.Bar = Bar;
-exports.__esModule = true;
 
 
 //// [noImplicitAnyDestructuringInPrivateMethod.d.ts]
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.js b/tests/baselines/reference/noImplicitUseStrict_amd.js
index 8b3e7628e4e..387d5b9497b 100644
--- a/tests/baselines/reference/noImplicitUseStrict_amd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.js
@@ -4,6 +4,6 @@ export var x = 0;
 
 //// [noImplicitUseStrict_amd.js]
 define(["require", "exports"], function (require, exports) {
-    exports.x = 0;
     exports.__esModule = true;
+    exports.x = 0;
 });
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.js b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
index 30d507c8fc2..4b6fd2db6cd 100644
--- a/tests/baselines/reference/noImplicitUseStrict_commonjs.js
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
@@ -3,5 +3,5 @@
 export var x = 0;
 
 //// [noImplicitUseStrict_commonjs.js]
-exports.x = 0;
 exports.__esModule = true;
+exports.x = 0;
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js
index b48c5fde9a5..484909c51fc 100644
--- a/tests/baselines/reference/noImplicitUseStrict_umd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.js
@@ -12,6 +12,6 @@ export var x = 0;
         define(["require", "exports"], factory);
     }
 })(function (require, exports) {
-    exports.x = 0;
     exports.__esModule = true;
+    exports.x = 0;
 });
diff --git a/tests/baselines/reference/nodeResolution1.js b/tests/baselines/reference/nodeResolution1.js
index 21f6e259d3d..d3dad3355e6 100644
--- a/tests/baselines/reference/nodeResolution1.js
+++ b/tests/baselines/reference/nodeResolution1.js
@@ -9,8 +9,8 @@ import y = require("./a");
 
 //// [a.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [b.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/nonMergedOverloads.js b/tests/baselines/reference/nonMergedOverloads.js
index 8183e02d0f2..515792feb70 100644
--- a/tests/baselines/reference/nonMergedOverloads.js
+++ b/tests/baselines/reference/nonMergedOverloads.js
@@ -7,8 +7,8 @@ export function f() {
 
 //// [nonMergedOverloads.js]
 "use strict";
+exports.__esModule = true;
 var f = 10;
 function f() {
 }
 exports.f = f;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/objectIndexer.js b/tests/baselines/reference/objectIndexer.js
index 08dda7376dc..c93172951e9 100644
--- a/tests/baselines/reference/objectIndexer.js
+++ b/tests/baselines/reference/objectIndexer.js
@@ -18,11 +18,11 @@ class Emitter {
 //// [objectIndexer.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Emitter = (function () {
         function Emitter() {
             this.listeners = {};
         }
         return Emitter;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
index 47d356e3bf1..91665513153 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
+++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
@@ -13,15 +13,15 @@ export default function foo() { new Foo(); }
 //// [output.js]
 define("b", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function foo() { new a_1.default(); }
     exports.default = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("a", ["require", "exports", "b"], function (require, exports, b_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
     exports.default = Foo;
     b_1.default();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js
index 0c2618e2a9e..fd3a4003ddf 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -21,16 +21,17 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define("ref/a", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
@@ -39,7 +40,6 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
         return B;
     }(a_1.A));
     exports.B = B;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //# sourceMappingURL=all.js.map
 
diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map
index fa822fc1825..0e1c7d24100 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js.map
+++ b/tests/baselines/reference/outModuleConcatAmd.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
index c2d000629a5..c18f4e42252 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -20,18 +20,19 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>})();
 >>>define("ref/a", ["require", "exports"], function (require, exports) {
 >>>    "use strict";
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>    var A = (function () {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(13, 5) Source(2, 1) + SourceIndex(0)
+1 >Emitted(14, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(14, 9) Source(2, 1) + SourceIndex(0)
+1->Emitted(15, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -39,16 +40,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >         ^^^^^^^^^->
 1->export class A { 
 2 >        }
-1->Emitted(15, 9) Source(2, 18) + SourceIndex(0)
-2 >Emitted(15, 10) Source(2, 19) + SourceIndex(0)
+1->Emitted(16, 9) Source(2, 18) + SourceIndex(0)
+2 >Emitted(16, 10) Source(2, 19) + SourceIndex(0)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(16, 9) Source(2, 18) + SourceIndex(0)
-2 >Emitted(16, 17) Source(2, 19) + SourceIndex(0)
+1->Emitted(17, 9) Source(2, 18) + SourceIndex(0)
+2 >Emitted(17, 17) Source(2, 19) + SourceIndex(0)
 ---
 >>>    }());
 1 >^^^^
@@ -60,48 +61,47 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >    }
 3 >     
 4 >     export class A { }
-1 >Emitted(17, 5) Source(2, 18) + SourceIndex(0)
-2 >Emitted(17, 6) Source(2, 19) + SourceIndex(0)
-3 >Emitted(17, 6) Source(2, 1) + SourceIndex(0)
-4 >Emitted(17, 10) Source(2, 19) + SourceIndex(0)
+1 >Emitted(18, 5) Source(2, 18) + SourceIndex(0)
+2 >Emitted(18, 6) Source(2, 19) + SourceIndex(0)
+3 >Emitted(18, 6) Source(2, 1) + SourceIndex(0)
+4 >Emitted(18, 10) Source(2, 19) + SourceIndex(0)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
-3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    A
-1->Emitted(18, 5) Source(2, 14) + SourceIndex(0)
-2 >Emitted(18, 19) Source(2, 15) + SourceIndex(0)
+1->Emitted(19, 5) Source(2, 14) + SourceIndex(0)
+2 >Emitted(19, 19) Source(2, 15) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
 sourceFile:tests/cases/compiler/b.ts
 -------------------------------------------------------------------
->>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
 >>>    "use strict";
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>    var B = (function (_super) {
-1->^^^^
+1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->import {A} from "./ref/a";
+1 >import {A} from "./ref/a";
   >
-1->Emitted(23, 5) Source(2, 1) + SourceIndex(1)
+1 >Emitted(24, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(24, 9) Source(2, 24) + SourceIndex(1)
-2 >Emitted(24, 30) Source(2, 25) + SourceIndex(1)
+1->Emitted(25, 9) Source(2, 24) + SourceIndex(1)
+2 >Emitted(25, 30) Source(2, 25) + SourceIndex(1)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(25, 9) Source(2, 1) + SourceIndex(1)
+1 >Emitted(26, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -110,16 +110,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(27, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(27, 10) Source(2, 29) + SourceIndex(1)
+1->Emitted(28, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(28, 10) Source(2, 29) + SourceIndex(1)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(28, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(28, 17) Source(2, 29) + SourceIndex(1)
+1->Emitted(29, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(29, 17) Source(2, 29) + SourceIndex(1)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -135,22 +135,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(29, 5) Source(2, 28) + SourceIndex(1)
-2 >Emitted(29, 6) Source(2, 29) + SourceIndex(1)
-3 >Emitted(29, 6) Source(2, 1) + SourceIndex(1)
-4 >Emitted(29, 7) Source(2, 24) + SourceIndex(1)
-5 >Emitted(29, 12) Source(2, 25) + SourceIndex(1)
-6 >Emitted(29, 15) Source(2, 29) + SourceIndex(1)
+1 >Emitted(30, 5) Source(2, 28) + SourceIndex(1)
+2 >Emitted(30, 6) Source(2, 29) + SourceIndex(1)
+3 >Emitted(30, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(30, 7) Source(2, 24) + SourceIndex(1)
+5 >Emitted(30, 12) Source(2, 25) + SourceIndex(1)
+6 >Emitted(30, 15) Source(2, 29) + SourceIndex(1)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
-3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    B
-1->Emitted(30, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(30, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(31, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(31, 19) Source(2, 15) + SourceIndex(1)
 ---
->>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js
index aee6038f988..c45414b5e62 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -49,6 +49,7 @@ var Foo = (function () {
 }());
 define("ref/a", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /// <reference path="./b.ts" />
     var A = (function () {
         function A() {
@@ -56,10 +57,10 @@ define("ref/a", ["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
@@ -68,7 +69,6 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
         return B;
     }(a_1.A));
     exports.B = B;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //# sourceMappingURL=all.js.map
 
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
index a55c177680d..8b552ec3fb3 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
index 5f71c12c2a3..231da040f11 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -81,27 +81,28 @@ sourceFile:tests/cases/compiler/ref/a.ts
 -------------------------------------------------------------------
 >>>define("ref/a", ["require", "exports"], function (require, exports) {
 >>>    "use strict";
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>    /// <reference path="./b.ts" />
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >    /// <reference path="./b.ts" />
-1->Emitted(19, 5) Source(2, 1) + SourceIndex(1)
-2 >Emitted(19, 36) Source(2, 32) + SourceIndex(1)
+1->Emitted(20, 5) Source(2, 1) + SourceIndex(1)
+2 >Emitted(20, 36) Source(2, 32) + SourceIndex(1)
 ---
 >>>    var A = (function () {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-1 >Emitted(20, 5) Source(3, 1) + SourceIndex(1)
+1 >Emitted(21, 5) Source(3, 1) + SourceIndex(1)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(21, 9) Source(3, 1) + SourceIndex(1)
+1->Emitted(22, 9) Source(3, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -111,16 +112,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
   >	member: typeof GlobalFoo;
   >
 2 >        }
-1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
-2 >Emitted(22, 10) Source(5, 2) + SourceIndex(1)
+1->Emitted(23, 9) Source(5, 1) + SourceIndex(1)
+2 >Emitted(23, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(23, 9) Source(5, 1) + SourceIndex(1)
-2 >Emitted(23, 17) Source(5, 2) + SourceIndex(1)
+1->Emitted(24, 9) Source(5, 1) + SourceIndex(1)
+2 >Emitted(24, 17) Source(5, 2) + SourceIndex(1)
 ---
 >>>    }());
 1 >^^^^
@@ -134,48 +135,47 @@ sourceFile:tests/cases/compiler/ref/a.ts
 4 >     export class A {
   >     	member: typeof GlobalFoo;
   >     }
-1 >Emitted(24, 5) Source(5, 1) + SourceIndex(1)
-2 >Emitted(24, 6) Source(5, 2) + SourceIndex(1)
-3 >Emitted(24, 6) Source(3, 1) + SourceIndex(1)
-4 >Emitted(24, 10) Source(5, 2) + SourceIndex(1)
+1 >Emitted(25, 5) Source(5, 1) + SourceIndex(1)
+2 >Emitted(25, 6) Source(5, 2) + SourceIndex(1)
+3 >Emitted(25, 6) Source(3, 1) + SourceIndex(1)
+4 >Emitted(25, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
-3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    A
-1->Emitted(25, 5) Source(3, 14) + SourceIndex(1)
-2 >Emitted(25, 19) Source(3, 15) + SourceIndex(1)
+1->Emitted(26, 5) Source(3, 14) + SourceIndex(1)
+2 >Emitted(26, 19) Source(3, 15) + SourceIndex(1)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
 sourceFile:tests/cases/compiler/b.ts
 -------------------------------------------------------------------
->>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
 >>>    "use strict";
+>>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>    var B = (function (_super) {
-1->^^^^
+1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->import {A} from "./ref/a";
+1 >import {A} from "./ref/a";
   >
-1->Emitted(30, 5) Source(2, 1) + SourceIndex(2)
+1 >Emitted(31, 5) Source(2, 1) + SourceIndex(2)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(31, 9) Source(2, 24) + SourceIndex(2)
-2 >Emitted(31, 30) Source(2, 25) + SourceIndex(2)
+1->Emitted(32, 9) Source(2, 24) + SourceIndex(2)
+2 >Emitted(32, 30) Source(2, 25) + SourceIndex(2)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(32, 9) Source(2, 1) + SourceIndex(2)
+1 >Emitted(33, 9) Source(2, 1) + SourceIndex(2)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -184,16 +184,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(34, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(34, 10) Source(2, 29) + SourceIndex(2)
+1->Emitted(35, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(35, 10) Source(2, 29) + SourceIndex(2)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(35, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(35, 17) Source(2, 29) + SourceIndex(2)
+1->Emitted(36, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(36, 17) Source(2, 29) + SourceIndex(2)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -209,22 +209,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(36, 5) Source(2, 28) + SourceIndex(2)
-2 >Emitted(36, 6) Source(2, 29) + SourceIndex(2)
-3 >Emitted(36, 6) Source(2, 1) + SourceIndex(2)
-4 >Emitted(36, 7) Source(2, 24) + SourceIndex(2)
-5 >Emitted(36, 12) Source(2, 25) + SourceIndex(2)
-6 >Emitted(36, 15) Source(2, 29) + SourceIndex(2)
+1 >Emitted(37, 5) Source(2, 28) + SourceIndex(2)
+2 >Emitted(37, 6) Source(2, 29) + SourceIndex(2)
+3 >Emitted(37, 6) Source(2, 1) + SourceIndex(2)
+4 >Emitted(37, 7) Source(2, 24) + SourceIndex(2)
+5 >Emitted(37, 12) Source(2, 25) + SourceIndex(2)
+6 >Emitted(37, 15) Source(2, 29) + SourceIndex(2)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
-3 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    B
-1->Emitted(37, 5) Source(2, 14) + SourceIndex(2)
-2 >Emitted(37, 19) Source(2, 15) + SourceIndex(2)
+1->Emitted(38, 5) Source(2, 14) + SourceIndex(2)
+2 >Emitted(38, 19) Source(2, 15) + SourceIndex(2)
 ---
->>>    Object.defineProperty(exports, "__esModule", { value: true });
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadModifiersMustAgree.js b/tests/baselines/reference/overloadModifiersMustAgree.js
index 748854e38e8..783bf854a84 100644
--- a/tests/baselines/reference/overloadModifiersMustAgree.js
+++ b/tests/baselines/reference/overloadModifiersMustAgree.js
@@ -17,6 +17,7 @@ interface I {
 
 //// [overloadModifiersMustAgree.js]
 "use strict";
+exports.__esModule = true;
 var baz = (function () {
     function baz() {
     }
@@ -24,4 +25,3 @@ var baz = (function () {
     return baz;
 }());
 function bar(s) { }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parser0_004152.js b/tests/baselines/reference/parser0_004152.js
index 85a743c6faa..b4443e04136 100644
--- a/tests/baselines/reference/parser0_004152.js
+++ b/tests/baselines/reference/parser0_004152.js
@@ -6,6 +6,7 @@ export class Game {
 
 //// [parser0_004152.js]
 "use strict";
+exports.__esModule = true;
 var Game = (function () {
     function Game() {
         this.position = new DisplayPosition([]);
@@ -14,4 +15,3 @@ var Game = (function () {
     return Game;
 }());
 exports.Game = Game;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parser509546.js b/tests/baselines/reference/parser509546.js
index 4b95b2719e6..e99d1d1764d 100644
--- a/tests/baselines/reference/parser509546.js
+++ b/tests/baselines/reference/parser509546.js
@@ -6,10 +6,10 @@ export class Logger {
 
 //// [parser509546.js]
 "use strict";
+exports.__esModule = true;
 var Logger = (function () {
     function Logger() {
     }
     return Logger;
 }());
 exports.Logger = Logger;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parser509546_1.js b/tests/baselines/reference/parser509546_1.js
index 2b3afe47ac9..3fc82755fbf 100644
--- a/tests/baselines/reference/parser509546_1.js
+++ b/tests/baselines/reference/parser509546_1.js
@@ -6,10 +6,10 @@ export class Logger {
 
 //// [parser509546_1.js]
 "use strict";
+exports.__esModule = true;
 var Logger = (function () {
     function Logger() {
     }
     return Logger;
 }());
 exports.Logger = Logger;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parser509546_2.js b/tests/baselines/reference/parser509546_2.js
index 071c57efb87..c16f041b2db 100644
--- a/tests/baselines/reference/parser509546_2.js
+++ b/tests/baselines/reference/parser509546_2.js
@@ -8,10 +8,10 @@ export class Logger {
 
 //// [parser509546_2.js]
 "use strict";
+exports.__esModule = true;
 var Logger = (function () {
     function Logger() {
     }
     return Logger;
 }());
 exports.Logger = Logger;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parser618973.js b/tests/baselines/reference/parser618973.js
index 2898281f493..bfef06b061f 100644
--- a/tests/baselines/reference/parser618973.js
+++ b/tests/baselines/reference/parser618973.js
@@ -6,6 +6,7 @@ export export class Foo {
 
 //// [parser618973.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -14,4 +15,3 @@ var Foo = (function () {
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserArgumentList1.js b/tests/baselines/reference/parserArgumentList1.js
index 167903245c1..36c8f619235 100644
--- a/tests/baselines/reference/parserArgumentList1.js
+++ b/tests/baselines/reference/parserArgumentList1.js
@@ -7,10 +7,10 @@ export function removeClass (node:HTMLElement, className:string) {
 
 //// [parserArgumentList1.js]
 "use strict";
+exports.__esModule = true;
 function removeClass(node, className) {
     node.className = node.className.replace(_classNameRegexp(className), function (everything, leftDelimiter, name, rightDelimiter) {
         return leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '';
     });
 }
 exports.removeClass = removeClass;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserClass1.js b/tests/baselines/reference/parserClass1.js
index 97b8a7b0562..7fcbf29f242 100644
--- a/tests/baselines/reference/parserClass1.js
+++ b/tests/baselines/reference/parserClass1.js
@@ -11,6 +11,7 @@
 
 //// [parserClass1.js]
 "use strict";
+exports.__esModule = true;
 var NullLogger = (function () {
     function NullLogger() {
     }
@@ -24,4 +25,3 @@ var NullLogger = (function () {
     return NullLogger;
 }());
 exports.NullLogger = NullLogger;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserClass2.js b/tests/baselines/reference/parserClass2.js
index d1df19e6163..0d47a388acc 100644
--- a/tests/baselines/reference/parserClass2.js
+++ b/tests/baselines/reference/parserClass2.js
@@ -9,6 +9,7 @@
 
 //// [parserClass2.js]
 "use strict";
+exports.__esModule = true;
 var LoggerAdapter = (function () {
     function LoggerAdapter(logger) {
         this.logger = logger;
@@ -17,4 +18,3 @@ var LoggerAdapter = (function () {
     return LoggerAdapter;
 }());
 exports.LoggerAdapter = LoggerAdapter;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserEnum1.js b/tests/baselines/reference/parserEnum1.js
index 52971b2b9c2..43cdc626ab8 100644
--- a/tests/baselines/reference/parserEnum1.js
+++ b/tests/baselines/reference/parserEnum1.js
@@ -10,6 +10,7 @@
 
 //// [parserEnum1.js]
 "use strict";
+exports.__esModule = true;
 var SignatureFlags;
 (function (SignatureFlags) {
     SignatureFlags[SignatureFlags["None"] = 0] = "None";
@@ -17,4 +18,3 @@ var SignatureFlags;
     SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer";
     SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer";
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserEnum2.js b/tests/baselines/reference/parserEnum2.js
index 47d5899990d..0fa0633d280 100644
--- a/tests/baselines/reference/parserEnum2.js
+++ b/tests/baselines/reference/parserEnum2.js
@@ -10,6 +10,7 @@
 
 //// [parserEnum2.js]
 "use strict";
+exports.__esModule = true;
 var SignatureFlags;
 (function (SignatureFlags) {
     SignatureFlags[SignatureFlags["None"] = 0] = "None";
@@ -17,4 +18,3 @@ var SignatureFlags;
     SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer";
     SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer";
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserEnum3.js b/tests/baselines/reference/parserEnum3.js
index e18a4c20696..b9b9e743e4b 100644
--- a/tests/baselines/reference/parserEnum3.js
+++ b/tests/baselines/reference/parserEnum3.js
@@ -6,7 +6,7 @@
 
 //// [parserEnum3.js]
 "use strict";
+exports.__esModule = true;
 var SignatureFlags;
 (function (SignatureFlags) {
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserEnum4.js b/tests/baselines/reference/parserEnum4.js
index 90c0253e1f9..96d3c8757ed 100644
--- a/tests/baselines/reference/parserEnum4.js
+++ b/tests/baselines/reference/parserEnum4.js
@@ -7,7 +7,7 @@
 
 //// [parserEnum4.js]
 "use strict";
+exports.__esModule = true;
 var SignatureFlags;
 (function (SignatureFlags) {
 })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.js b/tests/baselines/reference/parserModifierOnStatementInBlock1.js
index e07e3ee9043..43c1e4bf845 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock1.js
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.js
@@ -6,8 +6,8 @@ export function foo() {
 
 //// [parserModifierOnStatementInBlock1.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     export var x = this;
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.js b/tests/baselines/reference/parserModifierOnStatementInBlock3.js
index 8d4f29558c8..85c3d6da0a4 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock3.js
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.js
@@ -7,9 +7,9 @@ export function foo() {
 
 //// [parserModifierOnStatementInBlock3.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     export function bar() {
     }
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/parserModule1.js b/tests/baselines/reference/parserModule1.js
index 5bd983595dc..484c74f721c 100644
--- a/tests/baselines/reference/parserModule1.js
+++ b/tests/baselines/reference/parserModule1.js
@@ -33,6 +33,7 @@
 
 //// [parserModule1.js]
 "use strict";
+exports.__esModule = true;
 var CompilerDiagnostics;
 (function (CompilerDiagnostics) {
     CompilerDiagnostics.debug = false;
@@ -59,4 +60,3 @@ var CompilerDiagnostics;
     }
     CompilerDiagnostics.assert = assert;
 })(CompilerDiagnostics = exports.CompilerDiagnostics || (exports.CompilerDiagnostics = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js
index 58199832ee6..e8c026429f1 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js
@@ -5,6 +5,6 @@ export var x = 1;
 //// [f1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js
index d6692582fed..6439d35aadf 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js
@@ -4,5 +4,5 @@ export var x = 1;
 
 //// [f1.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js
index 3e6e3a22d5c..df5115d5360 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js
@@ -4,6 +4,6 @@ export var x = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js
index 955fb4cf7ae..a0c8d5df7de 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js
@@ -3,5 +3,5 @@ export var x = 1;
 
 //// [file1.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
index e05006539a9..8809efa963a 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js
@@ -22,25 +22,25 @@ export var y = 100;
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.y = 100;
     exports.__esModule = true;
+    exports.y = 100;
 });
 //// [file2.js]
 define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) {
     "use strict";
-    exports.x = file3_1.x + file4_1.y;
     exports.__esModule = true;
+    exports.x = file3_1.x + file4_1.y;
 });
 //// [file1.js]
 // baseUrl set via command line
 define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) {
     "use strict";
-    use(file2_1.x.toExponential());
     exports.__esModule = true;
+    use(file2_1.x.toExponential());
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
index 515f6e51715..cd0eb7d7794 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js
@@ -21,17 +21,17 @@ export var y: number;
 
 //// [file3.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file3_1 = require("./file3"); // found with baseurl
 var file4_1 = require("file4"); // found with fallback
 exports.x = file3_1.x + file4_1.y;
-exports.__esModule = true;
 //// [file1.js]
 // baseUrl set via command line
 "use strict";
+exports.__esModule = true;
 var file2_1 = require("folder2/file2");
 use(file2_1.x.toExponential());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
index 28b3eb8a902..2a8254fb696 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js
@@ -19,24 +19,24 @@ export var y = 100;
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.y = 100;
     exports.__esModule = true;
+    exports.y = 100;
 });
 //// [file2.js]
 define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) {
     "use strict";
-    exports.x = file3_1.x + file4_1.y;
     exports.__esModule = true;
+    exports.x = file3_1.x + file4_1.y;
 });
 //// [file1.js]
 define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) {
     "use strict";
-    use(file2_1.x.toExponential());
     exports.__esModule = true;
+    use(file2_1.x.toExponential());
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
index cf9e143ebb0..ff1a51662b0 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js
@@ -18,16 +18,16 @@ export var y: number;
 
 //// [file3.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file3_1 = require("./file3"); // found with baseurl
 var file4_1 = require("file4"); // found with fallback
 exports.x = file3_1.x + file4_1.y;
-exports.__esModule = true;
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var file2_1 = require("folder2/file2");
 use(file2_1.x.toExponential());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
index 46244521fab..1b9782660d8 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js
@@ -28,33 +28,33 @@ export var z1 = 1;
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.y = 1;
     exports.__esModule = true;
+    exports.y = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.z = 1;
     exports.__esModule = true;
+    exports.z = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.z1 = 1;
     exports.__esModule = true;
+    exports.z1 = 1;
 });
 //// [file1.js]
 define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) {
     "use strict";
+    exports.__esModule = true;
     use(file1_1.x.toExponential());
     use(file2_1.y.toExponential());
     use(file3_1.z.toExponential());
     use(file4_1.z1.toExponential());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
index 69e5e16fe91..7d10c4d4a8b 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js
@@ -27,18 +27,19 @@ export var z1 = 1;
 
 //// [file1.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [file2.js]
 "use strict";
-exports.y = 1;
 exports.__esModule = true;
+exports.y = 1;
 //// [file4.js]
 "use strict";
-exports.z1 = 1;
 exports.__esModule = true;
+exports.z1 = 1;
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("folder2/file1");
 var file2_1 = require("folder3/file2");
 var file3_1 = require("components/file3");
@@ -47,4 +48,3 @@ use(file1_1.x.toExponential());
 use(file2_1.y.toExponential());
 use(file3_1.z.toExponential());
 use(file4_1.z1.toExponential());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
index 12e8e5dbda5..3289efd0209 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js
@@ -14,12 +14,12 @@ export {x} from "../file2";
 //// [file3.js]
 define(["require", "exports", "../file2"], function (require, exports, file2_1) {
     "use strict";
-    exports.x = file2_1.x;
     exports.__esModule = true;
+    exports.x = file2_1.x;
 });
 //// [file1.js]
 define(["require", "exports", "./project/file3"], function (require, exports, file3_1) {
     "use strict";
-    use(file3_1.x.toExponential());
     exports.__esModule = true;
+    use(file3_1.x.toExponential());
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
index 5cc834d0712..74c0f40758a 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js
@@ -13,11 +13,11 @@ export {x} from "../file2";
 
 //// [file3.js]
 "use strict";
+exports.__esModule = true;
 var file2_1 = require("../file2");
 exports.x = file2_1.x;
-exports.__esModule = true;
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var file3_1 = require("./project/file3");
 use(file3_1.x.toFixed());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
index 9aa886aeb26..55aca054e82 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js
@@ -36,13 +36,13 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "module1", "templates/module2", "../file3"], function (require, exports, module1_1, module2_1, file3_1) {
     "use strict";
-    exports.x = module1_1.a + module2_1.b + file3_1.x;
     exports.__esModule = true;
+    exports.x = module1_1.a + module2_1.b + file3_1.x;
 });
 //// [file1.js]
 define(["require", "exports", "./project/file2", "module3"], function (require, exports, file2_1, module3_1) {
     "use strict";
+    exports.__esModule = true;
     use(file2_1.x.toFixed());
     use(module3_1.y.toFixed());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
index 8095c4de6a1..303b98f4d83 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js
@@ -33,15 +33,15 @@ export let y: number;
 exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var module1_1 = require("module1");
 var module2_1 = require("templates/module2");
 var file3_1 = require("../file3");
 exports.x = module1_1.a + module2_1.b + file3_1.x;
-exports.__esModule = true;
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var file2_1 = require("./project/file2");
 var module3_1 = require("module3");
 use(file2_1.x.toFixed());
 use(module3_1.y.toFixed());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
index 44a53df492a..a91cc9d8d5a 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
@@ -14,14 +14,14 @@ import { bar } from "bar";
 
 //// [foo.js]
 "use strict";
+exports.__esModule = true;
 function foo() { }
 exports.foo = foo;
-exports.__esModule = true;
 //// [bar.js]
 "use strict";
+exports.__esModule = true;
 function bar() { }
 exports.bar = bar;
-exports.__esModule = true;
 //// [a.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/prespecializedGenericMembers1.js b/tests/baselines/reference/prespecializedGenericMembers1.js
index cdfcaad8743..f7e41263237 100644
--- a/tests/baselines/reference/prespecializedGenericMembers1.js
+++ b/tests/baselines/reference/prespecializedGenericMembers1.js
@@ -22,6 +22,7 @@ var catBag = new CatBag(catThing);
 
 //// [prespecializedGenericMembers1.js]
 "use strict";
+exports.__esModule = true;
 var Cat = (function () {
     function Cat() {
     }
@@ -39,4 +40,3 @@ var catThing = {
     barry: cat
 };
 var catBag = new CatBag(catThing);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js
index a85eb6de60c..9d077d19e06 100644
--- a/tests/baselines/reference/privacyAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyAccessorDeclFile.js
@@ -1061,6 +1061,7 @@ module publicModuleInGlobal {
 
 //// [privacyAccessorDeclFile_externalModule.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var privateClass = (function () {
     function privateClass() {
     }
@@ -2498,7 +2499,6 @@ var privateModule;
         return privateClassWithPrivateModuleSetAccessorTypes;
     }());
 })(privateModule || (privateModule = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [privacyAccessorDeclFile_GlobalFile.js]
 var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
index cbec9edb154..d19869b0f03 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
@@ -139,6 +139,7 @@ class privateClassWithPrivateModuleGetAccessorTypes {
 //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.js]
 //// [privacyCannotNameAccessorDeclFile_Widgets.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Widget1 = (function () {
     function Widget1() {
         this.name = 'one';
@@ -164,9 +165,9 @@ var SpecializedWidget;
     }
     SpecializedWidget.createWidget2 = createWidget2;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [privacyCannotNameAccessorDeclFile_exporter.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 ///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
 var Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
@@ -186,9 +187,9 @@ function createExportedWidget4() {
     return Widgets1.SpecializedGlobalWidget.createWidget4();
 }
 exports.createExportedWidget4 = createExportedWidget4;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [privacyCannotNameAccessorDeclFile_consumer.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var exporter = require("./privacyCannotNameAccessorDeclFile_exporter");
 var publicClassWithWithPrivateGetAccessorTypes = (function () {
     function publicClassWithWithPrivateGetAccessorTypes() {
@@ -380,7 +381,6 @@ var privateClassWithPrivateModuleGetAccessorTypes = (function () {
     });
     return privateClassWithPrivateModuleGetAccessorTypes;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts]
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
index 7f3ef5512ae..df24bf70259 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
@@ -103,6 +103,7 @@ var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4()
 //// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.js]
 //// [privacyCannotNameVarTypeDeclFile_Widgets.js]
 "use strict";
+exports.__esModule = true;
 var Widget1 = (function () {
     function Widget1() {
         this.name = 'one';
@@ -128,9 +129,9 @@ var SpecializedWidget;
     }
     SpecializedWidget.createWidget2 = createWidget2;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
-exports.__esModule = true;
 //// [privacyCannotNameVarTypeDeclFile_exporter.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
 var Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
@@ -150,9 +151,9 @@ function createExportedWidget4() {
     return Widgets1.SpecializedGlobalWidget.createWidget4();
 }
 exports.createExportedWidget4 = createExportedWidget4;
-exports.__esModule = true;
 //// [privacyCannotNameVarTypeDeclFile_consumer.js]
 "use strict";
+exports.__esModule = true;
 var exporter = require("./privacyCannotNameVarTypeDeclFile_exporter");
 var publicClassWithWithPrivatePropertyTypes = (function () {
     function publicClassWithWithPrivatePropertyTypes() {
@@ -208,7 +209,6 @@ privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.cre
 privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4();
 var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2();
 var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
-exports.__esModule = true;
 
 
 //// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts]
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
index e150564b747..8ddcc60a8ff 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
@@ -18,6 +18,7 @@ module Query {
 
 //// [privacyCheckAnonymousFunctionParameter.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1; // Makes this an external module
 var Query;
 (function (Query) {
@@ -31,7 +32,6 @@ var Query;
         });
     }
 })(Query || (Query = {}));
-exports.__esModule = true;
 
 
 //// [privacyCheckAnonymousFunctionParameter.d.ts]
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
index 3dee88c4f71..f18f47c20c3 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
@@ -17,6 +17,7 @@ module Q {
 //// [privacyCheckAnonymousFunctionParameter2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.x = 1; // Makes this an external module 
     var Q;
     (function (Q) {
@@ -30,7 +31,6 @@ define(["require", "exports"], function (require, exports) {
             Q.foo(null);
         }
     })(Q || (Q = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
index faa22fe190f..dc868d86bff 100644
--- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
+++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
@@ -13,6 +13,7 @@ export class B<T2> {
 //// [privacyCheckOnTypeParameterReferenceInConstructorParameter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A(callback) {
             var child = new B(this);
@@ -26,7 +27,6 @@ define(["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js
index 40cff7997a7..614bcedebe0 100644
--- a/tests/baselines/reference/privacyCheckTypeOfFunction.js
+++ b/tests/baselines/reference/privacyCheckTypeOfFunction.js
@@ -7,7 +7,7 @@ export var b = foo;
 
 //// [privacyCheckTypeOfFunction.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
 }
 exports.b = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js
index 4b08cf22e4f..95b12f4e2fa 100644
--- a/tests/baselines/reference/privacyClass.js
+++ b/tests/baselines/reference/privacyClass.js
@@ -139,6 +139,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var m1_c_public = (function () {
@@ -430,4 +431,3 @@ var glo_C12_public = (function (_super) {
     return glo_C12_public;
 }(glo_c_private));
 exports.glo_C12_public = glo_C12_public;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
index 0c500f0ed28..2803006c5b5 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -109,6 +109,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var publicModule;
 (function (publicModule) {
     var publicClassInPublicModule = (function () {
@@ -289,7 +290,6 @@ var publicClassExtendingFromPrivateModuleClass = (function (_super) {
     return publicClassExtendingFromPrivateModuleClass;
 }(privateModule.publicClassInPrivateModule));
 exports.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
-exports.__esModule = true;
 //// [privacyClassExtendsClauseDeclFile_GlobalFile.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
index 595889593cd..3d78f2a8048 100644
--- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
@@ -96,6 +96,7 @@ class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceI
 
 //// [privacyClassImplementsClauseDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 var publicModule;
 (function (publicModule) {
     var privateClassImplementingPublicInterfaceInModule = (function () {
@@ -207,7 +208,6 @@ var publicClassImplementingFromPrivateModuleInterface = (function () {
     return publicClassImplementingFromPrivateModuleInterface;
 }());
 exports.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface;
-exports.__esModule = true;
 //// [privacyClassImplementsClauseDeclFile_GlobalFile.js]
 var publicModuleInGlobal;
 (function (publicModuleInGlobal) {
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
index 3304fbd1df3..00314bdceab 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
@@ -159,6 +159,7 @@ function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createE
 //// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.js]
 //// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.js]
 "use strict";
+exports.__esModule = true;
 var Widget1 = (function () {
     function Widget1() {
         this.name = 'one';
@@ -184,9 +185,9 @@ var SpecializedWidget;
     }
     SpecializedWidget.createWidget2 = createWidget2;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
-exports.__esModule = true;
 //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
 var Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
@@ -206,9 +207,9 @@ function createExportedWidget4() {
     return Widgets1.SpecializedGlobalWidget.createWidget4();
 }
 exports.createExportedWidget4 = createExportedWidget4;
-exports.__esModule = true;
 //// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js]
 "use strict";
+exports.__esModule = true;
 var exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter");
 var publicClassWithWithPrivateParmeterTypes = (function () {
     function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -394,7 +395,6 @@ function privateFunctionWithPrivateModuleParameterTypes(param) {
 function privateFunctionWithPrivateModuleParameterTypes1(param) {
     if (param === void 0) { param = exporter.createExportedWidget4(); }
 }
-exports.__esModule = true;
 
 
 //// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts]
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
index c354ed68321..2124f8fbb24 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
@@ -166,6 +166,7 @@ function privateFunctionWithPrivateModuleReturnTypes1() {
 //// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.js]
 //// [privacyFunctionReturnTypeDeclFile_Widgets.js]
 "use strict";
+exports.__esModule = true;
 var Widget1 = (function () {
     function Widget1() {
         this.name = 'one';
@@ -191,9 +192,9 @@ var SpecializedWidget;
     }
     SpecializedWidget.createWidget2 = createWidget2;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
-exports.__esModule = true;
 //// [privacyFunctionReturnTypeDeclFile_exporter.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
 var Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
@@ -213,9 +214,9 @@ function createExportedWidget4() {
     return Widgets1.SpecializedGlobalWidget.createWidget4();
 }
 exports.createExportedWidget4 = createExportedWidget4;
-exports.__esModule = true;
 //// [privacyFunctionReturnTypeDeclFile_consumer.js]
 "use strict";
+exports.__esModule = true;
 var exporter = require("./privacyFunctionReturnTypeDeclFile_exporter");
 var publicClassWithWithPrivateParmeterTypes = (function () {
     function publicClassWithWithPrivateParmeterTypes() {
@@ -351,7 +352,6 @@ function privateFunctionWithPrivateModuleReturnTypes() {
 function privateFunctionWithPrivateModuleReturnTypes1() {
     return exporter.createExportedWidget4();
 }
-exports.__esModule = true;
 
 
 //// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts]
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
index c4968d84371..255b8d68db6 100644
--- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
@@ -688,6 +688,7 @@ module publicModuleInGlobal {
 
 //// [privacyFunctionParameterDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -1027,7 +1028,6 @@ var privateModule;
     function privateFunctionWithPrivateModuleParameterTypes(param) {
     }
 })(privateModule || (privateModule = {}));
-exports.__esModule = true;
 //// [privacyFunctionParameterDeclFile_GlobalFile.js]
 var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
index 132c9e6a30c..1aba74efaa4 100644
--- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
@@ -1195,6 +1195,7 @@ module publicModuleInGlobal {
 
 //// [privacyFunctionReturnTypeDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -1819,7 +1820,6 @@ var privateModule;
         return new privateModule.publicClass();
     }
 })(privateModule || (privateModule = {}));
-exports.__esModule = true;
 //// [privacyFunctionReturnTypeDeclFile_GlobalFile.js]
 var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js
index fd8b8a3c684..255d21edcdb 100644
--- a/tests/baselines/reference/privacyGetter.js
+++ b/tests/baselines/reference/privacyGetter.js
@@ -210,6 +210,7 @@ class C8_private {
 //// [privacyGetter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var m1;
     (function (m1) {
         var C1_public = (function () {
@@ -504,5 +505,4 @@ define(["require", "exports"], function (require, exports) {
         });
         return C8_private;
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js
index 8059f3da545..6bc17794680 100644
--- a/tests/baselines/reference/privacyGloFunc.js
+++ b/tests/baselines/reference/privacyGloFunc.js
@@ -533,6 +533,7 @@ export function f12_public(): C5_private { //error
 //// [privacyGloFunc.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m1;
     (function (m1) {
         var C1_public = (function () {
@@ -983,5 +984,4 @@ define(["require", "exports"], function (require, exports) {
         return new C5_private(); //error
     }
     exports.f12_public = f12_public;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js
index 3dcb212af95..1a3dc9d9b18 100644
--- a/tests/baselines/reference/privacyImport.js
+++ b/tests/baselines/reference/privacyImport.js
@@ -358,6 +358,7 @@ export module m3 {
 
 //// [privacyImport.js]
 "use strict";
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var m1_M1_public;
@@ -701,4 +702,3 @@ var m3;
         //import m2 = require("use_glo_M1_public");
     })(m4 || (m4 = {}));
 })(m3 = exports.m3 || (exports.m3 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js
index b7cfd542470..5a15a7280ec 100644
--- a/tests/baselines/reference/privacyImportParseErrors.js
+++ b/tests/baselines/reference/privacyImportParseErrors.js
@@ -358,6 +358,7 @@ export module m3 {
 
 //// [privacyImportParseErrors.js]
 "use strict";
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var m1_M1_public;
@@ -575,4 +576,3 @@ var m3;
         var a = 10;
     })(m4 || (m4 = {}));
 })(m3 = exports.m3 || (exports.m3 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js
index 4b78192dc97..360f1683b6a 100644
--- a/tests/baselines/reference/privacyInterface.js
+++ b/tests/baselines/reference/privacyInterface.js
@@ -266,6 +266,7 @@ export interface glo_C6_public extends  glo_i_private, glo_i_public {
 
 //// [privacyInterface.js]
 "use strict";
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var C1_public = (function () {
@@ -311,4 +312,3 @@ var C6_private = (function () {
     }
     return C6_private;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
index 5006bab0ad1..408abc04940 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
@@ -154,6 +154,7 @@ module import_private {
 
 //// [privacyLocalInternalReferenceImportWithExport.js]
 "use strict";
+exports.__esModule = true;
 // private elements
 var m_private;
 (function (m_private) {
@@ -294,4 +295,3 @@ var import_private;
     import_private.publicUse_im_private_mi_public = new import_private.im_private_mi_public.c();
     var privateUse_im_private_mu_public;
 })(import_private || (import_private = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
index 9cc12f1c798..8b158d7cc3d 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
@@ -155,6 +155,7 @@ module import_private {
 //// [privacyLocalInternalReferenceImportWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // private elements
     var m_private;
     (function (m_private) {
@@ -295,5 +296,4 @@ define(["require", "exports"], function (require, exports) {
         import_private.publicUse_im_private_mi_public = new im_private_mi_public.c();
         var privateUse_im_private_mu_public;
     })(import_private || (import_private = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
index ae53d1bc51c..312d682669c 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
@@ -52,6 +52,7 @@ export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require.js]
 "use strict";
+exports.__esModule = true;
 // Public elements
 var c_public = (function () {
     function c_public() {
@@ -59,18 +60,18 @@ var c_public = (function () {
     return c_public;
 }());
 exports.c_public = c_public;
-exports.__esModule = true;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.js]
 "use strict";
+exports.__esModule = true;
 var c_public = (function () {
     function c_public() {
     }
     return c_public;
 }());
 exports.c_public = c_public;
-exports.__esModule = true;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
@@ -87,7 +88,6 @@ var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private()
 exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
 var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
 exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
-exports.__esModule = true;
 
 
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts]
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
index af8b2fd9eae..13b7de58ecf 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
@@ -53,6 +53,7 @@ export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // Public elements
     var c_public = (function () {
         function c_public() {
@@ -60,22 +61,22 @@ define(["require", "exports"], function (require, exports) {
         return c_public;
     }());
     exports.c_public = c_public;
-    exports.__esModule = true;
 });
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c_public = (function () {
         function c_public() {
         }
         return c_public;
     }());
     exports.c_public = c_public;
-    exports.__esModule = true;
 });
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js]
 define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleImportWithoutExport_require"], function (require, exports, im_private_mi_private, im_private_mu_private, im_private_mi_public) {
     "use strict";
+    exports.__esModule = true;
     // Usage of privacy error imports
     var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
     exports.publicUse_im_private_mi_private = new im_private_mi_private.c_private();
@@ -85,7 +86,6 @@ define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleIm
     exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
     var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
     exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
index d26782ef2dd..a89d49609e9 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
@@ -102,6 +102,7 @@ export var publicUse_im_public_mu_public: im_public_mu_public.i;
 //// [privacyTopLevelInternalReferenceImportWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // private elements
     var m_private;
     (function (m_private) {
@@ -198,5 +199,4 @@ define(["require", "exports"], function (require, exports) {
     var privateUse_im_public_mi_public = new exports.im_public_mi_public.c();
     exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c();
     var privateUse_im_public_mu_public;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
index 402e30c17a7..85a6cc3691a 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
@@ -103,6 +103,7 @@ export var publicUse_im_private_mu_public: im_private_mu_public.i;
 //// [privacyTopLevelInternalReferenceImportWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // private elements
     var m_private;
     (function (m_private) {
@@ -199,5 +200,4 @@ define(["require", "exports"], function (require, exports) {
     var privateUse_im_private_mi_public = new im_private_mi_public.c();
     exports.publicUse_im_private_mi_public = new im_private_mi_public.c();
     var privateUse_im_private_mu_public;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js
index 71683805c05..98e0a57d59e 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.js
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.js
@@ -134,6 +134,7 @@ function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
 
 //// [privacyTypeParameterOfFunction.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -244,4 +245,3 @@ function publicFunctionWithPublicTypeParametersWithoutExtends() {
 exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
 function privateFunctionWithPublicTypeParametersWithoutExtends() {
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
index bc1be54d2e5..f5fdf6dfff8 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
@@ -440,6 +440,7 @@ module privateModule {
 
 //// [privacyTypeParameterOfFunctionDeclFile.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -815,4 +816,3 @@ var privateModule;
     function privateFunctionWithPublicTypeParametersWithoutExtends() {
     }
 })(privateModule || (privateModule = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js
index 50fe3b8b456..ba1a9bd10e0 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClass.js
+++ b/tests/baselines/reference/privacyTypeParametersOfClass.js
@@ -45,6 +45,7 @@ class privateClassWithPublicTypeParametersWithoutExtends<T> {
 
 //// [privacyTypeParametersOfClass.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -108,4 +109,3 @@ var privateClassWithPublicTypeParametersWithoutExtends = (function () {
     };
     return privateClassWithPublicTypeParametersWithoutExtends;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
index 6f012c1b34e..8e21589de42 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
@@ -156,6 +156,7 @@ module privateModule {
 
 //// [privacyTypeParametersOfClassDeclFile.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -382,4 +383,3 @@ var privateModule;
         return privateClassWithPublicTypeParametersWithoutExtends;
     }());
 })(privateModule || (privateModule = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js
index e7fb531c773..0b511a01f06 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.js
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.js
@@ -60,6 +60,7 @@ interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
 
 //// [privacyTypeParametersOfInterface.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -82,4 +83,3 @@ var publicClassT = (function () {
     return publicClassT;
 }());
 exports.publicClassT = publicClassT;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
index d4929d9b329..f7d107b5855 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
@@ -192,6 +192,7 @@ module privateModule {
 
 //// [privacyTypeParametersOfInterfaceDeclFile.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -264,4 +265,3 @@ var privateModule;
     }());
     privateModule.publicClassInPrivateModuleT = publicClassInPrivateModuleT;
 })(privateModule || (privateModule = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js
index f5ed884807a..4c97d273c3e 100644
--- a/tests/baselines/reference/privacyVar.js
+++ b/tests/baselines/reference/privacyVar.js
@@ -176,6 +176,7 @@ export var glo_v24_public: glo_C2_private = new glo_C2_private(); // error
 
 //// [privacyVar.js]
 "use strict";
+exports.__esModule = true;
 var m1;
 (function (m1) {
     var C1_public = (function () {
@@ -332,4 +333,3 @@ var glo_v21_private = new glo_C1_public();
 exports.glo_v22_public = new glo_C1_public();
 var glo_v23_private = new glo_C2_private();
 exports.glo_v24_public = new glo_C2_private(); // error
-exports.__esModule = true;
diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js
index ab62eccebc9..eab99747849 100644
--- a/tests/baselines/reference/privacyVarDeclFile.js
+++ b/tests/baselines/reference/privacyVarDeclFile.js
@@ -427,6 +427,7 @@ module publicModuleInGlobal {
 
 //// [privacyVarDeclFile_externalModule.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -574,7 +575,6 @@ var privateModule;
     }());
     var privateVarWithPrivateModulePropertyTypes;
 })(privateModule || (privateModule = {}));
-exports.__esModule = true;
 //// [privacyVarDeclFile_GlobalFile.js]
 var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.js b/tests/baselines/reference/privatePropertyUsingObjectType.js
index 2b058047aaa..65e2129a5fc 100644
--- a/tests/baselines/reference/privatePropertyUsingObjectType.js
+++ b/tests/baselines/reference/privatePropertyUsingObjectType.js
@@ -12,11 +12,11 @@ export interface IFilterProvider {
 //// [privatePropertyUsingObjectType.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var FilterManager = (function () {
         function FilterManager() {
         }
         return FilterManager;
     }());
     exports.FilterManager = FilterManager;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js
index a8a506f23c3..1e03f7745d2 100644
--- a/tests/baselines/reference/project/baseline/amd/decl.js
+++ b/tests/baselines/reference/project/baseline/amd/decl.js
@@ -1,9 +1,9 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     ;
     function point(x, y) {
         return { x: x, y: y };
     }
     exports.point = point;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js
index 5daa1879628..b4d6d12445b 100644
--- a/tests/baselines/reference/project/baseline/amd/emit.js
+++ b/tests/baselines/reference/project/baseline/amd/emit.js
@@ -1,5 +1,5 @@
 define(["require", "exports", "./decl"], function (require, exports, g) {
     "use strict";
-    var p = g.point(10, 20);
     exports.__esModule = true;
+    var p = g.point(10, 20);
 });
diff --git a/tests/baselines/reference/project/baseline/node/decl.js b/tests/baselines/reference/project/baseline/node/decl.js
index 998ffaa5592..b7047c3f047 100644
--- a/tests/baselines/reference/project/baseline/node/decl.js
+++ b/tests/baselines/reference/project/baseline/node/decl.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 ;
 function point(x, y) {
     return { x: x, y: y };
 }
 exports.point = point;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js
index 17c96719d0b..9410f82bc32 100644
--- a/tests/baselines/reference/project/baseline/node/emit.js
+++ b/tests/baselines/reference/project/baseline/node/emit.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var g = require("./decl");
 var p = g.point(10, 20);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js
index a8a506f23c3..1e03f7745d2 100644
--- a/tests/baselines/reference/project/baseline2/amd/decl.js
+++ b/tests/baselines/reference/project/baseline2/amd/decl.js
@@ -1,9 +1,9 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     ;
     function point(x, y) {
         return { x: x, y: y };
     }
     exports.point = point;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
index 859d262e9c6..18dae0f6420 100644
--- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
@@ -1,5 +1,5 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var p = { x: 10, y: 20 };
     exports.__esModule = true;
+    var p = { x: 10, y: 20 };
 });
diff --git a/tests/baselines/reference/project/baseline2/node/decl.js b/tests/baselines/reference/project/baseline2/node/decl.js
index 998ffaa5592..b7047c3f047 100644
--- a/tests/baselines/reference/project/baseline2/node/decl.js
+++ b/tests/baselines/reference/project/baseline2/node/decl.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 ;
 function point(x, y) {
     return { x: x, y: y };
 }
 exports.point = point;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js
index c172dcd312f..ce766eee086 100644
--- a/tests/baselines/reference/project/baseline2/node/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js
@@ -1,3 +1,3 @@
 "use strict";
-var p = { x: 10, y: 20 };
 exports.__esModule = true;
+var p = { x: 10, y: 20 };
diff --git a/tests/baselines/reference/project/baseline3/amd/nestedModule.js b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
index 3fa69311ffa..c4f4e37489d 100644
--- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var outer;
     (function (outer) {
         var inner;
@@ -8,5 +9,4 @@ define(["require", "exports"], function (require, exports) {
             inner.a = local;
         })(inner = outer.inner || (outer.inner = {}));
     })(outer = exports.outer || (exports.outer = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js
index 9596b38253a..345fd8914cc 100644
--- a/tests/baselines/reference/project/baseline3/node/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var outer;
 (function (outer) {
     var inner;
@@ -7,4 +8,3 @@ var outer;
         inner.a = local;
     })(inner = outer.inner || (outer.inner = {}));
 })(outer = exports.outer || (exports.outer = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js
index 30c63965136..4db463a7966 100644
--- a/tests/baselines/reference/project/declarationDir/amd/a.js
+++ b/tests/baselines/reference/project/declarationDir/amd/a.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
index 14c0c78edb8..bdae3c44b0a 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
index b62647beae0..ff657652a4a 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js
index 7480c269a05..2139e86c811 100644
--- a/tests/baselines/reference/project/declarationDir/node/a.js
+++ b/tests/baselines/reference/project/declarationDir/node/a.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
index 3c9a75de66e..df27fec56d1 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
index 6f1ce11cdc6..385b6df7591 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports.C = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
index 30c63965136..4db463a7966 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
index 14c0c78edb8..bdae3c44b0a 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
index b62647beae0..ff657652a4a 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js
index 7480c269a05..2139e86c811 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/a.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
index 3c9a75de66e..df27fec56d1 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
index 6f1ce11cdc6..385b6df7591 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports.C = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js
index d190c7a5767..b90d4415806 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/out.js
+++ b/tests/baselines/reference/project/declarationDir3/amd/out.js
@@ -1,30 +1,30 @@
 define("subfolder/b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("subfolder/c", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
index 44111609dca..1610052986d 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
@@ -1,7 +1,7 @@
 define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) {
     "use strict";
+    exports.__esModule = true;
     exports.useGlo_m4_x4 = glo_m4.x;
     exports.useGlo_m4_d4 = glo_m4.d;
     exports.useGlo_m4_f4 = glo_m4.foo();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
index b3ee7499e44..b7ddd253b1a 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
@@ -1,6 +1,6 @@
 "use strict";
+exports.__esModule = true;
 var glo_m4 = require("glo_m4");
 exports.useGlo_m4_x4 = glo_m4.x;
 exports.useGlo_m4_d4 = glo_m4.d;
 exports.useGlo_m4_f4 = glo_m4.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
index a6563ac4f73..6ecb0c59793 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
@@ -1,10 +1,10 @@
 define(["require", "exports", "private_m4"], function (require, exports, private_m4) {
     "use strict";
+    exports.__esModule = true;
     var usePrivate_m4_m1;
     (function (usePrivate_m4_m1) {
         var x3 = private_m4.x;
         var d3 = private_m4.d;
         var f3 = private_m4.foo();
     })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
index 24526ded58b..79310d89c02 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 // only used privately no need to emit
 var private_m4 = require("private_m4");
 var usePrivate_m4_m1;
@@ -7,4 +8,3 @@ var usePrivate_m4_m1;
     var d3 = private_m4.d;
     var f3 = private_m4.foo();
 })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
index b3dc7cc82f2..c6c57dabc81 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
@@ -1,5 +1,5 @@
 define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) {
     "use strict";
-    exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
     exports.__esModule = true;
+    exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
 });
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
index 8d74ebb2b6e..991afa567cf 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var fncOnly_m4 = require("fncOnly_m4");
 exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
index 6f282e26147..1a0305591cc 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     function foo2() {
         return new m4.d();
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
index e9c49cd4ddc..6f962bd42e5 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
@@ -1,10 +1,10 @@
 define(["require", "exports", "m5"], function (require, exports, m5) {
     "use strict";
+    exports.__esModule = true;
     exports.d = m5.foo2();
     exports.x = m5.foo2;
     function n() {
         return m5.foo2();
     }
     exports.n = n;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
index fd0ae21091e..db280e7fd8e 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 function foo2() {
     return new m4.d();
 }
 exports.foo2 = foo2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
index f06725c1068..7cc88b54ff3 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 // Do not emit unused import
 var m5 = require("m5");
 exports.d = m5.foo2();
@@ -7,4 +8,3 @@ function n() {
     return m5.foo2();
 }
 exports.n = n;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
index 8af4110011c..5375f44c013 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4", "m4"], function (require, exports, m4, multiImport_m4) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
@@ -15,5 +16,4 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi
     exports.useMultiImport_m4_x4 = multiImport_m4.x;
     exports.useMultiImport_m4_d4 = multiImport_m4.d;
     exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
index fc6900da8d5..395cbeee966 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
@@ -17,4 +18,3 @@ var multiImport_m4 = require("m4"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
index 6f282e26147..1a0305591cc 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     function foo2() {
         return new m4.d();
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
index 7221b9e2e8f..b8a22cfdc1f 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
@@ -13,5 +14,4 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
         var f3 = m4.foo();
     })(m1 = exports.m1 || (exports.m1 = {}));
     exports.d = m5.foo2();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
index fd0ae21091e..db280e7fd8e 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 function foo2() {
     return new m4.d();
 }
 exports.foo2 = foo2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
index 7e7a43ce145..49958bb9814 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
@@ -15,4 +16,3 @@ var m1;
 // Do not emit unused import
 var m5 = require("m5");
 exports.d = m5.foo2();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
index 1c8e3a5a308..af5fcb7d874 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
@@ -12,5 +13,4 @@ define(["require", "exports", "m4"], function (require, exports, m4) {
         var d3 = m4.d;
         var f3 = m4.foo();
     })(m1 = exports.m1 || (exports.m1 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
index ea2836708d2..3a5602a2166 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
@@ -12,4 +13,3 @@ var m1;
     var d3 = m4.d;
     var f3 = m4.foo();
 })(m1 = exports.m1 || (exports.m1 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 2ef457654e2..7eeee43049b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 891c03b13f2..c44e24a081e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index b12b9bfe9bb..d393dda0c57 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 30f6e242bc8..436eab5db94 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 2ef457654e2..7eeee43049b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 891c03b13f2..c44e24a081e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index b12b9bfe9bb..d393dda0c57 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 30f6e242bc8..436eab5db94 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 225b233f3e1..1c199b7384a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index e9248099943..df6d2c811c0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index ee9fb6673be..749fbd732a5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 9d5330f5c81..0c75dbb2b00 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 5db5f8f1bfb..b49f0a04b53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 62dc8a8d83f..c67e35d1b89 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 2d386326fcd..1935dadfdb3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index 944360ae9cc..fa9c5691047 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index dd409b9f2c3..b3b4c42289f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 78b4b9fcfe1..80d6ba438ba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index e7e1070403f..dabe72d2787 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index bd73b1912c2..d28465d805e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index aff7400b20f..46d82346a37 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index 6ba04afda9e..3813e4b2cca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 2d386326fcd..1935dadfdb3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 944360ae9cc..fa9c5691047 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index dd409b9f2c3..b3b4c42289f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 62dc8a8d83f..c67e35d1b89 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 5db5f8f1bfb..b49f0a04b53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bd73b1912c2..d28465d805e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index aff7400b20f..46d82346a37 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 6ba04afda9e..3813e4b2cca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index e7e1070403f..dabe72d2787 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 78b4b9fcfe1..80d6ba438ba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 4b75cfaa754..371d873f345 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d65b73465ef..783691c52ed 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index dd98ae30d59..1f3b6d7a6dc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index 43b1caa625e..16e1f512923 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index c8ece24eda3..a112cba6d0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 27d3a9788c4..a6a299a8a7e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index 02f7bbcbb67..d16575e8a97 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index 058f9c4c3a5..94e4facb645 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 766ff607b54..47915c9660b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index dd98ae30d59..1f3b6d7a6dc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 43b1caa625e..16e1f512923 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c8ece24eda3..a112cba6d0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 27d3a9788c4..a6a299a8a7e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 02f7bbcbb67..d16575e8a97 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 058f9c4c3a5..94e4facb645 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 766ff607b54..47915c9660b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 00530261d76..c5e2f0c04bf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a30b607676c..293a1478989 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 1d0559224b8..8359b4472ee 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index a6d24f0f020..9cef03b0711 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index cb628091e33..32cd3e8915e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 99859780314..39f0b136568 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index a23c1871126..de654530492 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index 541d8dc4c26..61925246a0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index a758d2a1cd0..4a1329681e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1d0559224b8..8359b4472ee 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index a6d24f0f020..9cef03b0711 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index cb628091e33..32cd3e8915e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 99859780314..39f0b136568 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index a23c1871126..de654530492 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 541d8dc4c26..61925246a0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index a758d2a1cd0..4a1329681e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 0f5938617e2..11d40e4d23b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 173790ea042..61dfeeeb8d3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 30cf48ae0ef..c467f0b8be0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 0dab1514706..7c959ab9408 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index f7a19e1fa14..d43267b1c9a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 14104ec68b9..15c5c91190e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 744aff01a08..9a46a37deb8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 0dab1514706..7c959ab9408 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index edf0e169c56..727afdc29fd 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 14104ec68b9..15c5c91190e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 3f4ebdb1911..2a89c0fc929 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index b2efc9bf3d4..0b7f01fdec5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index f1ed00eb139..62af54d3700 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 95830bd2c25..d4bfc447280 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 4f51d470c82..59de6353786 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 9cdad10a966..6cf63b567ba 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 2df791f04e8..2a191801c43 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index ee8a26cafcf..301f83dab55 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index 1d1c53b36cf..2dcea15d050 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index e60e0fbfa7a..6c74ce312be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 3c653ded700..97b03befa22 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index a889d6f19b3..28edf754650 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 83cb52c7f14..9a8f5b77498 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index 5f97087307d..bd9b5d0051a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 9ef0d252f05..603b29da7fa 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 8c64bacf533..3821a46478a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f50e1837a86..4090486a730 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index ee8a26cafcf..301f83dab55 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 1222f92a7d2..f637a581e13 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index e60e0fbfa7a..6c74ce312be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index edafd9055b2..fa97d15a89a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 4f51d470c82..59de6353786 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3cfb1b4c030..8de8d6f84b6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 5f97087307d..bd9b5d0051a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 4e054f32699..ca070c2062f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 8c64bacf533..3821a46478a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 931971b3f84..6ce6e73202e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 3c653ded700..97b03befa22 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 44a6d536eed..e4a7bb40897 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index b4f33f056d6..83050ce43fe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index 8151fed382b..b890ae8232a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index 611b73c5c7d..df737e96f26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
index fe1308aca7e..2cbff5fc156 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index a6d5cebe7f1..84f19710abc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
index b1a971bd89f..a0cc81f5af9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index 733fa0fc069..ea360554f92 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
index e4c81cdfc8e..2cce36f74c2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index 86cfbeb5b63..e395bf8648f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index df8c82915fb..f5001a6551e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 611b73c5c7d..df737e96f26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index f361c1c0917..2fb4fbfd5c3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a6d5cebe7f1..84f19710abc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 7479c4aebee..0110f9dce16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 733fa0fc069..ea360554f92 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 7e4f77c1c69..4849c53d0c4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 86cfbeb5b63..e395bf8648f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 37af60df3ea..587721fb87a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 5721a33f4a5..5e9e5c8593d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 29a43275b49..b99a41c8c3c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index dbfe0b5d927..dcfdb34145e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index 62ec7868d70..c4c2a04f642 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index a8d6293492c..2df46e6835c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index debe15abde9..9574bd33b83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 172c4d4804a..44556b78663 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
index 461809c985f..4ac58aea856 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index ef62267d957..47558364d4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 09f9886020e..2885a499091 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index dbfe0b5d927..dcfdb34145e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 5eab5555cbe..0ee63c42070 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a8d6293492c..2df46e6835c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 81956eb2903..fa9502d4d64 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 172c4d4804a..44556b78663 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index fd86ae84059..cabfd9f98d6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index ef62267d957..47558364d4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 708517a1d95..d6d12689721 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a7416c83297..aa198a56dbe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index c657ed8edce..4d37c4456a3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 56f12c22903..6ba684e3841 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index c657ed8edce..4d37c4456a3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 56f12c22903..6ba684e3841 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 62e49557aab..d9f0f5b1531 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 7618a616fa3..e84545ade77 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5df712534f6..cc3f604524f 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 6a226fbc86c..e115b1ebd64 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 3c1c9b64dc2..0b4d12cead1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9bdc7ad5504..fa0bcf94a5d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 3a4d618044a..6a2bfc777e9 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 4103e499cbd..29b98b193fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 49f97b88a38..f4de6b06e49 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
index 830a0ddd3e5..842d34fe73d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9bdc7ad5504..fa0bcf94a5d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 3a4d618044a..6a2bfc777e9 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 3c1c9b64dc2..0b4d12cead1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 49f97b88a38..f4de6b06e49 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 830a0ddd3e5..842d34fe73d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 4103e499cbd..29b98b193fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 058227b1276..1ea95ed9ba0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index f80ee7e3208..cd6a7fab377 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
index eceec7b450a..f0cb61b0632 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
index d68dbf6eb9e..ed2f67c585b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
index b9de639cb1d..da3b77ba146 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
index 826729aba87..f4d0ecfe24b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index eceec7b450a..f0cb61b0632 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d68dbf6eb9e..ed2f67c585b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index b9de639cb1d..da3b77ba146 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 826729aba87..f4d0ecfe24b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 16cec87f1e7..d19b9195685 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index c7b114195f2..ba2950b1a5e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 755cc1d0aaf..2f6470b65ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 957a73c648a..a88a706d9b1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index f7e43883048..5b58a2ee571 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
index 8baefdad92b..d4034d62c4a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 755cc1d0aaf..2f6470b65ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 957a73c648a..a88a706d9b1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index f7e43883048..5b58a2ee571 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 8baefdad92b..d4034d62c4a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index cf6d4730e19..63e58be27dc 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index d1ea7163910..12f2439e6f5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 62e49557aab..d9f0f5b1531 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 33f8f550fbd..92315bfcacc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5df712534f6..cc3f604524f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index a60954292ba..c98b66faded 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 058227b1276..1ea95ed9ba0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 9ca8e953224..5d14898713d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 16cec87f1e7..d19b9195685 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 714b2137400..f5849debd83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index cf6d4730e19..63e58be27dc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a2fff6d9c90..6f4defc3e4c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
index b5c401da717..65e3b33be1a 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
@@ -1,7 +1,7 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
index fb163c512b8..4fc36cd0222 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
@@ -1,6 +1,6 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
index 432701235d5..493e1b9636e 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = "10"; // Error: Should be number
     m1.rel = 42; // Error: Should be boolean
     m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
index 12d17b60709..51370836837 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = "10"; // Error: Should be number
 m1.rel = 42; // Error: Should be boolean
 m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
index 81c077dfd9c..948a6d68b83 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m1", "m4"], function (require, exports, m1, m4) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
     var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
index 0d06a91c2a6..50feab5d27f 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 var m4 = require("m4");
 m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
 var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js
index 11da1c899c1..a6bce0ab2c6 100644
--- a/tests/baselines/reference/project/nonRelative/amd/consume.js
+++ b/tests/baselines/reference/project/nonRelative/amd/consume.js
@@ -1,10 +1,10 @@
 define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (require, exports, mod, x, y) {
     "use strict";
+    exports.__esModule = true;
     x.hello();
     y.hello();
     var str = mod.call();
     if (str !== "success") {
         fail();
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/decl.js b/tests/baselines/reference/project/nonRelative/amd/decl.js
index 90d387773d3..d22c3ced24e 100644
--- a/tests/baselines/reference/project/nonRelative/amd/decl.js
+++ b/tests/baselines/reference/project/nonRelative/amd/decl.js
@@ -1,8 +1,8 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function call() {
         return "success";
     }
     exports.call = call;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
index 4731ff335a3..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
index 4731ff335a3..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
index 4731ff335a3..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js
index d4f9f6e288d..51d811bb72a 100644
--- a/tests/baselines/reference/project/nonRelative/node/consume.js
+++ b/tests/baselines/reference/project/nonRelative/node/consume.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var mod = require("decl");
 var x = require("lib/foo/a");
 var y = require("lib/bar/a");
@@ -8,4 +9,3 @@ var str = mod.call();
 if (str !== "success") {
     fail();
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/decl.js b/tests/baselines/reference/project/nonRelative/node/decl.js
index 9bb5f2ac6ed..7cde1400c60 100644
--- a/tests/baselines/reference/project/nonRelative/node/decl.js
+++ b/tests/baselines/reference/project/nonRelative/node/decl.js
@@ -1,6 +1,6 @@
 "use strict";
+exports.__esModule = true;
 function call() {
     return "success";
 }
 exports.call = call;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
index 819723f9833..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
index 819723f9833..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
index 819723f9833..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index bc27e650743..ef652b9e929 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index bc27e650743..ef652b9e929 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
index 87b3e0b6856..fb9329a59b4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
index 313682ec06c..18fccdca8bb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,4 +16,3 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 87b3e0b6856..fb9329a59b4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 313682ec06c..18fccdca8bb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,4 +16,3 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 5c65bc4968b..adb1b5061b5 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,5 +47,4 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
index 39ac64cda82..c062c0ac6d4 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
index e12a028abc0..2e50e0b7989 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 39ac64cda82..c062c0ac6d4 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index e12a028abc0..2e50e0b7989 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 4c036fa59a1..0a1f6b523c9 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,5 +30,4 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
index 865896d2602..0fdf8d91b32 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
index 8d4d683ff7c..33f201ce9d5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 865896d2602..0fdf8d91b32 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 8d4d683ff7c..33f201ce9d5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 7c40db25bb7..2ddfb9277a3 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,5 +30,4 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index e9a80c428b2..67693560dfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9f1206b5b14..d188f8a16bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index e9a80c428b2..67693560dfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9f1206b5b14..d188f8a16bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 57114f145bd..3520f3c0a5f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 132d98cd87f..ed2de159383 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index ab7082a2e8e..bed0bf9b3e2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 6bebdd113b6..616307fc2aa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index 21c996978fd..ac1540d3d7c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 06c30f32eaf..4281eb94fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index b757263c866..20f34963221 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index b123ccf13c8..e794023608c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 6bebdd113b6..616307fc2aa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 21c996978fd..ac1540d3d7c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index ab7082a2e8e..bed0bf9b3e2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index b757263c866..20f34963221 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index b123ccf13c8..e794023608c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 06c30f32eaf..4281eb94fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index bd89a9514f2..5970dfad43e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index ffc39be8044..101e0b07546 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index 6366b8c2d85..5194b89b4a5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index 04bd4e10a3b..6316b37945c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 9dc457a0167..ec26fbe336a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index ffc39be8044..101e0b07546 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6366b8c2d85..5194b89b4a5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 04bd4e10a3b..6316b37945c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 9dc457a0167..ec26fbe336a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 8718a3a9350..64a56e71714 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index cd798e72d89..a8d5da3a201 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index 6738a871942..1628374eef4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 81d64320d78..f43884731e0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index b2ea9133dfc..649377c06fc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index cd798e72d89..a8d5da3a201 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6738a871942..1628374eef4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 81d64320d78..f43884731e0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index b2ea9133dfc..649377c06fc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index af3b647fcab..bbf9b58c64f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 560075530f1..d65693aee66 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 27abb47a45b..5d1100e38fa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 560075530f1..d65693aee66 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 27abb47a45b..5d1100e38fa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 5378b914fc7..544b444f69a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index cd6b23ddc0f..39cc19f0b09 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 6b4ece94c15..7571615de41 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 8271bf25be1..ad01eacc00c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index 8be239f3553..343b30f743a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index c7ae549832a..a7121ab0fb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index 37adc61e54f..ddd49759374 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 79b428ca3a1..34026638960 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 8271bf25be1..ad01eacc00c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 8be239f3553..343b30f743a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 6b4ece94c15..7571615de41 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 37adc61e54f..ddd49759374 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 79b428ca3a1..34026638960 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index c7ae549832a..a7121ab0fb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 66fd3cfe867..12697408ddd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index 29c8533aded..f9a2fd1d740 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index 8086d9c04da..70db4f7545c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index 0d24a0e332a..0e6c49a9aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 29c8533aded..f9a2fd1d740 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 8086d9c04da..70db4f7545c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 0d24a0e332a..0e6c49a9aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a5dcbdc600a..1132db08bd0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 91793ab1002..07643a2c9dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 00e388b171e..a9e9284e21d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index 07178ab519f..9b21b166c37 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 91793ab1002..07643a2c9dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 00e388b171e..a9e9284e21d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 07178ab519f..9b21b166c37 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index d9e63184a83..5121f5c6a1e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
index c4bc3c32708..a7a1fecb87f 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
index 208dd329040..ba1b40abf87 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index c0b56df8d90..35edbb3cd9c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 5e34d4494dd..3c66628ccf7 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index e9248099943..df6d2c811c0 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 9d5330f5c81..0c75dbb2b00 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
index c4bc3c32708..a7a1fecb87f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
index 096386e968d..99618a3d6a7 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
index 208dd329040..ba1b40abf87 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
index a9dba1be1dd..308a0083438 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 2293c1a7c96..8ba69854427 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index d21a585cc41..1179d812037 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 5d8cf325d52..14fbdd65f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 49bb95f32d5..a42c40521a1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a48d929a860..86d72e20c93 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index b9e5ddb335f..18103b0a8b1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d65b73465ef..783691c52ed 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
index 9a899efce64..80722609800 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
index 57b2f0a9935..90f1d966b1c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 128c9957bf4..2eb15ca540b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 50263c64897..742f4f4a9af 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 40d0111893e..c819ff2c52c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index cc2b2e9b918..b94230beb69 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index a30b607676c..293a1478989 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
index 9a899efce64..80722609800 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
index 6f71fb82f4c..6f61cbbee19 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 50263c64897..742f4f4a9af 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 9c9d3ffec92..ab37fc26b40 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 173790ea042..61dfeeeb8d3 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 33f8f550fbd..92315bfcacc 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index a60954292ba..c98b66faded 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 9ca8e953224..5d14898713d 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
index 714b2137400..f5849debd83 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a2fff6d9c90..6f4defc3e4c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
index d80da6d9e1b..66facecde7f 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var RM = (function () {
         function RM() {
         }
@@ -15,5 +16,4 @@ define(["require", "exports"], function (require, exports) {
         return RM;
     }());
     exports.RM = RM;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
index a07a323df50..221c2322227 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var RM = (function () {
     function RM() {
     }
@@ -14,4 +15,3 @@ var RM = (function () {
     return RM;
 }());
 exports.RM = RM;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
index b16939b5d8f..457f929fe62 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
@@ -31,6 +31,7 @@ var y: Foo2;
 //// [propertyIdentityWithPrivacyMismatch_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     var x; // Should be error (mod1.Foo !== mod2.Foo)
     var Foo1 = (function () {
@@ -45,5 +46,4 @@ define(["require", "exports"], function (require, exports) {
     }());
     var y;
     var y;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js
index bec6247b7cc..cd306e411d5 100644
--- a/tests/baselines/reference/reExportDefaultExport.js
+++ b/tests/baselines/reference/reExportDefaultExport.js
@@ -16,15 +16,15 @@ foo();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() {
 }
 exports.default = f;
 exports.f = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 var m1_2 = require("./m1");
 m1_2.f();
 m1_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/reExportUndefined2.js b/tests/baselines/reference/reExportUndefined2.js
index 726b25c748d..bde88442b33 100644
--- a/tests/baselines/reference/reExportUndefined2.js
+++ b/tests/baselines/reference/reExportUndefined2.js
@@ -12,11 +12,11 @@ use(undefined);
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var undefined;
 exports.undefined = undefined;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 use(a_1.undefined);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.js b/tests/baselines/reference/reactNamespaceImportPresevation.js
index 99eb5a94bac..682dd0f7882 100644
--- a/tests/baselines/reference/reactNamespaceImportPresevation.js
+++ b/tests/baselines/reference/reactNamespaceImportPresevation.js
@@ -16,6 +16,6 @@ declare var foo: any;
 
 //// [test.jsx]
 "use strict";
+exports.__esModule = true;
 var myReactLib = require("my-React-Lib"); // should not be elided
 <foo data/>;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js
index 87e85e9d20f..3c41bed5e62 100644
--- a/tests/baselines/reference/recursiveMods.js
+++ b/tests/baselines/reference/recursiveMods.js
@@ -26,6 +26,7 @@ export module Foo {
 
 //// [recursiveMods.js]
 "use strict";
+exports.__esModule = true;
 var Foo;
 (function (Foo) {
     var C = (function () {
@@ -51,4 +52,3 @@ var Foo;
         return;
     }
 })(Foo = exports.Foo || (exports.Foo = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js
index 9bd5fb62e1a..aae728c9e25 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -43,6 +43,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var foo2 = require("./foo2");
 var x = (function (_super) {
     __extends(x, _super);
@@ -51,4 +52,3 @@ var x = (function (_super) {
     }
     return x;
 }(foo2.x));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/relativeNamesInClassicResolution.js b/tests/baselines/reference/relativeNamesInClassicResolution.js
index 68fef5a3e9d..cf43ec2a5ca 100644
--- a/tests/baselines/reference/relativeNamesInClassicResolution.js
+++ b/tests/baselines/reference/relativeNamesInClassicResolution.js
@@ -15,6 +15,6 @@ define(["require", "exports"], function (require, exports) {
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
diff --git a/tests/baselines/reference/relativePathMustResolve.js b/tests/baselines/reference/relativePathMustResolve.js
index a8c841261fd..52e760a0240 100644
--- a/tests/baselines/reference/relativePathMustResolve.js
+++ b/tests/baselines/reference/relativePathMustResolve.js
@@ -10,6 +10,6 @@ var z = foo.x + 10;
 
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./test/foo");
 var z = foo.x + 10;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/relativePathToDeclarationFile.js b/tests/baselines/reference/relativePathToDeclarationFile.js
index 84a784779f6..58cf090ad86 100644
--- a/tests/baselines/reference/relativePathToDeclarationFile.js
+++ b/tests/baselines/reference/relativePathToDeclarationFile.js
@@ -28,10 +28,10 @@ if(foo.M2.x){
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("foo");
 var other = require("./other");
 var relMod = require("./sub/relMod");
 if (foo.M2.x) {
     var x = new relMod(other.M2.x.charCodeAt(0));
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/requireAsFunctionInExternalModule.js b/tests/baselines/reference/requireAsFunctionInExternalModule.js
index 39a39fb1bbe..f4eac77052a 100644
--- a/tests/baselines/reference/requireAsFunctionInExternalModule.js
+++ b/tests/baselines/reference/requireAsFunctionInExternalModule.js
@@ -18,22 +18,22 @@ hello();
 
 //// [c.js]
 "use strict";
+exports.__esModule = true;
 function require(a) { }
 exports["default"] = require;
 function has(a) { return true; }
 exports.has = has;
-exports.__esModule = true;
 //// [m.js]
 "use strict";
+exports.__esModule = true;
 var c_1 = require("./c");
 function hello() { }
 exports.hello = hello;
 if (c_1.has('ember-debug')) {
     c_1["default"]('ember-debug');
 }
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m_1 = require("./m");
 m_1.hello();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js
index 6ef27122df4..667002efeaa 100644
--- a/tests/baselines/reference/requireEmitSemicolon.js
+++ b/tests/baselines/reference/requireEmitSemicolon.js
@@ -22,6 +22,7 @@ export module Database {
 //// [requireEmitSemicolon_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Models;
     (function (Models) {
         var Person = (function () {
@@ -31,11 +32,11 @@ define(["require", "exports"], function (require, exports) {
         }());
         Models.Person = Person;
     })(Models = exports.Models || (exports.Models = {}));
-    exports.__esModule = true;
 });
 //// [requireEmitSemicolon_1.js]
 define(["require", "exports", "requireEmitSemicolon_0"], function (require, exports, P) {
     "use strict";
+    exports.__esModule = true;
     var Database;
     (function (Database) {
         var DB = (function () {
@@ -48,5 +49,4 @@ define(["require", "exports", "requireEmitSemicolon_0"], function (require, expo
         }());
         Database.DB = DB;
     })(Database = exports.Database || (exports.Database = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js
index 6b0941349e0..f172f37d053 100644
--- a/tests/baselines/reference/reservedWords2.js
+++ b/tests/baselines/reference/reservedWords2.js
@@ -15,6 +15,7 @@ enum void {}
 
 //// [reservedWords2.js]
 "use strict";
+exports.__esModule = true;
 require();
 while ( = require("dfdf"))
     ;
@@ -37,4 +38,3 @@ if ()
 (function () {
 })( || ( = {}));
 void {};
-exports.__esModule = true;
diff --git a/tests/baselines/reference/reuseInnerModuleMember.js b/tests/baselines/reference/reuseInnerModuleMember.js
index c4d0a7745fa..d432daed2a7 100644
--- a/tests/baselines/reference/reuseInnerModuleMember.js
+++ b/tests/baselines/reference/reuseInnerModuleMember.js
@@ -20,9 +20,9 @@ module bar {
 exports.__esModule = true;
 //// [reuseInnerModuleMember_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='reuseInnerModuleMember_0.ts'/>
 var bar;
 (function (bar) {
     var x;
 })(bar || (bar = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/scannerClass2.js b/tests/baselines/reference/scannerClass2.js
index 96dd8c0b283..bc489268afd 100644
--- a/tests/baselines/reference/scannerClass2.js
+++ b/tests/baselines/reference/scannerClass2.js
@@ -9,6 +9,7 @@
 
 //// [scannerClass2.js]
 "use strict";
+exports.__esModule = true;
 var LoggerAdapter = (function () {
     function LoggerAdapter(logger) {
         this.logger = logger;
@@ -17,4 +18,3 @@ var LoggerAdapter = (function () {
     return LoggerAdapter;
 }());
 exports.LoggerAdapter = LoggerAdapter;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/scannerEnum1.js b/tests/baselines/reference/scannerEnum1.js
index 17a0b66fde2..75c182206b9 100644
--- a/tests/baselines/reference/scannerEnum1.js
+++ b/tests/baselines/reference/scannerEnum1.js
@@ -6,9 +6,9 @@
 
 //// [scannerEnum1.js]
 "use strict";
+exports.__esModule = true;
 var CodeGenTarget;
 (function (CodeGenTarget) {
     CodeGenTarget[CodeGenTarget["ES3"] = 0] = "ES3";
     CodeGenTarget[CodeGenTarget["ES5"] = 1] = "ES5";
 })(CodeGenTarget = exports.CodeGenTarget || (exports.CodeGenTarget = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/shebangBeforeReferences.js b/tests/baselines/reference/shebangBeforeReferences.js
index 67f0cbff690..41f3cee97e1 100644
--- a/tests/baselines/reference/shebangBeforeReferences.js
+++ b/tests/baselines/reference/shebangBeforeReferences.js
@@ -18,6 +18,6 @@ use(x);
 //// [f.js]
 #!/usr/bin/env node
 "use strict";
+exports.__esModule = true;
 var test_1 = require("test");
 use(test_1.x);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/shorthand-property-es6-amd.js b/tests/baselines/reference/shorthand-property-es6-amd.js
index f1a26e46144..0935606ca5d 100644
--- a/tests/baselines/reference/shorthand-property-es6-amd.js
+++ b/tests/baselines/reference/shorthand-property-es6-amd.js
@@ -8,9 +8,9 @@ const bar = { foo, baz };
 //// [test.js]
 define(["require", "exports", "./foo"], function (require, exports, foo_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     const baz = 42;
     const bar = { foo: foo_1.foo, baz };
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js
index 2e90d3a4474..b61620c8eb5 100644
--- a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js
+++ b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js
@@ -9,12 +9,12 @@ export function foo () {
 
 //// [shorthandOfExportedEntity01_targetES2015_CommonJS.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.test = "test";
 function foo() {
     const x = { test: exports.test };
 }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [shorthandOfExportedEntity01_targetES2015_CommonJS.d.ts]
diff --git a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js
index 09130120de4..9c63ca6aa28 100644
--- a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js
+++ b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js
@@ -9,12 +9,12 @@ export function foo () {
 
 //// [shorthandOfExportedEntity02_targetES5_CommonJS.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.test = "test";
 function foo() {
     var x = { test: exports.test };
 }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [shorthandOfExportedEntity02_targetES5_CommonJS.d.ts]
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
index 339878ad4a5..f5c7a53f307 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
+++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js
@@ -17,13 +17,13 @@ use(foo);
 
 //// [existingModule.js]
 "use strict";
-exports.x = 1;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = 1;
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const existingModule_1 = require("./existingModule");
 const missingModule_1 = require("./missingModule");
 const test = { x: existingModule_1.x, foo: missingModule_1.foo };
 use(existingModule_1.x);
 use(missingModule_1.foo);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js
index 8dc10349c90..537c3c07135 100644
--- a/tests/baselines/reference/sourceMapValidationImport.js
+++ b/tests/baselines/reference/sourceMapValidationImport.js
@@ -10,6 +10,7 @@ var y = new b();
 
 //// [sourceMapValidationImport.js]
 "use strict";
+exports.__esModule = true;
 var m;
 (function (m) {
     var c = (function () {
@@ -23,5 +24,4 @@ var a = m.c;
 exports.b = m.c;
 var x = new a();
 var y = new exports.b();
-exports.__esModule = true;
 //# sourceMappingURL=sourceMapValidationImport.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map
index 5b7870209a1..bf6c7989cfc 100644
--- a/tests/baselines/reference/sourceMapValidationImport.js.map
+++ b/tests/baselines/reference/sourceMapValidationImport.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationImport.js.map]
-{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";;AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
index 235557adfba..d1fc9b1b720 100644
--- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/sourceMapValidationImport.js
 sourceFile:sourceMapValidationImport.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>exports.__esModule = true;
 >>>var m;
 1 >
 2 >^^^^
@@ -22,10 +23,10 @@ sourceFile:sourceMapValidationImport.ts
   >         export class c {
   >         }
   >     }
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(1, 15) + SourceIndex(0)
-3 >Emitted(2, 6) Source(1, 16) + SourceIndex(0)
-4 >Emitted(2, 7) Source(4, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(1, 15) + SourceIndex(0)
+3 >Emitted(3, 6) Source(1, 16) + SourceIndex(0)
+4 >Emitted(3, 7) Source(4, 2) + SourceIndex(0)
 ---
 >>>(function (m) {
 1->
@@ -35,22 +36,22 @@ sourceFile:sourceMapValidationImport.ts
 1->
 2 >export module 
 3 >           m
-1->Emitted(3, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(1, 15) + SourceIndex(0)
-3 >Emitted(3, 13) Source(1, 16) + SourceIndex(0)
+1->Emitted(4, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(1, 15) + SourceIndex(0)
+3 >Emitted(4, 13) Source(1, 16) + SourceIndex(0)
 ---
 >>>    var c = (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1-> {
   >    
-1->Emitted(4, 5) Source(2, 5) + SourceIndex(0)
+1->Emitted(5, 5) Source(2, 5) + SourceIndex(0)
 ---
 >>>        function c() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(2, 5) + SourceIndex(0)
+1->Emitted(6, 9) Source(2, 5) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -59,16 +60,16 @@ sourceFile:sourceMapValidationImport.ts
 1->export class c {
   >    
 2 >        }
-1->Emitted(6, 9) Source(3, 5) + SourceIndex(0)
-2 >Emitted(6, 10) Source(3, 6) + SourceIndex(0)
+1->Emitted(7, 9) Source(3, 5) + SourceIndex(0)
+2 >Emitted(7, 10) Source(3, 6) + SourceIndex(0)
 ---
 >>>        return c;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(3, 5) + SourceIndex(0)
-2 >Emitted(7, 17) Source(3, 6) + SourceIndex(0)
+1->Emitted(8, 9) Source(3, 5) + SourceIndex(0)
+2 >Emitted(8, 17) Source(3, 6) + SourceIndex(0)
 ---
 >>>    }());
 1 >^^^^
@@ -81,10 +82,10 @@ sourceFile:sourceMapValidationImport.ts
 3 >     
 4 >     export class c {
   >         }
-1 >Emitted(8, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(8, 6) Source(3, 6) + SourceIndex(0)
-3 >Emitted(8, 6) Source(2, 5) + SourceIndex(0)
-4 >Emitted(8, 10) Source(3, 6) + SourceIndex(0)
+1 >Emitted(9, 5) Source(3, 5) + SourceIndex(0)
+2 >Emitted(9, 6) Source(3, 6) + SourceIndex(0)
+3 >Emitted(9, 6) Source(2, 5) + SourceIndex(0)
+4 >Emitted(9, 10) Source(3, 6) + SourceIndex(0)
 ---
 >>>    m.c = c;
 1->^^^^
@@ -97,10 +98,10 @@ sourceFile:sourceMapValidationImport.ts
 3 >        {
   >           }
 4 >           
-1->Emitted(9, 5) Source(2, 18) + SourceIndex(0)
-2 >Emitted(9, 8) Source(2, 19) + SourceIndex(0)
-3 >Emitted(9, 12) Source(3, 6) + SourceIndex(0)
-4 >Emitted(9, 13) Source(3, 6) + SourceIndex(0)
+1->Emitted(10, 5) Source(2, 18) + SourceIndex(0)
+2 >Emitted(10, 8) Source(2, 19) + SourceIndex(0)
+3 >Emitted(10, 12) Source(3, 6) + SourceIndex(0)
+4 >Emitted(10, 13) Source(3, 6) + SourceIndex(0)
 ---
 >>>})(m = exports.m || (exports.m = {}));
 1->
@@ -125,15 +126,15 @@ sourceFile:sourceMapValidationImport.ts
   >                                  export class c {
   >                                  }
   >                              }
-1->Emitted(10, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(10, 2) Source(4, 2) + SourceIndex(0)
-3 >Emitted(10, 4) Source(1, 15) + SourceIndex(0)
-4 >Emitted(10, 5) Source(1, 16) + SourceIndex(0)
-5 >Emitted(10, 8) Source(1, 15) + SourceIndex(0)
-6 >Emitted(10, 17) Source(1, 16) + SourceIndex(0)
-7 >Emitted(10, 22) Source(1, 15) + SourceIndex(0)
-8 >Emitted(10, 31) Source(1, 16) + SourceIndex(0)
-9 >Emitted(10, 39) Source(4, 2) + SourceIndex(0)
+1->Emitted(11, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(11, 2) Source(4, 2) + SourceIndex(0)
+3 >Emitted(11, 4) Source(1, 15) + SourceIndex(0)
+4 >Emitted(11, 5) Source(1, 16) + SourceIndex(0)
+5 >Emitted(11, 8) Source(1, 15) + SourceIndex(0)
+6 >Emitted(11, 17) Source(1, 16) + SourceIndex(0)
+7 >Emitted(11, 22) Source(1, 15) + SourceIndex(0)
+8 >Emitted(11, 31) Source(1, 16) + SourceIndex(0)
+9 >Emitted(11, 39) Source(4, 2) + SourceIndex(0)
 ---
 >>>var a = m.c;
 1 >
@@ -154,14 +155,14 @@ sourceFile:sourceMapValidationImport.ts
 6 >         .
 7 >          c
 8 >           ;
-1 >Emitted(11, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(11, 5) Source(5, 8) + SourceIndex(0)
-3 >Emitted(11, 6) Source(5, 9) + SourceIndex(0)
-4 >Emitted(11, 9) Source(5, 12) + SourceIndex(0)
-5 >Emitted(11, 10) Source(5, 13) + SourceIndex(0)
-6 >Emitted(11, 11) Source(5, 14) + SourceIndex(0)
-7 >Emitted(11, 12) Source(5, 15) + SourceIndex(0)
-8 >Emitted(11, 13) Source(5, 16) + SourceIndex(0)
+1 >Emitted(12, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(12, 5) Source(5, 8) + SourceIndex(0)
+3 >Emitted(12, 6) Source(5, 9) + SourceIndex(0)
+4 >Emitted(12, 9) Source(5, 12) + SourceIndex(0)
+5 >Emitted(12, 10) Source(5, 13) + SourceIndex(0)
+6 >Emitted(12, 11) Source(5, 14) + SourceIndex(0)
+7 >Emitted(12, 12) Source(5, 15) + SourceIndex(0)
+8 >Emitted(12, 13) Source(5, 16) + SourceIndex(0)
 ---
 >>>exports.b = m.c;
 1->
@@ -182,14 +183,14 @@ sourceFile:sourceMapValidationImport.ts
 6 >             .
 7 >              c
 8 >               ;
-1->Emitted(12, 1) Source(6, 15) + SourceIndex(0)
-2 >Emitted(12, 9) Source(6, 15) + SourceIndex(0)
-3 >Emitted(12, 10) Source(6, 16) + SourceIndex(0)
-4 >Emitted(12, 13) Source(6, 19) + SourceIndex(0)
-5 >Emitted(12, 14) Source(6, 20) + SourceIndex(0)
-6 >Emitted(12, 15) Source(6, 21) + SourceIndex(0)
-7 >Emitted(12, 16) Source(6, 22) + SourceIndex(0)
-8 >Emitted(12, 17) Source(6, 23) + SourceIndex(0)
+1->Emitted(13, 1) Source(6, 15) + SourceIndex(0)
+2 >Emitted(13, 9) Source(6, 15) + SourceIndex(0)
+3 >Emitted(13, 10) Source(6, 16) + SourceIndex(0)
+4 >Emitted(13, 13) Source(6, 19) + SourceIndex(0)
+5 >Emitted(13, 14) Source(6, 20) + SourceIndex(0)
+6 >Emitted(13, 15) Source(6, 21) + SourceIndex(0)
+7 >Emitted(13, 16) Source(6, 22) + SourceIndex(0)
+8 >Emitted(13, 17) Source(6, 23) + SourceIndex(0)
 ---
 >>>var x = new a();
 1->
@@ -210,14 +211,14 @@ sourceFile:sourceMapValidationImport.ts
 6 >            a
 7 >             ()
 8 >               ;
-1->Emitted(13, 1) Source(7, 1) + SourceIndex(0)
-2 >Emitted(13, 5) Source(7, 5) + SourceIndex(0)
-3 >Emitted(13, 6) Source(7, 6) + SourceIndex(0)
-4 >Emitted(13, 9) Source(7, 9) + SourceIndex(0)
-5 >Emitted(13, 13) Source(7, 13) + SourceIndex(0)
-6 >Emitted(13, 14) Source(7, 14) + SourceIndex(0)
-7 >Emitted(13, 16) Source(7, 16) + SourceIndex(0)
-8 >Emitted(13, 17) Source(7, 17) + SourceIndex(0)
+1->Emitted(14, 1) Source(7, 1) + SourceIndex(0)
+2 >Emitted(14, 5) Source(7, 5) + SourceIndex(0)
+3 >Emitted(14, 6) Source(7, 6) + SourceIndex(0)
+4 >Emitted(14, 9) Source(7, 9) + SourceIndex(0)
+5 >Emitted(14, 13) Source(7, 13) + SourceIndex(0)
+6 >Emitted(14, 14) Source(7, 14) + SourceIndex(0)
+7 >Emitted(14, 16) Source(7, 16) + SourceIndex(0)
+8 >Emitted(14, 17) Source(7, 17) + SourceIndex(0)
 ---
 >>>var y = new exports.b();
 1->
@@ -228,7 +229,7 @@ sourceFile:sourceMapValidationImport.ts
 6 >            ^^^^^^^^^
 7 >                     ^^
 8 >                       ^
-9 >                        ^^^->
+9 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -238,14 +239,13 @@ sourceFile:sourceMapValidationImport.ts
 6 >            b
 7 >                     ()
 8 >                       ;
-1->Emitted(14, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(14, 5) Source(8, 5) + SourceIndex(0)
-3 >Emitted(14, 6) Source(8, 6) + SourceIndex(0)
-4 >Emitted(14, 9) Source(8, 9) + SourceIndex(0)
-5 >Emitted(14, 13) Source(8, 13) + SourceIndex(0)
-6 >Emitted(14, 22) Source(8, 14) + SourceIndex(0)
-7 >Emitted(14, 24) Source(8, 16) + SourceIndex(0)
-8 >Emitted(14, 25) Source(8, 17) + SourceIndex(0)
+1->Emitted(15, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(15, 5) Source(8, 5) + SourceIndex(0)
+3 >Emitted(15, 6) Source(8, 6) + SourceIndex(0)
+4 >Emitted(15, 9) Source(8, 9) + SourceIndex(0)
+5 >Emitted(15, 13) Source(8, 13) + SourceIndex(0)
+6 >Emitted(15, 22) Source(8, 14) + SourceIndex(0)
+7 >Emitted(15, 24) Source(8, 16) + SourceIndex(0)
+8 >Emitted(15, 25) Source(8, 17) + SourceIndex(0)
 ---
->>>exports.__esModule = true;
 >>>//# sourceMappingURL=sourceMapValidationImport.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js
index 823f2bc44ec..747aa93e631 100644
--- a/tests/baselines/reference/staticInstanceResolution3.js
+++ b/tests/baselines/reference/staticInstanceResolution3.js
@@ -14,6 +14,7 @@ WinJS.Promise.timeout(10);
 
 //// [staticInstanceResolution3_0.js]
 "use strict";
+exports.__esModule = true;
 var Promise = (function () {
     function Promise() {
     }
@@ -23,10 +24,9 @@ var Promise = (function () {
     return Promise;
 }());
 exports.Promise = Promise;
-exports.__esModule = true;
 //// [staticInstanceResolution3_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='staticInstanceResolution3_0.ts'/>
 var WinJS = require("./staticInstanceResolution3_0");
 WinJS.Promise.timeout(10);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js
index da64e191cc8..0bbd1cf412f 100644
--- a/tests/baselines/reference/staticInstanceResolution5.js
+++ b/tests/baselines/reference/staticInstanceResolution5.js
@@ -19,6 +19,7 @@ function z(w3: WinJS) { }
 //// [staticInstanceResolution5_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Promise = (function () {
         function Promise() {
         }
@@ -28,14 +29,13 @@ define(["require", "exports"], function (require, exports) {
         return Promise;
     }());
     exports.Promise = Promise;
-    exports.__esModule = true;
 });
 //// [staticInstanceResolution5_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // these 3 should be errors
     var x = function (w1) { };
     var y = function (w2) { };
     function z(w3) { }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
index e1694f4ed5f..b8b5b030bcd 100644
--- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
@@ -23,6 +23,7 @@ export class publicClassWithWithPrivateTypeParameters {
 
 //// [staticMethodWithTypeParameterExtendsClauseDeclFile.js]
 "use strict";
+exports.__esModule = true;
 var privateClass = (function () {
     function privateClass() {
     }
@@ -52,7 +53,6 @@ var publicClassWithWithPrivateTypeParameters = (function () {
     return publicClassWithWithPrivateTypeParameters;
 }());
 exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
-exports.__esModule = true;
 
 
 //// [staticMethodWithTypeParameterExtendsClauseDeclFile.d.ts]
diff --git a/tests/baselines/reference/topLevelAmbientModule.js b/tests/baselines/reference/topLevelAmbientModule.js
index d496cfc4f85..3e162170c87 100644
--- a/tests/baselines/reference/topLevelAmbientModule.js
+++ b/tests/baselines/reference/topLevelAmbientModule.js
@@ -14,7 +14,7 @@ var z = foo.x + 10;
 //// [foo_0.js]
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="foo_0.ts"/>
 var foo = require("foo");
 var z = foo.x + 10;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/topLevelExports.js b/tests/baselines/reference/topLevelExports.js
index 8cb7a7cfe4e..5f58c44d2f2 100644
--- a/tests/baselines/reference/topLevelExports.js
+++ b/tests/baselines/reference/topLevelExports.js
@@ -8,8 +8,8 @@ void log(foo).toString();
 //// [topLevelExports.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.foo = 3;
     function log(n) { return n; }
     void log(exports.foo).toString();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/topLevelFileModule.js b/tests/baselines/reference/topLevelFileModule.js
index cc97c8e2ffe..8ff74cc89f4 100644
--- a/tests/baselines/reference/topLevelFileModule.js
+++ b/tests/baselines/reference/topLevelFileModule.js
@@ -17,7 +17,7 @@ var z = foo.x + fum.y;
 exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./vs/foo_0");
 var fum = require("./vs/fum");
 var z = foo.x + fum.y;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/topLevelFileModuleMissing.js b/tests/baselines/reference/topLevelFileModuleMissing.js
index 0861d67389d..37d9ac5b150 100644
--- a/tests/baselines/reference/topLevelFileModuleMissing.js
+++ b/tests/baselines/reference/topLevelFileModuleMissing.js
@@ -10,6 +10,6 @@ var z = foo.x + 10;
 
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("vs/foo");
 var z = foo.x + 10;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/topLevelLambda4.js b/tests/baselines/reference/topLevelLambda4.js
index 7cfdf180063..5ccfb91bec7 100644
--- a/tests/baselines/reference/topLevelLambda4.js
+++ b/tests/baselines/reference/topLevelLambda4.js
@@ -5,6 +5,6 @@ export var x = () => this.window;
 define(["require", "exports"], function (require, exports) {
     "use strict";
     var _this = this;
-    exports.x = function () { return _this.window; };
     exports.__esModule = true;
+    exports.x = function () { return _this.window; };
 });
diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
index 7ded4600300..8f4ecb37d31 100644
--- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
+++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
@@ -19,8 +19,8 @@ var z2 = foo.y() + 10; // Should resolve
 //// [foo_1.js]
 //// [foo_2.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="foo_1.ts"/>
 var foo = require("vs/foo_0");
 var z1 = foo.x + 10; // Should error, as declaration should win
 var z2 = foo.y() + 10; // Should resolve
-exports.__esModule = true;
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.js b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
index 6b3930271bb..04bac08d307 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.js
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
@@ -59,6 +59,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 });
 // https://github.com/Microsoft/TypeScript/issues/11177
 var Bluebird = require("bluebird");
 function a() {
@@ -99,4 +100,3 @@ function a() {
         });
     });
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
index a4356e562e7..cd4ce3c862e 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -20,5 +21,4 @@ MyClass1 = __decorate([
     __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
 ], MyClass1);
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js
index 7e30c98d6e8..4571caffa31 100644
--- a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js
index f350f205d5a..4d133b7655c 100644
--- a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
@@ -1,5 +1,5 @@
 "use strict";
+exports.__esModule = true;
 a;
 b;
-exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js
index 12a13d2aebf..2c7bb7add09 100644
--- a/tests/baselines/reference/transpile/Generates module output.js	
+++ b/tests/baselines/reference/transpile/Generates module output.js	
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 0;
     exports.__esModule = true;
+    var x = 0;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js
index 0b3dcfad991..04ba1d12e5e 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
@@ -1,5 +1,5 @@
 "use strict";
+exports.__esModule = true;
 /// <reference path="file2.ts" />
 var x = 0;
-exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js
index 7e30c98d6e8..4571caffa31 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js
index 7e30c98d6e8..4571caffa31 100644
--- a/tests/baselines/reference/transpile/No extra errors for file without extension.js	
+++ b/tests/baselines/reference/transpile/No extra errors for file without extension.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js
index 4f5beb97d2c..c5ffb86a1aa 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
@@ -1,6 +1,6 @@
 define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) {
     "use strict";
-    use(SomeName_1.foo);
     exports.__esModule = true;
+    use(SomeName_1.foo);
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js
index 97215e27b98..0ecfbce2397 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
@@ -8,8 +8,8 @@
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var SomeName_1 = require("SomeOtherName");
     use(SomeName_1.foo);
-    exports.__esModule = true;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with lib values.js b/tests/baselines/reference/transpile/Support options with lib values.js
index 1ac09c54ab8..72e077de381 100644
--- a/tests/baselines/reference/transpile/Support options with lib values.js	
+++ b/tests/baselines/reference/transpile/Support options with lib values.js	
@@ -1,4 +1,4 @@
 "use strict";
-var a = 10;
 exports.__esModule = true;
+var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with types values.js b/tests/baselines/reference/transpile/Support options with types values.js
index 1ac09c54ab8..72e077de381 100644
--- a/tests/baselines/reference/transpile/Support options with types values.js	
+++ b/tests/baselines/reference/transpile/Support options with types values.js	
@@ -1,4 +1,4 @@
 "use strict";
-var a = 10;
 exports.__esModule = true;
+var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js
index e109ef9014f..8ef38d2b617 100644
--- a/tests/baselines/reference/transpile/Supports backslashes in file name.js	
+++ b/tests/baselines/reference/transpile/Supports backslashes in file name.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x;
 exports.__esModule = true;
+var x;
 //# sourceMappingURL=b.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowJs.js b/tests/baselines/reference/transpile/Supports setting allowJs.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowJs.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowJs.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.js b/tests/baselines/reference/transpile/Supports setting baseUrl.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting baseUrl.js	
+++ b/tests/baselines/reference/transpile/Supports setting baseUrl.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting charset.js b/tests/baselines/reference/transpile/Supports setting charset.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting charset.js	
+++ b/tests/baselines/reference/transpile/Supports setting charset.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declaration.js b/tests/baselines/reference/transpile/Supports setting declaration.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting declaration.js	
+++ b/tests/baselines/reference/transpile/Supports setting declaration.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declarationDir.js b/tests/baselines/reference/transpile/Supports setting declarationDir.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting declarationDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting declarationDir.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitBOM.js b/tests/baselines/reference/transpile/Supports setting emitBOM.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting emitBOM.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitBOM.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
+++ b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
+++ b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting isolatedModules.js b/tests/baselines/reference/transpile/Supports setting isolatedModules.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
+++ b/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsx.js b/tests/baselines/reference/transpile/Supports setting jsx.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting jsx.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsx.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsxFactory.js b/tests/baselines/reference/transpile/Supports setting jsxFactory.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting lib.js b/tests/baselines/reference/transpile/Supports setting lib.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting lib.js	
+++ b/tests/baselines/reference/transpile/Supports setting lib.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting locale.js b/tests/baselines/reference/transpile/Supports setting locale.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting locale.js	
+++ b/tests/baselines/reference/transpile/Supports setting locale.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting module.js b/tests/baselines/reference/transpile/Supports setting module.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting module.js	
+++ b/tests/baselines/reference/transpile/Supports setting module.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.js b/tests/baselines/reference/transpile/Supports setting moduleResolution.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
+++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting newLine.js b/tests/baselines/reference/transpile/Supports setting newLine.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting newLine.js	
+++ b/tests/baselines/reference/transpile/Supports setting newLine.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmit.js b/tests/baselines/reference/transpile/Supports setting noEmit.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmit.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmit.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
+++ b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
+++ b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js
index 5233b2a8e48..8124d51fde3 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
@@ -1,3 +1,3 @@
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noLib.js b/tests/baselines/reference/transpile/Supports setting noLib.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noLib.js	
+++ b/tests/baselines/reference/transpile/Supports setting noLib.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noResolve.js b/tests/baselines/reference/transpile/Supports setting noResolve.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noResolve.js	
+++ b/tests/baselines/reference/transpile/Supports setting noResolve.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting out.js b/tests/baselines/reference/transpile/Supports setting out.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting out.js	
+++ b/tests/baselines/reference/transpile/Supports setting out.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outDir.js b/tests/baselines/reference/transpile/Supports setting outDir.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting outDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting outDir.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outFile.js b/tests/baselines/reference/transpile/Supports setting outFile.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting outFile.js	
+++ b/tests/baselines/reference/transpile/Supports setting outFile.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting paths.js b/tests/baselines/reference/transpile/Supports setting paths.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting paths.js	
+++ b/tests/baselines/reference/transpile/Supports setting paths.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
+++ b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting reactNamespace.js b/tests/baselines/reference/transpile/Supports setting reactNamespace.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
+++ b/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting removeComments.js b/tests/baselines/reference/transpile/Supports setting removeComments.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting removeComments.js	
+++ b/tests/baselines/reference/transpile/Supports setting removeComments.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDir.js b/tests/baselines/reference/transpile/Supports setting rootDir.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDir.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDirs.js b/tests/baselines/reference/transpile/Supports setting rootDirs.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDirs.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDirs.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
+++ b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting stripInternal.js b/tests/baselines/reference/transpile/Supports setting stripInternal.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting stripInternal.js	
+++ b/tests/baselines/reference/transpile/Supports setting stripInternal.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting typeRoots.js b/tests/baselines/reference/transpile/Supports setting typeRoots.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting typeRoots.js	
+++ b/tests/baselines/reference/transpile/Supports setting typeRoots.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting types.js b/tests/baselines/reference/transpile/Supports setting types.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting types.js	
+++ b/tests/baselines/reference/transpile/Supports setting types.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports urls in file name.js b/tests/baselines/reference/transpile/Supports urls in file name.js
index 071466dd65f..933981306d2 100644
--- a/tests/baselines/reference/transpile/Supports urls in file name.js	
+++ b/tests/baselines/reference/transpile/Supports urls in file name.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x;
 exports.__esModule = true;
+var x;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
index 54ceb0250e1..0b3bbaa8d73 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -16,5 +17,4 @@ MyClass = __decorate([
 ], MyClass);
 exports.MyClass = MyClass;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js
index 2c2e8563d24..04042012d18 100644
--- a/tests/baselines/reference/transpile/Uses correct newLine character.js	
+++ b/tests/baselines/reference/transpile/Uses correct newLine character.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js
index 54832b95928..b9048bd515d 100644
--- a/tests/baselines/reference/transpile/transpile .js files.js	
+++ b/tests/baselines/reference/transpile/transpile .js files.js	
@@ -1,4 +1,4 @@
 "use strict";
-var a = 10;
 exports.__esModule = true;
+var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js
index ff03528b3e5..2a73615e476 100644
--- a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
+++ b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = React.createElement("div", null);
 exports.__esModule = true;
+var x = React.createElement("div", null);
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js
index 64f18cd24e0..235cca0be1c 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.js
+++ b/tests/baselines/reference/tsxAttributeResolution10.js
@@ -34,6 +34,7 @@ export class MyComponent {
 //// [file.jsx]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var MyComponent = (function () {
         function MyComponent() {
         }
@@ -48,5 +49,4 @@ define(["require", "exports"], function (require, exports) {
     <MyComponent bar={true}/>;
     // Should be ok
     <MyComponent data-bar='hello'/>;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js
index 2375e5e32ff..d7880c820d8 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.js
+++ b/tests/baselines/reference/tsxAttributeResolution9.js
@@ -30,6 +30,7 @@ export class MyComponent {
 //// [file.jsx]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var MyComponent = (function () {
         function MyComponent() {
         }
@@ -40,5 +41,4 @@ define(["require", "exports"], function (require, exports) {
     exports.MyComponent = MyComponent;
     <MyComponent foo="bar"/>; // ok  
     <MyComponent foo={0}/>; // should be an error
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
index 96f400740c3..f6403804fae 100644
--- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
+++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var ShortDetails = (function (_super) {
     __extends(ShortDetails, _super);
     function ShortDetails() {
@@ -44,4 +45,3 @@ var ShortDetails = (function (_super) {
     return ShortDetails;
 }(React.Component));
 exports.ShortDetails = ShortDetails;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js
index 210d92fa884..c918efb5f4f 100644
--- a/tests/baselines/reference/tsxDefaultImports.js
+++ b/tests/baselines/reference/tsxDefaultImports.js
@@ -16,6 +16,7 @@ let a = Def.E.one;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var SomeEnum;
 (function (SomeEnum) {
     SomeEnum[SomeEnum["one"] = 0] = "one";
@@ -27,9 +28,8 @@ var SomeClass = (function () {
 }());
 SomeClass.E = SomeEnum;
 exports["default"] = SomeClass;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var a = a_1["default"].E.one;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxDynamicTagName5.js b/tests/baselines/reference/tsxDynamicTagName5.js
index 5c87d9a5eb9..4dd03843f15 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
@@ -45,4 +46,3 @@ var Text = (function (_super) {
     return Text;
 }(React.Component));
 exports.Text = Text;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxDynamicTagName7.js b/tests/baselines/reference/tsxDynamicTagName7.js
index 8f1b47e2d10..f4f230b995a 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
@@ -46,4 +47,3 @@ var Text = (function (_super) {
     return Text;
 }(React.Component));
 exports.Text = Text;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxDynamicTagName8.js b/tests/baselines/reference/tsxDynamicTagName8.js
index ab57998ad3c..348574ebf42 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
@@ -45,4 +46,3 @@ var Text = (function (_super) {
     return Text;
 }(React.Component));
 exports.Text = Text;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxDynamicTagName9.js b/tests/baselines/reference/tsxDynamicTagName9.js
index 90608ed48f1..e720b2644a0 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Text = (function (_super) {
     __extends(Text, _super);
@@ -45,4 +46,3 @@ var Text = (function (_super) {
     return Text;
 }(React.Component));
 exports.Text = Text;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxElementResolution17.js b/tests/baselines/reference/tsxElementResolution17.js
index 9f56d05406e..899498caf8d 100644
--- a/tests/baselines/reference/tsxElementResolution17.js
+++ b/tests/baselines/reference/tsxElementResolution17.js
@@ -31,6 +31,6 @@ import s2 = require('elements2');
 //// [consumer.jsx]
 define(["require", "exports", "elements1"], function (require, exports, s1) {
     "use strict";
-    <s1.MyElement />;
     exports.__esModule = true;
+    <s1.MyElement />;
 });
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
index 921d831809d..02136e782db 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -24,17 +24,17 @@ import {MyClass} from './file1';
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var MyClass = (function () {
         function MyClass() {
         }
         return MyClass;
     }());
     exports.MyClass = MyClass;
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "react", "./file1"], function (require, exports, React, file1_1) {
     "use strict";
-    React.createElement(file1_1.MyClass, null);
     exports.__esModule = true;
+    React.createElement(file1_1.MyClass, null);
 });
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js
index e7135b49528..c8c64062d13 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -43,6 +43,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var Button = (function (_super) {
     __extends(Button, _super);
@@ -55,7 +56,6 @@ var Button = (function (_super) {
     return Button;
 }(React.Component));
 exports.Button = Button;
-exports.__esModule = true;
 //// [app.jsx]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -68,6 +68,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 // Should see var button_1 = require('./button') here
 var button_1 = require("./button");
@@ -82,4 +83,3 @@ var App = (function (_super) {
     return App;
 }(React.Component));
 exports.App = App;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index ae190baba4c..aae48021457 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -27,9 +27,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
     }
     return t;
 };
+exports.__esModule = true;
 var mod_1 = require("mod");
 // Should see mod_1['default'] in emit here
 React.createElement(Foo, { handler: mod_1["default"] });
 // Should see mod_1['default'] in emit here
 React.createElement(Foo, __assign({}, mod_1["default"]));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxPreserveEmit1.js b/tests/baselines/reference/tsxPreserveEmit1.js
index 4e227238f6c..585b603abfb 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.js
+++ b/tests/baselines/reference/tsxPreserveEmit1.js
@@ -36,6 +36,7 @@ module M {
 //// [test.jsx]
 define(["require", "exports", "react", "react-router"], function (require, exports, React, ReactRouter) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var Route = ReactRouter.Route;
     var routes1 = <Route />;
     var M;
@@ -45,5 +46,4 @@ define(["require", "exports", "react", "react-router"], function (require, expor
         // Should emit 'M.X' in both opening and closing tags
         var y = <M.X></M.X>;
     })(M || (M = {}));
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js
index 88d9d6aa95e..a6517352f9a 100644
--- a/tests/baselines/reference/tsxReactEmit5.js
+++ b/tests/baselines/reference/tsxReactEmit5.js
@@ -31,9 +31,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
     }
     return t;
 };
+exports.__esModule = true;
 var test_1 = require("./test");
 // Should emit test_1.React.createElement
 //  and React.__spread
 var foo;
 var spread1 = test_1.React.createElement("div", __assign({ x: '' }, foo, { y: '' }));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
index a67614a5522..64356eefe83 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -50,6 +50,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 function Greet(x) {
     return <div>Hello, {x}</div>;
@@ -82,4 +83,3 @@ var g = <BigGreeter key={100}/>;
 var h = <div ref={function (x) { return x.innerText; }}/>;
 // Error - property not on ontextually typed intrinsic ref callback parameter
 var i = <div ref={function (x) { return x.propertyNotOnHtmlDivElement; }}/>;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.js b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
index 6cc6e6638f2..d66e105e3e5 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.js
@@ -21,6 +21,7 @@ var App: React.StatelessComponent<{ children }> = ({children}) => (
 //// [file.jsx]
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
+    exports.__esModule = true;
     var Foo = function (props) { return <div />; };
     // Should be OK
     var foo = <Foo />;
@@ -34,5 +35,4 @@ define(["require", "exports", "react"], function (require, exports, React) {
         <MainMenu />
 	</div>);
     };
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.js b/tests/baselines/reference/tsxUnionTypeComponent1.js
index 5c123cf634f..a0cd220c4e0 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -36,6 +36,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var React = require("react");
 var MyComponent = (function (_super) {
     __extends(MyComponent, _super);
@@ -59,4 +60,3 @@ var MyButtonComponent = (function (_super) {
     return MyButtonComponent;
 }(React.Component));
 React.createElement(MyComponent, { AnyComponent: MyButtonComponent });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.js b/tests/baselines/reference/tsxUnionTypeComponent2.js
index 725f3041855..ded3052dd50 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.js
@@ -13,7 +13,7 @@ const X: Invalid1 = 1;
 
 //// [file.js]
 "use strict";
+exports.__esModule = true;
 var React = require("react");
 var X = 1;
 React.createElement(X, null);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
index 82336a2e6b8..df12050eaf6 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
@@ -13,17 +13,17 @@ f.foo();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     var classes = undefined;
     return new classes(null);
 }
 exports.foo = foo;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var f = require("./file1");
 f.foo();
-exports.__esModule = true;
 
 
 //// [file1.d.ts]
diff --git a/tests/baselines/reference/typeGuardsAsAssertions.js b/tests/baselines/reference/typeGuardsAsAssertions.js
index 955b0b573f0..84596dd99e2 100644
--- a/tests/baselines/reference/typeGuardsAsAssertions.js
+++ b/tests/baselines/reference/typeGuardsAsAssertions.js
@@ -125,6 +125,7 @@ function f6() {
 //// [typeGuardsAsAssertions.js]
 // Repro from #8513
 "use strict";
+exports.__esModule = true;
 var cond;
 exports.none = { none: '' };
 function isSome(value) {
@@ -227,4 +228,3 @@ function f6() {
     x = "";
     x.slice();
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeGuardsInExternalModule.js b/tests/baselines/reference/typeGuardsInExternalModule.js
index 2039b875cfa..0a5abd59373 100644
--- a/tests/baselines/reference/typeGuardsInExternalModule.js
+++ b/tests/baselines/reference/typeGuardsInExternalModule.js
@@ -27,6 +27,7 @@ else {
 // Note that type guards affect types of variables and parameters only and 
 // have no effect on members of objects such as properties. 
 "use strict";
+exports.__esModule = true;
 // local variable in external module
 var num;
 var var1;
@@ -45,4 +46,3 @@ if (typeof exports.var2 === "string") {
 else {
     strOrNum = exports.var2; // number | string
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeInferenceLiteralUnion.js b/tests/baselines/reference/typeInferenceLiteralUnion.js
index 9147b05a29e..289dd413046 100644
--- a/tests/baselines/reference/typeInferenceLiteralUnion.js
+++ b/tests/baselines/reference/typeInferenceLiteralUnion.js
@@ -38,6 +38,7 @@ extentMixed = extent([new NumCoercible(10), 13, '12', true]);
 
 //// [typeInferenceLiteralUnion.js]
 "use strict";
+exports.__esModule = true;
 // Not very useful, but meets Numeric
 var NumCoercible = (function () {
     function NumCoercible(a) {
@@ -57,4 +58,3 @@ function extent(array) {
 exports.extent = extent;
 var extentMixed;
 extentMixed = extent([new NumCoercible(10), 13, '12', true]);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js
index 0520bf5ac9b..9a293139417 100644
--- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js
+++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js
@@ -25,6 +25,7 @@ i2 = a2; // no error
 //// [typeParameterCompatibilityAccrossDeclarations.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a = {
         x: function (y) { return null; }
     };
@@ -37,5 +38,4 @@ define(["require", "exports"], function (require, exports) {
     i = a; // error
     a2 = i2; // no error
     i2 = a2; // no error
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/typePredicateInLoop.js b/tests/baselines/reference/typePredicateInLoop.js
index 15175a99b3d..f5a99b68971 100644
--- a/tests/baselines/reference/typePredicateInLoop.js
+++ b/tests/baselines/reference/typePredicateInLoop.js
@@ -24,6 +24,7 @@ export function y(arg: Type): void {
 //// [typePredicateInLoop.js]
 // Repro from #12101
 "use strict";
+exports.__esModule = true;
 var guard = function (arg) { return arg.type === 1; };
 var otherFunc = function (arg1, arg2) { };
 function y(arg) {
@@ -36,4 +37,3 @@ function y(arg) {
     }
 }
 exports.y = y;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeReferenceDirectives7.js b/tests/baselines/reference/typeReferenceDirectives7.js
index 485f48ae013..d44626f51d0 100644
--- a/tests/baselines/reference/typeReferenceDirectives7.js
+++ b/tests/baselines/reference/typeReferenceDirectives7.js
@@ -18,9 +18,9 @@ export let y = () => x
 //// [app.js]
 /// <reference types="lib"/>
 "use strict";
+exports.__esModule = true;
 exports.$ = 1;
 exports.y = function () { return exports.x; };
-exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives8.js b/tests/baselines/reference/typeReferenceDirectives8.js
index 436b04d5ce3..f19e63f7e07 100644
--- a/tests/baselines/reference/typeReferenceDirectives8.js
+++ b/tests/baselines/reference/typeReferenceDirectives8.js
@@ -16,14 +16,14 @@ export const bar = foo();
 
 //// [mod1.js]
 "use strict";
+exports.__esModule = true;
 function foo() { return { x: 1 }; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [mod2.js]
 "use strict";
+exports.__esModule = true;
 var mod1_1 = require("./mod1");
 exports.bar = mod1_1.foo();
-exports.__esModule = true;
 
 
 //// [mod1.d.ts]
diff --git a/tests/baselines/reference/typeReferenceDirectives9.js b/tests/baselines/reference/typeReferenceDirectives9.js
index f624eb6e488..6710abcad97 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.js
+++ b/tests/baselines/reference/typeReferenceDirectives9.js
@@ -35,27 +35,27 @@ export const bar = Cls.bar();
 
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var Cls = (function () {
     function Cls() {
     }
     return Cls;
 }());
 exports.Cls = Cls;
-exports.__esModule = true;
 //// [mod1.js]
 /// <reference types="lib" />
 "use strict";
+exports.__esModule = true;
 var main_1 = require("./main");
 main_1.Cls.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [mod2.js]
 "use strict";
+exports.__esModule = true;
 var main_1 = require("./main");
 require("./mod1");
 exports.cls = main_1.Cls;
 exports.foo = new main_1.Cls().foo();
 exports.bar = main_1.Cls.bar();
-exports.__esModule = true;
 
 
 //// [main.d.ts]
diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js
index 184abcf3f87..cb8a40cf0a6 100644
--- a/tests/baselines/reference/typeResolution.js
+++ b/tests/baselines/reference/typeResolution.js
@@ -113,6 +113,7 @@ module TopLevelModule2 {
 //// [typeResolution.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TopLevelModule1;
     (function (TopLevelModule1) {
         var SubModule1;
@@ -274,6 +275,5 @@ define(["require", "exports"], function (require, exports) {
             SubModule3.ClassA = ClassA;
         })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {}));
     })(TopLevelModule2 || (TopLevelModule2 = {}));
-    exports.__esModule = true;
 });
 //# sourceMappingURL=typeResolution.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map
index 99d359bdbee..5bf95ac5b29 100644
--- a/tests/baselines/reference/typeResolution.js.map
+++ b/tests/baselines/reference/typeResolution.js.map
@@ -1,2 +1,2 @@
 //// [typeResolution.js.map]
-{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa;gBACvB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI;4BACI,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI;wBACI,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwEvB;QAED,IAAc,UAAU,CAWvB;QAXD,WAAc,UAAU;YACpB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa;gBACvB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO1B;QAGL,CAAC,EAXa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,CAEvB;QAFD,WAAO,iBAAiB;YACpB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,KAAjB,iBAAiB,QAEvB;IACL,CAAC,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe;QAClB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU;YACpB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAIvB;IACL,CAAC,EANM,eAAe,KAAf,eAAe,QAMrB"}
\ No newline at end of file
+{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa;gBACvB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI;4BACI,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI;wBACI,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwEvB;QAED,IAAc,UAAU,CAWvB;QAXD,WAAc,UAAU;YACpB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa;gBACvB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO1B;QAGL,CAAC,EAXa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,CAEvB;QAFD,WAAO,iBAAiB;YACpB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,KAAjB,iBAAiB,QAEvB;IACL,CAAC,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe;QAClB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU;YACpB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAIvB;IACL,CAAC,EANM,eAAe,KAAf,eAAe,QAMrB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt
index 598d7f17ebe..19e8b9991d1 100644
--- a/tests/baselines/reference/typeResolution.sourcemap.txt
+++ b/tests/baselines/reference/typeResolution.sourcemap.txt
@@ -10,6 +10,7 @@ sourceFile:typeResolution.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports"], function (require, exports) {
 >>>    "use strict";
+>>>    exports.__esModule = true;
 >>>    var TopLevelModule1;
 1 >^^^^
 2 >    ^^^^
@@ -119,10 +120,10 @@ sourceFile:typeResolution.ts
   >                               export class ClassA { }
   >                           }
   >                       }
-1 >Emitted(3, 5) Source(1, 1) + SourceIndex(0)
-2 >Emitted(3, 9) Source(1, 15) + SourceIndex(0)
-3 >Emitted(3, 24) Source(1, 30) + SourceIndex(0)
-4 >Emitted(3, 25) Source(100, 2) + SourceIndex(0)
+1 >Emitted(4, 5) Source(1, 1) + SourceIndex(0)
+2 >Emitted(4, 9) Source(1, 15) + SourceIndex(0)
+3 >Emitted(4, 24) Source(1, 30) + SourceIndex(0)
+4 >Emitted(4, 25) Source(100, 2) + SourceIndex(0)
 ---
 >>>    (function (TopLevelModule1) {
 1->^^^^
@@ -131,9 +132,9 @@ sourceFile:typeResolution.ts
 1->
 2 >    export module 
 3 >               TopLevelModule1
-1->Emitted(4, 5) Source(1, 1) + SourceIndex(0)
-2 >Emitted(4, 16) Source(1, 15) + SourceIndex(0)
-3 >Emitted(4, 31) Source(1, 30) + SourceIndex(0)
+1->Emitted(5, 5) Source(1, 1) + SourceIndex(0)
+2 >Emitted(5, 16) Source(1, 15) + SourceIndex(0)
+3 >Emitted(5, 31) Source(1, 30) + SourceIndex(0)
 ---
 >>>        var SubModule1;
 1 >^^^^^^^^
@@ -218,10 +219,10 @@ sourceFile:typeResolution.ts
   >                                  }
   >                              }
   >                          }
-1 >Emitted(5, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(5, 13) Source(2, 19) + SourceIndex(0)
-3 >Emitted(5, 23) Source(2, 29) + SourceIndex(0)
-4 >Emitted(5, 24) Source(74, 6) + SourceIndex(0)
+1 >Emitted(6, 9) Source(2, 5) + SourceIndex(0)
+2 >Emitted(6, 13) Source(2, 19) + SourceIndex(0)
+3 >Emitted(6, 23) Source(2, 29) + SourceIndex(0)
+4 >Emitted(6, 24) Source(74, 6) + SourceIndex(0)
 ---
 >>>        (function (SubModule1) {
 1->^^^^^^^^
@@ -231,9 +232,9 @@ sourceFile:typeResolution.ts
 1->
 2 >        export module 
 3 >                   SubModule1
-1->Emitted(6, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(6, 20) Source(2, 19) + SourceIndex(0)
-3 >Emitted(6, 30) Source(2, 29) + SourceIndex(0)
+1->Emitted(7, 9) Source(2, 5) + SourceIndex(0)
+2 >Emitted(7, 20) Source(2, 19) + SourceIndex(0)
+3 >Emitted(7, 30) Source(2, 29) + SourceIndex(0)
 ---
 >>>            var SubSubModule1;
 1->^^^^^^^^^^^^
@@ -302,10 +303,10 @@ sourceFile:typeResolution.ts
   >                                             }
   >                                         }
   >                                     }
-1->Emitted(7, 13) Source(3, 9) + SourceIndex(0)
-2 >Emitted(7, 17) Source(3, 23) + SourceIndex(0)
-3 >Emitted(7, 30) Source(3, 36) + SourceIndex(0)
-4 >Emitted(7, 31) Source(59, 10) + SourceIndex(0)
+1->Emitted(8, 13) Source(3, 9) + SourceIndex(0)
+2 >Emitted(8, 17) Source(3, 23) + SourceIndex(0)
+3 >Emitted(8, 30) Source(3, 36) + SourceIndex(0)
+4 >Emitted(8, 31) Source(59, 10) + SourceIndex(0)
 ---
 >>>            (function (SubSubModule1) {
 1->^^^^^^^^^^^^
@@ -315,22 +316,22 @@ sourceFile:typeResolution.ts
 1->
 2 >            export module 
 3 >                       SubSubModule1
-1->Emitted(8, 13) Source(3, 9) + SourceIndex(0)
-2 >Emitted(8, 24) Source(3, 23) + SourceIndex(0)
-3 >Emitted(8, 37) Source(3, 36) + SourceIndex(0)
+1->Emitted(9, 13) Source(3, 9) + SourceIndex(0)
+2 >Emitted(9, 24) Source(3, 23) + SourceIndex(0)
+3 >Emitted(9, 37) Source(3, 36) + SourceIndex(0)
 ---
 >>>                var ClassA = (function () {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >            
-1->Emitted(9, 17) Source(4, 13) + SourceIndex(0)
+1->Emitted(10, 17) Source(4, 13) + SourceIndex(0)
 ---
 >>>                    function ClassA() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(10, 21) Source(4, 13) + SourceIndex(0)
+1->Emitted(11, 21) Source(4, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -357,8 +358,8 @@ sourceFile:typeResolution.ts
   >                }
   >            
 2 >                    }
-1->Emitted(11, 21) Source(23, 13) + SourceIndex(0)
-2 >Emitted(11, 22) Source(23, 14) + SourceIndex(0)
+1->Emitted(12, 21) Source(23, 13) + SourceIndex(0)
+2 >Emitted(12, 22) Source(23, 14) + SourceIndex(0)
 ---
 >>>                    ClassA.prototype.AisIn1_1_1 = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -368,9 +369,9 @@ sourceFile:typeResolution.ts
 1->
 2 >                    AisIn1_1_1
 3 >                                               
-1->Emitted(12, 21) Source(5, 24) + SourceIndex(0)
-2 >Emitted(12, 48) Source(5, 34) + SourceIndex(0)
-3 >Emitted(12, 51) Source(5, 17) + SourceIndex(0)
+1->Emitted(13, 21) Source(5, 24) + SourceIndex(0)
+2 >Emitted(13, 48) Source(5, 34) + SourceIndex(0)
+3 >Emitted(13, 51) Source(5, 17) + SourceIndex(0)
 ---
 >>>                        // Try all qualified names of this type
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -378,8 +379,8 @@ sourceFile:typeResolution.ts
 1->public AisIn1_1_1() {
   >                    
 2 >                        // Try all qualified names of this type
-1->Emitted(13, 25) Source(6, 21) + SourceIndex(0)
-2 >Emitted(13, 64) Source(6, 60) + SourceIndex(0)
+1->Emitted(14, 25) Source(6, 21) + SourceIndex(0)
+2 >Emitted(14, 64) Source(6, 60) + SourceIndex(0)
 ---
 >>>                        var a1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -392,10 +393,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a1: ClassA
 4 >                              ;
-1 >Emitted(14, 25) Source(7, 21) + SourceIndex(0)
-2 >Emitted(14, 29) Source(7, 25) + SourceIndex(0)
-3 >Emitted(14, 31) Source(7, 35) + SourceIndex(0)
-4 >Emitted(14, 32) Source(7, 36) + SourceIndex(0)
+1 >Emitted(15, 25) Source(7, 21) + SourceIndex(0)
+2 >Emitted(15, 29) Source(7, 25) + SourceIndex(0)
+3 >Emitted(15, 31) Source(7, 35) + SourceIndex(0)
+4 >Emitted(15, 32) Source(7, 36) + SourceIndex(0)
 ---
 >>>                        a1.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -410,12 +411,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(15, 25) Source(7, 37) + SourceIndex(0)
-2 >Emitted(15, 27) Source(7, 39) + SourceIndex(0)
-3 >Emitted(15, 28) Source(7, 40) + SourceIndex(0)
-4 >Emitted(15, 38) Source(7, 50) + SourceIndex(0)
-5 >Emitted(15, 40) Source(7, 52) + SourceIndex(0)
-6 >Emitted(15, 41) Source(7, 53) + SourceIndex(0)
+1->Emitted(16, 25) Source(7, 37) + SourceIndex(0)
+2 >Emitted(16, 27) Source(7, 39) + SourceIndex(0)
+3 >Emitted(16, 28) Source(7, 40) + SourceIndex(0)
+4 >Emitted(16, 38) Source(7, 50) + SourceIndex(0)
+5 >Emitted(16, 40) Source(7, 52) + SourceIndex(0)
+6 >Emitted(16, 41) Source(7, 53) + SourceIndex(0)
 ---
 >>>                        var a2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -428,10 +429,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a2: SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(16, 25) Source(8, 21) + SourceIndex(0)
-2 >Emitted(16, 29) Source(8, 25) + SourceIndex(0)
-3 >Emitted(16, 31) Source(8, 49) + SourceIndex(0)
-4 >Emitted(16, 32) Source(8, 50) + SourceIndex(0)
+1 >Emitted(17, 25) Source(8, 21) + SourceIndex(0)
+2 >Emitted(17, 29) Source(8, 25) + SourceIndex(0)
+3 >Emitted(17, 31) Source(8, 49) + SourceIndex(0)
+4 >Emitted(17, 32) Source(8, 50) + SourceIndex(0)
 ---
 >>>                        a2.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -446,12 +447,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(17, 25) Source(8, 51) + SourceIndex(0)
-2 >Emitted(17, 27) Source(8, 53) + SourceIndex(0)
-3 >Emitted(17, 28) Source(8, 54) + SourceIndex(0)
-4 >Emitted(17, 38) Source(8, 64) + SourceIndex(0)
-5 >Emitted(17, 40) Source(8, 66) + SourceIndex(0)
-6 >Emitted(17, 41) Source(8, 67) + SourceIndex(0)
+1->Emitted(18, 25) Source(8, 51) + SourceIndex(0)
+2 >Emitted(18, 27) Source(8, 53) + SourceIndex(0)
+3 >Emitted(18, 28) Source(8, 54) + SourceIndex(0)
+4 >Emitted(18, 38) Source(8, 64) + SourceIndex(0)
+5 >Emitted(18, 40) Source(8, 66) + SourceIndex(0)
+6 >Emitted(18, 41) Source(8, 67) + SourceIndex(0)
 ---
 >>>                        var a3;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -464,10 +465,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a3: SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(18, 25) Source(9, 21) + SourceIndex(0)
-2 >Emitted(18, 29) Source(9, 25) + SourceIndex(0)
-3 >Emitted(18, 31) Source(9, 60) + SourceIndex(0)
-4 >Emitted(18, 32) Source(9, 61) + SourceIndex(0)
+1 >Emitted(19, 25) Source(9, 21) + SourceIndex(0)
+2 >Emitted(19, 29) Source(9, 25) + SourceIndex(0)
+3 >Emitted(19, 31) Source(9, 60) + SourceIndex(0)
+4 >Emitted(19, 32) Source(9, 61) + SourceIndex(0)
 ---
 >>>                        a3.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -482,12 +483,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(19, 25) Source(9, 62) + SourceIndex(0)
-2 >Emitted(19, 27) Source(9, 64) + SourceIndex(0)
-3 >Emitted(19, 28) Source(9, 65) + SourceIndex(0)
-4 >Emitted(19, 38) Source(9, 75) + SourceIndex(0)
-5 >Emitted(19, 40) Source(9, 77) + SourceIndex(0)
-6 >Emitted(19, 41) Source(9, 78) + SourceIndex(0)
+1->Emitted(20, 25) Source(9, 62) + SourceIndex(0)
+2 >Emitted(20, 27) Source(9, 64) + SourceIndex(0)
+3 >Emitted(20, 28) Source(9, 65) + SourceIndex(0)
+4 >Emitted(20, 38) Source(9, 75) + SourceIndex(0)
+5 >Emitted(20, 40) Source(9, 77) + SourceIndex(0)
+6 >Emitted(20, 41) Source(9, 78) + SourceIndex(0)
 ---
 >>>                        var a4;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -500,10 +501,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(20, 25) Source(10, 21) + SourceIndex(0)
-2 >Emitted(20, 29) Source(10, 25) + SourceIndex(0)
-3 >Emitted(20, 31) Source(10, 76) + SourceIndex(0)
-4 >Emitted(20, 32) Source(10, 77) + SourceIndex(0)
+1 >Emitted(21, 25) Source(10, 21) + SourceIndex(0)
+2 >Emitted(21, 29) Source(10, 25) + SourceIndex(0)
+3 >Emitted(21, 31) Source(10, 76) + SourceIndex(0)
+4 >Emitted(21, 32) Source(10, 77) + SourceIndex(0)
 ---
 >>>                        a4.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -519,12 +520,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(21, 25) Source(10, 78) + SourceIndex(0)
-2 >Emitted(21, 27) Source(10, 80) + SourceIndex(0)
-3 >Emitted(21, 28) Source(10, 81) + SourceIndex(0)
-4 >Emitted(21, 38) Source(10, 91) + SourceIndex(0)
-5 >Emitted(21, 40) Source(10, 93) + SourceIndex(0)
-6 >Emitted(21, 41) Source(10, 94) + SourceIndex(0)
+1->Emitted(22, 25) Source(10, 78) + SourceIndex(0)
+2 >Emitted(22, 27) Source(10, 80) + SourceIndex(0)
+3 >Emitted(22, 28) Source(10, 81) + SourceIndex(0)
+4 >Emitted(22, 38) Source(10, 91) + SourceIndex(0)
+5 >Emitted(22, 40) Source(10, 93) + SourceIndex(0)
+6 >Emitted(22, 41) Source(10, 94) + SourceIndex(0)
 ---
 >>>                        // Two variants of qualifying a peer type
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -533,8 +534,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Two variants of qualifying a peer type
-1->Emitted(22, 25) Source(12, 21) + SourceIndex(0)
-2 >Emitted(22, 66) Source(12, 62) + SourceIndex(0)
+1->Emitted(23, 25) Source(12, 21) + SourceIndex(0)
+2 >Emitted(23, 66) Source(12, 62) + SourceIndex(0)
 ---
 >>>                        var b1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -547,10 +548,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            b1: ClassB
 4 >                              ;
-1 >Emitted(23, 25) Source(13, 21) + SourceIndex(0)
-2 >Emitted(23, 29) Source(13, 25) + SourceIndex(0)
-3 >Emitted(23, 31) Source(13, 35) + SourceIndex(0)
-4 >Emitted(23, 32) Source(13, 36) + SourceIndex(0)
+1 >Emitted(24, 25) Source(13, 21) + SourceIndex(0)
+2 >Emitted(24, 29) Source(13, 25) + SourceIndex(0)
+3 >Emitted(24, 31) Source(13, 35) + SourceIndex(0)
+4 >Emitted(24, 32) Source(13, 36) + SourceIndex(0)
 ---
 >>>                        b1.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -565,12 +566,12 @@ sourceFile:typeResolution.ts
 4 >                           BisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(24, 25) Source(13, 37) + SourceIndex(0)
-2 >Emitted(24, 27) Source(13, 39) + SourceIndex(0)
-3 >Emitted(24, 28) Source(13, 40) + SourceIndex(0)
-4 >Emitted(24, 38) Source(13, 50) + SourceIndex(0)
-5 >Emitted(24, 40) Source(13, 52) + SourceIndex(0)
-6 >Emitted(24, 41) Source(13, 53) + SourceIndex(0)
+1->Emitted(25, 25) Source(13, 37) + SourceIndex(0)
+2 >Emitted(25, 27) Source(13, 39) + SourceIndex(0)
+3 >Emitted(25, 28) Source(13, 40) + SourceIndex(0)
+4 >Emitted(25, 38) Source(13, 50) + SourceIndex(0)
+5 >Emitted(25, 40) Source(13, 52) + SourceIndex(0)
+6 >Emitted(25, 41) Source(13, 53) + SourceIndex(0)
 ---
 >>>                        var b2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -583,10 +584,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB
 4 >                              ;
-1 >Emitted(25, 25) Source(14, 21) + SourceIndex(0)
-2 >Emitted(25, 29) Source(14, 25) + SourceIndex(0)
-3 >Emitted(25, 31) Source(14, 76) + SourceIndex(0)
-4 >Emitted(25, 32) Source(14, 77) + SourceIndex(0)
+1 >Emitted(26, 25) Source(14, 21) + SourceIndex(0)
+2 >Emitted(26, 29) Source(14, 25) + SourceIndex(0)
+3 >Emitted(26, 31) Source(14, 76) + SourceIndex(0)
+4 >Emitted(26, 32) Source(14, 77) + SourceIndex(0)
 ---
 >>>                        b2.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -602,12 +603,12 @@ sourceFile:typeResolution.ts
 4 >                           BisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(26, 25) Source(14, 78) + SourceIndex(0)
-2 >Emitted(26, 27) Source(14, 80) + SourceIndex(0)
-3 >Emitted(26, 28) Source(14, 81) + SourceIndex(0)
-4 >Emitted(26, 38) Source(14, 91) + SourceIndex(0)
-5 >Emitted(26, 40) Source(14, 93) + SourceIndex(0)
-6 >Emitted(26, 41) Source(14, 94) + SourceIndex(0)
+1->Emitted(27, 25) Source(14, 78) + SourceIndex(0)
+2 >Emitted(27, 27) Source(14, 80) + SourceIndex(0)
+3 >Emitted(27, 28) Source(14, 81) + SourceIndex(0)
+4 >Emitted(27, 38) Source(14, 91) + SourceIndex(0)
+5 >Emitted(27, 40) Source(14, 93) + SourceIndex(0)
+6 >Emitted(27, 41) Source(14, 94) + SourceIndex(0)
 ---
 >>>                        // Type only accessible from the root
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -616,8 +617,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Type only accessible from the root
-1->Emitted(27, 25) Source(16, 21) + SourceIndex(0)
-2 >Emitted(27, 62) Source(16, 58) + SourceIndex(0)
+1->Emitted(28, 25) Source(16, 21) + SourceIndex(0)
+2 >Emitted(28, 62) Source(16, 58) + SourceIndex(0)
 ---
 >>>                        var c1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -630,10 +631,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
 4 >                              ;
-1 >Emitted(28, 25) Source(17, 21) + SourceIndex(0)
-2 >Emitted(28, 29) Source(17, 25) + SourceIndex(0)
-3 >Emitted(28, 31) Source(17, 76) + SourceIndex(0)
-4 >Emitted(28, 32) Source(17, 77) + SourceIndex(0)
+1 >Emitted(29, 25) Source(17, 21) + SourceIndex(0)
+2 >Emitted(29, 29) Source(17, 25) + SourceIndex(0)
+3 >Emitted(29, 31) Source(17, 76) + SourceIndex(0)
+4 >Emitted(29, 32) Source(17, 77) + SourceIndex(0)
 ---
 >>>                        c1.AisIn1_2_2();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -649,12 +650,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_2_2
 5 >                                     ()
 6 >                                       ;
-1->Emitted(29, 25) Source(17, 78) + SourceIndex(0)
-2 >Emitted(29, 27) Source(17, 80) + SourceIndex(0)
-3 >Emitted(29, 28) Source(17, 81) + SourceIndex(0)
-4 >Emitted(29, 38) Source(17, 91) + SourceIndex(0)
-5 >Emitted(29, 40) Source(17, 93) + SourceIndex(0)
-6 >Emitted(29, 41) Source(17, 94) + SourceIndex(0)
+1->Emitted(30, 25) Source(17, 78) + SourceIndex(0)
+2 >Emitted(30, 27) Source(17, 80) + SourceIndex(0)
+3 >Emitted(30, 28) Source(17, 81) + SourceIndex(0)
+4 >Emitted(30, 38) Source(17, 91) + SourceIndex(0)
+5 >Emitted(30, 40) Source(17, 93) + SourceIndex(0)
+6 >Emitted(30, 41) Source(17, 94) + SourceIndex(0)
 ---
 >>>                        // Interface reference
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -663,8 +664,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Interface reference
-1->Emitted(30, 25) Source(19, 21) + SourceIndex(0)
-2 >Emitted(30, 47) Source(19, 43) + SourceIndex(0)
+1->Emitted(31, 25) Source(19, 21) + SourceIndex(0)
+2 >Emitted(31, 47) Source(19, 43) + SourceIndex(0)
 ---
 >>>                        var d1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -677,10 +678,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d1: InterfaceX
 4 >                              ;
-1 >Emitted(31, 25) Source(20, 21) + SourceIndex(0)
-2 >Emitted(31, 29) Source(20, 25) + SourceIndex(0)
-3 >Emitted(31, 31) Source(20, 39) + SourceIndex(0)
-4 >Emitted(31, 32) Source(20, 40) + SourceIndex(0)
+1 >Emitted(32, 25) Source(20, 21) + SourceIndex(0)
+2 >Emitted(32, 29) Source(20, 25) + SourceIndex(0)
+3 >Emitted(32, 31) Source(20, 39) + SourceIndex(0)
+4 >Emitted(32, 32) Source(20, 40) + SourceIndex(0)
 ---
 >>>                        d1.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -695,12 +696,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(32, 25) Source(20, 41) + SourceIndex(0)
-2 >Emitted(32, 27) Source(20, 43) + SourceIndex(0)
-3 >Emitted(32, 28) Source(20, 44) + SourceIndex(0)
-4 >Emitted(32, 38) Source(20, 54) + SourceIndex(0)
-5 >Emitted(32, 40) Source(20, 56) + SourceIndex(0)
-6 >Emitted(32, 41) Source(20, 57) + SourceIndex(0)
+1->Emitted(33, 25) Source(20, 41) + SourceIndex(0)
+2 >Emitted(33, 27) Source(20, 43) + SourceIndex(0)
+3 >Emitted(33, 28) Source(20, 44) + SourceIndex(0)
+4 >Emitted(33, 38) Source(20, 54) + SourceIndex(0)
+5 >Emitted(33, 40) Source(20, 56) + SourceIndex(0)
+6 >Emitted(33, 41) Source(20, 57) + SourceIndex(0)
 ---
 >>>                        var d2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -713,10 +714,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d2: SubSubModule1.InterfaceX
 4 >                              ;
-1 >Emitted(33, 25) Source(21, 21) + SourceIndex(0)
-2 >Emitted(33, 29) Source(21, 25) + SourceIndex(0)
-3 >Emitted(33, 31) Source(21, 53) + SourceIndex(0)
-4 >Emitted(33, 32) Source(21, 54) + SourceIndex(0)
+1 >Emitted(34, 25) Source(21, 21) + SourceIndex(0)
+2 >Emitted(34, 29) Source(21, 25) + SourceIndex(0)
+3 >Emitted(34, 31) Source(21, 53) + SourceIndex(0)
+4 >Emitted(34, 32) Source(21, 54) + SourceIndex(0)
 ---
 >>>                        d2.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -731,12 +732,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(34, 25) Source(21, 55) + SourceIndex(0)
-2 >Emitted(34, 27) Source(21, 57) + SourceIndex(0)
-3 >Emitted(34, 28) Source(21, 58) + SourceIndex(0)
-4 >Emitted(34, 38) Source(21, 68) + SourceIndex(0)
-5 >Emitted(34, 40) Source(21, 70) + SourceIndex(0)
-6 >Emitted(34, 41) Source(21, 71) + SourceIndex(0)
+1->Emitted(35, 25) Source(21, 55) + SourceIndex(0)
+2 >Emitted(35, 27) Source(21, 57) + SourceIndex(0)
+3 >Emitted(35, 28) Source(21, 58) + SourceIndex(0)
+4 >Emitted(35, 38) Source(21, 68) + SourceIndex(0)
+5 >Emitted(35, 40) Source(21, 70) + SourceIndex(0)
+6 >Emitted(35, 41) Source(21, 71) + SourceIndex(0)
 ---
 >>>                    };
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -745,8 +746,8 @@ sourceFile:typeResolution.ts
 1 >
   >                
 2 >                    }
-1 >Emitted(35, 21) Source(22, 17) + SourceIndex(0)
-2 >Emitted(35, 22) Source(22, 18) + SourceIndex(0)
+1 >Emitted(36, 21) Source(22, 17) + SourceIndex(0)
+2 >Emitted(36, 22) Source(22, 18) + SourceIndex(0)
 ---
 >>>                    return ClassA;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -754,8 +755,8 @@ sourceFile:typeResolution.ts
 1->
   >            
 2 >                    }
-1->Emitted(36, 21) Source(23, 13) + SourceIndex(0)
-2 >Emitted(36, 34) Source(23, 14) + SourceIndex(0)
+1->Emitted(37, 21) Source(23, 13) + SourceIndex(0)
+2 >Emitted(37, 34) Source(23, 14) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -786,10 +787,10 @@ sourceFile:typeResolution.ts
   >                                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
   >                                 }
   >                             }
-1 >Emitted(37, 17) Source(23, 13) + SourceIndex(0)
-2 >Emitted(37, 18) Source(23, 14) + SourceIndex(0)
-3 >Emitted(37, 18) Source(4, 13) + SourceIndex(0)
-4 >Emitted(37, 22) Source(23, 14) + SourceIndex(0)
+1 >Emitted(38, 17) Source(23, 13) + SourceIndex(0)
+2 >Emitted(38, 18) Source(23, 14) + SourceIndex(0)
+3 >Emitted(38, 18) Source(4, 13) + SourceIndex(0)
+4 >Emitted(38, 22) Source(23, 14) + SourceIndex(0)
 ---
 >>>                SubSubModule1.ClassA = ClassA;
 1->^^^^^^^^^^^^^^^^
@@ -819,23 +820,23 @@ sourceFile:typeResolution.ts
   >                                                    }
   >                                                }
 4 >                                             
-1->Emitted(38, 17) Source(4, 26) + SourceIndex(0)
-2 >Emitted(38, 37) Source(4, 32) + SourceIndex(0)
-3 >Emitted(38, 46) Source(23, 14) + SourceIndex(0)
-4 >Emitted(38, 47) Source(23, 14) + SourceIndex(0)
+1->Emitted(39, 17) Source(4, 26) + SourceIndex(0)
+2 >Emitted(39, 37) Source(4, 32) + SourceIndex(0)
+3 >Emitted(39, 46) Source(23, 14) + SourceIndex(0)
+4 >Emitted(39, 47) Source(23, 14) + SourceIndex(0)
 ---
 >>>                var ClassB = (function () {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >            
-1 >Emitted(39, 17) Source(24, 13) + SourceIndex(0)
+1 >Emitted(40, 17) Source(24, 13) + SourceIndex(0)
 ---
 >>>                    function ClassB() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(40, 21) Source(24, 13) + SourceIndex(0)
+1->Emitted(41, 21) Source(24, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -865,8 +866,8 @@ sourceFile:typeResolution.ts
   >                }
   >            
 2 >                    }
-1->Emitted(41, 21) Source(46, 13) + SourceIndex(0)
-2 >Emitted(41, 22) Source(46, 14) + SourceIndex(0)
+1->Emitted(42, 21) Source(46, 13) + SourceIndex(0)
+2 >Emitted(42, 22) Source(46, 14) + SourceIndex(0)
 ---
 >>>                    ClassB.prototype.BisIn1_1_1 = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -876,9 +877,9 @@ sourceFile:typeResolution.ts
 1->
 2 >                    BisIn1_1_1
 3 >                                               
-1->Emitted(42, 21) Source(25, 24) + SourceIndex(0)
-2 >Emitted(42, 48) Source(25, 34) + SourceIndex(0)
-3 >Emitted(42, 51) Source(25, 17) + SourceIndex(0)
+1->Emitted(43, 21) Source(25, 24) + SourceIndex(0)
+2 >Emitted(43, 48) Source(25, 34) + SourceIndex(0)
+3 >Emitted(43, 51) Source(25, 17) + SourceIndex(0)
 ---
 >>>                        /** Exactly the same as above in AisIn1_1_1 **/
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -886,8 +887,8 @@ sourceFile:typeResolution.ts
 1->public BisIn1_1_1() {
   >                    
 2 >                        /** Exactly the same as above in AisIn1_1_1 **/
-1->Emitted(43, 25) Source(26, 21) + SourceIndex(0)
-2 >Emitted(43, 72) Source(26, 68) + SourceIndex(0)
+1->Emitted(44, 25) Source(26, 21) + SourceIndex(0)
+2 >Emitted(44, 72) Source(26, 68) + SourceIndex(0)
 ---
 >>>                        // Try all qualified names of this type
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -896,8 +897,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Try all qualified names of this type
-1 >Emitted(44, 25) Source(28, 21) + SourceIndex(0)
-2 >Emitted(44, 64) Source(28, 60) + SourceIndex(0)
+1 >Emitted(45, 25) Source(28, 21) + SourceIndex(0)
+2 >Emitted(45, 64) Source(28, 60) + SourceIndex(0)
 ---
 >>>                        var a1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -910,10 +911,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a1: ClassA
 4 >                              ;
-1 >Emitted(45, 25) Source(29, 21) + SourceIndex(0)
-2 >Emitted(45, 29) Source(29, 25) + SourceIndex(0)
-3 >Emitted(45, 31) Source(29, 35) + SourceIndex(0)
-4 >Emitted(45, 32) Source(29, 36) + SourceIndex(0)
+1 >Emitted(46, 25) Source(29, 21) + SourceIndex(0)
+2 >Emitted(46, 29) Source(29, 25) + SourceIndex(0)
+3 >Emitted(46, 31) Source(29, 35) + SourceIndex(0)
+4 >Emitted(46, 32) Source(29, 36) + SourceIndex(0)
 ---
 >>>                        a1.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -928,12 +929,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(46, 25) Source(29, 37) + SourceIndex(0)
-2 >Emitted(46, 27) Source(29, 39) + SourceIndex(0)
-3 >Emitted(46, 28) Source(29, 40) + SourceIndex(0)
-4 >Emitted(46, 38) Source(29, 50) + SourceIndex(0)
-5 >Emitted(46, 40) Source(29, 52) + SourceIndex(0)
-6 >Emitted(46, 41) Source(29, 53) + SourceIndex(0)
+1->Emitted(47, 25) Source(29, 37) + SourceIndex(0)
+2 >Emitted(47, 27) Source(29, 39) + SourceIndex(0)
+3 >Emitted(47, 28) Source(29, 40) + SourceIndex(0)
+4 >Emitted(47, 38) Source(29, 50) + SourceIndex(0)
+5 >Emitted(47, 40) Source(29, 52) + SourceIndex(0)
+6 >Emitted(47, 41) Source(29, 53) + SourceIndex(0)
 ---
 >>>                        var a2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -946,10 +947,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a2: SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(47, 25) Source(30, 21) + SourceIndex(0)
-2 >Emitted(47, 29) Source(30, 25) + SourceIndex(0)
-3 >Emitted(47, 31) Source(30, 49) + SourceIndex(0)
-4 >Emitted(47, 32) Source(30, 50) + SourceIndex(0)
+1 >Emitted(48, 25) Source(30, 21) + SourceIndex(0)
+2 >Emitted(48, 29) Source(30, 25) + SourceIndex(0)
+3 >Emitted(48, 31) Source(30, 49) + SourceIndex(0)
+4 >Emitted(48, 32) Source(30, 50) + SourceIndex(0)
 ---
 >>>                        a2.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -964,12 +965,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(48, 25) Source(30, 51) + SourceIndex(0)
-2 >Emitted(48, 27) Source(30, 53) + SourceIndex(0)
-3 >Emitted(48, 28) Source(30, 54) + SourceIndex(0)
-4 >Emitted(48, 38) Source(30, 64) + SourceIndex(0)
-5 >Emitted(48, 40) Source(30, 66) + SourceIndex(0)
-6 >Emitted(48, 41) Source(30, 67) + SourceIndex(0)
+1->Emitted(49, 25) Source(30, 51) + SourceIndex(0)
+2 >Emitted(49, 27) Source(30, 53) + SourceIndex(0)
+3 >Emitted(49, 28) Source(30, 54) + SourceIndex(0)
+4 >Emitted(49, 38) Source(30, 64) + SourceIndex(0)
+5 >Emitted(49, 40) Source(30, 66) + SourceIndex(0)
+6 >Emitted(49, 41) Source(30, 67) + SourceIndex(0)
 ---
 >>>                        var a3;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -982,10 +983,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a3: SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(49, 25) Source(31, 21) + SourceIndex(0)
-2 >Emitted(49, 29) Source(31, 25) + SourceIndex(0)
-3 >Emitted(49, 31) Source(31, 60) + SourceIndex(0)
-4 >Emitted(49, 32) Source(31, 61) + SourceIndex(0)
+1 >Emitted(50, 25) Source(31, 21) + SourceIndex(0)
+2 >Emitted(50, 29) Source(31, 25) + SourceIndex(0)
+3 >Emitted(50, 31) Source(31, 60) + SourceIndex(0)
+4 >Emitted(50, 32) Source(31, 61) + SourceIndex(0)
 ---
 >>>                        a3.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1000,12 +1001,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(50, 25) Source(31, 62) + SourceIndex(0)
-2 >Emitted(50, 27) Source(31, 64) + SourceIndex(0)
-3 >Emitted(50, 28) Source(31, 65) + SourceIndex(0)
-4 >Emitted(50, 38) Source(31, 75) + SourceIndex(0)
-5 >Emitted(50, 40) Source(31, 77) + SourceIndex(0)
-6 >Emitted(50, 41) Source(31, 78) + SourceIndex(0)
+1->Emitted(51, 25) Source(31, 62) + SourceIndex(0)
+2 >Emitted(51, 27) Source(31, 64) + SourceIndex(0)
+3 >Emitted(51, 28) Source(31, 65) + SourceIndex(0)
+4 >Emitted(51, 38) Source(31, 75) + SourceIndex(0)
+5 >Emitted(51, 40) Source(31, 77) + SourceIndex(0)
+6 >Emitted(51, 41) Source(31, 78) + SourceIndex(0)
 ---
 >>>                        var a4;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1018,10 +1019,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(51, 25) Source(32, 21) + SourceIndex(0)
-2 >Emitted(51, 29) Source(32, 25) + SourceIndex(0)
-3 >Emitted(51, 31) Source(32, 76) + SourceIndex(0)
-4 >Emitted(51, 32) Source(32, 77) + SourceIndex(0)
+1 >Emitted(52, 25) Source(32, 21) + SourceIndex(0)
+2 >Emitted(52, 29) Source(32, 25) + SourceIndex(0)
+3 >Emitted(52, 31) Source(32, 76) + SourceIndex(0)
+4 >Emitted(52, 32) Source(32, 77) + SourceIndex(0)
 ---
 >>>                        a4.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1037,12 +1038,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(52, 25) Source(32, 78) + SourceIndex(0)
-2 >Emitted(52, 27) Source(32, 80) + SourceIndex(0)
-3 >Emitted(52, 28) Source(32, 81) + SourceIndex(0)
-4 >Emitted(52, 38) Source(32, 91) + SourceIndex(0)
-5 >Emitted(52, 40) Source(32, 93) + SourceIndex(0)
-6 >Emitted(52, 41) Source(32, 94) + SourceIndex(0)
+1->Emitted(53, 25) Source(32, 78) + SourceIndex(0)
+2 >Emitted(53, 27) Source(32, 80) + SourceIndex(0)
+3 >Emitted(53, 28) Source(32, 81) + SourceIndex(0)
+4 >Emitted(53, 38) Source(32, 91) + SourceIndex(0)
+5 >Emitted(53, 40) Source(32, 93) + SourceIndex(0)
+6 >Emitted(53, 41) Source(32, 94) + SourceIndex(0)
 ---
 >>>                        // Two variants of qualifying a peer type
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1051,8 +1052,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Two variants of qualifying a peer type
-1->Emitted(53, 25) Source(34, 21) + SourceIndex(0)
-2 >Emitted(53, 66) Source(34, 62) + SourceIndex(0)
+1->Emitted(54, 25) Source(34, 21) + SourceIndex(0)
+2 >Emitted(54, 66) Source(34, 62) + SourceIndex(0)
 ---
 >>>                        var b1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1065,10 +1066,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            b1: ClassB
 4 >                              ;
-1 >Emitted(54, 25) Source(35, 21) + SourceIndex(0)
-2 >Emitted(54, 29) Source(35, 25) + SourceIndex(0)
-3 >Emitted(54, 31) Source(35, 35) + SourceIndex(0)
-4 >Emitted(54, 32) Source(35, 36) + SourceIndex(0)
+1 >Emitted(55, 25) Source(35, 21) + SourceIndex(0)
+2 >Emitted(55, 29) Source(35, 25) + SourceIndex(0)
+3 >Emitted(55, 31) Source(35, 35) + SourceIndex(0)
+4 >Emitted(55, 32) Source(35, 36) + SourceIndex(0)
 ---
 >>>                        b1.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1083,12 +1084,12 @@ sourceFile:typeResolution.ts
 4 >                           BisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(55, 25) Source(35, 37) + SourceIndex(0)
-2 >Emitted(55, 27) Source(35, 39) + SourceIndex(0)
-3 >Emitted(55, 28) Source(35, 40) + SourceIndex(0)
-4 >Emitted(55, 38) Source(35, 50) + SourceIndex(0)
-5 >Emitted(55, 40) Source(35, 52) + SourceIndex(0)
-6 >Emitted(55, 41) Source(35, 53) + SourceIndex(0)
+1->Emitted(56, 25) Source(35, 37) + SourceIndex(0)
+2 >Emitted(56, 27) Source(35, 39) + SourceIndex(0)
+3 >Emitted(56, 28) Source(35, 40) + SourceIndex(0)
+4 >Emitted(56, 38) Source(35, 50) + SourceIndex(0)
+5 >Emitted(56, 40) Source(35, 52) + SourceIndex(0)
+6 >Emitted(56, 41) Source(35, 53) + SourceIndex(0)
 ---
 >>>                        var b2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1101,10 +1102,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB
 4 >                              ;
-1 >Emitted(56, 25) Source(36, 21) + SourceIndex(0)
-2 >Emitted(56, 29) Source(36, 25) + SourceIndex(0)
-3 >Emitted(56, 31) Source(36, 76) + SourceIndex(0)
-4 >Emitted(56, 32) Source(36, 77) + SourceIndex(0)
+1 >Emitted(57, 25) Source(36, 21) + SourceIndex(0)
+2 >Emitted(57, 29) Source(36, 25) + SourceIndex(0)
+3 >Emitted(57, 31) Source(36, 76) + SourceIndex(0)
+4 >Emitted(57, 32) Source(36, 77) + SourceIndex(0)
 ---
 >>>                        b2.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1120,12 +1121,12 @@ sourceFile:typeResolution.ts
 4 >                           BisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(57, 25) Source(36, 78) + SourceIndex(0)
-2 >Emitted(57, 27) Source(36, 80) + SourceIndex(0)
-3 >Emitted(57, 28) Source(36, 81) + SourceIndex(0)
-4 >Emitted(57, 38) Source(36, 91) + SourceIndex(0)
-5 >Emitted(57, 40) Source(36, 93) + SourceIndex(0)
-6 >Emitted(57, 41) Source(36, 94) + SourceIndex(0)
+1->Emitted(58, 25) Source(36, 78) + SourceIndex(0)
+2 >Emitted(58, 27) Source(36, 80) + SourceIndex(0)
+3 >Emitted(58, 28) Source(36, 81) + SourceIndex(0)
+4 >Emitted(58, 38) Source(36, 91) + SourceIndex(0)
+5 >Emitted(58, 40) Source(36, 93) + SourceIndex(0)
+6 >Emitted(58, 41) Source(36, 94) + SourceIndex(0)
 ---
 >>>                        // Type only accessible from the root
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1134,8 +1135,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Type only accessible from the root
-1->Emitted(58, 25) Source(38, 21) + SourceIndex(0)
-2 >Emitted(58, 62) Source(38, 58) + SourceIndex(0)
+1->Emitted(59, 25) Source(38, 21) + SourceIndex(0)
+2 >Emitted(59, 62) Source(38, 58) + SourceIndex(0)
 ---
 >>>                        var c1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1148,10 +1149,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
 4 >                              ;
-1 >Emitted(59, 25) Source(39, 21) + SourceIndex(0)
-2 >Emitted(59, 29) Source(39, 25) + SourceIndex(0)
-3 >Emitted(59, 31) Source(39, 76) + SourceIndex(0)
-4 >Emitted(59, 32) Source(39, 77) + SourceIndex(0)
+1 >Emitted(60, 25) Source(39, 21) + SourceIndex(0)
+2 >Emitted(60, 29) Source(39, 25) + SourceIndex(0)
+3 >Emitted(60, 31) Source(39, 76) + SourceIndex(0)
+4 >Emitted(60, 32) Source(39, 77) + SourceIndex(0)
 ---
 >>>                        c1.AisIn1_2_2();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1166,12 +1167,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_2_2
 5 >                                     ()
 6 >                                       ;
-1->Emitted(60, 25) Source(39, 78) + SourceIndex(0)
-2 >Emitted(60, 27) Source(39, 80) + SourceIndex(0)
-3 >Emitted(60, 28) Source(39, 81) + SourceIndex(0)
-4 >Emitted(60, 38) Source(39, 91) + SourceIndex(0)
-5 >Emitted(60, 40) Source(39, 93) + SourceIndex(0)
-6 >Emitted(60, 41) Source(39, 94) + SourceIndex(0)
+1->Emitted(61, 25) Source(39, 78) + SourceIndex(0)
+2 >Emitted(61, 27) Source(39, 80) + SourceIndex(0)
+3 >Emitted(61, 28) Source(39, 81) + SourceIndex(0)
+4 >Emitted(61, 38) Source(39, 91) + SourceIndex(0)
+5 >Emitted(61, 40) Source(39, 93) + SourceIndex(0)
+6 >Emitted(61, 41) Source(39, 94) + SourceIndex(0)
 ---
 >>>                        var c2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1184,10 +1185,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            c2: TopLevelModule2.SubModule3.ClassA
 4 >                              ;
-1 >Emitted(61, 25) Source(40, 21) + SourceIndex(0)
-2 >Emitted(61, 29) Source(40, 25) + SourceIndex(0)
-3 >Emitted(61, 31) Source(40, 62) + SourceIndex(0)
-4 >Emitted(61, 32) Source(40, 63) + SourceIndex(0)
+1 >Emitted(62, 25) Source(40, 21) + SourceIndex(0)
+2 >Emitted(62, 29) Source(40, 25) + SourceIndex(0)
+3 >Emitted(62, 31) Source(40, 62) + SourceIndex(0)
+4 >Emitted(62, 32) Source(40, 63) + SourceIndex(0)
 ---
 >>>                        c2.AisIn2_3();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1203,12 +1204,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn2_3
 5 >                                   ()
 6 >                                     ;
-1->Emitted(62, 25) Source(40, 64) + SourceIndex(0)
-2 >Emitted(62, 27) Source(40, 66) + SourceIndex(0)
-3 >Emitted(62, 28) Source(40, 67) + SourceIndex(0)
-4 >Emitted(62, 36) Source(40, 75) + SourceIndex(0)
-5 >Emitted(62, 38) Source(40, 77) + SourceIndex(0)
-6 >Emitted(62, 39) Source(40, 78) + SourceIndex(0)
+1->Emitted(63, 25) Source(40, 64) + SourceIndex(0)
+2 >Emitted(63, 27) Source(40, 66) + SourceIndex(0)
+3 >Emitted(63, 28) Source(40, 67) + SourceIndex(0)
+4 >Emitted(63, 36) Source(40, 75) + SourceIndex(0)
+5 >Emitted(63, 38) Source(40, 77) + SourceIndex(0)
+6 >Emitted(63, 39) Source(40, 78) + SourceIndex(0)
 ---
 >>>                        // Interface reference
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1217,8 +1218,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Interface reference
-1->Emitted(63, 25) Source(42, 21) + SourceIndex(0)
-2 >Emitted(63, 47) Source(42, 43) + SourceIndex(0)
+1->Emitted(64, 25) Source(42, 21) + SourceIndex(0)
+2 >Emitted(64, 47) Source(42, 43) + SourceIndex(0)
 ---
 >>>                        var d1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1231,10 +1232,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d1: InterfaceX
 4 >                              ;
-1 >Emitted(64, 25) Source(43, 21) + SourceIndex(0)
-2 >Emitted(64, 29) Source(43, 25) + SourceIndex(0)
-3 >Emitted(64, 31) Source(43, 39) + SourceIndex(0)
-4 >Emitted(64, 32) Source(43, 40) + SourceIndex(0)
+1 >Emitted(65, 25) Source(43, 21) + SourceIndex(0)
+2 >Emitted(65, 29) Source(43, 25) + SourceIndex(0)
+3 >Emitted(65, 31) Source(43, 39) + SourceIndex(0)
+4 >Emitted(65, 32) Source(43, 40) + SourceIndex(0)
 ---
 >>>                        d1.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1249,12 +1250,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(65, 25) Source(43, 41) + SourceIndex(0)
-2 >Emitted(65, 27) Source(43, 43) + SourceIndex(0)
-3 >Emitted(65, 28) Source(43, 44) + SourceIndex(0)
-4 >Emitted(65, 38) Source(43, 54) + SourceIndex(0)
-5 >Emitted(65, 40) Source(43, 56) + SourceIndex(0)
-6 >Emitted(65, 41) Source(43, 57) + SourceIndex(0)
+1->Emitted(66, 25) Source(43, 41) + SourceIndex(0)
+2 >Emitted(66, 27) Source(43, 43) + SourceIndex(0)
+3 >Emitted(66, 28) Source(43, 44) + SourceIndex(0)
+4 >Emitted(66, 38) Source(43, 54) + SourceIndex(0)
+5 >Emitted(66, 40) Source(43, 56) + SourceIndex(0)
+6 >Emitted(66, 41) Source(43, 57) + SourceIndex(0)
 ---
 >>>                        var d2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1267,10 +1268,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d2: SubSubModule1.InterfaceX
 4 >                              ;
-1 >Emitted(66, 25) Source(44, 21) + SourceIndex(0)
-2 >Emitted(66, 29) Source(44, 25) + SourceIndex(0)
-3 >Emitted(66, 31) Source(44, 53) + SourceIndex(0)
-4 >Emitted(66, 32) Source(44, 54) + SourceIndex(0)
+1 >Emitted(67, 25) Source(44, 21) + SourceIndex(0)
+2 >Emitted(67, 29) Source(44, 25) + SourceIndex(0)
+3 >Emitted(67, 31) Source(44, 53) + SourceIndex(0)
+4 >Emitted(67, 32) Source(44, 54) + SourceIndex(0)
 ---
 >>>                        d2.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1285,12 +1286,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(67, 25) Source(44, 55) + SourceIndex(0)
-2 >Emitted(67, 27) Source(44, 57) + SourceIndex(0)
-3 >Emitted(67, 28) Source(44, 58) + SourceIndex(0)
-4 >Emitted(67, 38) Source(44, 68) + SourceIndex(0)
-5 >Emitted(67, 40) Source(44, 70) + SourceIndex(0)
-6 >Emitted(67, 41) Source(44, 71) + SourceIndex(0)
+1->Emitted(68, 25) Source(44, 55) + SourceIndex(0)
+2 >Emitted(68, 27) Source(44, 57) + SourceIndex(0)
+3 >Emitted(68, 28) Source(44, 58) + SourceIndex(0)
+4 >Emitted(68, 38) Source(44, 68) + SourceIndex(0)
+5 >Emitted(68, 40) Source(44, 70) + SourceIndex(0)
+6 >Emitted(68, 41) Source(44, 71) + SourceIndex(0)
 ---
 >>>                    };
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1299,8 +1300,8 @@ sourceFile:typeResolution.ts
 1 >
   >                
 2 >                    }
-1 >Emitted(68, 21) Source(45, 17) + SourceIndex(0)
-2 >Emitted(68, 22) Source(45, 18) + SourceIndex(0)
+1 >Emitted(69, 21) Source(45, 17) + SourceIndex(0)
+2 >Emitted(69, 22) Source(45, 18) + SourceIndex(0)
 ---
 >>>                    return ClassB;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1308,8 +1309,8 @@ sourceFile:typeResolution.ts
 1->
   >            
 2 >                    }
-1->Emitted(69, 21) Source(46, 13) + SourceIndex(0)
-2 >Emitted(69, 34) Source(46, 14) + SourceIndex(0)
+1->Emitted(70, 21) Source(46, 13) + SourceIndex(0)
+2 >Emitted(70, 34) Source(46, 14) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -1343,10 +1344,10 @@ sourceFile:typeResolution.ts
   >                                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
   >                                 }
   >                             }
-1 >Emitted(70, 17) Source(46, 13) + SourceIndex(0)
-2 >Emitted(70, 18) Source(46, 14) + SourceIndex(0)
-3 >Emitted(70, 18) Source(24, 13) + SourceIndex(0)
-4 >Emitted(70, 22) Source(46, 14) + SourceIndex(0)
+1 >Emitted(71, 17) Source(46, 13) + SourceIndex(0)
+2 >Emitted(71, 18) Source(46, 14) + SourceIndex(0)
+3 >Emitted(71, 18) Source(24, 13) + SourceIndex(0)
+4 >Emitted(71, 22) Source(46, 14) + SourceIndex(0)
 ---
 >>>                SubSubModule1.ClassB = ClassB;
 1->^^^^^^^^^^^^^^^^
@@ -1380,10 +1381,10 @@ sourceFile:typeResolution.ts
   >                                                    }
   >                                                }
 4 >                                             
-1->Emitted(71, 17) Source(24, 26) + SourceIndex(0)
-2 >Emitted(71, 37) Source(24, 32) + SourceIndex(0)
-3 >Emitted(71, 46) Source(46, 14) + SourceIndex(0)
-4 >Emitted(71, 47) Source(46, 14) + SourceIndex(0)
+1->Emitted(72, 17) Source(24, 26) + SourceIndex(0)
+2 >Emitted(72, 37) Source(24, 32) + SourceIndex(0)
+3 >Emitted(72, 46) Source(46, 14) + SourceIndex(0)
+4 >Emitted(72, 47) Source(46, 14) + SourceIndex(0)
 ---
 >>>                var NonExportedClassQ = (function () {
 1->^^^^^^^^^^^^^^^^
@@ -1391,21 +1392,21 @@ sourceFile:typeResolution.ts
 1->
   >            export interface InterfaceX { XisIn1_1_1(); }
   >            
-1->Emitted(72, 17) Source(48, 13) + SourceIndex(0)
+1->Emitted(73, 17) Source(48, 13) + SourceIndex(0)
 ---
 >>>                    function NonExportedClassQ() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^^^^^^^^->
 1->class NonExportedClassQ {
   >                
-1->Emitted(73, 21) Source(49, 17) + SourceIndex(0)
+1->Emitted(74, 21) Source(49, 17) + SourceIndex(0)
 ---
 >>>                        function QQ() {
 1->^^^^^^^^^^^^^^^^^^^^^^^^
 2 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->constructor() {
   >                    
-1->Emitted(74, 25) Source(50, 21) + SourceIndex(0)
+1->Emitted(75, 25) Source(50, 21) + SourceIndex(0)
 ---
 >>>                            /* Sampling of stuff from AisIn1_1_1 */
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1413,8 +1414,8 @@ sourceFile:typeResolution.ts
 1->function QQ() {
   >                        
 2 >                            /* Sampling of stuff from AisIn1_1_1 */
-1->Emitted(75, 29) Source(51, 25) + SourceIndex(0)
-2 >Emitted(75, 68) Source(51, 64) + SourceIndex(0)
+1->Emitted(76, 29) Source(51, 25) + SourceIndex(0)
+2 >Emitted(76, 68) Source(51, 64) + SourceIndex(0)
 ---
 >>>                            var a4;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1427,10 +1428,10 @@ sourceFile:typeResolution.ts
 2 >                            var 
 3 >                                a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
 4 >                                  ;
-1 >Emitted(76, 29) Source(52, 25) + SourceIndex(0)
-2 >Emitted(76, 33) Source(52, 29) + SourceIndex(0)
-3 >Emitted(76, 35) Source(52, 80) + SourceIndex(0)
-4 >Emitted(76, 36) Source(52, 81) + SourceIndex(0)
+1 >Emitted(77, 29) Source(52, 25) + SourceIndex(0)
+2 >Emitted(77, 33) Source(52, 29) + SourceIndex(0)
+3 >Emitted(77, 35) Source(52, 80) + SourceIndex(0)
+4 >Emitted(77, 36) Source(52, 81) + SourceIndex(0)
 ---
 >>>                            a4.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1445,12 +1446,12 @@ sourceFile:typeResolution.ts
 4 >                               AisIn1_1_1
 5 >                                         ()
 6 >                                           ;
-1->Emitted(77, 29) Source(52, 82) + SourceIndex(0)
-2 >Emitted(77, 31) Source(52, 84) + SourceIndex(0)
-3 >Emitted(77, 32) Source(52, 85) + SourceIndex(0)
-4 >Emitted(77, 42) Source(52, 95) + SourceIndex(0)
-5 >Emitted(77, 44) Source(52, 97) + SourceIndex(0)
-6 >Emitted(77, 45) Source(52, 98) + SourceIndex(0)
+1->Emitted(78, 29) Source(52, 82) + SourceIndex(0)
+2 >Emitted(78, 31) Source(52, 84) + SourceIndex(0)
+3 >Emitted(78, 32) Source(52, 85) + SourceIndex(0)
+4 >Emitted(78, 42) Source(52, 95) + SourceIndex(0)
+5 >Emitted(78, 44) Source(52, 97) + SourceIndex(0)
+6 >Emitted(78, 45) Source(52, 98) + SourceIndex(0)
 ---
 >>>                            var c1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1463,10 +1464,10 @@ sourceFile:typeResolution.ts
 2 >                            var 
 3 >                                c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
 4 >                                  ;
-1 >Emitted(78, 29) Source(53, 25) + SourceIndex(0)
-2 >Emitted(78, 33) Source(53, 29) + SourceIndex(0)
-3 >Emitted(78, 35) Source(53, 80) + SourceIndex(0)
-4 >Emitted(78, 36) Source(53, 81) + SourceIndex(0)
+1 >Emitted(79, 29) Source(53, 25) + SourceIndex(0)
+2 >Emitted(79, 33) Source(53, 29) + SourceIndex(0)
+3 >Emitted(79, 35) Source(53, 80) + SourceIndex(0)
+4 >Emitted(79, 36) Source(53, 81) + SourceIndex(0)
 ---
 >>>                            c1.AisIn1_2_2();
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1481,12 +1482,12 @@ sourceFile:typeResolution.ts
 4 >                               AisIn1_2_2
 5 >                                         ()
 6 >                                           ;
-1->Emitted(79, 29) Source(53, 82) + SourceIndex(0)
-2 >Emitted(79, 31) Source(53, 84) + SourceIndex(0)
-3 >Emitted(79, 32) Source(53, 85) + SourceIndex(0)
-4 >Emitted(79, 42) Source(53, 95) + SourceIndex(0)
-5 >Emitted(79, 44) Source(53, 97) + SourceIndex(0)
-6 >Emitted(79, 45) Source(53, 98) + SourceIndex(0)
+1->Emitted(80, 29) Source(53, 82) + SourceIndex(0)
+2 >Emitted(80, 31) Source(53, 84) + SourceIndex(0)
+3 >Emitted(80, 32) Source(53, 85) + SourceIndex(0)
+4 >Emitted(80, 42) Source(53, 95) + SourceIndex(0)
+5 >Emitted(80, 44) Source(53, 97) + SourceIndex(0)
+6 >Emitted(80, 45) Source(53, 98) + SourceIndex(0)
 ---
 >>>                            var d1;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1499,10 +1500,10 @@ sourceFile:typeResolution.ts
 2 >                            var 
 3 >                                d1: InterfaceX
 4 >                                  ;
-1 >Emitted(80, 29) Source(54, 25) + SourceIndex(0)
-2 >Emitted(80, 33) Source(54, 29) + SourceIndex(0)
-3 >Emitted(80, 35) Source(54, 43) + SourceIndex(0)
-4 >Emitted(80, 36) Source(54, 44) + SourceIndex(0)
+1 >Emitted(81, 29) Source(54, 25) + SourceIndex(0)
+2 >Emitted(81, 33) Source(54, 29) + SourceIndex(0)
+3 >Emitted(81, 35) Source(54, 43) + SourceIndex(0)
+4 >Emitted(81, 36) Source(54, 44) + SourceIndex(0)
 ---
 >>>                            d1.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1517,12 +1518,12 @@ sourceFile:typeResolution.ts
 4 >                               XisIn1_1_1
 5 >                                         ()
 6 >                                           ;
-1->Emitted(81, 29) Source(54, 45) + SourceIndex(0)
-2 >Emitted(81, 31) Source(54, 47) + SourceIndex(0)
-3 >Emitted(81, 32) Source(54, 48) + SourceIndex(0)
-4 >Emitted(81, 42) Source(54, 58) + SourceIndex(0)
-5 >Emitted(81, 44) Source(54, 60) + SourceIndex(0)
-6 >Emitted(81, 45) Source(54, 61) + SourceIndex(0)
+1->Emitted(82, 29) Source(54, 45) + SourceIndex(0)
+2 >Emitted(82, 31) Source(54, 47) + SourceIndex(0)
+3 >Emitted(82, 32) Source(54, 48) + SourceIndex(0)
+4 >Emitted(82, 42) Source(54, 58) + SourceIndex(0)
+5 >Emitted(82, 44) Source(54, 60) + SourceIndex(0)
+6 >Emitted(82, 45) Source(54, 61) + SourceIndex(0)
 ---
 >>>                            var c2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1535,10 +1536,10 @@ sourceFile:typeResolution.ts
 2 >                            var 
 3 >                                c2: TopLevelModule2.SubModule3.ClassA
 4 >                                  ;
-1 >Emitted(82, 29) Source(55, 25) + SourceIndex(0)
-2 >Emitted(82, 33) Source(55, 29) + SourceIndex(0)
-3 >Emitted(82, 35) Source(55, 66) + SourceIndex(0)
-4 >Emitted(82, 36) Source(55, 67) + SourceIndex(0)
+1 >Emitted(83, 29) Source(55, 25) + SourceIndex(0)
+2 >Emitted(83, 33) Source(55, 29) + SourceIndex(0)
+3 >Emitted(83, 35) Source(55, 66) + SourceIndex(0)
+4 >Emitted(83, 36) Source(55, 67) + SourceIndex(0)
 ---
 >>>                            c2.AisIn2_3();
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1553,12 +1554,12 @@ sourceFile:typeResolution.ts
 4 >                               AisIn2_3
 5 >                                       ()
 6 >                                         ;
-1->Emitted(83, 29) Source(55, 68) + SourceIndex(0)
-2 >Emitted(83, 31) Source(55, 70) + SourceIndex(0)
-3 >Emitted(83, 32) Source(55, 71) + SourceIndex(0)
-4 >Emitted(83, 40) Source(55, 79) + SourceIndex(0)
-5 >Emitted(83, 42) Source(55, 81) + SourceIndex(0)
-6 >Emitted(83, 43) Source(55, 82) + SourceIndex(0)
+1->Emitted(84, 29) Source(55, 68) + SourceIndex(0)
+2 >Emitted(84, 31) Source(55, 70) + SourceIndex(0)
+3 >Emitted(84, 32) Source(55, 71) + SourceIndex(0)
+4 >Emitted(84, 40) Source(55, 79) + SourceIndex(0)
+5 >Emitted(84, 42) Source(55, 81) + SourceIndex(0)
+6 >Emitted(84, 43) Source(55, 82) + SourceIndex(0)
 ---
 >>>                        }
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1566,8 +1567,8 @@ sourceFile:typeResolution.ts
 1 >
   >                    
 2 >                        }
-1 >Emitted(84, 25) Source(56, 21) + SourceIndex(0)
-2 >Emitted(84, 26) Source(56, 22) + SourceIndex(0)
+1 >Emitted(85, 25) Source(56, 21) + SourceIndex(0)
+2 >Emitted(85, 26) Source(56, 22) + SourceIndex(0)
 ---
 >>>                    }
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1576,8 +1577,8 @@ sourceFile:typeResolution.ts
 1 >
   >                
 2 >                    }
-1 >Emitted(85, 21) Source(57, 17) + SourceIndex(0)
-2 >Emitted(85, 22) Source(57, 18) + SourceIndex(0)
+1 >Emitted(86, 21) Source(57, 17) + SourceIndex(0)
+2 >Emitted(86, 22) Source(57, 18) + SourceIndex(0)
 ---
 >>>                    return NonExportedClassQ;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1585,8 +1586,8 @@ sourceFile:typeResolution.ts
 1->
   >            
 2 >                    }
-1->Emitted(86, 21) Source(58, 13) + SourceIndex(0)
-2 >Emitted(86, 45) Source(58, 14) + SourceIndex(0)
+1->Emitted(87, 21) Source(58, 13) + SourceIndex(0)
+2 >Emitted(87, 45) Source(58, 14) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -1608,10 +1609,10 @@ sourceFile:typeResolution.ts
   >                                     }
   >                                 }
   >                             }
-1 >Emitted(87, 17) Source(58, 13) + SourceIndex(0)
-2 >Emitted(87, 18) Source(58, 14) + SourceIndex(0)
-3 >Emitted(87, 18) Source(48, 13) + SourceIndex(0)
-4 >Emitted(87, 22) Source(58, 14) + SourceIndex(0)
+1 >Emitted(88, 17) Source(58, 13) + SourceIndex(0)
+2 >Emitted(88, 18) Source(58, 14) + SourceIndex(0)
+3 >Emitted(88, 18) Source(48, 13) + SourceIndex(0)
+4 >Emitted(88, 22) Source(58, 14) + SourceIndex(0)
 ---
 >>>            })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {}));
 1->^^^^^^^^^^^^
@@ -1689,15 +1690,15 @@ sourceFile:typeResolution.ts
   >                                                                                                    }
   >                                                                                                }
   >                                                                                            }
-1->Emitted(88, 13) Source(59, 9) + SourceIndex(0)
-2 >Emitted(88, 14) Source(59, 10) + SourceIndex(0)
-3 >Emitted(88, 16) Source(3, 23) + SourceIndex(0)
-4 >Emitted(88, 29) Source(3, 36) + SourceIndex(0)
-5 >Emitted(88, 32) Source(3, 23) + SourceIndex(0)
-6 >Emitted(88, 56) Source(3, 36) + SourceIndex(0)
-7 >Emitted(88, 61) Source(3, 23) + SourceIndex(0)
-8 >Emitted(88, 85) Source(3, 36) + SourceIndex(0)
-9 >Emitted(88, 93) Source(59, 10) + SourceIndex(0)
+1->Emitted(89, 13) Source(59, 9) + SourceIndex(0)
+2 >Emitted(89, 14) Source(59, 10) + SourceIndex(0)
+3 >Emitted(89, 16) Source(3, 23) + SourceIndex(0)
+4 >Emitted(89, 29) Source(3, 36) + SourceIndex(0)
+5 >Emitted(89, 32) Source(3, 23) + SourceIndex(0)
+6 >Emitted(89, 56) Source(3, 36) + SourceIndex(0)
+7 >Emitted(89, 61) Source(3, 23) + SourceIndex(0)
+8 >Emitted(89, 85) Source(3, 36) + SourceIndex(0)
+9 >Emitted(89, 93) Source(59, 10) + SourceIndex(0)
 ---
 >>>            // Should have no effect on S1.SS1.ClassA above because it is not exported
 1 >^^^^^^^^^^^^
@@ -1706,29 +1707,29 @@ sourceFile:typeResolution.ts
   >        
   >        
 2 >            // Should have no effect on S1.SS1.ClassA above because it is not exported
-1 >Emitted(89, 13) Source(61, 9) + SourceIndex(0)
-2 >Emitted(89, 87) Source(61, 83) + SourceIndex(0)
+1 >Emitted(90, 13) Source(61, 9) + SourceIndex(0)
+2 >Emitted(90, 87) Source(61, 83) + SourceIndex(0)
 ---
 >>>            var ClassA = (function () {
 1 >^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >        
-1 >Emitted(90, 13) Source(62, 9) + SourceIndex(0)
+1 >Emitted(91, 13) Source(62, 9) + SourceIndex(0)
 ---
 >>>                function ClassA() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^->
 1->class ClassA {
   >            
-1->Emitted(91, 17) Source(63, 13) + SourceIndex(0)
+1->Emitted(92, 17) Source(63, 13) + SourceIndex(0)
 ---
 >>>                    function AA() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^->
 1->constructor() {
   >                
-1->Emitted(92, 21) Source(64, 17) + SourceIndex(0)
+1->Emitted(93, 21) Source(64, 17) + SourceIndex(0)
 ---
 >>>                        var a2;
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1741,10 +1742,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a2: SubSubModule1.ClassA
 4 >                              ;
-1->Emitted(93, 25) Source(65, 21) + SourceIndex(0)
-2 >Emitted(93, 29) Source(65, 25) + SourceIndex(0)
-3 >Emitted(93, 31) Source(65, 49) + SourceIndex(0)
-4 >Emitted(93, 32) Source(65, 50) + SourceIndex(0)
+1->Emitted(94, 25) Source(65, 21) + SourceIndex(0)
+2 >Emitted(94, 29) Source(65, 25) + SourceIndex(0)
+3 >Emitted(94, 31) Source(65, 49) + SourceIndex(0)
+4 >Emitted(94, 32) Source(65, 50) + SourceIndex(0)
 ---
 >>>                        a2.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1759,12 +1760,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(94, 25) Source(65, 51) + SourceIndex(0)
-2 >Emitted(94, 27) Source(65, 53) + SourceIndex(0)
-3 >Emitted(94, 28) Source(65, 54) + SourceIndex(0)
-4 >Emitted(94, 38) Source(65, 64) + SourceIndex(0)
-5 >Emitted(94, 40) Source(65, 66) + SourceIndex(0)
-6 >Emitted(94, 41) Source(65, 67) + SourceIndex(0)
+1->Emitted(95, 25) Source(65, 51) + SourceIndex(0)
+2 >Emitted(95, 27) Source(65, 53) + SourceIndex(0)
+3 >Emitted(95, 28) Source(65, 54) + SourceIndex(0)
+4 >Emitted(95, 38) Source(65, 64) + SourceIndex(0)
+5 >Emitted(95, 40) Source(65, 66) + SourceIndex(0)
+6 >Emitted(95, 41) Source(65, 67) + SourceIndex(0)
 ---
 >>>                        var a3;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1777,10 +1778,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a3: SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(95, 25) Source(66, 21) + SourceIndex(0)
-2 >Emitted(95, 29) Source(66, 25) + SourceIndex(0)
-3 >Emitted(95, 31) Source(66, 60) + SourceIndex(0)
-4 >Emitted(95, 32) Source(66, 61) + SourceIndex(0)
+1 >Emitted(96, 25) Source(66, 21) + SourceIndex(0)
+2 >Emitted(96, 29) Source(66, 25) + SourceIndex(0)
+3 >Emitted(96, 31) Source(66, 60) + SourceIndex(0)
+4 >Emitted(96, 32) Source(66, 61) + SourceIndex(0)
 ---
 >>>                        a3.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1795,12 +1796,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(96, 25) Source(66, 62) + SourceIndex(0)
-2 >Emitted(96, 27) Source(66, 64) + SourceIndex(0)
-3 >Emitted(96, 28) Source(66, 65) + SourceIndex(0)
-4 >Emitted(96, 38) Source(66, 75) + SourceIndex(0)
-5 >Emitted(96, 40) Source(66, 77) + SourceIndex(0)
-6 >Emitted(96, 41) Source(66, 78) + SourceIndex(0)
+1->Emitted(97, 25) Source(66, 62) + SourceIndex(0)
+2 >Emitted(97, 27) Source(66, 64) + SourceIndex(0)
+3 >Emitted(97, 28) Source(66, 65) + SourceIndex(0)
+4 >Emitted(97, 38) Source(66, 75) + SourceIndex(0)
+5 >Emitted(97, 40) Source(66, 77) + SourceIndex(0)
+6 >Emitted(97, 41) Source(66, 78) + SourceIndex(0)
 ---
 >>>                        var a4;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1813,10 +1814,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
 4 >                              ;
-1 >Emitted(97, 25) Source(67, 21) + SourceIndex(0)
-2 >Emitted(97, 29) Source(67, 25) + SourceIndex(0)
-3 >Emitted(97, 31) Source(67, 76) + SourceIndex(0)
-4 >Emitted(97, 32) Source(67, 77) + SourceIndex(0)
+1 >Emitted(98, 25) Source(67, 21) + SourceIndex(0)
+2 >Emitted(98, 29) Source(67, 25) + SourceIndex(0)
+3 >Emitted(98, 31) Source(67, 76) + SourceIndex(0)
+4 >Emitted(98, 32) Source(67, 77) + SourceIndex(0)
 ---
 >>>                        a4.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1832,12 +1833,12 @@ sourceFile:typeResolution.ts
 4 >                           AisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(98, 25) Source(67, 78) + SourceIndex(0)
-2 >Emitted(98, 27) Source(67, 80) + SourceIndex(0)
-3 >Emitted(98, 28) Source(67, 81) + SourceIndex(0)
-4 >Emitted(98, 38) Source(67, 91) + SourceIndex(0)
-5 >Emitted(98, 40) Source(67, 93) + SourceIndex(0)
-6 >Emitted(98, 41) Source(67, 94) + SourceIndex(0)
+1->Emitted(99, 25) Source(67, 78) + SourceIndex(0)
+2 >Emitted(99, 27) Source(67, 80) + SourceIndex(0)
+3 >Emitted(99, 28) Source(67, 81) + SourceIndex(0)
+4 >Emitted(99, 38) Source(67, 91) + SourceIndex(0)
+5 >Emitted(99, 40) Source(67, 93) + SourceIndex(0)
+6 >Emitted(99, 41) Source(67, 94) + SourceIndex(0)
 ---
 >>>                        // Interface reference
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1846,8 +1847,8 @@ sourceFile:typeResolution.ts
   >                    
   >                    
 2 >                        // Interface reference
-1->Emitted(99, 25) Source(69, 21) + SourceIndex(0)
-2 >Emitted(99, 47) Source(69, 43) + SourceIndex(0)
+1->Emitted(100, 25) Source(69, 21) + SourceIndex(0)
+2 >Emitted(100, 47) Source(69, 43) + SourceIndex(0)
 ---
 >>>                        var d2;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1860,10 +1861,10 @@ sourceFile:typeResolution.ts
 2 >                        var 
 3 >                            d2: SubSubModule1.InterfaceX
 4 >                              ;
-1 >Emitted(100, 25) Source(70, 21) + SourceIndex(0)
-2 >Emitted(100, 29) Source(70, 25) + SourceIndex(0)
-3 >Emitted(100, 31) Source(70, 53) + SourceIndex(0)
-4 >Emitted(100, 32) Source(70, 54) + SourceIndex(0)
+1 >Emitted(101, 25) Source(70, 21) + SourceIndex(0)
+2 >Emitted(101, 29) Source(70, 25) + SourceIndex(0)
+3 >Emitted(101, 31) Source(70, 53) + SourceIndex(0)
+4 >Emitted(101, 32) Source(70, 54) + SourceIndex(0)
 ---
 >>>                        d2.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1878,12 +1879,12 @@ sourceFile:typeResolution.ts
 4 >                           XisIn1_1_1
 5 >                                     ()
 6 >                                       ;
-1->Emitted(101, 25) Source(70, 55) + SourceIndex(0)
-2 >Emitted(101, 27) Source(70, 57) + SourceIndex(0)
-3 >Emitted(101, 28) Source(70, 58) + SourceIndex(0)
-4 >Emitted(101, 38) Source(70, 68) + SourceIndex(0)
-5 >Emitted(101, 40) Source(70, 70) + SourceIndex(0)
-6 >Emitted(101, 41) Source(70, 71) + SourceIndex(0)
+1->Emitted(102, 25) Source(70, 55) + SourceIndex(0)
+2 >Emitted(102, 27) Source(70, 57) + SourceIndex(0)
+3 >Emitted(102, 28) Source(70, 58) + SourceIndex(0)
+4 >Emitted(102, 38) Source(70, 68) + SourceIndex(0)
+5 >Emitted(102, 40) Source(70, 70) + SourceIndex(0)
+6 >Emitted(102, 41) Source(70, 71) + SourceIndex(0)
 ---
 >>>                    }
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1891,8 +1892,8 @@ sourceFile:typeResolution.ts
 1 >
   >                
 2 >                    }
-1 >Emitted(102, 21) Source(71, 17) + SourceIndex(0)
-2 >Emitted(102, 22) Source(71, 18) + SourceIndex(0)
+1 >Emitted(103, 21) Source(71, 17) + SourceIndex(0)
+2 >Emitted(103, 22) Source(71, 18) + SourceIndex(0)
 ---
 >>>                }
 1 >^^^^^^^^^^^^^^^^
@@ -1901,8 +1902,8 @@ sourceFile:typeResolution.ts
 1 >
   >            
 2 >                }
-1 >Emitted(103, 17) Source(72, 13) + SourceIndex(0)
-2 >Emitted(103, 18) Source(72, 14) + SourceIndex(0)
+1 >Emitted(104, 17) Source(72, 13) + SourceIndex(0)
+2 >Emitted(104, 18) Source(72, 14) + SourceIndex(0)
 ---
 >>>                return ClassA;
 1->^^^^^^^^^^^^^^^^
@@ -1910,8 +1911,8 @@ sourceFile:typeResolution.ts
 1->
   >        
 2 >                }
-1->Emitted(104, 17) Source(73, 9) + SourceIndex(0)
-2 >Emitted(104, 30) Source(73, 10) + SourceIndex(0)
+1->Emitted(105, 17) Source(73, 9) + SourceIndex(0)
+2 >Emitted(105, 30) Source(73, 10) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -1934,10 +1935,10 @@ sourceFile:typeResolution.ts
   >                             }
   >                         }
   >                     }
-1 >Emitted(105, 13) Source(73, 9) + SourceIndex(0)
-2 >Emitted(105, 14) Source(73, 10) + SourceIndex(0)
-3 >Emitted(105, 14) Source(62, 9) + SourceIndex(0)
-4 >Emitted(105, 18) Source(73, 10) + SourceIndex(0)
+1 >Emitted(106, 13) Source(73, 9) + SourceIndex(0)
+2 >Emitted(106, 14) Source(73, 10) + SourceIndex(0)
+3 >Emitted(106, 14) Source(62, 9) + SourceIndex(0)
+4 >Emitted(106, 18) Source(73, 10) + SourceIndex(0)
 ---
 >>>        })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {}));
 1->^^^^^^^^
@@ -2031,15 +2032,15 @@ sourceFile:typeResolution.ts
   >                                                                                             }
   >                                                                                         }
   >                                                                                     }
-1->Emitted(106, 9) Source(74, 5) + SourceIndex(0)
-2 >Emitted(106, 10) Source(74, 6) + SourceIndex(0)
-3 >Emitted(106, 12) Source(2, 19) + SourceIndex(0)
-4 >Emitted(106, 22) Source(2, 29) + SourceIndex(0)
-5 >Emitted(106, 25) Source(2, 19) + SourceIndex(0)
-6 >Emitted(106, 51) Source(2, 29) + SourceIndex(0)
-7 >Emitted(106, 56) Source(2, 19) + SourceIndex(0)
-8 >Emitted(106, 82) Source(2, 29) + SourceIndex(0)
-9 >Emitted(106, 90) Source(74, 6) + SourceIndex(0)
+1->Emitted(107, 9) Source(74, 5) + SourceIndex(0)
+2 >Emitted(107, 10) Source(74, 6) + SourceIndex(0)
+3 >Emitted(107, 12) Source(2, 19) + SourceIndex(0)
+4 >Emitted(107, 22) Source(2, 29) + SourceIndex(0)
+5 >Emitted(107, 25) Source(2, 19) + SourceIndex(0)
+6 >Emitted(107, 51) Source(2, 29) + SourceIndex(0)
+7 >Emitted(107, 56) Source(2, 19) + SourceIndex(0)
+8 >Emitted(107, 82) Source(2, 29) + SourceIndex(0)
+9 >Emitted(107, 90) Source(74, 6) + SourceIndex(0)
 ---
 >>>        var SubModule2;
 1 >^^^^^^^^
@@ -2064,10 +2065,10 @@ sourceFile:typeResolution.ts
   >                              
   >                              export interface InterfaceY { YisIn1_2(); }
   >                          }
-1 >Emitted(107, 9) Source(76, 5) + SourceIndex(0)
-2 >Emitted(107, 13) Source(76, 19) + SourceIndex(0)
-3 >Emitted(107, 23) Source(76, 29) + SourceIndex(0)
-4 >Emitted(107, 24) Source(87, 6) + SourceIndex(0)
+1 >Emitted(108, 9) Source(76, 5) + SourceIndex(0)
+2 >Emitted(108, 13) Source(76, 19) + SourceIndex(0)
+3 >Emitted(108, 23) Source(76, 29) + SourceIndex(0)
+4 >Emitted(108, 24) Source(87, 6) + SourceIndex(0)
 ---
 >>>        (function (SubModule2) {
 1->^^^^^^^^
@@ -2077,9 +2078,9 @@ sourceFile:typeResolution.ts
 1->
 2 >        export module 
 3 >                   SubModule2
-1->Emitted(108, 9) Source(76, 5) + SourceIndex(0)
-2 >Emitted(108, 20) Source(76, 19) + SourceIndex(0)
-3 >Emitted(108, 30) Source(76, 29) + SourceIndex(0)
+1->Emitted(109, 9) Source(76, 5) + SourceIndex(0)
+2 >Emitted(109, 20) Source(76, 19) + SourceIndex(0)
+3 >Emitted(109, 30) Source(76, 29) + SourceIndex(0)
 ---
 >>>            var SubSubModule2;
 1->^^^^^^^^^^^^
@@ -2099,10 +2100,10 @@ sourceFile:typeResolution.ts
   >                                         export interface InterfaceY { YisIn1_2_2(); }
   >                                         interface NonExportedInterfaceQ { }
   >                                     }
-1->Emitted(109, 13) Source(77, 9) + SourceIndex(0)
-2 >Emitted(109, 17) Source(77, 23) + SourceIndex(0)
-3 >Emitted(109, 30) Source(77, 36) + SourceIndex(0)
-4 >Emitted(109, 31) Source(84, 10) + SourceIndex(0)
+1->Emitted(110, 13) Source(77, 9) + SourceIndex(0)
+2 >Emitted(110, 17) Source(77, 23) + SourceIndex(0)
+3 >Emitted(110, 30) Source(77, 36) + SourceIndex(0)
+4 >Emitted(110, 31) Source(84, 10) + SourceIndex(0)
 ---
 >>>            (function (SubSubModule2) {
 1->^^^^^^^^^^^^
@@ -2112,9 +2113,9 @@ sourceFile:typeResolution.ts
 1->
 2 >            export module 
 3 >                       SubSubModule2
-1->Emitted(110, 13) Source(77, 9) + SourceIndex(0)
-2 >Emitted(110, 24) Source(77, 23) + SourceIndex(0)
-3 >Emitted(110, 37) Source(77, 36) + SourceIndex(0)
+1->Emitted(111, 13) Source(77, 9) + SourceIndex(0)
+2 >Emitted(111, 24) Source(77, 23) + SourceIndex(0)
+3 >Emitted(111, 37) Source(77, 36) + SourceIndex(0)
 ---
 >>>                // No code here since these are the mirror of the above calls
 1->^^^^^^^^^^^^^^^^
@@ -2122,21 +2123,21 @@ sourceFile:typeResolution.ts
 1-> {
   >            
 2 >                // No code here since these are the mirror of the above calls
-1->Emitted(111, 17) Source(78, 13) + SourceIndex(0)
-2 >Emitted(111, 78) Source(78, 74) + SourceIndex(0)
+1->Emitted(112, 17) Source(78, 13) + SourceIndex(0)
+2 >Emitted(112, 78) Source(78, 74) + SourceIndex(0)
 ---
 >>>                var ClassA = (function () {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >            
-1 >Emitted(112, 17) Source(79, 13) + SourceIndex(0)
+1 >Emitted(113, 17) Source(79, 13) + SourceIndex(0)
 ---
 >>>                    function ClassA() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(113, 21) Source(79, 13) + SourceIndex(0)
+1->Emitted(114, 21) Source(79, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2144,8 +2145,8 @@ sourceFile:typeResolution.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->export class ClassA { public AisIn1_2_2() { } 
 2 >                    }
-1->Emitted(114, 21) Source(79, 59) + SourceIndex(0)
-2 >Emitted(114, 22) Source(79, 60) + SourceIndex(0)
+1->Emitted(115, 21) Source(79, 59) + SourceIndex(0)
+2 >Emitted(115, 22) Source(79, 60) + SourceIndex(0)
 ---
 >>>                    ClassA.prototype.AisIn1_2_2 = function () { };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2158,19 +2159,19 @@ sourceFile:typeResolution.ts
 3 >                                               
 4 >                                                  public AisIn1_2_2() { 
 5 >                                                                }
-1->Emitted(115, 21) Source(79, 42) + SourceIndex(0)
-2 >Emitted(115, 48) Source(79, 52) + SourceIndex(0)
-3 >Emitted(115, 51) Source(79, 35) + SourceIndex(0)
-4 >Emitted(115, 65) Source(79, 57) + SourceIndex(0)
-5 >Emitted(115, 66) Source(79, 58) + SourceIndex(0)
+1->Emitted(116, 21) Source(79, 42) + SourceIndex(0)
+2 >Emitted(116, 48) Source(79, 52) + SourceIndex(0)
+3 >Emitted(116, 51) Source(79, 35) + SourceIndex(0)
+4 >Emitted(116, 65) Source(79, 57) + SourceIndex(0)
+5 >Emitted(116, 66) Source(79, 58) + SourceIndex(0)
 ---
 >>>                    return ClassA;
 1 >^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^
 1 > 
 2 >                    }
-1 >Emitted(116, 21) Source(79, 59) + SourceIndex(0)
-2 >Emitted(116, 34) Source(79, 60) + SourceIndex(0)
+1 >Emitted(117, 21) Source(79, 59) + SourceIndex(0)
+2 >Emitted(117, 34) Source(79, 60) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -2182,10 +2183,10 @@ sourceFile:typeResolution.ts
 2 >                }
 3 >                 
 4 >                 export class ClassA { public AisIn1_2_2() { } }
-1 >Emitted(117, 17) Source(79, 59) + SourceIndex(0)
-2 >Emitted(117, 18) Source(79, 60) + SourceIndex(0)
-3 >Emitted(117, 18) Source(79, 13) + SourceIndex(0)
-4 >Emitted(117, 22) Source(79, 60) + SourceIndex(0)
+1 >Emitted(118, 17) Source(79, 59) + SourceIndex(0)
+2 >Emitted(118, 18) Source(79, 60) + SourceIndex(0)
+3 >Emitted(118, 18) Source(79, 13) + SourceIndex(0)
+4 >Emitted(118, 22) Source(79, 60) + SourceIndex(0)
 ---
 >>>                SubSubModule2.ClassA = ClassA;
 1->^^^^^^^^^^^^^^^^
@@ -2196,23 +2197,23 @@ sourceFile:typeResolution.ts
 2 >                ClassA
 3 >                                     { public AisIn1_2_2() { } }
 4 >                                             
-1->Emitted(118, 17) Source(79, 26) + SourceIndex(0)
-2 >Emitted(118, 37) Source(79, 32) + SourceIndex(0)
-3 >Emitted(118, 46) Source(79, 60) + SourceIndex(0)
-4 >Emitted(118, 47) Source(79, 60) + SourceIndex(0)
+1->Emitted(119, 17) Source(79, 26) + SourceIndex(0)
+2 >Emitted(119, 37) Source(79, 32) + SourceIndex(0)
+3 >Emitted(119, 46) Source(79, 60) + SourceIndex(0)
+4 >Emitted(119, 47) Source(79, 60) + SourceIndex(0)
 ---
 >>>                var ClassB = (function () {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >            
-1 >Emitted(119, 17) Source(80, 13) + SourceIndex(0)
+1 >Emitted(120, 17) Source(80, 13) + SourceIndex(0)
 ---
 >>>                    function ClassB() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(120, 21) Source(80, 13) + SourceIndex(0)
+1->Emitted(121, 21) Source(80, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2220,8 +2221,8 @@ sourceFile:typeResolution.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->export class ClassB { public BisIn1_2_2() { } 
 2 >                    }
-1->Emitted(121, 21) Source(80, 59) + SourceIndex(0)
-2 >Emitted(121, 22) Source(80, 60) + SourceIndex(0)
+1->Emitted(122, 21) Source(80, 59) + SourceIndex(0)
+2 >Emitted(122, 22) Source(80, 60) + SourceIndex(0)
 ---
 >>>                    ClassB.prototype.BisIn1_2_2 = function () { };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2234,19 +2235,19 @@ sourceFile:typeResolution.ts
 3 >                                               
 4 >                                                  public BisIn1_2_2() { 
 5 >                                                                }
-1->Emitted(122, 21) Source(80, 42) + SourceIndex(0)
-2 >Emitted(122, 48) Source(80, 52) + SourceIndex(0)
-3 >Emitted(122, 51) Source(80, 35) + SourceIndex(0)
-4 >Emitted(122, 65) Source(80, 57) + SourceIndex(0)
-5 >Emitted(122, 66) Source(80, 58) + SourceIndex(0)
+1->Emitted(123, 21) Source(80, 42) + SourceIndex(0)
+2 >Emitted(123, 48) Source(80, 52) + SourceIndex(0)
+3 >Emitted(123, 51) Source(80, 35) + SourceIndex(0)
+4 >Emitted(123, 65) Source(80, 57) + SourceIndex(0)
+5 >Emitted(123, 66) Source(80, 58) + SourceIndex(0)
 ---
 >>>                    return ClassB;
 1 >^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^
 1 > 
 2 >                    }
-1 >Emitted(123, 21) Source(80, 59) + SourceIndex(0)
-2 >Emitted(123, 34) Source(80, 60) + SourceIndex(0)
+1 >Emitted(124, 21) Source(80, 59) + SourceIndex(0)
+2 >Emitted(124, 34) Source(80, 60) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -2258,10 +2259,10 @@ sourceFile:typeResolution.ts
 2 >                }
 3 >                 
 4 >                 export class ClassB { public BisIn1_2_2() { } }
-1 >Emitted(124, 17) Source(80, 59) + SourceIndex(0)
-2 >Emitted(124, 18) Source(80, 60) + SourceIndex(0)
-3 >Emitted(124, 18) Source(80, 13) + SourceIndex(0)
-4 >Emitted(124, 22) Source(80, 60) + SourceIndex(0)
+1 >Emitted(125, 17) Source(80, 59) + SourceIndex(0)
+2 >Emitted(125, 18) Source(80, 60) + SourceIndex(0)
+3 >Emitted(125, 18) Source(80, 13) + SourceIndex(0)
+4 >Emitted(125, 22) Source(80, 60) + SourceIndex(0)
 ---
 >>>                SubSubModule2.ClassB = ClassB;
 1->^^^^^^^^^^^^^^^^
@@ -2272,23 +2273,23 @@ sourceFile:typeResolution.ts
 2 >                ClassB
 3 >                                     { public BisIn1_2_2() { } }
 4 >                                             
-1->Emitted(125, 17) Source(80, 26) + SourceIndex(0)
-2 >Emitted(125, 37) Source(80, 32) + SourceIndex(0)
-3 >Emitted(125, 46) Source(80, 60) + SourceIndex(0)
-4 >Emitted(125, 47) Source(80, 60) + SourceIndex(0)
+1->Emitted(126, 17) Source(80, 26) + SourceIndex(0)
+2 >Emitted(126, 37) Source(80, 32) + SourceIndex(0)
+3 >Emitted(126, 46) Source(80, 60) + SourceIndex(0)
+4 >Emitted(126, 47) Source(80, 60) + SourceIndex(0)
 ---
 >>>                var ClassC = (function () {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >            
-1 >Emitted(126, 17) Source(81, 13) + SourceIndex(0)
+1 >Emitted(127, 17) Source(81, 13) + SourceIndex(0)
 ---
 >>>                    function ClassC() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(127, 21) Source(81, 13) + SourceIndex(0)
+1->Emitted(128, 21) Source(81, 13) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2296,8 +2297,8 @@ sourceFile:typeResolution.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->export class ClassC { public CisIn1_2_2() { } 
 2 >                    }
-1->Emitted(128, 21) Source(81, 59) + SourceIndex(0)
-2 >Emitted(128, 22) Source(81, 60) + SourceIndex(0)
+1->Emitted(129, 21) Source(81, 59) + SourceIndex(0)
+2 >Emitted(129, 22) Source(81, 60) + SourceIndex(0)
 ---
 >>>                    ClassC.prototype.CisIn1_2_2 = function () { };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -2310,19 +2311,19 @@ sourceFile:typeResolution.ts
 3 >                                               
 4 >                                                  public CisIn1_2_2() { 
 5 >                                                                }
-1->Emitted(129, 21) Source(81, 42) + SourceIndex(0)
-2 >Emitted(129, 48) Source(81, 52) + SourceIndex(0)
-3 >Emitted(129, 51) Source(81, 35) + SourceIndex(0)
-4 >Emitted(129, 65) Source(81, 57) + SourceIndex(0)
-5 >Emitted(129, 66) Source(81, 58) + SourceIndex(0)
+1->Emitted(130, 21) Source(81, 42) + SourceIndex(0)
+2 >Emitted(130, 48) Source(81, 52) + SourceIndex(0)
+3 >Emitted(130, 51) Source(81, 35) + SourceIndex(0)
+4 >Emitted(130, 65) Source(81, 57) + SourceIndex(0)
+5 >Emitted(130, 66) Source(81, 58) + SourceIndex(0)
 ---
 >>>                    return ClassC;
 1 >^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^
 1 > 
 2 >                    }
-1 >Emitted(130, 21) Source(81, 59) + SourceIndex(0)
-2 >Emitted(130, 34) Source(81, 60) + SourceIndex(0)
+1 >Emitted(131, 21) Source(81, 59) + SourceIndex(0)
+2 >Emitted(131, 34) Source(81, 60) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -2334,10 +2335,10 @@ sourceFile:typeResolution.ts
 2 >                }
 3 >                 
 4 >                 export class ClassC { public CisIn1_2_2() { } }
-1 >Emitted(131, 17) Source(81, 59) + SourceIndex(0)
-2 >Emitted(131, 18) Source(81, 60) + SourceIndex(0)
-3 >Emitted(131, 18) Source(81, 13) + SourceIndex(0)
-4 >Emitted(131, 22) Source(81, 60) + SourceIndex(0)
+1 >Emitted(132, 17) Source(81, 59) + SourceIndex(0)
+2 >Emitted(132, 18) Source(81, 60) + SourceIndex(0)
+3 >Emitted(132, 18) Source(81, 13) + SourceIndex(0)
+4 >Emitted(132, 22) Source(81, 60) + SourceIndex(0)
 ---
 >>>                SubSubModule2.ClassC = ClassC;
 1->^^^^^^^^^^^^^^^^
@@ -2349,10 +2350,10 @@ sourceFile:typeResolution.ts
 2 >                ClassC
 3 >                                     { public CisIn1_2_2() { } }
 4 >                                             
-1->Emitted(132, 17) Source(81, 26) + SourceIndex(0)
-2 >Emitted(132, 37) Source(81, 32) + SourceIndex(0)
-3 >Emitted(132, 46) Source(81, 60) + SourceIndex(0)
-4 >Emitted(132, 47) Source(81, 60) + SourceIndex(0)
+1->Emitted(133, 17) Source(81, 26) + SourceIndex(0)
+2 >Emitted(133, 37) Source(81, 32) + SourceIndex(0)
+3 >Emitted(133, 46) Source(81, 60) + SourceIndex(0)
+4 >Emitted(133, 47) Source(81, 60) + SourceIndex(0)
 ---
 >>>            })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {}));
 1->^^^^^^^^^^^^
@@ -2383,15 +2384,15 @@ sourceFile:typeResolution.ts
   >                                                                                                export interface InterfaceY { YisIn1_2_2(); }
   >                                                                                                interface NonExportedInterfaceQ { }
   >                                                                                            }
-1->Emitted(133, 13) Source(84, 9) + SourceIndex(0)
-2 >Emitted(133, 14) Source(84, 10) + SourceIndex(0)
-3 >Emitted(133, 16) Source(77, 23) + SourceIndex(0)
-4 >Emitted(133, 29) Source(77, 36) + SourceIndex(0)
-5 >Emitted(133, 32) Source(77, 23) + SourceIndex(0)
-6 >Emitted(133, 56) Source(77, 36) + SourceIndex(0)
-7 >Emitted(133, 61) Source(77, 23) + SourceIndex(0)
-8 >Emitted(133, 85) Source(77, 36) + SourceIndex(0)
-9 >Emitted(133, 93) Source(84, 10) + SourceIndex(0)
+1->Emitted(134, 13) Source(84, 9) + SourceIndex(0)
+2 >Emitted(134, 14) Source(84, 10) + SourceIndex(0)
+3 >Emitted(134, 16) Source(77, 23) + SourceIndex(0)
+4 >Emitted(134, 29) Source(77, 36) + SourceIndex(0)
+5 >Emitted(134, 32) Source(77, 23) + SourceIndex(0)
+6 >Emitted(134, 56) Source(77, 36) + SourceIndex(0)
+7 >Emitted(134, 61) Source(77, 23) + SourceIndex(0)
+8 >Emitted(134, 85) Source(77, 36) + SourceIndex(0)
+9 >Emitted(134, 93) Source(84, 10) + SourceIndex(0)
 ---
 >>>        })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {}));
 1 >^^^^^^^^
@@ -2426,15 +2427,15 @@ sourceFile:typeResolution.ts
   >                                                                                         
   >                                                                                         export interface InterfaceY { YisIn1_2(); }
   >                                                                                     }
-1 >Emitted(134, 9) Source(87, 5) + SourceIndex(0)
-2 >Emitted(134, 10) Source(87, 6) + SourceIndex(0)
-3 >Emitted(134, 12) Source(76, 19) + SourceIndex(0)
-4 >Emitted(134, 22) Source(76, 29) + SourceIndex(0)
-5 >Emitted(134, 25) Source(76, 19) + SourceIndex(0)
-6 >Emitted(134, 51) Source(76, 29) + SourceIndex(0)
-7 >Emitted(134, 56) Source(76, 19) + SourceIndex(0)
-8 >Emitted(134, 82) Source(76, 29) + SourceIndex(0)
-9 >Emitted(134, 90) Source(87, 6) + SourceIndex(0)
+1 >Emitted(135, 9) Source(87, 5) + SourceIndex(0)
+2 >Emitted(135, 10) Source(87, 6) + SourceIndex(0)
+3 >Emitted(135, 12) Source(76, 19) + SourceIndex(0)
+4 >Emitted(135, 22) Source(76, 29) + SourceIndex(0)
+5 >Emitted(135, 25) Source(76, 19) + SourceIndex(0)
+6 >Emitted(135, 51) Source(76, 29) + SourceIndex(0)
+7 >Emitted(135, 56) Source(76, 19) + SourceIndex(0)
+8 >Emitted(135, 82) Source(76, 29) + SourceIndex(0)
+9 >Emitted(135, 90) Source(87, 6) + SourceIndex(0)
 ---
 >>>        var ClassA = (function () {
 1 >^^^^^^^^
@@ -2442,13 +2443,13 @@ sourceFile:typeResolution.ts
 1 >
   >    
   >    
-1 >Emitted(135, 9) Source(89, 5) + SourceIndex(0)
+1 >Emitted(136, 9) Source(89, 5) + SourceIndex(0)
 ---
 >>>            function ClassA() {
 1->^^^^^^^^^^^^
 2 >            ^^->
 1->
-1->Emitted(136, 13) Source(89, 5) + SourceIndex(0)
+1->Emitted(137, 13) Source(89, 5) + SourceIndex(0)
 ---
 >>>            }
 1->^^^^^^^^^^^^
@@ -2458,8 +2459,8 @@ sourceFile:typeResolution.ts
   >        public AisIn1() { }
   >    
 2 >            }
-1->Emitted(137, 13) Source(91, 5) + SourceIndex(0)
-2 >Emitted(137, 14) Source(91, 6) + SourceIndex(0)
+1->Emitted(138, 13) Source(91, 5) + SourceIndex(0)
+2 >Emitted(138, 14) Source(91, 6) + SourceIndex(0)
 ---
 >>>            ClassA.prototype.AisIn1 = function () { };
 1->^^^^^^^^^^^^
@@ -2472,11 +2473,11 @@ sourceFile:typeResolution.ts
 3 >                                   
 4 >                                      public AisIn1() { 
 5 >                                                    }
-1->Emitted(138, 13) Source(90, 16) + SourceIndex(0)
-2 >Emitted(138, 36) Source(90, 22) + SourceIndex(0)
-3 >Emitted(138, 39) Source(90, 9) + SourceIndex(0)
-4 >Emitted(138, 53) Source(90, 27) + SourceIndex(0)
-5 >Emitted(138, 54) Source(90, 28) + SourceIndex(0)
+1->Emitted(139, 13) Source(90, 16) + SourceIndex(0)
+2 >Emitted(139, 36) Source(90, 22) + SourceIndex(0)
+3 >Emitted(139, 39) Source(90, 9) + SourceIndex(0)
+4 >Emitted(139, 53) Source(90, 27) + SourceIndex(0)
+5 >Emitted(139, 54) Source(90, 28) + SourceIndex(0)
 ---
 >>>            return ClassA;
 1 >^^^^^^^^^^^^
@@ -2484,8 +2485,8 @@ sourceFile:typeResolution.ts
 1 >
   >    
 2 >            }
-1 >Emitted(139, 13) Source(91, 5) + SourceIndex(0)
-2 >Emitted(139, 26) Source(91, 6) + SourceIndex(0)
+1 >Emitted(140, 13) Source(91, 5) + SourceIndex(0)
+2 >Emitted(140, 26) Source(91, 6) + SourceIndex(0)
 ---
 >>>        }());
 1 >^^^^^^^^
@@ -2499,10 +2500,10 @@ sourceFile:typeResolution.ts
 4 >         class ClassA {
   >                 public AisIn1() { }
   >             }
-1 >Emitted(140, 9) Source(91, 5) + SourceIndex(0)
-2 >Emitted(140, 10) Source(91, 6) + SourceIndex(0)
-3 >Emitted(140, 10) Source(89, 5) + SourceIndex(0)
-4 >Emitted(140, 14) Source(91, 6) + SourceIndex(0)
+1 >Emitted(141, 9) Source(91, 5) + SourceIndex(0)
+2 >Emitted(141, 10) Source(91, 6) + SourceIndex(0)
+3 >Emitted(141, 10) Source(89, 5) + SourceIndex(0)
+4 >Emitted(141, 14) Source(91, 6) + SourceIndex(0)
 ---
 >>>        var NotExportedModule;
 1->^^^^^^^^
@@ -2522,10 +2523,10 @@ sourceFile:typeResolution.ts
 4 >                              {
   >                                     export class ClassA { }
   >                                 }
-1->Emitted(141, 9) Source(97, 5) + SourceIndex(0)
-2 >Emitted(141, 13) Source(97, 12) + SourceIndex(0)
-3 >Emitted(141, 30) Source(97, 29) + SourceIndex(0)
-4 >Emitted(141, 31) Source(99, 6) + SourceIndex(0)
+1->Emitted(142, 9) Source(97, 5) + SourceIndex(0)
+2 >Emitted(142, 13) Source(97, 12) + SourceIndex(0)
+3 >Emitted(142, 30) Source(97, 29) + SourceIndex(0)
+4 >Emitted(142, 31) Source(99, 6) + SourceIndex(0)
 ---
 >>>        (function (NotExportedModule) {
 1->^^^^^^^^
@@ -2535,22 +2536,22 @@ sourceFile:typeResolution.ts
 1->
 2 >        module 
 3 >                   NotExportedModule
-1->Emitted(142, 9) Source(97, 5) + SourceIndex(0)
-2 >Emitted(142, 20) Source(97, 12) + SourceIndex(0)
-3 >Emitted(142, 37) Source(97, 29) + SourceIndex(0)
+1->Emitted(143, 9) Source(97, 5) + SourceIndex(0)
+2 >Emitted(143, 20) Source(97, 12) + SourceIndex(0)
+3 >Emitted(143, 37) Source(97, 29) + SourceIndex(0)
 ---
 >>>            var ClassA = (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >        
-1->Emitted(143, 13) Source(98, 9) + SourceIndex(0)
+1->Emitted(144, 13) Source(98, 9) + SourceIndex(0)
 ---
 >>>                function ClassA() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^->
 1->
-1->Emitted(144, 17) Source(98, 9) + SourceIndex(0)
+1->Emitted(145, 17) Source(98, 9) + SourceIndex(0)
 ---
 >>>                }
 1->^^^^^^^^^^^^^^^^
@@ -2558,16 +2559,16 @@ sourceFile:typeResolution.ts
 3 >                 ^^^^^^^^^^^^^^->
 1->export class ClassA { 
 2 >                }
-1->Emitted(145, 17) Source(98, 31) + SourceIndex(0)
-2 >Emitted(145, 18) Source(98, 32) + SourceIndex(0)
+1->Emitted(146, 17) Source(98, 31) + SourceIndex(0)
+2 >Emitted(146, 18) Source(98, 32) + SourceIndex(0)
 ---
 >>>                return ClassA;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^
 1->
 2 >                }
-1->Emitted(146, 17) Source(98, 31) + SourceIndex(0)
-2 >Emitted(146, 30) Source(98, 32) + SourceIndex(0)
+1->Emitted(147, 17) Source(98, 31) + SourceIndex(0)
+2 >Emitted(147, 30) Source(98, 32) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -2579,10 +2580,10 @@ sourceFile:typeResolution.ts
 2 >            }
 3 >             
 4 >             export class ClassA { }
-1 >Emitted(147, 13) Source(98, 31) + SourceIndex(0)
-2 >Emitted(147, 14) Source(98, 32) + SourceIndex(0)
-3 >Emitted(147, 14) Source(98, 9) + SourceIndex(0)
-4 >Emitted(147, 18) Source(98, 32) + SourceIndex(0)
+1 >Emitted(148, 13) Source(98, 31) + SourceIndex(0)
+2 >Emitted(148, 14) Source(98, 32) + SourceIndex(0)
+3 >Emitted(148, 14) Source(98, 9) + SourceIndex(0)
+4 >Emitted(148, 18) Source(98, 32) + SourceIndex(0)
 ---
 >>>            NotExportedModule.ClassA = ClassA;
 1->^^^^^^^^^^^^
@@ -2594,10 +2595,10 @@ sourceFile:typeResolution.ts
 2 >            ClassA
 3 >                                     { }
 4 >                                             
-1->Emitted(148, 13) Source(98, 22) + SourceIndex(0)
-2 >Emitted(148, 37) Source(98, 28) + SourceIndex(0)
-3 >Emitted(148, 46) Source(98, 32) + SourceIndex(0)
-4 >Emitted(148, 47) Source(98, 32) + SourceIndex(0)
+1->Emitted(149, 13) Source(98, 22) + SourceIndex(0)
+2 >Emitted(149, 37) Source(98, 28) + SourceIndex(0)
+3 >Emitted(149, 46) Source(98, 32) + SourceIndex(0)
+4 >Emitted(149, 47) Source(98, 32) + SourceIndex(0)
 ---
 >>>        })(NotExportedModule || (NotExportedModule = {}));
 1->^^^^^^^^
@@ -2618,13 +2619,13 @@ sourceFile:typeResolution.ts
 7 >                                                   {
   >                                                          export class ClassA { }
   >                                                      }
-1->Emitted(149, 9) Source(99, 5) + SourceIndex(0)
-2 >Emitted(149, 10) Source(99, 6) + SourceIndex(0)
-3 >Emitted(149, 12) Source(97, 12) + SourceIndex(0)
-4 >Emitted(149, 29) Source(97, 29) + SourceIndex(0)
-5 >Emitted(149, 34) Source(97, 12) + SourceIndex(0)
-6 >Emitted(149, 51) Source(97, 29) + SourceIndex(0)
-7 >Emitted(149, 59) Source(99, 6) + SourceIndex(0)
+1->Emitted(150, 9) Source(99, 5) + SourceIndex(0)
+2 >Emitted(150, 10) Source(99, 6) + SourceIndex(0)
+3 >Emitted(150, 12) Source(97, 12) + SourceIndex(0)
+4 >Emitted(150, 29) Source(97, 29) + SourceIndex(0)
+5 >Emitted(150, 34) Source(97, 12) + SourceIndex(0)
+6 >Emitted(150, 51) Source(97, 29) + SourceIndex(0)
+7 >Emitted(150, 59) Source(99, 6) + SourceIndex(0)
 ---
 >>>    })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {}));
 1->^^^^
@@ -2745,15 +2746,15 @@ sourceFile:typeResolution.ts
   >                                                                                    export class ClassA { }
   >                                                                                }
   >                                                                            }
-1->Emitted(150, 5) Source(100, 1) + SourceIndex(0)
-2 >Emitted(150, 6) Source(100, 2) + SourceIndex(0)
-3 >Emitted(150, 8) Source(1, 15) + SourceIndex(0)
-4 >Emitted(150, 23) Source(1, 30) + SourceIndex(0)
-5 >Emitted(150, 26) Source(1, 15) + SourceIndex(0)
-6 >Emitted(150, 49) Source(1, 30) + SourceIndex(0)
-7 >Emitted(150, 54) Source(1, 15) + SourceIndex(0)
-8 >Emitted(150, 77) Source(1, 30) + SourceIndex(0)
-9 >Emitted(150, 85) Source(100, 2) + SourceIndex(0)
+1->Emitted(151, 5) Source(100, 1) + SourceIndex(0)
+2 >Emitted(151, 6) Source(100, 2) + SourceIndex(0)
+3 >Emitted(151, 8) Source(1, 15) + SourceIndex(0)
+4 >Emitted(151, 23) Source(1, 30) + SourceIndex(0)
+5 >Emitted(151, 26) Source(1, 15) + SourceIndex(0)
+6 >Emitted(151, 49) Source(1, 30) + SourceIndex(0)
+7 >Emitted(151, 54) Source(1, 15) + SourceIndex(0)
+8 >Emitted(151, 77) Source(1, 30) + SourceIndex(0)
+9 >Emitted(151, 85) Source(100, 2) + SourceIndex(0)
 ---
 >>>    var TopLevelModule2;
 1 >^^^^
@@ -2773,10 +2774,10 @@ sourceFile:typeResolution.ts
   >                               }
   >                           }
   >                       }
-1 >Emitted(151, 5) Source(102, 1) + SourceIndex(0)
-2 >Emitted(151, 9) Source(102, 8) + SourceIndex(0)
-3 >Emitted(151, 24) Source(102, 23) + SourceIndex(0)
-4 >Emitted(151, 25) Source(108, 2) + SourceIndex(0)
+1 >Emitted(152, 5) Source(102, 1) + SourceIndex(0)
+2 >Emitted(152, 9) Source(102, 8) + SourceIndex(0)
+3 >Emitted(152, 24) Source(102, 23) + SourceIndex(0)
+4 >Emitted(152, 25) Source(108, 2) + SourceIndex(0)
 ---
 >>>    (function (TopLevelModule2) {
 1->^^^^
@@ -2785,9 +2786,9 @@ sourceFile:typeResolution.ts
 1->
 2 >    module 
 3 >               TopLevelModule2
-1->Emitted(152, 5) Source(102, 1) + SourceIndex(0)
-2 >Emitted(152, 16) Source(102, 8) + SourceIndex(0)
-3 >Emitted(152, 31) Source(102, 23) + SourceIndex(0)
+1->Emitted(153, 5) Source(102, 1) + SourceIndex(0)
+2 >Emitted(153, 16) Source(102, 8) + SourceIndex(0)
+3 >Emitted(153, 31) Source(102, 23) + SourceIndex(0)
 ---
 >>>        var SubModule3;
 1 >^^^^^^^^
@@ -2804,10 +2805,10 @@ sourceFile:typeResolution.ts
   >                                  public AisIn2_3() { }
   >                              }
   >                          }
-1 >Emitted(153, 9) Source(103, 5) + SourceIndex(0)
-2 >Emitted(153, 13) Source(103, 19) + SourceIndex(0)
-3 >Emitted(153, 23) Source(103, 29) + SourceIndex(0)
-4 >Emitted(153, 24) Source(107, 6) + SourceIndex(0)
+1 >Emitted(154, 9) Source(103, 5) + SourceIndex(0)
+2 >Emitted(154, 13) Source(103, 19) + SourceIndex(0)
+3 >Emitted(154, 23) Source(103, 29) + SourceIndex(0)
+4 >Emitted(154, 24) Source(107, 6) + SourceIndex(0)
 ---
 >>>        (function (SubModule3) {
 1->^^^^^^^^
@@ -2817,22 +2818,22 @@ sourceFile:typeResolution.ts
 1->
 2 >        export module 
 3 >                   SubModule3
-1->Emitted(154, 9) Source(103, 5) + SourceIndex(0)
-2 >Emitted(154, 20) Source(103, 19) + SourceIndex(0)
-3 >Emitted(154, 30) Source(103, 29) + SourceIndex(0)
+1->Emitted(155, 9) Source(103, 5) + SourceIndex(0)
+2 >Emitted(155, 20) Source(103, 19) + SourceIndex(0)
+3 >Emitted(155, 30) Source(103, 29) + SourceIndex(0)
 ---
 >>>            var ClassA = (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >        
-1->Emitted(155, 13) Source(104, 9) + SourceIndex(0)
+1->Emitted(156, 13) Source(104, 9) + SourceIndex(0)
 ---
 >>>                function ClassA() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^->
 1->
-1->Emitted(156, 17) Source(104, 9) + SourceIndex(0)
+1->Emitted(157, 17) Source(104, 9) + SourceIndex(0)
 ---
 >>>                }
 1->^^^^^^^^^^^^^^^^
@@ -2842,8 +2843,8 @@ sourceFile:typeResolution.ts
   >            public AisIn2_3() { }
   >        
 2 >                }
-1->Emitted(157, 17) Source(106, 9) + SourceIndex(0)
-2 >Emitted(157, 18) Source(106, 10) + SourceIndex(0)
+1->Emitted(158, 17) Source(106, 9) + SourceIndex(0)
+2 >Emitted(158, 18) Source(106, 10) + SourceIndex(0)
 ---
 >>>                ClassA.prototype.AisIn2_3 = function () { };
 1->^^^^^^^^^^^^^^^^
@@ -2856,11 +2857,11 @@ sourceFile:typeResolution.ts
 3 >                                         
 4 >                                            public AisIn2_3() { 
 5 >                                                          }
-1->Emitted(158, 17) Source(105, 20) + SourceIndex(0)
-2 >Emitted(158, 42) Source(105, 28) + SourceIndex(0)
-3 >Emitted(158, 45) Source(105, 13) + SourceIndex(0)
-4 >Emitted(158, 59) Source(105, 33) + SourceIndex(0)
-5 >Emitted(158, 60) Source(105, 34) + SourceIndex(0)
+1->Emitted(159, 17) Source(105, 20) + SourceIndex(0)
+2 >Emitted(159, 42) Source(105, 28) + SourceIndex(0)
+3 >Emitted(159, 45) Source(105, 13) + SourceIndex(0)
+4 >Emitted(159, 59) Source(105, 33) + SourceIndex(0)
+5 >Emitted(159, 60) Source(105, 34) + SourceIndex(0)
 ---
 >>>                return ClassA;
 1 >^^^^^^^^^^^^^^^^
@@ -2868,8 +2869,8 @@ sourceFile:typeResolution.ts
 1 >
   >        
 2 >                }
-1 >Emitted(159, 17) Source(106, 9) + SourceIndex(0)
-2 >Emitted(159, 30) Source(106, 10) + SourceIndex(0)
+1 >Emitted(160, 17) Source(106, 9) + SourceIndex(0)
+2 >Emitted(160, 30) Source(106, 10) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -2883,10 +2884,10 @@ sourceFile:typeResolution.ts
 4 >             export class ClassA {
   >                         public AisIn2_3() { }
   >                     }
-1 >Emitted(160, 13) Source(106, 9) + SourceIndex(0)
-2 >Emitted(160, 14) Source(106, 10) + SourceIndex(0)
-3 >Emitted(160, 14) Source(104, 9) + SourceIndex(0)
-4 >Emitted(160, 18) Source(106, 10) + SourceIndex(0)
+1 >Emitted(161, 13) Source(106, 9) + SourceIndex(0)
+2 >Emitted(161, 14) Source(106, 10) + SourceIndex(0)
+3 >Emitted(161, 14) Source(104, 9) + SourceIndex(0)
+4 >Emitted(161, 18) Source(106, 10) + SourceIndex(0)
 ---
 >>>            SubModule3.ClassA = ClassA;
 1->^^^^^^^^^^^^
@@ -2900,10 +2901,10 @@ sourceFile:typeResolution.ts
   >                                         public AisIn2_3() { }
   >                                     }
 4 >                                      
-1->Emitted(161, 13) Source(104, 22) + SourceIndex(0)
-2 >Emitted(161, 30) Source(104, 28) + SourceIndex(0)
-3 >Emitted(161, 39) Source(106, 10) + SourceIndex(0)
-4 >Emitted(161, 40) Source(106, 10) + SourceIndex(0)
+1->Emitted(162, 13) Source(104, 22) + SourceIndex(0)
+2 >Emitted(162, 30) Source(104, 28) + SourceIndex(0)
+3 >Emitted(162, 39) Source(106, 10) + SourceIndex(0)
+4 >Emitted(162, 40) Source(106, 10) + SourceIndex(0)
 ---
 >>>        })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {}));
 1->^^^^^^^^
@@ -2929,15 +2930,15 @@ sourceFile:typeResolution.ts
   >                                                                                             public AisIn2_3() { }
   >                                                                                         }
   >                                                                                     }
-1->Emitted(162, 9) Source(107, 5) + SourceIndex(0)
-2 >Emitted(162, 10) Source(107, 6) + SourceIndex(0)
-3 >Emitted(162, 12) Source(103, 19) + SourceIndex(0)
-4 >Emitted(162, 22) Source(103, 29) + SourceIndex(0)
-5 >Emitted(162, 25) Source(103, 19) + SourceIndex(0)
-6 >Emitted(162, 51) Source(103, 29) + SourceIndex(0)
-7 >Emitted(162, 56) Source(103, 19) + SourceIndex(0)
-8 >Emitted(162, 82) Source(103, 29) + SourceIndex(0)
-9 >Emitted(162, 90) Source(107, 6) + SourceIndex(0)
+1->Emitted(163, 9) Source(107, 5) + SourceIndex(0)
+2 >Emitted(163, 10) Source(107, 6) + SourceIndex(0)
+3 >Emitted(163, 12) Source(103, 19) + SourceIndex(0)
+4 >Emitted(163, 22) Source(103, 29) + SourceIndex(0)
+5 >Emitted(163, 25) Source(103, 19) + SourceIndex(0)
+6 >Emitted(163, 51) Source(103, 29) + SourceIndex(0)
+7 >Emitted(163, 56) Source(103, 19) + SourceIndex(0)
+8 >Emitted(163, 82) Source(103, 29) + SourceIndex(0)
+9 >Emitted(163, 90) Source(107, 6) + SourceIndex(0)
 ---
 >>>    })(TopLevelModule2 || (TopLevelModule2 = {}));
 1 >^^^^
@@ -2961,14 +2962,13 @@ sourceFile:typeResolution.ts
   >                                                  }
   >                                              }
   >                                          }
-1 >Emitted(163, 5) Source(108, 1) + SourceIndex(0)
-2 >Emitted(163, 6) Source(108, 2) + SourceIndex(0)
-3 >Emitted(163, 8) Source(102, 8) + SourceIndex(0)
-4 >Emitted(163, 23) Source(102, 23) + SourceIndex(0)
-5 >Emitted(163, 28) Source(102, 8) + SourceIndex(0)
-6 >Emitted(163, 43) Source(102, 23) + SourceIndex(0)
-7 >Emitted(163, 51) Source(108, 2) + SourceIndex(0)
+1 >Emitted(164, 5) Source(108, 1) + SourceIndex(0)
+2 >Emitted(164, 6) Source(108, 2) + SourceIndex(0)
+3 >Emitted(164, 8) Source(102, 8) + SourceIndex(0)
+4 >Emitted(164, 23) Source(102, 23) + SourceIndex(0)
+5 >Emitted(164, 28) Source(102, 8) + SourceIndex(0)
+6 >Emitted(164, 43) Source(102, 23) + SourceIndex(0)
+7 >Emitted(164, 51) Source(108, 2) + SourceIndex(0)
 ---
->>>    exports.__esModule = true;
 >>>});
 >>>//# sourceMappingURL=typeResolution.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
index 4e4d3810ed2..2ea407932bb 100644
--- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js
@@ -25,8 +25,8 @@ x + y + z;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var xyz_1 = require("xyz");
 var pdq_1 = require("pdq");
 var abc_1 = require("abc");
 xyz_1.x + pdq_1.y + abc_1.z;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
index d6e50572187..d21c51faee3 100644
--- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js
@@ -13,6 +13,6 @@ x;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var xyz_1 = require("xyz");
 xyz_1.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeUsedAsValueError2.js b/tests/baselines/reference/typeUsedAsValueError2.js
index fc247b6443c..2c068d4f4d2 100644
--- a/tests/baselines/reference/typeUsedAsValueError2.js
+++ b/tests/baselines/reference/typeUsedAsValueError2.js
@@ -34,7 +34,7 @@ define(["require", "exports"], function (require, exports) {
 //// [world.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     HelloInterface.world;
     HelloNamespace.world;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js
index a7528ade883..ba4451243ca 100644
--- a/tests/baselines/reference/typeofANonExportedType.js
+++ b/tests/baselines/reference/typeofANonExportedType.js
@@ -53,6 +53,7 @@ export var r13: typeof foo;
 
 //// [typeofANonExportedType.js]
 "use strict";
+exports.__esModule = true;
 var x = 1;
 var y = { foo: '' };
 var C = (function () {
@@ -86,4 +87,3 @@ function foo() { }
     }());
     foo.C = C;
 })(foo || (foo = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js
index 7a11fae8f8f..2500193ebde 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.js
+++ b/tests/baselines/reference/typeofAmbientExternalModules.js
@@ -20,13 +20,13 @@ y2 = ext;
 
 //// [typeofAmbientExternalModules_0.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports.C = C;
-exports.__esModule = true;
 //// [typeofAmbientExternalModules_1.js]
 "use strict";
 var D = (function () {
@@ -37,6 +37,7 @@ var D = (function () {
 module.exports = D;
 //// [typeofAmbientExternalModules_2.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='typeofAmbientExternalModules_0.ts'/>
 ///<reference path='typeofAmbientExternalModules_1.ts'/>
 var ext = require("./typeofAmbientExternalModules_0");
@@ -45,4 +46,3 @@ var y1 = ext;
 y1 = exp;
 var y2 = exp;
 y2 = ext;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js
index ab40a7c91a0..e166f6b745b 100644
--- a/tests/baselines/reference/typeofAnExportedType.js
+++ b/tests/baselines/reference/typeofAnExportedType.js
@@ -53,6 +53,7 @@ export var r13: typeof foo;
 
 //// [typeofAnExportedType.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 exports.y = { foo: '' };
 var C = (function () {
@@ -89,4 +90,3 @@ exports.foo = foo;
     }());
     foo.C = C;
 })(foo = exports.foo || (exports.foo = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js
index f28ff7e1033..97c6b6d7278 100644
--- a/tests/baselines/reference/typeofExternalModules.js
+++ b/tests/baselines/reference/typeofExternalModules.js
@@ -18,13 +18,13 @@ y2 = ext;
 
 //// [typeofExternalModules_external.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports.C = C;
-exports.__esModule = true;
 //// [typeofExternalModules_exportAssign.js]
 "use strict";
 var D = (function () {
@@ -35,10 +35,10 @@ var D = (function () {
 module.exports = D;
 //// [typeofExternalModules_core.js]
 "use strict";
+exports.__esModule = true;
 var ext = require("./typeofExternalModules_external");
 var exp = require("./typeofExternalModules_exportAssign");
 var y1 = ext;
 y1 = exp;
 var y2 = exp;
 y2 = ext;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
index c321e548181..4a93b9293a5 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js
@@ -25,8 +25,8 @@ var y: {M2: Object} = foo0;
 exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo0 = require("./foo_0");
 // Per 11.2.3, foo_0 should still be "instantiated", albeit with no members
 var x = {};
 var y = foo0;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js
index c935d8b6728..14fa083d534 100644
--- a/tests/baselines/reference/typingsLookup4.js
+++ b/tests/baselines/reference/typingsLookup4.js
@@ -27,12 +27,12 @@ j + k + l;
 
 //// [lquery.js]
 "use strict";
-exports.l = 2;
 exports.__esModule = true;
+exports.l = 2;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var jquery_1 = require("jquery");
 var kquery_1 = require("kquery");
 var lquery_1 = require("lquery");
 jquery_1.j + kquery_1.k + lquery_1.l;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/umd-augmentation-1.js b/tests/baselines/reference/umd-augmentation-1.js
index 5665f5b2024..b04de61f192 100644
--- a/tests/baselines/reference/umd-augmentation-1.js
+++ b/tests/baselines/reference/umd-augmentation-1.js
@@ -41,6 +41,7 @@ var t = p.x;
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="math2d-augment.d.ts" />
 var m = require("math2d");
 var v = new m.Vector(3, 2);
@@ -48,4 +49,3 @@ var magnitude = m.getLength(v);
 var p = v.translate(5, 5);
 p = v.reverse();
 var t = p.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/umd-augmentation-3.js b/tests/baselines/reference/umd-augmentation-3.js
index 4cdd28a9552..9c4c4b09ec6 100644
--- a/tests/baselines/reference/umd-augmentation-3.js
+++ b/tests/baselines/reference/umd-augmentation-3.js
@@ -47,6 +47,7 @@ var t = p.x;
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="math2d-augment.d.ts" />
 var m = require("math2d");
 var v = new m.Vector(3, 2);
@@ -54,4 +55,3 @@ var magnitude = m.getLength(v);
 var p = v.translate(5, 5);
 p = v.reverse();
 var t = p.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/umd3.js b/tests/baselines/reference/umd3.js
index 563b73ec508..a3208c0741a 100644
--- a/tests/baselines/reference/umd3.js
+++ b/tests/baselines/reference/umd3.js
@@ -16,8 +16,8 @@ let y: number = x.n;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Foo = require("./foo");
 Foo.fn();
 var x;
 var y = x.n;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/umd4.js b/tests/baselines/reference/umd4.js
index dcd720b866a..ca96540d305 100644
--- a/tests/baselines/reference/umd4.js
+++ b/tests/baselines/reference/umd4.js
@@ -16,8 +16,8 @@ let y: number = x.n;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Bar = require("./foo");
 Bar.fn();
 var x;
 var y = x.n;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js
index cd99ace83b3..aa7ccc485c0 100644
--- a/tests/baselines/reference/umd5.js
+++ b/tests/baselines/reference/umd5.js
@@ -18,10 +18,10 @@ let z = Foo;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Bar = require("./foo");
 Bar.fn();
 var x;
 var y = x.n;
 // should error
 var z = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/umd8.js b/tests/baselines/reference/umd8.js
index 0b9109873be..c3e6617396b 100644
--- a/tests/baselines/reference/umd8.js
+++ b/tests/baselines/reference/umd8.js
@@ -23,8 +23,8 @@ let x: any = Foo; // Not OK in value position
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var y; // OK in type position
 y.foo();
 var z; // OK in ns position
 var x = Foo; // Not OK in value position
-exports.__esModule = true;
diff --git a/tests/baselines/reference/umdDependencyComment2.js b/tests/baselines/reference/umdDependencyComment2.js
index 1039bbac500..021ba5254b0 100644
--- a/tests/baselines/reference/umdDependencyComment2.js
+++ b/tests/baselines/reference/umdDependencyComment2.js
@@ -17,7 +17,7 @@ m1.f();
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m1 = require("m2");
     m1.f();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/umdDependencyCommentName1.js b/tests/baselines/reference/umdDependencyCommentName1.js
index 2f7326d8f81..eba6f0cc16b 100644
--- a/tests/baselines/reference/umdDependencyCommentName1.js
+++ b/tests/baselines/reference/umdDependencyCommentName1.js
@@ -17,7 +17,7 @@ m1.f();
     }
 })(function (require, exports, b) {
     "use strict";
+    exports.__esModule = true;
     var m1 = require("m2");
     m1.f();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/umdDependencyCommentName2.js b/tests/baselines/reference/umdDependencyCommentName2.js
index 9814a1d5e38..2ca52848d15 100644
--- a/tests/baselines/reference/umdDependencyCommentName2.js
+++ b/tests/baselines/reference/umdDependencyCommentName2.js
@@ -21,7 +21,7 @@ m1.f();
     }
 })(function (require, exports, b, c) {
     "use strict";
+    exports.__esModule = true;
     var m1 = require("m2");
     m1.f();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/unclosedExportClause01.js b/tests/baselines/reference/unclosedExportClause01.js
index d83ed700a29..f6b2c7e1062 100644
--- a/tests/baselines/reference/unclosedExportClause01.js
+++ b/tests/baselines/reference/unclosedExportClause01.js
@@ -18,28 +18,28 @@ export { x as a, from "./t1"
 
 //// [t1.js]
 "use strict";
-exports.x = "x";
 exports.__esModule = true;
+exports.x = "x";
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.x = t1_1.x;
 exports.from = t1_1.from;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.from = t1_1.from;
-exports.__esModule = true;
 //// [t4.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
 exports.from = t1_1.from;
-exports.__esModule = true;
 //// [t5.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
 exports.from = t1_1.from;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unclosedExportClause02.js b/tests/baselines/reference/unclosedExportClause02.js
index 1ff1f585768..73a83a39b62 100644
--- a/tests/baselines/reference/unclosedExportClause02.js
+++ b/tests/baselines/reference/unclosedExportClause02.js
@@ -22,21 +22,21 @@ export { x as a, from
 
 //// [t1.js]
 "use strict";
-exports.x = "x";
 exports.__esModule = true;
+exports.x = "x";
 //// [t2.js]
 "use strict";
-"./t1";
 exports.__esModule = true;
+"./t1";
 //// [t3.js]
 "use strict";
-"./t1";
 exports.__esModule = true;
+"./t1";
 //// [t4.js]
 "use strict";
-"./t1";
 exports.__esModule = true;
+"./t1";
 //// [t5.js]
 "use strict";
-"./t1";
 exports.__esModule = true;
+"./t1";
diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js
index b8bec8ceb13..927df99766e 100644
--- a/tests/baselines/reference/undeclaredModuleError.js
+++ b/tests/baselines/reference/undeclaredModuleError.js
@@ -18,6 +18,7 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat
 //// [undeclaredModuleError.js]
 define(["require", "exports", "fs"], function (require, exports, fs) {
     "use strict";
+    exports.__esModule = true;
     function readdir(path, accept, callback) { }
     function join() {
         var paths = [];
@@ -35,5 +36,4 @@ define(["require", "exports", "fs"], function (require, exports, fs) {
             });
         });
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/untypedModuleImport.js b/tests/baselines/reference/untypedModuleImport.js
index 7f088859221..90fb9ab5f43 100644
--- a/tests/baselines/reference/untypedModuleImport.js
+++ b/tests/baselines/reference/untypedModuleImport.js
@@ -23,18 +23,18 @@ foo(bar());
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("foo");
 foo.bar();
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("foo");
 foo();
-exports.__esModule = true;
 //// [c.js]
 "use strict";
+exports.__esModule = true;
 var foo_1 = require("foo");
 require("./a");
 require("./b");
 foo_1["default"](foo_1.bar());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_allowJs.js b/tests/baselines/reference/untypedModuleImport_allowJs.js
index 3948c748286..5d60df6687c 100644
--- a/tests/baselines/reference/untypedModuleImport_allowJs.js
+++ b/tests/baselines/reference/untypedModuleImport_allowJs.js
@@ -12,6 +12,6 @@ foo.bar();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var foo_1 = require("foo");
 foo_1["default"].bar();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.js b/tests/baselines/reference/untypedModuleImport_vsAmbient.js
index 6968f603061..4273033fe22 100644
--- a/tests/baselines/reference/untypedModuleImport_vsAmbient.js
+++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.js
@@ -18,7 +18,7 @@ x;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="./declarations.d.ts" />
 var foo_1 = require("foo");
 foo_1.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation.js b/tests/baselines/reference/untypedModuleImport_withAugmentation.js
index e8fc892f4a0..9d1770f5497 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation.js
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation.js
@@ -15,6 +15,6 @@ x;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var foo_1 = require("foo");
 foo_1.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js
index 9cffa5547fe..37f88dc65c3 100644
--- a/tests/baselines/reference/unusedImportDeclaration.js
+++ b/tests/baselines/reference/unusedImportDeclaration.js
@@ -25,11 +25,11 @@ var TesterB = (function () {
 module.exports = TesterB;
 //// [unusedImportDeclaration_testerA.js]
 "use strict";
+exports.__esModule = true;
 var thingy = {
     me: "A"
 };
 foo("IN " + thingy.me + "!");
-exports.__esModule = true;
 
 
 //// [unusedImportDeclaration_testerB.d.ts]
diff --git a/tests/baselines/reference/unusedImports1.js b/tests/baselines/reference/unusedImports1.js
index 910070b8955..4bfc7b31a4d 100644
--- a/tests/baselines/reference/unusedImports1.js
+++ b/tests/baselines/reference/unusedImports1.js
@@ -11,13 +11,13 @@ import {Calculator} from "./file1"
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
     return Calculator;
 }());
 exports.Calculator = Calculator;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js
index be28b2f8d40..3f65619c2ae 100644
--- a/tests/baselines/reference/unusedImports11.js
+++ b/tests/baselines/reference/unusedImports11.js
@@ -20,6 +20,7 @@ new r.Member();
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var Member = (function () {
     function Member() {
     }
@@ -27,9 +28,9 @@ var Member = (function () {
 }());
 exports.Member = Member;
 exports["default"] = Member;
-exports.__esModule = true;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 var b_2 = require("./b");
 var ns = require("./b");
@@ -39,4 +40,3 @@ new b_2["default"]();
 new b_2.Member();
 new ns.Member();
 new r.Member();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports12.js b/tests/baselines/reference/unusedImports12.js
index 90e6446d48e..bd4dbacbf26 100644
--- a/tests/baselines/reference/unusedImports12.js
+++ b/tests/baselines/reference/unusedImports12.js
@@ -15,6 +15,7 @@ import r = require("./b");
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var Member = (function () {
     function Member() {
     }
@@ -22,7 +23,6 @@ var Member = (function () {
 }());
 exports.Member = Member;
 exports["default"] = Member;
-exports.__esModule = true;
 //// [a.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports13.js b/tests/baselines/reference/unusedImports13.js
index 2db07a7f9cb..6c5977eaea8 100644
--- a/tests/baselines/reference/unusedImports13.js
+++ b/tests/baselines/reference/unusedImports13.js
@@ -23,6 +23,6 @@ declare global {
 
 //// [foo.jsx]
 "use strict";
+exports.__esModule = true;
 var React = require("react");
 exports.FooComponent = <div></div>;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports14.js b/tests/baselines/reference/unusedImports14.js
index e85a5d33045..19a10f2a3a0 100644
--- a/tests/baselines/reference/unusedImports14.js
+++ b/tests/baselines/reference/unusedImports14.js
@@ -23,6 +23,6 @@ declare global {
 
 //// [foo.js]
 "use strict";
+exports.__esModule = true;
 var React = require("react");
 exports.FooComponent = React.createElement("div", null);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports15.js b/tests/baselines/reference/unusedImports15.js
index faacbaf71c9..78bd0aa6c74 100644
--- a/tests/baselines/reference/unusedImports15.js
+++ b/tests/baselines/reference/unusedImports15.js
@@ -23,6 +23,6 @@ declare global {
 
 //// [foo.jsx]
 "use strict";
+exports.__esModule = true;
 var Element = require("react");
 exports.FooComponent = <div></div>;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports16.js b/tests/baselines/reference/unusedImports16.js
index 884770ab222..ffaafc45d4f 100644
--- a/tests/baselines/reference/unusedImports16.js
+++ b/tests/baselines/reference/unusedImports16.js
@@ -23,6 +23,6 @@ declare global {
 
 //// [foo.js]
 "use strict";
+exports.__esModule = true;
 var Element = require("react");
 exports.FooComponent = Element.createElement("div", null);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports2.js b/tests/baselines/reference/unusedImports2.js
index d498a242a57..ccb57a8f378 100644
--- a/tests/baselines/reference/unusedImports2.js
+++ b/tests/baselines/reference/unusedImports2.js
@@ -19,6 +19,7 @@ x.handleChar();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -29,10 +30,9 @@ exports.Calculator = Calculator;
 function test() {
 }
 exports.test = test;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports3.js b/tests/baselines/reference/unusedImports3.js
index a3ab3117b67..e968ac64062 100644
--- a/tests/baselines/reference/unusedImports3.js
+++ b/tests/baselines/reference/unusedImports3.js
@@ -22,6 +22,7 @@ test2();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -35,10 +36,9 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 file1_1.test();
 file1_1.test2();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports4.js b/tests/baselines/reference/unusedImports4.js
index 53e48513bc9..2a7f456fe99 100644
--- a/tests/baselines/reference/unusedImports4.js
+++ b/tests/baselines/reference/unusedImports4.js
@@ -23,6 +23,7 @@ test2();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -36,11 +37,10 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
 file1_1.test2();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports5.js b/tests/baselines/reference/unusedImports5.js
index 5856638cd09..1d187f008b8 100644
--- a/tests/baselines/reference/unusedImports5.js
+++ b/tests/baselines/reference/unusedImports5.js
@@ -23,6 +23,7 @@ test();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -36,11 +37,10 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
 file1_1.test();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports6.js b/tests/baselines/reference/unusedImports6.js
index 861862fe7a6..62386a5fa6c 100644
--- a/tests/baselines/reference/unusedImports6.js
+++ b/tests/baselines/reference/unusedImports6.js
@@ -23,6 +23,7 @@ import d from "./file1"
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -36,7 +37,6 @@ exports.test = test;
 function test2() {
 }
 exports["default"] = test2;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports7.js b/tests/baselines/reference/unusedImports7.js
index 519511fb9e1..2c2c87e56bf 100644
--- a/tests/baselines/reference/unusedImports7.js
+++ b/tests/baselines/reference/unusedImports7.js
@@ -21,6 +21,7 @@ import * as n from "./file1"
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -34,7 +35,6 @@ exports.test = test;
 function test2() {
 }
 exports["default"] = test2;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports8.js b/tests/baselines/reference/unusedImports8.js
index aa2aa248ff7..a095acd5466 100644
--- a/tests/baselines/reference/unusedImports8.js
+++ b/tests/baselines/reference/unusedImports8.js
@@ -23,6 +23,7 @@ t1();
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -36,11 +37,10 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
+exports.__esModule = true;
 var file1_1 = require("./file1");
 var x = new file1_1.Calculator();
 x.handleChar();
 file1_1.test();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedImports9.js b/tests/baselines/reference/unusedImports9.js
index f6fdc1b9e6f..89108d10e17 100644
--- a/tests/baselines/reference/unusedImports9.js
+++ b/tests/baselines/reference/unusedImports9.js
@@ -19,6 +19,7 @@ import c = require('./file1')
 
 //// [file1.js]
 "use strict";
+exports.__esModule = true;
 var Calculator = (function () {
     function Calculator() {
     }
@@ -32,7 +33,6 @@ exports.test = test;
 function test2() {
 }
 exports.test2 = test2;
-exports.__esModule = true;
 //// [file2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js
index a7121ec9d24..3fb4ef5347b 100644
--- a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js
+++ b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js
@@ -28,6 +28,7 @@ var __rest = (this && this.__rest) || function (s, e) {
             t[p[i]] = s[p[i]];
     return t;
 };
+exports.__esModule = true;
 var children = props.children, // here!
 _a = props.active, // here!
 rest = __rest(props, ["children", "active"]);
@@ -35,4 +36,3 @@ function foo() {
     var children = props.children, _a = props.active, rest = __rest(props, ["children", "active"]);
 }
 exports.asdf = 123;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParameters.js b/tests/baselines/reference/unusedLocalsAndParameters.js
index e538c9754b4..dc575daad33 100644
--- a/tests/baselines/reference/unusedLocalsAndParameters.js
+++ b/tests/baselines/reference/unusedLocalsAndParameters.js
@@ -86,6 +86,7 @@ namespace N {
 
 //// [unusedLocalsAndParameters.js]
 "use strict";
+exports.__esModule = true;
 // function declaration paramter
 function f(a) {
 }
@@ -166,4 +167,3 @@ var N;
 (function (N) {
     var x;
 })(N || (N = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
index b3088ac69c7..5d3e13e328b 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js
@@ -162,6 +162,7 @@ N;
 
 //// [unusedLocalsAndParametersDeferred.js]
 "use strict";
+exports.__esModule = true;
 function defered(a) {
     return a();
 }
@@ -323,4 +324,3 @@ var N;
     });
 })(N || (N = {}));
 N;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js
index 410620751fe..475b1ddb769 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js
@@ -25,6 +25,7 @@ export function genericFunc(details: number, message: any): any {
 
 //// [unusedLocalsAndParametersOverloadSignatures.js]
 "use strict";
+exports.__esModule = true;
 function func(details, message) {
     return details + message;
 }
@@ -43,4 +44,3 @@ function genericFunc(details, message) {
     return details + message;
 }
 exports.genericFunc = genericFunc;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js
index 20706997d5b..0ff6ac828d0 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js
@@ -29,8 +29,8 @@ y[0]();
 
 //// [unusedLocalsAndParametersTypeAliases.js]
 "use strict";
+exports.__esModule = true;
 var x;
 x();
 var y;
 y[0]();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js
index 7ab951c984d..97c7129b4a9 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js
@@ -13,7 +13,7 @@ export {}
 
 //// [unusedLocalsAndParametersTypeAliases2.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     foo();
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/unusedVariablesinModules1.js b/tests/baselines/reference/unusedVariablesinModules1.js
index 1320bb57448..edfb384697a 100644
--- a/tests/baselines/reference/unusedVariablesinModules1.js
+++ b/tests/baselines/reference/unusedVariablesinModules1.js
@@ -8,5 +8,5 @@ export var y: string;
 
 //// [unusedVariablesinModules1.js]
 "use strict";
-var x;
 exports.__esModule = true;
+var x;
diff --git a/tests/baselines/reference/useStrictLikePrologueString01.js b/tests/baselines/reference/useStrictLikePrologueString01.js
index bf5e88ba46c..6a1836f4332 100644
--- a/tests/baselines/reference/useStrictLikePrologueString01.js
+++ b/tests/baselines/reference/useStrictLikePrologueString01.js
@@ -9,7 +9,7 @@ export function f() {
 "hey!";
 " use strict ";
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() {
 }
 exports.f = f;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.js b/tests/baselines/reference/varArgsOnConstructorTypes.js
index fbadbc6ad31..9c790e7a48b 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.js
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.js
@@ -37,6 +37,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A(ctor) {
         }
@@ -56,5 +57,4 @@ define(["require", "exports"], function (require, exports) {
     exports.B = B;
     var reg;
     reg.register(B);
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
index dcc6a1364c2..a6d1b095894 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
@@ -34,7 +34,7 @@ exports.__esModule = true;
 exports.__esModule = true;
 //// [visibilityOfCrossModuleTypeUsage_fs.js]
 "use strict";
+exports.__esModule = true;
 function run(configuration) {
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/visibilityOfTypeParameters.js b/tests/baselines/reference/visibilityOfTypeParameters.js
index 922324c9c60..9d8a3e73dbe 100644
--- a/tests/baselines/reference/visibilityOfTypeParameters.js
+++ b/tests/baselines/reference/visibilityOfTypeParameters.js
@@ -8,6 +8,7 @@ export class MyClass {
 
 //// [visibilityOfTypeParameters.js]
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
@@ -17,7 +18,6 @@ var MyClass = (function () {
     return MyClass;
 }());
 exports.MyClass = MyClass;
-exports.__esModule = true;
 
 
 //// [visibilityOfTypeParameters.d.ts]
diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
index 204482e7548..4883f840ddb 100644
--- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
+++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
@@ -15,14 +15,14 @@ function main() {
 
 //// [voidAsNonAmbiguousReturnType_0.js]
 "use strict";
+exports.__esModule = true;
 function mkdirSync(path, mode) { }
 exports.mkdirSync = mkdirSync;
-exports.__esModule = true;
 //// [voidAsNonAmbiguousReturnType_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='voidAsNonAmbiguousReturnType_0.ts'/>
 var fs = require("./voidAsNonAmbiguousReturnType_0");
 function main() {
     fs.mkdirSync('test'); // should not error - return types are the same
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js
index 49cac46d212..97d528ecd62 100644
--- a/tests/baselines/reference/withExportDecl.js
+++ b/tests/baselines/reference/withExportDecl.js
@@ -61,6 +61,7 @@ export var eVar3 = 10, eVar4, eVar5;
 //// [withExportDecl.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var simpleVar;
     var anotherVar;
     var varWithSimpleType;
@@ -99,7 +100,6 @@ define(["require", "exports"], function (require, exports) {
     exports.eVar2 = 10;
     var eVar22;
     exports.eVar3 = 10;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js
index feb48648252..f0a1a2d2f14 100644
--- a/tests/baselines/reference/withImportDecl.js
+++ b/tests/baselines/reference/withImportDecl.js
@@ -46,17 +46,18 @@ b.foo;
 //// [withImportDecl_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [withImportDecl_1.js]
 define(["require", "exports", "withImportDecl_0"], function (require, exports, m3) {
     "use strict";
+    exports.__esModule = true;
     ///<reference path='withImportDecl_0.ts'/>
     var simpleVar;
     var anotherVar;
@@ -81,7 +82,6 @@ define(["require", "exports", "withImportDecl_0"], function (require, exports, m
     })(m1 || (m1 = {}));
     var b = new m3.A();
     b.foo;
-    exports.__esModule = true;
 });
 
 

From 1243e11a7bc63828c9791cdd7cdceb234cd6e53a Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Fri, 10 Feb 2017 13:26:21 -0800
Subject: [PATCH 126/127] Update unittests

---
 src/harness/unittests/compileOnSave.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/harness/unittests/compileOnSave.ts b/src/harness/unittests/compileOnSave.ts
index 706fc45b6da..b2c46c5a18c 100644
--- a/src/harness/unittests/compileOnSave.ts
+++ b/src/harness/unittests/compileOnSave.ts
@@ -520,7 +520,7 @@ namespace ts.projectSystem {
 
             const expectedEmittedFileName = "/a/b/f1.js";
             assert.isTrue(host.fileExists(expectedEmittedFileName));
-            assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\nexports.__esModule = true;\r\n`);
+            assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nexports.__esModule = true;\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
         });
 
         it("shoud not emit js files in external projects", () => {

From de400008149a20f1bb09a707b4c7de1fa4ba4b2e Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 13 Feb 2017 12:19:33 -0800
Subject: [PATCH 127/127] switch FileExtensionInfo to always mean .js file and
 deduplicate entries in getSupportedExtensions (#14046)

* - switch FileExtensionInfo to always mean .js file
- deduplicate entries in getSupportedExtensions

* (PR feedback): updated comment
---
 src/compiler/commandLineParser.ts             |  8 ++---
 src/compiler/core.ts                          | 26 +++++++-------
 src/compiler/types.ts                         |  3 +-
 .../unittests/tsserverProjectSystem.ts        | 35 +++++++++++++++++++
 src/server/editorServices.ts                  |  4 +--
 src/server/protocol.ts                        |  4 +--
 6 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 4ee76d7b817..52804dcd336 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -840,7 +840,7 @@ namespace ts {
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
-    export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}, configFileName?: string, resolutionStack: Path[] = [], extraFileExtensions: FileExtensionInfo[] = []): ParsedCommandLine {
+    export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}, configFileName?: string, resolutionStack: Path[] = [], extraFileExtensions: JsFileExtensionInfo[] = []): ParsedCommandLine {
         const errors: Diagnostic[] = [];
         basePath = normalizeSlashes(basePath);
         const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames);
@@ -1186,7 +1186,7 @@ namespace ts {
      * @param host The host used to resolve files and directories.
      * @param errors An array for diagnostic reporting.
      */
-    function matchFileNames(fileNames: string[], include: string[], exclude: string[], basePath: string, options: CompilerOptions, host: ParseConfigHost, errors: Diagnostic[], extraFileExtensions: FileExtensionInfo[]): ExpandResult {
+    function matchFileNames(fileNames: string[], include: string[], exclude: string[], basePath: string, options: CompilerOptions, host: ParseConfigHost, errors: Diagnostic[], extraFileExtensions: JsFileExtensionInfo[]): ExpandResult {
         basePath = normalizePath(basePath);
 
         // The exclude spec list is converted into a regular expression, which allows us to quickly
@@ -1361,7 +1361,7 @@ namespace ts {
      */
     function hasFileWithHigherPriorityExtension(file: string, literalFiles: Map<string>, wildcardFiles: Map<string>, extensions: string[], keyMapper: (value: string) => string) {
         const extensionPriority = getExtensionPriority(file, extensions);
-        const adjustedExtensionPriority = adjustExtensionPriority(extensionPriority);
+        const adjustedExtensionPriority = adjustExtensionPriority(extensionPriority, extensions);
         for (let i = ExtensionPriority.Highest; i < adjustedExtensionPriority; i++) {
             const higherPriorityExtension = extensions[i];
             const higherPriorityPath = keyMapper(changeExtension(file, higherPriorityExtension));
@@ -1383,7 +1383,7 @@ namespace ts {
      */
     function removeWildcardFilesWithLowerPriorityExtension(file: string, wildcardFiles: Map<string>, extensions: string[], keyMapper: (value: string) => string) {
         const extensionPriority = getExtensionPriority(file, extensions);
-        const nextExtensionPriority = getNextLowestExtensionPriority(extensionPriority);
+        const nextExtensionPriority = getNextLowestExtensionPriority(extensionPriority, extensions);
         for (let i = nextExtensionPriority; i < extensions.length; i++) {
             const lowerPriorityExtension = extensions[i];
             const lowerPriorityPath = keyMapper(changeExtension(file, lowerPriorityExtension));
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 94e32dfdbb3..43bbf86509e 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -2020,14 +2020,14 @@ namespace ts {
     export const supportedJavascriptExtensions = [".js", ".jsx"];
     const allSupportedExtensions = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions);
 
-    export function getSupportedExtensions(options?: CompilerOptions, extraFileExtensions?: FileExtensionInfo[]): string[] {
+    export function getSupportedExtensions(options?: CompilerOptions, extraFileExtensions?: JsFileExtensionInfo[]): string[] {
         const needAllExtensions = options && options.allowJs;
-        if (!extraFileExtensions || extraFileExtensions.length === 0) {
+        if (!extraFileExtensions || extraFileExtensions.length === 0 || !needAllExtensions) {
             return needAllExtensions ? allSupportedExtensions : supportedTypeScriptExtensions;
         }
-        const extensions = (needAllExtensions ? allSupportedExtensions : supportedTypeScriptExtensions).slice(0);
+        const extensions = allSupportedExtensions.slice(0);
         for (const extInfo of extraFileExtensions) {
-            if (needAllExtensions || extInfo.scriptKind === ScriptKind.TS) {
+            if (extensions.indexOf(extInfo.extension) === -1) {
                 extensions.push(extInfo.extension);
             }
         }
@@ -2042,7 +2042,7 @@ namespace ts {
         return forEach(supportedTypeScriptExtensions, extension => fileExtensionIs(fileName, extension));
     }
 
-    export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions, extraFileExtensions?: FileExtensionInfo[]) {
+    export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions, extraFileExtensions?: JsFileExtensionInfo[]) {
         if (!fileName) { return false; }
 
         for (const extension of getSupportedExtensions(compilerOptions, extraFileExtensions)) {
@@ -2061,7 +2061,6 @@ namespace ts {
     export const enum ExtensionPriority {
         TypeScriptFiles = 0,
         DeclarationAndJavaScriptFiles = 2,
-        Limit = 5,
 
         Highest = TypeScriptFiles,
         Lowest = DeclarationAndJavaScriptFiles,
@@ -2070,7 +2069,7 @@ namespace ts {
     export function getExtensionPriority(path: string, supportedExtensions: string[]): ExtensionPriority {
         for (let i = supportedExtensions.length - 1; i >= 0; i--) {
             if (fileExtensionIs(path, supportedExtensions[i])) {
-                return adjustExtensionPriority(<ExtensionPriority>i);
+                return adjustExtensionPriority(<ExtensionPriority>i, supportedExtensions);
             }
         }
 
@@ -2082,27 +2081,26 @@ namespace ts {
     /**
      * Adjusts an extension priority to be the highest priority within the same range.
      */
-    export function adjustExtensionPriority(extensionPriority: ExtensionPriority): ExtensionPriority {
+    export function adjustExtensionPriority(extensionPriority: ExtensionPriority, supportedExtensions: string[]): ExtensionPriority {
         if (extensionPriority < ExtensionPriority.DeclarationAndJavaScriptFiles) {
             return ExtensionPriority.TypeScriptFiles;
         }
-        else if (extensionPriority < ExtensionPriority.Limit) {
+        else if (extensionPriority < supportedExtensions.length) {
             return ExtensionPriority.DeclarationAndJavaScriptFiles;
         }
         else {
-            return ExtensionPriority.Limit;
-        }
-    }
+            return supportedExtensions.length;
+        }    }
 
     /**
      * Gets the next lowest extension priority for a given priority.
      */
-    export function getNextLowestExtensionPriority(extensionPriority: ExtensionPriority): ExtensionPriority {
+    export function getNextLowestExtensionPriority(extensionPriority: ExtensionPriority, supportedExtensions: string[]): ExtensionPriority {
         if (extensionPriority < ExtensionPriority.DeclarationAndJavaScriptFiles) {
             return ExtensionPriority.DeclarationAndJavaScriptFiles;
         }
         else {
-            return ExtensionPriority.Limit;
+            return supportedExtensions.length;
         }
     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index b93e4eff9f4..e3128723aff 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3153,9 +3153,8 @@
         ThisProperty
     }
 
-    export interface FileExtensionInfo {
+    export interface JsFileExtensionInfo {
         extension: string;
-        scriptKind: ScriptKind;
         isMixedContent: boolean;
     }
 
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index e6f4abde382..40a6c933242 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -1589,6 +1589,41 @@ namespace ts.projectSystem {
             checkProjectActualFiles(projectService.inferredProjects[1], [file2.path]);
         });
 
+        it ("loading files with correct priority", () => {
+            const f1 = {
+                path: "/a/main.ts",
+                content: "let x = 1"
+            };
+            const f2 = {
+                path: "/a/main.js",
+                content: "var y = 1"
+            };
+            const config = {
+                path: "/a/tsconfig.json",
+                content: JSON.stringify({
+                    compilerOptions: { allowJs: true }
+                })
+            };
+            const host = createServerHost([f1, f2, config]);
+            const projectService = createProjectService(host);
+            projectService.setHostConfiguration({
+                extraFileExtensions: [
+                    { extension: ".js", isMixedContent: false },
+                    { extension: ".html", isMixedContent: true }
+                ]
+            });
+            projectService.openClientFile(f1.path);
+            projectService.checkNumberOfProjects({ configuredProjects: 1 });
+            checkProjectActualFiles(projectService.configuredProjects[0], [ f1.path ]);
+
+            projectService.closeClientFile(f1.path);
+
+            projectService.openClientFile(f2.path);
+            projectService.checkNumberOfProjects({ configuredProjects: 1, inferredProjects: 1 });
+            checkProjectActualFiles(projectService.configuredProjects[0], [ f1.path ]);
+            checkProjectActualFiles(projectService.inferredProjects[0], [ f2.path ]);
+        });
+
         it("tsconfig script block support", () => {
             const file1 = {
                 path: "/a/b/f1.ts",
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index edc4fab9a19..36aa3939c83 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -107,7 +107,7 @@ namespace ts.server {
     export interface HostConfiguration {
         formatCodeOptions: FormatCodeSettings;
         hostInfo: string;
-        extraFileExtensions?: FileExtensionInfo[];
+        extraFileExtensions?: JsFileExtensionInfo[];
     }
 
     interface ConfigFileConversionResult {
@@ -132,7 +132,7 @@ namespace ts.server {
     interface FilePropertyReader<T> {
         getFileName(f: T): string;
         getScriptKind(f: T): ScriptKind;
-        hasMixedContent(f: T, extraFileExtensions: FileExtensionInfo[]): boolean;
+        hasMixedContent(f: T, extraFileExtensions: JsFileExtensionInfo[]): boolean;
     }
 
     const fileNamePropertyReader: FilePropertyReader<string> = {
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index c1b78e9dbaa..e82eca86ba9 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -1001,9 +1001,9 @@ namespace ts.server.protocol {
         formatOptions?: FormatCodeSettings;
 
         /**
-         * The host's additional supported file extensions
+         * The host's additional supported .js file extensions
          */
-        extraFileExtensions?: FileExtensionInfo[];
+        extraFileExtensions?: JsFileExtensionInfo[];
     }
 
     /**