Fix microsoft#7173: Widen the type do the defualt export expression before writing it out.

mhegazy · mhegazy · commit baa040115e48 · 2016-03-03T15:42:47.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -16240,7 +16240,7 @@ namespace ts {
         }
 
         function writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
-            const type = getTypeOfExpression(expr);
+            const type = getWidenedType(getTypeOfExpression(expr));
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
 
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js
@@ -0,0 +1,26 @@
+//// [declarationEmit_inferedDefaultExportType.ts]
+
+// test.ts
+export default {
+  foo: [],
+  bar: undefined,
+  baz: null
+}
+
+//// [declarationEmit_inferedDefaultExportType.js]
+"use strict";
+exports.__esModule = true;
+exports["default"] = {
+    foo: [],
+    bar: undefined,
+    baz: null
+};
+
+
+//// [declarationEmit_inferedDefaultExportType.d.ts]
+declare var _default: {
+    foo: any[];
+    bar: any;
+    baz: any;
+};
+export default _default;
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.symbols b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts ===
+
+// test.ts
+export default {
+  foo: [],
+>foo : Symbol(foo, Decl(declarationEmit_inferedDefaultExportType.ts, 2, 16))
+
+  bar: undefined,
+>bar : Symbol(bar, Decl(declarationEmit_inferedDefaultExportType.ts, 3, 10))
+>undefined : Symbol(undefined)
+
+  baz: null
+>baz : Symbol(baz, Decl(declarationEmit_inferedDefaultExportType.ts, 4, 17))
+}
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.types b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts ===
+
+// test.ts
+export default {
+>{  foo: [],  bar: undefined,  baz: null} : { foo: undefined[]; bar: undefined; baz: null; }
+
+  foo: [],
+>foo : undefined[]
+>[] : undefined[]
+
+  bar: undefined,
+>bar : undefined
+>undefined : undefined
+
+  baz: null
+>baz : null
+>null : null
+}
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.js b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.js
@@ -0,0 +1,25 @@
+//// [declarationEmit_inferedDefaultExportType2.ts]
+
+// test.ts
+export = {
+  foo: [],
+  bar: undefined,
+  baz: null
+}
+
+//// [declarationEmit_inferedDefaultExportType2.js]
+"use strict";
+module.exports = {
+    foo: [],
+    bar: undefined,
+    baz: null
+};
+
+
+//// [declarationEmit_inferedDefaultExportType2.d.ts]
+declare var _default: {
+    foo: any[];
+    bar: any;
+    baz: any;
+};
+export = _default;
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.symbols b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts ===
+
+// test.ts
+export = {
+  foo: [],
+>foo : Symbol(foo, Decl(declarationEmit_inferedDefaultExportType2.ts, 2, 10))
+
+  bar: undefined,
+>bar : Symbol(bar, Decl(declarationEmit_inferedDefaultExportType2.ts, 3, 10))
+>undefined : Symbol(undefined)
+
+  baz: null
+>baz : Symbol(baz, Decl(declarationEmit_inferedDefaultExportType2.ts, 4, 17))
+}
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.types b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts ===
+
+// test.ts
+export = {
+>{  foo: [],  bar: undefined,  baz: null} : { foo: undefined[]; bar: undefined; baz: null; }
+
+  foo: [],
+>foo : undefined[]
+>[] : undefined[]
+
+  bar: undefined,
+>bar : undefined
+>undefined : undefined
+
+  baz: null
+>baz : null
+>null : null
+}
diff --git a/tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts b/tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts
@@ -0,0 +1,9 @@
+// @declaration: true
+// @module: commonjs
+
+// test.ts
+export default {
+  foo: [],
+  bar: undefined,
+  baz: null
+}
diff --git a/tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts b/tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts
@@ -0,0 +1,9 @@
+// @declaration: true
+// @module: commonjs
+
+// test.ts
+export = {
+  foo: [],
+  bar: undefined,
+  baz: null
+}

Original file line number	Diff line number	Diff line change
`@@ -16240,7 +16240,7 @@ namespace ts {`
`16240`	`16240`	`}`
`16241`	`16241`
`16242`	`16242`	`function writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {`
`16243`		`- const type = getTypeOfExpression(expr);`
	`16243`	`+ const type = getWidenedType(getTypeOfExpression(expr));`
`16244`	`16244`	`getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);`
`16245`	`16245`	`}`
`16246`	`16246`