Merge pull request microsoft#7251 from Microsoft/exportEquals

vladima · vladima · commit 647280bc7419 · 2016-02-25T23:54:26.000-08:00
emit temp declarations after export equals
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -7402,8 +7402,8 @@ const _super = (function (geti, seti) {
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ true);
+                emitTempDeclarations(/*newLine*/ true);
                 decreaseIndent();
                 writeLine();
                 write("});");
@@ -7416,8 +7416,8 @@ const _super = (function (geti, seti) {
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ false);
+                emitTempDeclarations(/*newLine*/ true);
             }
 
             function emitUMDModule(node: SourceFile) {
@@ -7443,8 +7443,8 @@ const _super = (function (geti, seti) {
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ true);
+                emitTempDeclarations(/*newLine*/ true);
                 decreaseIndent();
                 writeLine();
                 write("});");
diff --git a/tests/baselines/reference/exportEqualsAmd.js b/tests/baselines/reference/exportEqualsAmd.js
@@ -0,0 +1,9 @@
+//// [exportEqualsAmd.ts]
+export = { ["hi"]: "there" };
+
+//// [exportEqualsAmd.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    return (_a = {}, _a["hi"] = "there", _a);
+    var _a;
+});
diff --git a/tests/baselines/reference/exportEqualsAmd.symbols b/tests/baselines/reference/exportEqualsAmd.symbols
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/exportEqualsAmd.ts ===
+export = { ["hi"]: "there" };
+No type information for this code.
diff --git a/tests/baselines/reference/exportEqualsAmd.types b/tests/baselines/reference/exportEqualsAmd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/exportEqualsAmd.ts ===
+export = { ["hi"]: "there" };
+>{ ["hi"]: "there" } : { ["hi"]: string; }
+>"hi" : string
+>"there" : string
+
diff --git a/tests/baselines/reference/exportEqualsCommonJs.js b/tests/baselines/reference/exportEqualsCommonJs.js
@@ -0,0 +1,7 @@
+//// [exportEqualsCommonJs.ts]
+export = { ["hi"]: "there" };
+
+//// [exportEqualsCommonJs.js]
+"use strict";
+module.exports = (_a = {}, _a["hi"] = "there", _a);
+var _a;
diff --git a/tests/baselines/reference/exportEqualsCommonJs.symbols b/tests/baselines/reference/exportEqualsCommonJs.symbols
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/exportEqualsCommonJs.ts ===
+export = { ["hi"]: "there" };
+No type information for this code.
diff --git a/tests/baselines/reference/exportEqualsCommonJs.types b/tests/baselines/reference/exportEqualsCommonJs.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/exportEqualsCommonJs.ts ===
+export = { ["hi"]: "there" };
+>{ ["hi"]: "there" } : { ["hi"]: string; }
+>"hi" : string
+>"there" : string
+
diff --git a/tests/baselines/reference/exportEqualsUmd.js b/tests/baselines/reference/exportEqualsUmd.js
@@ -0,0 +1,16 @@
+//// [exportEqualsUmd.ts]
+export = { ["hi"]: "there" };
+
+//// [exportEqualsUmd.js]
+(function (factory) {
+    if (typeof module === 'object' && typeof module.exports === 'object') {
+        var v = factory(require, exports); if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === 'function' && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    return (_a = {}, _a["hi"] = "there", _a);
+    var _a;
+});
diff --git a/tests/baselines/reference/exportEqualsUmd.symbols b/tests/baselines/reference/exportEqualsUmd.symbols
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/exportEqualsUmd.ts ===
+export = { ["hi"]: "there" };
+No type information for this code.
diff --git a/tests/baselines/reference/exportEqualsUmd.types b/tests/baselines/reference/exportEqualsUmd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/exportEqualsUmd.ts ===
+export = { ["hi"]: "there" };
+>{ ["hi"]: "there" } : { ["hi"]: string; }
+>"hi" : string
+>"there" : string
+
diff --git a/tests/cases/compiler/exportEqualsAmd.ts b/tests/cases/compiler/exportEqualsAmd.ts
@@ -0,0 +1,2 @@
+// @module: amd
+export = { ["hi"]: "there" };
diff --git a/tests/cases/compiler/exportEqualsCommonJs.ts b/tests/cases/compiler/exportEqualsCommonJs.ts
@@ -0,0 +1,2 @@
+// @module: commonjs
+export = { ["hi"]: "there" };
diff --git a/tests/cases/compiler/exportEqualsUmd.ts b/tests/cases/compiler/exportEqualsUmd.ts
@@ -0,0 +1,2 @@
+// @module: umd
+export = { ["hi"]: "there" };

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+=== tests/cases/compiler/exportEqualsAmd.ts ===`
	`2`	`+export = { ["hi"]: "there" };`
	`3`	`+No type information for this code.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+=== tests/cases/compiler/exportEqualsCommonJs.ts ===`
	`2`	`+export = { ["hi"]: "there" };`
	`3`	`+No type information for this code.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+=== tests/cases/compiler/exportEqualsUmd.ts ===`
	`2`	`+export = { ["hi"]: "there" };`
	`3`	`+No type information for this code.`