Merge pull request microsoft#7813 from Microsoft/exportDefaultAssignmentExpression

sheetalkamat · sheetalkamat · commit 8b203ec237b7 · 2016-04-04T13:59:13.000-07:00
Fix declaration file for default temp var name in declaration file during bundling
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -530,7 +530,10 @@ namespace ts {
             else {
                 // Expression
                 const tempVarName = getExportDefaultTempVariableName();
-                write("declare var ");
+                if (!noDeclare) {
+                    write("declare ");
+                }
+                write("var ");
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.js b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.js
@@ -0,0 +1,19 @@
+//// [pi.ts]
+export default 3.14159;
+
+//// [pi.js]
+System.register([], function(exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters:[],
+        execute: function() {
+            exports_1("default",3.14159);
+        }
+    }
+});
+
+
+//// [pi.d.ts]
+declare var _default: number;
+export default _default;
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.symbols b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.symbols
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/pi.ts ===
+export default 3.14159;
+No type information for this code.
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.types b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.types
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/pi.ts ===
+export default 3.14159;
+No type information for this code.
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js
@@ -0,0 +1,22 @@
+//// [pi.ts]
+
+export default 3.14159;
+
+//// [app.js]
+System.register("pi", [], function(exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters:[],
+        execute: function() {
+            exports_1("default",3.14159);
+        }
+    }
+});
+
+
+//// [app.d.ts]
+declare module "pi" {
+    var _default: number;
+    export default _default;
+}
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.symbols b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/pi.ts ===
+
+No type information for this code.export default 3.14159;
+No type information for this code.
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.types b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.types
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/pi.ts ===
+
+No type information for this code.export default 3.14159;
+No type information for this code.
diff --git a/tests/cases/compiler/declarationEmitDefaultExportWithTempVarName.ts b/tests/cases/compiler/declarationEmitDefaultExportWithTempVarName.ts
@@ -0,0 +1,4 @@
+// @declaration: true
+// @module: system
+// @Filename: pi.ts
+export default 3.14159;
diff --git a/tests/cases/compiler/declarationEmitDefaultExportWithTempVarNameWithBundling.ts b/tests/cases/compiler/declarationEmitDefaultExportWithTempVarNameWithBundling.ts
@@ -0,0 +1,6 @@
+// @declaration: true
+// @module: system
+// @outFile: app.js
+
+// @Filename: pi.ts
+export default 3.14159;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+=== tests/cases/compiler/pi.ts ===`
	`2`	`+export default 3.14159;`
	`3`	`+No type information for this code.`