Remove extra properties on ImportExpression node

babel · Dec 10, 2019 · 2e77d76 · 2e77d76
1 parent 93a3451
commit 2e77d76
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 64 deletions.
diff --git a/packages/babel-parser/src/plugins/estree.js b/packages/babel-parser/src/plugins/estree.js
@@ -421,8 +421,18 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       if (node.callee.type === "Import") {
         ((node: N.Node): N.EstreeImportExpression).type = "ImportExpression";
         ((node: N.Node): N.EstreeImportExpression).source = node.arguments[0];
+        delete node.arguments;
+        delete node.callee;
       }
 
       return node;
     }
+
+    // ImportExpressions do not have an arguments array.
+    toReferencedListDeep(
+      exprList: $ReadOnlyArray<?N.Expression> = [],
+      isParenthesizedExpr?: boolean,
+    ): $ReadOnlyArray<?N.Expression> {
+      return super.toReferencedListDeep(exprList, isParenthesizedExpr);
+    }
   };
diff --git a/packages/babel-parser/src/types.js b/packages/babel-parser/src/types.js
@@ -1041,8 +1041,6 @@ export type EstreeMethodDefinition = NodeBase & {
 
 export type EstreeImportExpression = NodeBase & {
   type: "ImportExpression",
-  callee: Import,
-  arguments: Array<Expression>,
   source: Expression,
 };
 

diff --git a/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-1/options.json b/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-1/options.json
@@ -1,5 +1,3 @@
 {
-  "plugins": [
-    "estree"
-  ]
-}
+  "plugins": ["estree"]
+}
diff --git a/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-2/options.json b/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-2/options.json
@@ -1,5 +1,3 @@
 {
-  "plugins": [
-    "estree"
-  ]
-}
+  "plugins": ["estree"]
+}
diff --git a/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-3/options.json b/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-3/options.json
@@ -1,5 +1,3 @@
 {
-  "plugins": [
-    "estree"
-  ]
-}
+  "plugins": ["estree"]
+}
diff --git a/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-4/options.json b/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-4/options.json
@@ -1,5 +1,3 @@
 {
-  "plugins": [
-    "estree"
-  ]
-}
+  "plugins": ["estree"]
+}
diff --git a/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-5/options.json b/...ges/babel-parser/test/fixtures/core/categorized/invalid-assignment-pattern-5/options.json
@@ -1,5 +1,3 @@
 {
-  "plugins": [
-    "estree"
-  ]
-}
+  "plugins": ["estree"]
+}
diff --git a/packages/babel-parser/test/fixtures/estree/bigInt/options.json b/packages/babel-parser/test/fixtures/estree/bigInt/options.json
@@ -1,6 +1,3 @@
 {
-  "plugins": [
-    "estree",
-    "bigInt"
-  ]
+  "plugins": ["estree", "bigInt"]
 }
diff --git a/packages/babel-parser/test/fixtures/estree/dynamic-import/basic/output.json b/packages/babel-parser/test/fixtures/estree/dynamic-import/basic/output.json
@@ -89,40 +89,6 @@
                   "column": 21
                 }
               },
-              "callee": {
-                "type": "Import",
-                "start": 10,
-                "end": 16,
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 10
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 16
-                  }
-                }
-              },
-              "arguments": [
-                {
-                  "type": "Literal",
-                  "start": 17,
-                  "end": 20,
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 17
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 20
-                    }
-                  },
-                  "value": "a",
-                  "raw": "\"a\""
-                }
-              ],
               "source": {
                 "type": "Literal",
                 "start": 17,

diff --git a/packages/babel-parser/test/fixtures/estree/dynamic-import/options.json b/packages/babel-parser/test/fixtures/estree/dynamic-import/options.json
@@ -1,6 +1,3 @@
 {
-  "plugins": [
-    "estree",
-    "dynamicImport"
-  ]
+  "plugins": ["estree", "dynamicImport"]
 }