[Fix] Evaluate import() argument synchronously

nicolo-ribaudo · ljharb · commit ac70d3a2b92c · 2020-04-19T14:58:38.000+02:00
Fixes #84
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## Unreleased
+- [Fix] Evaluate `import()` argument synchronously (#85)
 - [Dev Deps] update `eslint`, `eslint-config-airbnb-base`, `in-publish`, `rimraf`, `safe-publish-latest`, `tape`
 
 ## v2.3.0
diff --git a/src/utils.js b/src/utils.js
@@ -15,19 +15,16 @@ export function getImportSource(t, callNode) {
 }
 
 export function createDynamicImportTransform({ template, types: t }) {
-  const buildImport = template('Promise.resolve().then(() => MODULE)');
+  const buildImport = template('Promise.resolve(SOURCE).then(_ => INTEROP(require(_)))');
+  const buildImportNoInterop = template('Promise.resolve(SOURCE).then(_ => require(_))');
 
   return (context, path) => {
-    const requireCall = t.callExpression(
-      t.identifier('require'),
-      [getImportSource(t, path.parent)],
-    );
+    const SOURCE = getImportSource(t, path.parent);
+
+    const newImport = context.opts.noInterop
+      ? buildImportNoInterop({ SOURCE })
+      : buildImport({ SOURCE, INTEROP: context.addHelper('interopRequireWildcard') });
 
-    const { noInterop = false } = context.opts;
-    const MODULE = noInterop === true ? requireCall : t.callExpression(context.addHelper('interopRequireWildcard'), [requireCall]);
-    const newImport = buildImport({
-      MODULE,
-    });
     path.parentPath.replaceWith(newImport);
   };
 }
diff --git a/test/fixtures/basic-import/expected.es2015.js b/test/fixtures/basic-import/expected.es2015.js
@@ -2,6 +2,6 @@
 
 function _interopRequireWildcard(obj) {}
 
-var testModule = Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('test-module'));
+var testModule = Promise.resolve('test-module').then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
diff --git a/test/fixtures/basic-import/expected.js b/test/fixtures/basic-import/expected.js
@@ -1,3 +1,3 @@
 function _interopRequireWildcard(obj) {}
 
-const testModule = Promise.resolve().then(() => _interopRequireWildcard(require('test-module')));
+const testModule = Promise.resolve('test-module').then(_ => _interopRequireWildcard(require(_)));
diff --git a/test/fixtures/basic-import/expected.noInterop.js b/test/fixtures/basic-import/expected.noInterop.js
@@ -1 +1 @@
-const testModule = Promise.resolve().then(() => require('test-module'));
+const testModule = Promise.resolve('test-module').then(_ => require(_));
diff --git a/test/fixtures/chained-import/expected.es2015.js b/test/fixtures/chained-import/expected.es2015.js
@@ -2,18 +2,18 @@
 
 function _interopRequireWildcard(obj) {}
 
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('test-module'));
+Promise.resolve('test-module').then(function (_) {
+  return _interopRequireWildcard(require(_));
 }).then(function () {
-  return Promise.resolve().then(function () {
-    return _interopRequireWildcard(require('test-module-2'));
+  return Promise.resolve('test-module-2').then(function (_) {
+    return _interopRequireWildcard(require(_));
   });
 });
 
-Promise.all([Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('test-1'));
-}), Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('test-2'));
-}), Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('test-3'));
+Promise.all([Promise.resolve('test-1').then(function (_) {
+  return _interopRequireWildcard(require(_));
+}), Promise.resolve('test-2').then(function (_) {
+  return _interopRequireWildcard(require(_));
+}), Promise.resolve('test-3').then(function (_) {
+  return _interopRequireWildcard(require(_));
 })]).then(function () {});
diff --git a/test/fixtures/chained-import/expected.js b/test/fixtures/chained-import/expected.js
@@ -1,5 +1,5 @@
 function _interopRequireWildcard(obj) {}
 
-Promise.resolve().then(() => _interopRequireWildcard(require('test-module'))).then(() => Promise.resolve().then(() => _interopRequireWildcard(require('test-module-2'))));
+Promise.resolve('test-module').then(_ => _interopRequireWildcard(require(_))).then(() => Promise.resolve('test-module-2').then(_ => _interopRequireWildcard(require(_))));
 
-Promise.all([Promise.resolve().then(() => _interopRequireWildcard(require('test-1'))), Promise.resolve().then(() => _interopRequireWildcard(require('test-2'))), Promise.resolve().then(() => _interopRequireWildcard(require('test-3')))]).then(() => {});
+Promise.all([Promise.resolve('test-1').then(_ => _interopRequireWildcard(require(_))), Promise.resolve('test-2').then(_ => _interopRequireWildcard(require(_))), Promise.resolve('test-3').then(_ => _interopRequireWildcard(require(_)))]).then(() => {});
diff --git a/test/fixtures/chained-import/expected.noInterop.js b/test/fixtures/chained-import/expected.noInterop.js
@@ -1,3 +1,3 @@
-Promise.resolve().then(() => require('test-module')).then(() => Promise.resolve().then(() => require('test-module-2')));
+Promise.resolve('test-module').then(_ => require(_)).then(() => Promise.resolve('test-module-2').then(_ => require(_)));
 
