improve module loading interoperability for babel

src/compiler/emitter.ts

@@ -3012,6 +3012,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 return result;
             }
 
+            function emitEs6ExportDefaultCompat(node: Node) {
+                if (node.parent.kind === SyntaxKind.SourceFile) {
+                    Debug.assert(!!(node.flags & NodeFlags.Default) || node.kind === SyntaxKind.ExportAssignment);
+                    // only allow export default at a source file level
+                    if (compilerOptions.module === ModuleKind.CommonJS || compilerOptions.module === ModuleKind.AMD || compilerOptions.module === ModuleKind.UMD) {
+                        if (!currentSourceFile.symbol.exports["___esModule"]) {
+                            if (languageVersion === ScriptTarget.ES5) {
+                                // default value of configurable, enumerable, writable are `false`. 
+                                write("Object.defineProperty(exports, \"__esModule\", { value: true });");
+                                writeLine();
+                            }
+                            else if (languageVersion === ScriptTarget.ES3) {
+                                write("exports.__esModule = true;");
+                                writeLine();
+                            }
+                        }
+                    }
+                }
+            }
+
             function emitExportMemberAssignment(node: FunctionLikeDeclaration | ClassDeclaration) {
                 if (node.flags & NodeFlags.Export) {
                     writeLine();
@@ -3034,9 +3054,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     }
                     else {
                         if (node.flags & NodeFlags.Default) {
+                            emitEs6ExportDefaultCompat(node);
                             if (languageVersion === ScriptTarget.ES3) {
                                 write("exports[\"default\"]");
-                            } else {
+                            }
+                            else {
                                 write("exports.default");
                             }
                         }
@@ -5529,6 +5551,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                             write(")");
                         }
                         else {
+                            emitEs6ExportDefaultCompat(node);
                             emitContainingModuleName(node);
                             if (languageVersion === ScriptTarget.ES3) {
                                 write("[\"default\"] = ");

tests/baselines/reference/es5-commonjs.js

@@ -0,0 +1,27 @@
+//// [es5-commonjs.ts]
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
+
+
+//// [es5-commonjs.js]
+var A = (function () {
+    function A() {
+    }
+    A.prototype.B = function () {
+        return 42;
+    };
+    return A;
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = A;

tests/baselines/reference/es5-commonjs.symbols

@@ -0,0 +1,17 @@
+=== tests/cases/compiler/es5-commonjs.ts ===
+
+export default class A
+>A : Symbol(A, Decl(es5-commonjs.ts, 0, 0))
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : Symbol(B, Decl(es5-commonjs.ts, 6, 5))
+    {
+        return 42;
+    }
+}
+

tests/baselines/reference/es5-commonjs.types

@@ -0,0 +1,18 @@
+=== tests/cases/compiler/es5-commonjs.ts ===
+
+export default class A
+>A : A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : () => number
+    {
+        return 42;
+>42 : number
+    }
+}
+

tests/baselines/reference/es5-commonjs2.js

@@ -0,0 +1,8 @@
+//// [es5-commonjs2.ts]
+
+export default 1;
+
+
+//// [es5-commonjs2.js]
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = 1;

tests/baselines/reference/es5-commonjs2.symbols

@@ -0,0 +1,5 @@
+=== tests/cases/compiler/es5-commonjs2.ts ===
+
+No type information for this code.export default 1;
+No type information for this code.
+No type information for this code.

tests/baselines/reference/es5-commonjs2.types

@@ -0,0 +1,5 @@
+=== tests/cases/compiler/es5-commonjs2.ts ===
+
+No type information for this code.export default 1;
+No type information for this code.
+No type information for this code.

tests/baselines/reference/es5-commonjs3.js

@@ -0,0 +1,9 @@
+//// [es5-commonjs3.ts]
+
+export default "test";
+export var __esModule = 1;
+
+
+//// [es5-commonjs3.js]
+exports.default = "test";
+exports.__esModule = 1;

tests/baselines/reference/es5-commonjs3.symbols

@@ -0,0 +1,6 @@
+=== tests/cases/compiler/es5-commonjs3.ts ===
+
+export default "test";
+export var __esModule = 1;
+>__esModule : Symbol(__esModule, Decl(es5-commonjs3.ts, 2, 10))
+

tests/baselines/reference/es5-commonjs3.types

@@ -0,0 +1,7 @@
+=== tests/cases/compiler/es5-commonjs3.ts ===
+
+export default "test";
+export var __esModule = 1;
+>__esModule : number
+>1 : number
+

tests/baselines/reference/es5-commonjs4.js

@@ -0,0 +1,28 @@
+//// [es5-commonjs4.ts]
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
+export var __esModule = 1;
+
+
+//// [es5-commonjs4.js]
+var A = (function () {
+    function A() {
+    }
+    A.prototype.B = function () {
+        return 42;
+    };
+    return A;
+})();
+exports.default = A;
+exports.__esModule = 1;

tests/baselines/reference/es5-commonjs4.symbols

@@ -0,0 +1,19 @@
+=== tests/cases/compiler/es5-commonjs4.ts ===
+
+export default class A
+>A : Symbol(A, Decl(es5-commonjs4.ts, 0, 0))
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : Symbol(B, Decl(es5-commonjs4.ts, 6, 5))
+    {
+        return 42;
+    }
+}
+export var __esModule = 1;
+>__esModule : Symbol(__esModule, Decl(es5-commonjs4.ts, 13, 10))
+

tests/baselines/reference/es5-commonjs4.types

@@ -0,0 +1,21 @@
+=== tests/cases/compiler/es5-commonjs4.ts ===
+
+export default class A
+>A : A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : () => number
+    {
+        return 42;
+>42 : number
+    }
+}
+export var __esModule = 1;
+>__esModule : number
+>1 : number
+

tests/baselines/reference/es5-commonjs5.js

@@ -0,0 +1,13 @@
+//// [es5-commonjs5.ts]
+
+export default function () {
+	return "test";
+}
+
+
+//// [es5-commonjs5.js]
+function default_1() {
+    return "test";
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;

tests/baselines/reference/es5-commonjs5.symbols

@@ -0,0 +1,7 @@
+=== tests/cases/compiler/es5-commonjs5.ts ===
+
+No type information for this code.export default function () {
+No type information for this code.	return "test";
+No type information for this code.}
+No type information for this code.
+No type information for this code.

tests/baselines/reference/es5-commonjs5.types

@@ -0,0 +1,7 @@
+=== tests/cases/compiler/es5-commonjs5.ts ===
+
+export default function () {
+	return "test";
+>"test" : string
+}
+

tests/baselines/reference/es5-commonjs6.js

@@ -0,0 +1,10 @@
+//// [es5-commonjs6.ts]
+
+export default "test";
+var __esModule = 1;
+
+
+//// [es5-commonjs6.js]
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = "test";
+var __esModule = 1;

tests/baselines/reference/es5-commonjs6.symbols

@@ -0,0 +1,6 @@
+=== tests/cases/compiler/es5-commonjs6.ts ===
+
+export default "test";
+var __esModule = 1;
+>__esModule : Symbol(__esModule, Decl(es5-commonjs6.ts, 2, 3))
+

tests/baselines/reference/es5-commonjs6.types

@@ -0,0 +1,7 @@
+=== tests/cases/compiler/es5-commonjs6.ts ===
+
+export default "test";
+var __esModule = 1;
+>__esModule : number
+>1 : number
+

tests/baselines/reference/es5-system.js

@@ -0,0 +1,34 @@
+//// [es5-system.ts]
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
+
+
+//// [es5-system.js]
+System.register([], function(exports_1) {
+    var A;
+    return {
+        setters:[],
+        execute: function() {
+            A = (function () {
+                function A() {
+                }
+                A.prototype.B = function () {
+                    return 42;
+                };
+                return A;
+            })();
+            exports_1("default", A);
+        }
+    }
+});

tests/baselines/reference/es5-system.symbols

@@ -0,0 +1,17 @@
+=== tests/cases/compiler/es5-system.ts ===
+
+export default class A
+>A : Symbol(A, Decl(es5-system.ts, 0, 0))
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : Symbol(B, Decl(es5-system.ts, 6, 5))
+    {
+        return 42;
+    }
+}
+

tests/baselines/reference/es5-system.types

@@ -0,0 +1,18 @@
+=== tests/cases/compiler/es5-system.ts ===
+
+export default class A
+>A : A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+>B : () => number
+    {
+        return 42;
+>42 : number
+    }
+}
+

