Merge pull request microsoft#3586 from vvakame/addEsModule

improve  module loading interoperability for babel

Author: JsonFreeman

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");
                             }
                         }
@@ -5538,6 +5560,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);