-Promise.all([Promise.resolve().then(() => require('test-1')), Promise.resolve().then(() => require('test-2')), Promise.resolve().then(() => require('test-3'))]).then(() => {});
+Promise.all([Promise.resolve('test-1').then(_ => require(_)), Promise.resolve('test-2').then(_ => require(_)), Promise.resolve('test-3').then(_ => require(_))]).then(() => {});
diff --git a/test/fixtures/dynamic-argument/expected.es2015.js b/test/fixtures/dynamic-argument/expected.es2015.js
@@ -4,9 +4,9 @@ function _interopRequireWildcard(obj) {}
 
 var MODULE = Object('test-module');
 
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('' + String(MODULE)));
+Promise.resolve('' + String(MODULE)).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('test-' + String(MODULE)));
+Promise.resolve('test-' + String(MODULE)).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
diff --git a/test/fixtures/dynamic-argument/expected.js b/test/fixtures/dynamic-argument/expected.js
@@ -2,5 +2,5 @@ function _interopRequireWildcard(obj) {}
 
 const MODULE = Object('test-module');
 
-Promise.resolve().then(() => _interopRequireWildcard(require(`${MODULE}`)));
-Promise.resolve().then(() => _interopRequireWildcard(require(`test-${MODULE}`)));
+Promise.resolve(`${MODULE}`).then(_ => _interopRequireWildcard(require(_)));
+Promise.resolve(`test-${MODULE}`).then(_ => _interopRequireWildcard(require(_)));
diff --git a/test/fixtures/dynamic-argument/expected.noInterop.js b/test/fixtures/dynamic-argument/expected.noInterop.js
@@ -1,4 +1,4 @@
 const MODULE = Object('test-module');
 
-Promise.resolve().then(() => require(`${MODULE}`));
-Promise.resolve().then(() => require(`test-${MODULE}`));
+Promise.resolve(`${MODULE}`).then(_ => require(_));
+Promise.resolve(`test-${MODULE}`).then(_ => require(_));
diff --git a/test/fixtures/import-with-comment/expected.es2015.js b/test/fixtures/import-with-comment/expected.es2015.js
@@ -2,9 +2,9 @@
 
 function _interopRequireWildcard(obj) {}
 
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('my-module'));
+Promise.resolve('my-module').then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('my-module'));
+Promise.resolve('my-module').then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
diff --git a/test/fixtures/import-with-comment/expected.js b/test/fixtures/import-with-comment/expected.js
@@ -1,4 +1,4 @@
 function _interopRequireWildcard(obj) {}
 