tests/baselines/reference/es5-umd3.js

@@ -31,5 +31,6 @@ export default class A
         };
         return A;
     })();
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = A;
 });

tests/baselines/reference/es5ExportDefaultClassDeclaration.js

@@ -12,6 +12,7 @@ var C = (function () {
     C.prototype.method = function () { };
     return C;
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 
 

tests/baselines/reference/es5ExportDefaultClassDeclaration2.js

@@ -12,6 +12,7 @@ var default_1 = (function () {
     default_1.prototype.method = function () { };
     return default_1;
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 
 

tests/baselines/reference/es5ExportDefaultClassDeclaration3.js

@@ -24,6 +24,7 @@ var C = (function () {
     };
     return C;
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 var after = new C();
 var t = C;

tests/baselines/reference/es5ExportDefaultExpression.js

@@ -4,6 +4,7 @@ export default (1 + 2);
 
 
 //// [es5ExportDefaultExpression.js]
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = (1 + 2);
 
 

tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js

@@ -5,6 +5,7 @@ export default function f() { }
 
 //// [es5ExportDefaultFunctionDeclaration.js]
 function f() { }
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
 
 

tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js

@@ -5,6 +5,7 @@ export default function () { }
 
 //// [es5ExportDefaultFunctionDeclaration2.js]
 function default_1() { }
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 
 

tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js

@@ -13,6 +13,7 @@ var before = func();
 function func() {
     return func;
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = func;
 var after = func();
 

tests/baselines/reference/es5ExportDefaultIdentifier.js

@@ -8,6 +8,7 @@ export default f;
 //// [es5ExportDefaultIdentifier.js]
 function f() { }
 exports.f = f;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f;
 
 

tests/baselines/reference/es6ImportDefaultBindingAmd.js

@@ -14,6 +14,7 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import
 //// [es6ImportDefaultBindingAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     var a = 10;
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
 });
 //// [es6ImportDefaultBindingAmd_1.js]

tests/baselines/reference/es6ImportDefaultBindingDts.js

@@ -17,6 +17,7 @@ var c = (function () {
     }
     return c;
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = c;
 //// [client.js]
 var server_1 = require("server");

tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js

@@ -22,6 +22,7 @@ var x: number = defaultBinding6;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js]
 var a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");

tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js

@@ -22,6 +22,7 @@ export var x1: number = defaultBinding6;
 
 //// [server.js]
 var a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [client.js]
 var server_1 = require("server");

tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js

@@ -25,6 +25,7 @@ var a = (function () {
     }
     return a;
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [client.js]
 var server_1 = require("server");

tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js

@@ -27,6 +27,7 @@ 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 = {};
 });
 //// [client.js]

tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js

@@ -11,6 +11,7 @@ var x: number = defaultBinding;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 var a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1;

tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js

@@ -12,6 +12,7 @@ export var x: number = defaultBinding;
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     var a = 10;
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
 });
 //// [client.js]

tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js

@@ -16,6 +16,7 @@ define(["require", "exports"], function (require, exports) {
         }
         return a;
     })();
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
 });
 //// [client.js]

tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js

@@ -18,6 +18,7 @@ import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // SHould be
 
 //// [es6ImportDefaultBindingMergeErrors_0.js]
 var a = 10;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [es6ImportDefaultBindingMergeErrors_1.js]
 var es6ImportDefaultBindingMergeErrors_0_1 = require("es6ImportDefaultBindingMergeErrors_0");

tests/baselines/reference/es6ImportDefaultBindingWithExport.js

@@ -13,6 +13,7 @@ export import defaultBinding2 from "server"; // non referenced
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     var a = 10;
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
 });
 //// [client.js]

tests/baselines/reference/exportAndImport-es3-amd.js

@@ -16,12 +16,14 @@ export default function f2() {
 define(["require", "exports"], function (require, exports) {
     function f1() {
     }
+    exports.__esModule = true;
     exports["default"] = f1;
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     function f2() {
         m1_1["default"]();
     }
+    exports.__esModule = true;
     exports["default"] = f2;
 });

tests/baselines/reference/exportAndImport-es3.js

@@ -15,10 +15,12 @@ export default function f2() {
 //// [m1.js]
 function f1() {
 }
+exports.__esModule = true;
 exports["default"] = f1;
 //// [m2.js]
 var m1_1 = require("./m1");
 function f2() {
     m1_1["default"]();
 }
+exports.__esModule = true;
 exports["default"] = f2;

tests/baselines/reference/exportAndImport-es5-amd.js

@@ -16,12 +16,14 @@ export default function f2() {
 define(["require", "exports"], function (require, exports) {
     function f1() {
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = f1;
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     function f2() {
         m1_1.default();
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = f2;
 });

tests/baselines/reference/exportAndImport-es5.js

@@ -15,10 +15,12 @@ export default function f2() {
 //// [m1.js]
 function f1() {
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f1;
 //// [m2.js]
 var m1_1 = require("./m1");
 function f2() {
     m1_1.default();
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = f2;

tests/baselines/reference/exportStar-amd.js

@@ -36,6 +36,7 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [t2.js]
 define(["require", "exports"], function (require, exports) {
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = "hello";
     function foo() { }
     exports.foo = foo;

tests/baselines/reference/exportStar.js

@@ -33,6 +33,7 @@ foo;
 exports.x = 1;
 exports.y = 2;
 //// [t2.js]
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 function foo() { }
 exports.foo = foo;

tests/baselines/reference/exportsAndImports4-amd.js

@@ -41,6 +41,7 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = "hello";
 });
 //// [t3.js]

tests/baselines/reference/exportsAndImports4.js

@@ -40,6 +40,7 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 
 //// [t1.js]
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 //// [t3.js]
 var a = require("./t1");

tests/cases/compiler/es5-commonjs.ts

@@ -0,0 +1,17 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}

tests/cases/compiler/es5-commonjs2.ts

@@ -0,0 +1,6 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default 1;

tests/cases/compiler/es5-commonjs3.ts

@@ -0,0 +1,7 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default "test";
+export var __esModule = 1;

tests/cases/compiler/es5-commonjs4.ts

@@ -0,0 +1,18 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}
+export var __esModule = 1;

tests/cases/compiler/es5-commonjs5.ts

@@ -0,0 +1,8 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default function () {
+	return "test";
+}

tests/cases/compiler/es5-commonjs6.ts

@@ -0,0 +1,7 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: commonjs
+
+export default "test";
+var __esModule = 1;

tests/cases/compiler/es5-system.ts

@@ -0,0 +1,17 @@
+// @target: ES5
+// @sourcemap: false
+// @declaration: false
+// @module: system
+
+export default class A
+{
+    constructor ()
+    {
+
+    }
+
+    public B()
+    {
+        return 42;
+    }
+}