fix: private property with variance

babel · Nov 4, 2021 · 2cf9110 · 2cf9110
1 parent 6fc6ab8
commit 2cf9110
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 15 deletions.
diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
@@ -1999,6 +1999,7 @@ export default class ExpressionParser extends LValParser {
     }
 
     let isGenerator = this.eat(tt.star);
+    this.parsePropertyNamePrefixOperator(prop);
     const containsEsc = this.state.containsEsc;
     const key = this.parsePropertyName(prop);
 
@@ -2963,4 +2964,10 @@ export default class ExpressionParser extends LValParser {
     this.eat(tt.braceR);
     return this.finishNode<N.ModuleExpression>(node, "ModuleExpression");
   }
+
+  // Used in Flow plugin
+  parsePropertyNamePrefixOperator(
+    // eslint-disable-next-line no-unused-vars
+    prop: N.ObjectOrClassMember | N.ClassMember,
+  ): void {}
 }
diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
@@ -1437,6 +1437,7 @@ export default class StatementParser extends ExpressionParser {
     const publicMember: typeof publicMethod | typeof publicProp = publicMethod;
 
     member.static = isStatic;
+    this.parsePropertyNamePrefixOperator(member);
 
     if (this.eat(tt.star)) {
       // a generator

diff --git a/packages/babel-parser/src/plugins/flow/index.js b/packages/babel-parser/src/plugins/flow/index.js
@@ -2475,21 +2475,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       }
     }
 
-    parseClassElementName(node: N.ClassMember): N.Identifier | N.PrivateName {
-      const variance = this.flowParseVariance();
-      const key = super.parseClassElementName(node);
-      node.variance = variance;
-      return key;
-    }
-
-    parsePropertyName(
-      node: N.ObjectOrClassMember | N.ClassMember | N.TsNamedTypeElementBase,
-    ): N.Identifier {
-      const variance = this.flowParseVariance();
-      const key = super.parsePropertyName(node);
-      // $FlowIgnore ("variance" not defined on TsNamedTypeElementBase)
-      node.variance = variance;
-      return key;
+    parsePropertyNamePrefixOperator(
+      node: N.ObjectOrClassMember | N.ClassMember,
+    ): void {
+      node.variance = this.flowParseVariance();
     }
 
     // parse type parameters for object method shorthand

diff --git a/packages/babel-parser/test/fixtures/flow/class-private-property/variance/input.js b/packages/babel-parser/test/fixtures/flow/class-private-property/variance/input.js
@@ -0,0 +1,4 @@
+class A {
+  +#foo;
+  -#foo;
+}
diff --git a/packages/babel-parser/test/fixtures/flow/class-private-property/variance/output.json b/packages/babel-parser/test/fixtures/flow/class-private-property/variance/output.json
@@ -0,0 +1,72 @@
+{
+  "type": "File",
+  "start":0,"end":29,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":1}},
+  "errors": [
+    "SyntaxError: Duplicate private name #foo. (3:3)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":29,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":1}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start":0,"end":29,"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":29,"loc":{"start":{"line":1,"column":8},"end":{"line":4,"column":1}},
+          "body": [
+            {
+              "type": "ClassPrivateProperty",
+              "start":12,"end":18,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":8}},
+              "static": false,
+              "variance": {
+                "type": "Variance",
+                "start":12,"end":13,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":3}},
+                "kind": "plus"
+              },
+              "key": {
+                "type": "PrivateName",
+                "start":13,"end":17,"loc":{"start":{"line":2,"column":3},"end":{"line":2,"column":7}},
+                "id": {
+                  "type": "Identifier",
+                  "start":14,"end":17,"loc":{"start":{"line":2,"column":4},"end":{"line":2,"column":7},"identifierName":"foo"},
+                  "name": "foo"
+                }
+              },
+              "value": null
+            },
+            {
+              "type": "ClassPrivateProperty",
+              "start":21,"end":27,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":8}},
+              "static": false,
+              "variance": {
+                "type": "Variance",
+                "start":21,"end":22,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":3}},
+                "kind": "minus"
+              },
+              "key": {
+                "type": "PrivateName",
+                "start":22,"end":26,"loc":{"start":{"line":3,"column":3},"end":{"line":3,"column":7}},
+                "id": {
+                  "type": "Identifier",
+                  "start":23,"end":26,"loc":{"start":{"line":3,"column":4},"end":{"line":3,"column":7},"identifierName":"foo"},
+                  "name": "foo"
+                }
+              },
+              "value": null
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}