[babel 8] Materialize ESTree's classFeatures option (#13752)

* [babel 8] Enable ESTree classFeatures by default in @babel/parser * Fix `visitorKeys` * Update tests
babel · Sep 22, 2021 · 2e2d202 · 2e2d202
1 parent 3d1481f
commit 2e2d202
Show file tree

Hide file tree

Showing 36 changed files with 447 additions and 15 deletions.
diff --git a/eslint/babel-eslint-parser/src/worker/ast-info.cjs b/eslint/babel-eslint-parser/src/worker/ast-info.cjs
@@ -13,7 +13,7 @@ exports.getVisitorKeys = function getVisitorKeys() {
         ESLINT_VISITOR_KEYS.MethodDefinition,
       ),
       Property: ["decorators"].concat(ESLINT_VISITOR_KEYS.Property),
-      PropertyDefinition: ["decorators"].concat(
+      PropertyDefinition: ["decorators", "typeAnnotation"].concat(
         ESLINT_VISITOR_KEYS.PropertyDefinition,
       ),
     };

diff --git a/packages/babel-parser/src/plugins/estree.js b/packages/babel-parser/src/plugins/estree.js
@@ -183,8 +183,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     parsePrivateName(): any {
       const node = super.parsePrivateName();
-      if (!this.getPluginOption("estree", "classFeatures")) {
-        return node;
+      if (!process.env.BABEL_8_BREAKING) {
+        if (!this.getPluginOption("estree", "classFeatures")) {
+          return node;
+        }
       }
       return this.convertPrivateNameToPrivateIdentifier(node);
     }
@@ -201,15 +203,19 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     isPrivateName(node: N.Node): boolean {
-      if (!this.getPluginOption("estree", "classFeatures")) {
-        return super.isPrivateName(node);
+      if (!process.env.BABEL_8_BREAKING) {
+        if (!this.getPluginOption("estree", "classFeatures")) {
+          return super.isPrivateName(node);
+        }
       }
       return node.type === "PrivateIdentifier";
     }
 
     getPrivateNameSV(node: N.Node): string {
-      if (!this.getPluginOption("estree", "classFeatures")) {
-        return super.getPrivateNameSV(node);
+      if (!process.env.BABEL_8_BREAKING) {
+        if (!this.getPluginOption("estree", "classFeatures")) {
+          return super.getPrivateNameSV(node);
+        }
       }
       return node.name;
     }
@@ -265,18 +271,24 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     parseClassProperty(...args: [N.ClassProperty]): any {
       const propertyNode = (super.parseClassProperty(...args): any);
-      if (this.getPluginOption("estree", "classFeatures")) {
-        propertyNode.type = "PropertyDefinition";
+      if (!process.env.BABEL_8_BREAKING) {
+        if (!this.getPluginOption("estree", "classFeatures")) {
+          return (propertyNode: N.EstreePropertyDefinition);
+        }
       }
+      propertyNode.type = "PropertyDefinition";
       return (propertyNode: N.EstreePropertyDefinition);
     }
 
     parseClassPrivateProperty(...args: [N.ClassPrivateProperty]): any {
       const propertyNode = (super.parseClassPrivateProperty(...args): any);
-      if (this.getPluginOption("estree", "classFeatures")) {
-        propertyNode.type = "PropertyDefinition";
-        propertyNode.computed = false;
+      if (!process.env.BABEL_8_BREAKING) {
+        if (!this.getPluginOption("estree", "classFeatures")) {
+          return (propertyNode: N.EstreePropertyDefinition);
+        }
       }
+      propertyNode.type = "PropertyDefinition";
+      propertyNode.computed = false;
       return (propertyNode: N.EstreePropertyDefinition);
     }
 

diff --git a/...stree/class-private-method/basic/input.js → ...ass-private-method/basic-babel-7/input.js b/...stree/class-private-method/basic/input.js → ...ass-private-method/basic-babel-7/input.js
diff --git a/...e/class-private-method/basic/options.json → ...private-method/basic-babel-7/options.json b/...e/class-private-method/basic/options.json → ...private-method/basic-babel-7/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": ["flow", "jsx", ["estree", { "classFeatures": true }]]
 }
diff --git a/...ee/class-private-method/basic/output.json → ...-private-method/basic-babel-7/output.json b/...ee/class-private-method/basic/output.json → ...-private-method/basic-babel-7/output.json
diff --git a/...class-private-method/not-enabled/input.js → ...ass-private-method/basic-babel-8/input.js b/...class-private-method/not-enabled/input.js → ...ass-private-method/basic-babel-8/input.js
diff --git a/...s-private-method/not-enabled/options.json → ...private-method/basic-babel-8/options.json b/...s-private-method/not-enabled/options.json → ...private-method/basic-babel-8/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": true,
   "plugins": ["flow", "jsx", "estree"]
 }
diff --git a/packages/babel-parser/test/fixtures/estree/class-private-method/basic-babel-8/output.json b/packages/babel-parser/test/fixtures/estree/class-private-method/basic-babel-8/output.json
@@ -0,0 +1,110 @@
+{
+  "type": "File",
+  "start":0,"end":70,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":1}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":70,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":1}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start":0,"end":70,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":1}},
+        "id": {
+          "type": "Identifier",
+          "start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7},"identifierName":"A"},
+          "name": "A"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start":8,"end":70,"loc":{"start":{"line":1,"column":8},"end":{"line":4,"column":1}},
+          "body": [
+            {
+              "type": "MethodDefinition",
+              "start":12,"end":35,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":25}},
+              "static": false,
+              "key": {
+                "type": "PrivateIdentifier",
+                "start":12,"end":16,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":6}},
+                "name": "foo"
+              },
+              "kind": "method",
+              "value": {
+                "type": "FunctionExpression",
+                "start":16,"end":35,"loc":{"start":{"line":2,"column":6},"end":{"line":2,"column":25}},
+                "id": null,
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start":17,"end":20,"loc":{"start":{"line":2,"column":7},"end":{"line":2,"column":10},"identifierName":"arg"},
+                    "name": "arg"
+                  },
+                  {
+                    "type": "RestElement",
+                    "start":22,"end":31,"loc":{"start":{"line":2,"column":12},"end":{"line":2,"column":21}},
+                    "argument": {
+                      "type": "Identifier",
+                      "start":25,"end":31,"loc":{"start":{"line":2,"column":15},"end":{"line":2,"column":21},"identifierName":"others"},
+                      "name": "others"
+                    }
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start":33,"end":35,"loc":{"start":{"line":2,"column":23},"end":{"line":2,"column":25}},
+                  "body": []
+                }
+              },
+              "computed": false
+            },
+            {
+              "type": "MethodDefinition",
+              "start":38,"end":68,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":32}},
+              "static": true,
+              "key": {
+                "type": "PrivateIdentifier",
+                "start":45,"end":49,"loc":{"start":{"line":3,"column":9},"end":{"line":3,"column":13}},
+                "name": "bar"
+              },
+              "kind": "method",
+              "value": {
+                "type": "FunctionExpression",
+                "start":49,"end":68,"loc":{"start":{"line":3,"column":13},"end":{"line":3,"column":32}},
+                "id": null,
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start":50,"end":53,"loc":{"start":{"line":3,"column":14},"end":{"line":3,"column":17},"identifierName":"arg"},
+                    "name": "arg"
+                  },
+                  {
+                    "type": "RestElement",
+                    "start":55,"end":64,"loc":{"start":{"line":3,"column":19},"end":{"line":3,"column":28}},
+                    "argument": {
+                      "type": "Identifier",
+                      "start":58,"end":64,"loc":{"start":{"line":3,"column":22},"end":{"line":3,"column":28},"identifierName":"others"},
+                      "name": "others"
+                    }
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start":66,"end":68,"loc":{"start":{"line":3,"column":30},"end":{"line":3,"column":32}},
+                  "body": []
+                }
+              },
+              "computed": false
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/estree/class-private-method/not-enabled-babel-7/input.js b/packages/babel-parser/test/fixtures/estree/class-private-method/not-enabled-babel-7/input.js
@@ -0,0 +1,4 @@
+class A {
+  #foo(arg, ...others) {}
+  static #bar(arg, ...others) {}
+}
diff --git a/...s/babel-parser/test/fixtures/estree/class-private-method/not-enabled-babel-7/options.json b/...s/babel-parser/test/fixtures/estree/class-private-method/not-enabled-babel-7/options.json
@@ -0,0 +1,4 @@
+{
+  "BABEL_8_BREAKING": false,
+  "plugins": ["flow", "jsx", "estree"]
+}
diff --git a/...ss-private-method/not-enabled/output.json → ...te-method/not-enabled-babel-7/output.json b/...ss-private-method/not-enabled/output.json → ...te-method/not-enabled-babel-7/output.json
diff --git a/...ree/class-private-property/basic/input.js → ...s-private-property/basic-babel-7/input.js b/...ree/class-private-property/basic/input.js → ...s-private-property/basic-babel-7/input.js
diff --git a/.../estree/class-property/basic/options.json → ...ivate-property/basic-babel-7/options.json b/.../estree/class-property/basic/options.json → ...ivate-property/basic-babel-7/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["estree", { "classFeatures": true }]]
 }
diff --git a/.../class-private-property/basic/output.json → ...rivate-property/basic-babel-7/output.json b/.../class-private-property/basic/output.json → ...rivate-property/basic-babel-7/output.json
diff --git a/...ass-private-property/not-enabled/input.js → ...s-private-property/basic-babel-8/input.js b/...ass-private-property/not-enabled/input.js → ...s-private-property/basic-babel-8/input.js
diff --git a/...e/class-property/not-enabled/options.json → ...ivate-property/basic-babel-8/options.json b/...e/class-property/not-enabled/options.json → ...ivate-property/basic-babel-8/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": true,
   "plugins": ["estree"]
 }
diff --git a/...-private-property/not-enabled/output.json → ...rivate-property/basic-babel-8/output.json b/...-private-property/not-enabled/output.json → ...rivate-property/basic-babel-8/output.json
diff --git a/...ges/babel-parser/test/fixtures/estree/class-private-property/not-enabled-babel-7/input.js b/...ges/babel-parser/test/fixtures/estree/class-private-property/not-enabled-babel-7/input.js
@@ -0,0 +1,4 @@
+class A {
+  #foo = "bar";
+  static #bar = foo;
+}
diff --git a/...babel-parser/test/fixtures/estree/class-private-property/not-enabled-babel-7/options.json b/...babel-parser/test/fixtures/estree/class-private-property/not-enabled-babel-7/options.json
@@ -0,0 +1,4 @@
+{
+  "BABEL_8_BREAKING": false,
+  "plugins": ["estree"]
+}
diff --git a/.../babel-parser/test/fixtures/estree/class-private-property/not-enabled-babel-7/output.json b/.../babel-parser/test/fixtures/estree/class-private-property/not-enabled-babel-7/output.json
@@ -0,0 +1,67 @@
+{
+  "type": "File",
+  "start":0,"end":48,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":1}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":48,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":1}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start":0,"end":48,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":1}},
+        "id": {
+          "type": "Identifier",
+          "start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7},"identifierName":"A"},
+          "name": "A"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start":8,"end":48,"loc":{"start":{"line":1,"column":8},"end":{"line":4,"column":1}},
+          "body": [
+            {
+              "type": "ClassPrivateProperty",
+              "start":12,"end":25,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":15}},
+              "static": false,
+              "key": {
+                "type": "PrivateName",
+                "start":12,"end":16,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":6}},
+                "id": {
+                  "type": "Identifier",
+                  "start":13,"end":16,"loc":{"start":{"line":2,"column":3},"end":{"line":2,"column":6},"identifierName":"foo"},
+                  "name": "foo"
+                }
+              },
+              "value": {
+                "type": "Literal",
+                "start":19,"end":24,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":14}},
+                "value": "bar",
+                "raw": "\"bar\""
+              }
+            },
+            {
+              "type": "ClassPrivateProperty",
+              "start":28,"end":46,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":20}},
+              "static": true,
+              "key": {
+                "type": "PrivateName",
+                "start":35,"end":39,"loc":{"start":{"line":3,"column":9},"end":{"line":3,"column":13}},
+                "id": {
+                  "type": "Identifier",
+                  "start":36,"end":39,"loc":{"start":{"line":3,"column":10},"end":{"line":3,"column":13},"identifierName":"bar"},
+                  "name": "bar"
+                }
+              },
+              "value": {
+                "type": "Identifier",
+                "start":42,"end":45,"loc":{"start":{"line":3,"column":16},"end":{"line":3,"column":19},"identifierName":"foo"},
+                "name": "foo"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/estree/class-private-property/not-enabled/options.json b/packages/babel-parser/test/fixtures/estree/class-private-property/not-enabled/options.json
diff --git a/...ures/estree/class-property/basic/input.js → ...ree/class-property/basic-babel-7/input.js b/...ures/estree/class-property/basic/input.js → ...ree/class-property/basic-babel-7/input.js
diff --git a/...class-private-property/basic/options.json → ...class-property/basic-babel-7/options.json b/...class-private-property/basic/options.json → ...class-property/basic-babel-7/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [["estree", { "classFeatures": true }]]
 }
diff --git a/...s/estree/class-property/basic/output.json → .../class-property/basic-babel-7/output.json b/...s/estree/class-property/basic/output.json → .../class-property/basic-babel-7/output.json
diff --git a/...stree/class-property/not-enabled/input.js → ...ree/class-property/basic-babel-8/input.js b/...stree/class-property/not-enabled/input.js → ...ree/class-property/basic-babel-8/input.js
diff --git a/...ures/estree/private-in/basic/options.json → ...class-property/basic-babel-8/options.json b/...ures/estree/private-in/basic/options.json → ...class-property/basic-babel-8/options.json
@@ -1,3 +1,4 @@
 {
+  "BABEL_8_BREAKING": true,
   "plugins": ["estree"]
 }