feature(estree-to-babel) add support of ImportExpression

coderaiser · Jul 16, 2021 · 8cd0249 · 8cd0249
1 parent 35d69fa
commit 8cd0249
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@ The thing is `@babel/parser` has a [little differences](https://babeljs.io/docs/
 - `ClassPrivateMethod`;
 - `ClassPrivateName` stores name as `Identifier` in `id` field;
 - `ClassPrivateProperty` instead of `FieldDefinition`;
+- `CallExpression` instead of `ImportExpression`;
 - etc...
 
 `estree-to-babel` aims to smooth this differences.

diff --git a/lib/convert-import-to-call.js b/lib/convert-import-to-call.js
@@ -0,0 +1,21 @@
+'use strict';
+
+const {
+    CallExpression,
+    Identifier,
+} = require('@babel/types');
+
+const setLiteral = require('./set-literal');
+
+module.exports = (path) => {
+    const {source} = path.node;
+
+    setLiteral(source);
+
+    const callNode = CallExpression(Identifier('import'), [
+        source,
+    ]);
+
+    path.replaceWith(callNode);
+};
+
diff --git a/lib/estree-to-babel.js b/lib/estree-to-babel.js
@@ -7,6 +7,7 @@ const traverseObjectExpression = require('./traverse-object-expression');
 const setClassMethod = require('./set-class-method');
 const setClassPrivateProperty = require('./set-class-private-property');
 const setClassPrivateName = require('./set-class-private-name');
+const convertImportToCall = require('./convert-import-to-call');
 
 const {convertNodeComments} = require('./comments');
 
@@ -22,11 +23,10 @@ module.exports = (node) => {
             const {node} = path;
             const {type} = node;
 
-            if (type === 'Literal')
+            if (/Literal$/.test(type)) {
                 setLiteral(node);
-
-            if (/Literal$/.test(type))
                 return setEsprimaRaw(node);
+            }
 
             if (type === 'Property')
                 return setObjectProperty(node);
@@ -39,6 +39,9 @@ module.exports = (node) => {
 
             if (type === 'PrivateName')
                 return setClassPrivateName(path);
+
+            if (type === 'ImportExpression')
+                return convertImportToCall(path);
         },
         exit(path) {
             const {node} = path;

diff --git a/test/estree-to-babel.js b/test/estree-to-babel.js
@@ -78,6 +78,7 @@ const fixture = {
         classPrivateProperty: readJSON('class-private-property.json'),
         strictMode: readJSON('strict-mode.json'),
         classMethodBabel: readJSON('class-method-babel.json'),
+        importExpression: readJSON('import-expression.json'),
     },
     js: {
         property: readJS('property.js'),
@@ -93,6 +94,7 @@ const fixture = {
         classMethod: readJS('class-method.js'),
         classPrivateMethod: readJS('class-private-method.js'),
         classPrivateProperty: readJS('class-private-property.js'),
+        importExpression: readJS('import-expression.js'),
     },
 };
 
@@ -256,3 +258,13 @@ test('estree-to-babel: acorn.parse: private property', (t) => {
     t.end();
 });
 
+test('estree-to-babel: espree.parse: ImportExpression', (t) => {
+    const ast = acornParse(fixture.js.importExpression);
+    const result = estreeToBabel(ast);
+
+    update('import-expression', result);
+
+    t.jsonEqual(result, fixture.ast.importExpression, 'should equal');
+    t.end();
+});
+
diff --git a/test/fixture/import-expression.js b/test/fixture/import-expression.js
@@ -0,0 +1 @@
+import('x');
diff --git a/test/fixture/import-expression.json b/test/fixture/import-expression.json
@@ -0,0 +1,70 @@
+{
+    "type": "File",
+    "program": {
+        "type": "Program",
+        "start": 0,
+        "end": 13,
+        "loc": {
+            "start": {
+                "line": 1,
+                "column": 0
+            },
+            "end": {
+                "line": 2,
+                "column": 0
+            }
+        },
+        "body": [
+            {
+                "type": "ExpressionStatement",
+                "start": 0,
+                "end": 12,
+                "loc": {
+                    "start": {
+                        "line": 1,
+                        "column": 0
+                    },
+                    "end": {
+                        "line": 1,
+                        "column": 12
+                    }
+                },
+                "expression": {
+                    "type": "CallExpression",
+                    "callee": {
+                        "type": "Identifier",
+                        "name": "import"
+                    },
+                    "arguments": [
+                        {
+                            "type": "StringLiteral",
+                            "start": 7,
+                            "end": 10,
+                            "loc": {
+                                "start": {
+                                    "line": 1,
+                                    "column": 7
+                                },
+                                "end": {
+                                    "line": 1,
+                                    "column": 10
+                                }
+                            },
+                            "value": "x",
+                            "raw": "'x'",
+                            "extra": {
+                                "raw": "'x'"
+                            }
+                        }
+                    ],
+                    "trailingComments": [],
+                    "leadingComments": [],
+                    "innerComments": []
+                }
+            }
+        ],
+        "sourceType": "module",
+        "directives": []
+    },
+    "comments": []
+}