Chore: align babel-eslint-parser & espree

babel · Feb 13, 2020 · 6b15391 · 6b15391
1 parent 3fc904e
commit 6b15391
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 59 deletions.
diff --git a/eslint/babel-eslint-parser/src/convert/convertAST.js b/eslint/babel-eslint-parser/src/convert/convertAST.js
@@ -1,14 +1,10 @@
 import { types as t, traverse } from "@babel/core";
 
 function convertNodes(ast, code) {
-  const state = { source: code };
   const astTransformVisitor = {
     noScope: true,
     enter(path) {
-      const node = path.node;
-
-      // private var to track original node type
-      node._babelType = node.type;
+      const { node } = path;
 
       if (node.innerComments) {
         delete node.innerComments;
@@ -23,7 +19,15 @@ function convertNodes(ast, code) {
       }
     },
     exit(path) {
-      const node = path.node;
+      const { node } = path;
+
+      if (Object.hasOwnProperty.call(node, "extra")) {
+        delete node.extra;
+      }
+
+      if (node.loc && Object.hasOwnProperty.call(node.loc, "identifierName")) {
+        delete node.loc.identifierName;
+      }
 
       if (path.isTypeParameter()) {
         node.type = "Identifier";
@@ -74,6 +78,7 @@ function convertNodes(ast, code) {
       }
     },
   };
+  const state = { source: code };
 
   // Monkey patch visitor keys in order to be able to traverse the estree nodes
   t.VISITOR_KEYS.Property = t.VISITOR_KEYS.ObjectProperty;
@@ -95,9 +100,9 @@ function convertNodes(ast, code) {
 function convertProgramNode(ast) {
   ast.type = "Program";
   ast.sourceType = ast.program.sourceType;
-  ast.directives = ast.program.directives;
   ast.body = ast.program.body;
   delete ast.program;
+  delete ast.errors;
 
   if (ast.comments.length) {
     const lastComment = ast.comments[ast.comments.length - 1];

diff --git a/eslint/babel-eslint-parser/test/helpers/assert-implements-ast.js b/eslint/babel-eslint-parser/test/helpers/assert-implements-ast.js
diff --git a/eslint/babel-eslint-parser/test/index.js b/eslint/babel-eslint-parser/test/index.js
@@ -3,17 +3,42 @@ import espree from "espree";
 import escope from "eslint-scope";
 import unpad from "dedent";
 import { parseForESLint } from "../src";
-import assertImplementsAST from "./helpers/assert-implements-ast";
 
-const babelOptions = {
+const BABEL_OPTIONS = {
   configFile: require.resolve(
     "@babel/eslint-shared-fixtures/config/babel.config.js",
   ),
 };
+const ALLOWED_PROPERTIES = [
+  "importKind",
+  "exportKind",
+  "variance",
+  "typeArguments",
+];
+
+function deeplyRemoveProperties(obj, props) {
+  for (const [k, v] of Object.entries(obj)) {
+    if (typeof v === "object") {
+      if (Array.isArray(v)) {
+        for (const el of v) {
+          if (el != null) {
+            deeplyRemoveProperties(el, props);
+          }
+        }
+      }
+
+      if (props.includes(k)) delete obj[k];
+      else v != null && deeplyRemoveProperties(v, props);
+      continue;
+    }
+
+    if (props.includes(k)) delete obj[k];
+  }
+}
 
 function parseAndAssertSame(code) {
   code = unpad(code);
-  const esAST = espree.parse(code, {
+  const espreeAST = espree.parse(code, {
     ecmaFeatures: {
       // enable JSX parsing
       jsx: true,
@@ -31,21 +56,22 @@ function parseAndAssertSame(code) {
     ecmaVersion: 2020,
     sourceType: "module",
   });
-  const babylonAST = parseForESLint(code, {
+  const babelAST = parseForESLint(code, {
     eslintVisitorKeys: true,
     eslintScopeManager: true,
-    babelOptions,
+    babelOptions: BABEL_OPTIONS,
   }).ast;
-  assertImplementsAST(esAST, babylonAST);
+  deeplyRemoveProperties(babelAST, ALLOWED_PROPERTIES);
+  expect(babelAST).toEqual(espreeAST);
 }
 
-describe("babylon-to-espree", () => {
+describe("Babel and Espree", () => {
   describe("compatibility", () => {
     it("should allow ast.analyze to be called without options", function() {
       const esAST = parseForESLint("`test`", {
         eslintScopeManager: true,
         eslintVisitorKeys: true,
-        babelOptions,
+        babelOptions: BABEL_OPTIONS,
       }).ast;
       expect(() => {
         escope.analyze(esAST);
@@ -244,7 +270,7 @@ describe("babylon-to-espree", () => {
     const babylonAST = parseForESLint(code, {
       eslintVisitorKeys: true,
       eslintScopeManager: true,
-      babelOptions,
+      babelOptions: BABEL_OPTIONS,
     }).ast;
     assert.strictEqual(babylonAST.tokens[1].type, "Punctuator");
   });
@@ -255,7 +281,7 @@ describe("babylon-to-espree", () => {
     const babylonAST = parseForESLint(code, {
       eslintVisitorKeys: true,
       eslintScopeManager: true,
-      babelOptions,
+      babelOptions: BABEL_OPTIONS,
     }).ast;
     assert.strictEqual(babylonAST.tokens[1].type, "Punctuator");
   });
@@ -266,7 +292,7 @@ describe("babylon-to-espree", () => {
     const babylonAST = parseForESLint(code, {
       eslintVisitorKeys: true,
       eslintScopeManager: true,
-      babelOptions,
+      babelOptions: BABEL_OPTIONS,
     }).ast;
     assert.strictEqual(babylonAST.tokens[1].type, "Punctuator");
   });
@@ -277,7 +303,7 @@ describe("babylon-to-espree", () => {
     const babylonAST = parseForESLint(code, {
       eslintVisitorKeys: true,
       eslintScopeManager: true,
-      babelOptions,
+      babelOptions: BABEL_OPTIONS,
     }).ast;
     assert.strictEqual(babylonAST.tokens[3].type, "Punctuator");
     assert.strictEqual(babylonAST.tokens[3].value, "#");