Visit default export expressions (microsoft#18977)

weswigham · web-flow · commit 7a4c3314e816 · 2017-10-05T16:47:24.000-07:00
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -861,10 +861,10 @@ namespace ts {
             if (original && hasAssociatedEndOfDeclarationMarker(original)) {
                 // Defer exports until we encounter an EndOfDeclarationMarker node
                 const id = getOriginalNodeId(node);
-                deferredExports[id] = appendExportStatement(deferredExports[id], createIdentifier("default"), node.expression, /*location*/ node, /*allowComments*/ true);
+                deferredExports[id] = appendExportStatement(deferredExports[id], createIdentifier("default"), visitNode(node.expression, importCallExpressionVisitor), /*location*/ node, /*allowComments*/ true);
             }
             else {
-                statements = appendExportStatement(statements, createIdentifier("default"), node.expression, /*location*/ node, /*allowComments*/ true);
+                statements = appendExportStatement(statements, createIdentifier("default"), visitNode(node.expression, importCallExpressionVisitor), /*location*/ node, /*allowComments*/ true);
             }
 
             return singleOrMany(statements);
diff --git a/tests/baselines/reference/dynamicImportInDefaultExportExpression.errors.txt b/tests/baselines/reference/dynamicImportInDefaultExportExpression.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/compiler/dynamicImportInDefaultExportExpression.ts(3,23): error TS2307: Cannot find module './foo2'.
+
+
+==== tests/cases/compiler/dynamicImportInDefaultExportExpression.ts (1 errors) ====
+    export default {
+        getInstance: function () {
+            return import('./foo2');
+                          ~~~~~~~~
+!!! error TS2307: Cannot find module './foo2'.
+        }
+    }
diff --git a/tests/baselines/reference/dynamicImportInDefaultExportExpression.js b/tests/baselines/reference/dynamicImportInDefaultExportExpression.js
@@ -0,0 +1,15 @@
+//// [dynamicImportInDefaultExportExpression.ts]
+export default {
+    getInstance: function () {
+        return import('./foo2');
+    }
+}
+
+//// [dynamicImportInDefaultExportExpression.js]
+"use strict";
+exports.__esModule = true;
+exports["default"] = {
+    getInstance: function () {
+        return Promise.resolve().then(function () { return require('./foo2'); });
+    }
+};
diff --git a/tests/baselines/reference/dynamicImportInDefaultExportExpression.symbols b/tests/baselines/reference/dynamicImportInDefaultExportExpression.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/dynamicImportInDefaultExportExpression.ts ===
+export default {
+    getInstance: function () {
+>getInstance : Symbol(getInstance, Decl(dynamicImportInDefaultExportExpression.ts, 0, 16))
+
+        return import('./foo2');
+    }
+}
diff --git a/tests/baselines/reference/dynamicImportInDefaultExportExpression.types b/tests/baselines/reference/dynamicImportInDefaultExportExpression.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/dynamicImportInDefaultExportExpression.ts ===
+export default {
+>{    getInstance: function () {        return import('./foo2');    }} : { getInstance: () => Promise<any>; }
+
+    getInstance: function () {
+>getInstance : () => Promise<any>
+>function () {        return import('./foo2');    } : () => Promise<any>
+
+        return import('./foo2');
+>import('./foo2') : Promise<any>
+>'./foo2' : "./foo2"
+    }
+}
diff --git a/tests/cases/compiler/dynamicImportInDefaultExportExpression.ts b/tests/cases/compiler/dynamicImportInDefaultExportExpression.ts
@@ -0,0 +1,7 @@
+// @skipLibCheck: true
+// @lib: es6
+export default {
+    getInstance: function () {
+        return import('./foo2');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -861,10 +861,10 @@ namespace ts {`
`861`	`861`	`if (original && hasAssociatedEndOfDeclarationMarker(original)) {`
`862`	`862`	`// Defer exports until we encounter an EndOfDeclarationMarker node`
`863`	`863`	`const id = getOriginalNodeId(node);`
`864`		`- deferredExports[id] = appendExportStatement(deferredExports[id], createIdentifier("default"), node.expression, /location/ node, /allowComments/ true);`
	`864`	`+ deferredExports[id] = appendExportStatement(deferredExports[id], createIdentifier("default"), visitNode(node.expression, importCallExpressionVisitor), /location/ node, /allowComments/ true);`
`865`	`865`	`}`
`866`	`866`	`else {`
`867`		`- statements = appendExportStatement(statements, createIdentifier("default"), node.expression, /location/ node, /allowComments/ true);`
	`867`	`+ statements = appendExportStatement(statements, createIdentifier("default"), visitNode(node.expression, importCallExpressionVisitor), /location/ node, /allowComments/ true);`
`868`	`868`	`}`
`869`	`869`
`870`	`870`	`return singleOrMany(statements);`