-Promise.resolve().then(() => _interopRequireWildcard(require('my-module')));
-Promise.resolve().then(() => _interopRequireWildcard(require('my-module')));
+Promise.resolve('my-module').then(_ => _interopRequireWildcard(require(_)));
+Promise.resolve('my-module').then(_ => _interopRequireWildcard(require(_)));
diff --git a/test/fixtures/import-with-comment/expected.noInterop.js b/test/fixtures/import-with-comment/expected.noInterop.js
@@ -1,2 +1,2 @@
-Promise.resolve().then(() => require('my-module'));
-Promise.resolve().then(() => require('my-module'));
+Promise.resolve('my-module').then(_ => require(_));
+Promise.resolve('my-module').then(_ => require(_));
diff --git a/test/fixtures/nested-import/expected.es2015.js b/test/fixtures/nested-import/expected.es2015.js
@@ -3,8 +3,8 @@
 function _interopRequireWildcard(obj) {}
 
 function getModule(path) {
-  return Promise.resolve().then(function () {
-    return _interopRequireWildcard(require('test-module'));
+  return Promise.resolve('test-module').then(function (_) {
+    return _interopRequireWildcard(require(_));
   });
 }
 
diff --git a/test/fixtures/nested-import/expected.js b/test/fixtures/nested-import/expected.js
@@ -1,7 +1,7 @@
 function _interopRequireWildcard(obj) {}
 
 function getModule(path) {
-  return Promise.resolve().then(() => _interopRequireWildcard(require('test-module')));
+  return Promise.resolve('test-module').then(_ => _interopRequireWildcard(require(_)));
 }
 
 getModule().then(() => {});
diff --git a/test/fixtures/nested-import/expected.noInterop.js b/test/fixtures/nested-import/expected.noInterop.js
@@ -1,5 +1,5 @@
 function getModule(path) {
-  return Promise.resolve().then(() => require('test-module'));
+  return Promise.resolve('test-module').then(_ => require(_));
 }
 
 getModule().then(() => {});
diff --git a/test/fixtures/non-string-argument/expected.es2015.js b/test/fixtures/non-string-argument/expected.es2015.js
@@ -2,27 +2,27 @@
 
 function _interopRequireWildcard(obj) {}
 
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('' + String({ 'answer': 42 })));
+Promise.resolve('' + String({ 'answer': 42 })).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('' + String(['foo', 'bar'])));
+Promise.resolve('' + String(['foo', 'bar'])).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('' + 42));
+Promise.resolve('' + 42).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('' + String(void 0)));
+Promise.resolve('' + String(void 0)).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('' + String(undefined)));
+Promise.resolve('' + String(undefined)).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('' + String(null)));
+Promise.resolve('' + String(null)).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('' + String(true)));
+Promise.resolve('' + String(true)).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
-Promise.resolve().then(function () {
-  return _interopRequireWildcard(require('' + String(Symbol())));
+Promise.resolve('' + String(Symbol())).then(function (_) {
+  return _interopRequireWildcard(require(_));
 });
diff --git a/test/fixtures/non-string-argument/expected.js b/test/fixtures/non-string-argument/expected.js
@@ -1,10 +1,10 @@
 function _interopRequireWildcard(obj) {}
 
-Promise.resolve().then(() => _interopRequireWildcard(require(`${{ 'answer': 42 }}`)));
-Promise.resolve().then(() => _interopRequireWildcard(require(`${['foo', 'bar']}`)));
-Promise.resolve().then(() => _interopRequireWildcard(require(`${42}`)));
-Promise.resolve().then(() => _interopRequireWildcard(require(`${void 0}`)));
-Promise.resolve().then(() => _interopRequireWildcard(require(`${undefined}`)));
-Promise.resolve().then(() => _interopRequireWildcard(require(`${null}`)));
-Promise.resolve().then(() => _interopRequireWildcard(require(`${true}`)));
-Promise.resolve().then(() => _interopRequireWildcard(require(`${Symbol()}`)));
+Promise.resolve(`${{ 'answer': 42 }}`).then(_ => _interopRequireWildcard(require(_)));
+Promise.resolve(`${['foo', 'bar']}`).then(_ => _interopRequireWildcard(require(_)));
+Promise.resolve(`${42}`).then(_ => _interopRequireWildcard(require(_)));
+Promise.resolve(`${void 0}`).then(_ => _interopRequireWildcard(require(_)));
+Promise.resolve(`${undefined}`).then(_ => _interopRequireWildcard(require(_)));
+Promise.resolve(`${null}`).then(_ => _interopRequireWildcard(require(_)));
+Promise.resolve(`${true}`).then(_ => _interopRequireWildcard(require(_)));
+Promise.resolve(`${Symbol()}`).then(_ => _interopRequireWildcard(require(_)));
diff --git a/test/fixtures/non-string-argument/expected.noInterop.js b/test/fixtures/non-string-argument/expected.noInterop.js
@@ -1,8 +1,8 @@
-Promise.resolve().then(() => require(`${{ 'answer': 42 }}`));
-Promise.resolve().then(() => require(`${['foo', 'bar']}`));
-Promise.resolve().then(() => require(`${42}`));
-Promise.resolve().then(() => require(`${void 0}`));
-Promise.resolve().then(() => require(`${undefined}`));
-Promise.resolve().then(() => require(`${null}`));
-Promise.resolve().then(() => require(`${true}`));
-Promise.resolve().then(() => require(`${Symbol()}`));
+Promise.resolve(`${{ 'answer': 42 }}`).then(_ => require(_));
+Promise.resolve(`${['foo', 'bar']}`).then(_ => require(_));
+Promise.resolve(`${42}`).then(_ => require(_));
+Promise.resolve(`${void 0}`).then(_ => require(_));
+Promise.resolve(`${undefined}`).then(_ => require(_));
+Promise.resolve(`${null}`).then(_ => require(_));
+Promise.resolve(`${true}`).then(_ => require(_));
+Promise.resolve(`${Symbol()}`).then(_ => require(_));

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`## Unreleased`
	`2`	+- [Fix] Evaluate `import()` argument synchronously (#85)
`2`	`3`	- [Dev Deps] update `eslint`, `eslint-config-airbnb-base`, `in-publish`, `rimraf`, `safe-publish-latest`, `tape`
`3`	`4`
`4`	`5`	`## v2.3.0`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`function _interopRequireWildcard(obj) {}`
`2`	`2`
`3`		`-const testModule = Promise.resolve().then(() => _interopRequireWildcard(require('test-module')));`
	`3`	`+const testModule = Promise.resolve('test-module').then(_ => _interopRequireWildcard(require(_)));`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-const testModule = Promise.resolve().then(() => require('test-module'));`
	`1`	`+const testModule = Promise.resolve('test-module').then(_ => require(_));`