From 7a4c3314e816bc7a7589d1e6e52328c38f1fc693 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wwigham@gmail.com>
Date: Thu, 5 Oct 2017 16:47:24 -0700
Subject: [PATCH] Visit default export expressions (#18977)

---
 src/compiler/transformers/module/module.ts        |  4 ++--
 ...amicImportInDefaultExportExpression.errors.txt | 11 +++++++++++
 .../dynamicImportInDefaultExportExpression.js     | 15 +++++++++++++++
 ...dynamicImportInDefaultExportExpression.symbols |  8 ++++++++
 .../dynamicImportInDefaultExportExpression.types  | 13 +++++++++++++
 .../dynamicImportInDefaultExportExpression.ts     |  7 +++++++
 6 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/dynamicImportInDefaultExportExpression.errors.txt
 create mode 100644 tests/baselines/reference/dynamicImportInDefaultExportExpression.js
 create mode 100644 tests/baselines/reference/dynamicImportInDefaultExportExpression.symbols
 create mode 100644 tests/baselines/reference/dynamicImportInDefaultExportExpression.types
 create mode 100644 tests/cases/compiler/dynamicImportInDefaultExportExpression.ts

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 145ac07c2f2..ecbef685649 100644
--- 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
new file mode 100644
index 00000000000..8bf6704b743
--- /dev/null
+++ 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'.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/dynamicImportInDefaultExportExpression.js b/tests/baselines/reference/dynamicImportInDefaultExportExpression.js
new file mode 100644
index 00000000000..75e5e0d57a2
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..d16b5f0a374
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..c75894a17ff
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..0e6ad95886b
--- /dev/null
+++ b/tests/cases/compiler/dynamicImportInDefaultExportExpression.ts
@@ -0,0 +1,7 @@
+// @skipLibCheck: true
+// @lib: es6
+export default {
+    getInstance: function () {
+        return import('./foo2');
+    }
+}
\ No newline at end of file