Merge pull request #727 from jridgewell/private-methods

classPrivateMethods enables PrivateName usage
babel · Sep 18, 2017 · d016dea · d016dea
2 parents 9b582c9 + 1f11dc0
commit d016dea
Show file tree

Hide file tree

Showing 34 changed files with 161 additions and 183 deletions.
diff --git a/src/parser/expression.js b/src/parser/expression.js
@@ -348,7 +348,6 @@ export default class ExpressionParser extends LValParser {
         if (arg.type === "Identifier") {
           this.raise(node.start, "Deleting local variable in strict mode");
         } else if (
-          this.hasPlugin("classPrivateProperties") &&
           arg.type === "MemberExpression" &&
           arg.property.type === "PrivateName"
         ) {
@@ -471,9 +470,7 @@ export default class ExpressionParser extends LValParser {
     } else if (this.eat(tt.dot)) {
       const node = this.startNodeAt(startPos, startLoc);
       node.object = base;
-      node.property = this.hasPlugin("classPrivateProperties")
-        ? this.parseMaybePrivateName()
-        : this.parseIdentifier(true);
+      node.property = this.parseMaybePrivateName();
       node.computed = false;
       return this.finishNode(node, "MemberExpression");
     } else if (this.eat(tt.bracketL)) {
@@ -809,10 +806,12 @@ export default class ExpressionParser extends LValParser {
   }
 
   parseMaybePrivateName(): N.PrivateName | N.Identifier {
-    const isPrivate = this.eat(tt.hash);
+    const isPrivate = this.match(tt.hash);
 
     if (isPrivate) {
+      this.expectOnePlugin(["classPrivateProperties", "classPrivateMethods"]);
       const node = this.startNode();
+      this.next();
       node.id = this.parseIdentifier(true);
       return this.finishNode(node, "PrivateName");
     } else {

diff --git a/test/fixtures/experimental/class-private-methods/async-generator/expected.json b/test/fixtures/experimental/class-private-methods/async-generator/expected.json
@@ -92,12 +92,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 22,
+                "start": 21,
                 "end": 31,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 10
+                    "column": 9
                   },
                   "end": {
                     "line": 2,
@@ -652,4 +652,4 @@
     ],
     "directives": []
   }
-}
+}
diff --git a/test/fixtures/experimental/class-private-methods/async-generator/options.json b/test/fixtures/experimental/class-private-methods/async-generator/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["classProperties", "classPrivateMethods", "asyncGenerators"]
+  "plugins": ["classPrivateMethods", "asyncGenerators"]
 }
diff --git a/test/fixtures/experimental/class-private-methods/async/expected.json b/test/fixtures/experimental/class-private-methods/async/expected.json
@@ -92,12 +92,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 23,
+                "start": 22,
                 "end": 27,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 9
+                    "column": 8
                   },
                   "end": {
                     "line": 2,
@@ -217,4 +217,4 @@
     ],
     "directives": []
   }
-}
+}
diff --git a/test/fixtures/experimental/class-private-methods/async/options.json b/test/fixtures/experimental/class-private-methods/async/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["classProperties", "classPrivateMethods"]
+  "plugins": ["classPrivateMethods"]
 }
diff --git a/test/fixtures/experimental/class-private-methods/combined/expected.json b/test/fixtures/experimental/class-private-methods/combined/expected.json
@@ -147,12 +147,12 @@
               "kind": "method",
               "key": {
                 "type": "PrivateName",
-                "start": 26,
+                "start": 25,
                 "end": 27,
                 "loc": {
                   "start": {
                     "line": 4,
-                    "column": 4
+                    "column": 3
                   },
                   "end": {
                     "line": 4,
@@ -282,12 +282,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 57,
+                "start": 56,
                 "end": 58,
                 "loc": {
                   "start": {
                     "line": 8,
-                    "column": 3
+                    "column": 2
                   },
                   "end": {
                     "line": 8,
@@ -443,12 +443,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 99,
+                "start": 98,
                 "end": 100,
                 "loc": {
                   "start": {
                     "line": 11,
-                    "column": 7
+                    "column": 6
                   },
                   "end": {
                     "line": 11,
@@ -566,12 +566,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 122,
+                "start": 121,
                 "end": 123,
                 "loc": {
                   "start": {
                     "line": 13,
-                    "column": 3
+                    "column": 2
                   },
                   "end": {
                     "line": 13,
@@ -708,4 +708,4 @@
     ],
     "directives": []
   }
-}
+}
diff --git a/test/fixtures/experimental/class-private-methods/failure-name-constructor/options.json b/test/fixtures/experimental/class-private-methods/failure-name-constructor/options.json
@@ -1,7 +1,4 @@
 {
-  "throws": "Classes may not have a private field named '#constructor' (2:3)",
-  "plugins": [
-    "classProperties",
-    "classPrivateMethods"
-    ]
+  "throws": "Classes may not have a private field named '#constructor' (2:2)",
+  "plugins": [ "classPrivateMethods" ]
 }
diff --git a/test/fixtures/experimental/class-private-methods/failure-no-plugin/options.json b/test/fixtures/experimental/class-private-methods/failure-no-plugin/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "This experimental syntax requires enabling the parser plugin: 'classPrivateMethods' (3:3)",
-  "plugins": ["classProperties", "classPrivateProperties"]
+  "throws": "This experimental syntax requires enabling the parser plugin: 'classPrivateMethods' (3:2)",
+  "plugins": ["classPrivateProperties"]
 }
diff --git a/test/fixtures/experimental/class-private-methods/generator/expected.json b/test/fixtures/experimental/class-private-methods/generator/expected.json
@@ -93,12 +93,12 @@
               "kind": "method",
               "key": {
                 "type": "PrivateName",
-                "start": 18,
+                "start": 17,
                 "end": 22,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 4
+                    "column": 3
                   },
                   "end": {
                     "line": 2,
@@ -217,4 +217,4 @@
     ],
     "directives": []
   }
-}
+}
diff --git a/test/fixtures/experimental/class-private-methods/generator/options.json b/test/fixtures/experimental/class-private-methods/generator/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["classProperties", "classPrivateMethods"]
+  "plugins": ["classPrivateMethods"]
 }
diff --git a/test/fixtures/experimental/class-private-methods/get-set/expected.json b/test/fixtures/experimental/class-private-methods/get-set/expected.json
@@ -92,12 +92,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 21,
+                "start": 20,
                 "end": 25,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 7
+                    "column": 6
                   },
                   "end": {
                     "line": 2,
@@ -213,12 +213,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 60,
+                "start": 59,
                 "end": 64,
                 "loc": {
                   "start": {
                     "line": 5,
-                    "column": 7
+                    "column": 6
                   },
                   "end": {
                     "line": 5,
@@ -359,4 +359,4 @@
     ],
     "directives": []
   }
-}
+}
diff --git a/test/fixtures/experimental/class-private-methods/get-set/options.json b/test/fixtures/experimental/class-private-methods/get-set/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["classProperties", "classPrivateMethods"]
+  "plugins": ["classPrivateMethods"]
 }
diff --git a/test/fixtures/experimental/class-private-methods/method/expected.json b/test/fixtures/experimental/class-private-methods/method/expected.json
@@ -92,12 +92,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 17,
+                "start": 16,
                 "end": 26,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 3
+                    "column": 2
                   },
                   "end": {
                     "line": 2,
@@ -201,4 +201,4 @@
     ],
     "directives": []
   }
-}
+}
diff --git a/test/fixtures/experimental/class-private-methods/method/options.json b/test/fixtures/experimental/class-private-methods/method/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["classProperties", "classPrivateMethods"]
+  "plugins": ["classPrivateMethods"]
 }
diff --git a/test/fixtures/experimental/class-private-properties/asi-failure-generator/actual.js b/test/fixtures/experimental/class-private-properties/asi-failure-generator/actual.js
@@ -1,4 +1,4 @@
 class Foo {
   #p = x
-  *#m () {}
+  *m () {}
 }
diff --git a/test/fixtures/experimental/class-private-properties/asi-failure-generator/options.json b/test/fixtures/experimental/class-private-properties/asi-failure-generator/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "Unexpected token (3:3)",
-  "plugins": ["classProperties", "classPrivateProperties"]
+  "throws": "Unexpected token, expected ; (3:8)",
+  "plugins": ["classPrivateProperties"]
 }
diff --git a/test/fixtures/experimental/class-private-properties/asi-failure-inline/options.json b/test/fixtures/experimental/class-private-properties/asi-failure-inline/options.json
@@ -1,4 +1,4 @@
 {
   "throws": "Unexpected token (2:5)",
-  "plugins": ["classProperties", "classPrivateProperties"]
+  "plugins": ["classPrivateProperties"]
 }
diff --git a/test/fixtures/experimental/class-private-properties/asi-success/expected.json b/test/fixtures/experimental/class-private-properties/asi-success/expected.json
@@ -92,12 +92,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 15,
+                "start": 14,
                 "end": 16,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 3
+                    "column": 2
                   },
                   "end": {
                     "line": 2,
@@ -141,12 +141,12 @@
               "static": false,
               "key": {
                 "type": "PrivateName",
-                "start": 20,
+                "start": 19,
                 "end": 21,
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 3
+                    "column": 2
                   },
                   "end": {
                     "line": 3,
@@ -179,4 +179,4 @@
     ],
     "directives": []
   }
-}
+}
diff --git a/test/fixtures/experimental/class-private-properties/asi-success/options.json b/test/fixtures/experimental/class-private-properties/asi-success/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["classProperties", "classPrivateProperties"]
+  "plugins": ["classPrivateProperties"]
 }
diff --git a/test/fixtures/experimental/class-private-properties/failure-computed/options.json b/test/fixtures/experimental/class-private-properties/failure-computed/options.json
@@ -1,7 +1,4 @@
 {
   "throws": "Unexpected token (3:3)",
-  "plugins": [
-    "classProperties",
-    "classPrivateProperties"
-    ]
+  "plugins": [ "classPrivateProperties" ]
 }
diff --git a/...xtures/experimental/class-private-properties/failure-delete-private-property/options.json b/...xtures/experimental/class-private-properties/failure-delete-private-property/options.json
@@ -1,7 +1,4 @@
 {
   "throws": "Deleting a private field is not allowed (4:4)",
-  "plugins": [
-    "classProperties",
-    "classPrivateProperties"
-    ]
+  "plugins": [ "classPrivateProperties" ]
 }
diff --git a/test/fixtures/experimental/class-private-properties/failure-name-constructor/options.json b/test/fixtures/experimental/class-private-properties/failure-name-constructor/options.json
@@ -1,7 +1,4 @@
 {
-  "throws": "Classes may not have a private field named '#constructor' (2:3)",
-  "plugins": [
-    "classProperties",
-    "classPrivateProperties"
-    ]
+  "throws": "Classes may not have a private field named '#constructor' (2:2)",
+  "plugins": [ "classPrivateProperties" ]
 }
diff --git a/test/fixtures/experimental/class-private-properties/failure-numeric-literal/options.json b/test/fixtures/experimental/class-private-properties/failure-numeric-literal/options.json
@@ -1,7 +1,4 @@
 {
   "throws": "Unexpected token (2:3)",
-  "plugins": [
-    "classProperties",
-    "classPrivateProperties"
-    ]
+  "plugins": [ "classPrivateProperties" ]
 }
diff --git a/...tures/experimental/class-private-properties/failure-numeric-start-identifier/options.json b/...tures/experimental/class-private-properties/failure-numeric-start-identifier/options.json
@@ -1,4 +1,4 @@
 {
   "throws": "Identifier directly after number (2:4)",
-  "plugins": ["classProperties", "classPrivateProperties"]
+  "plugins": ["classPrivateProperties"]
 }
diff --git a/test/fixtures/experimental/class-private-properties/failure-shorthand/options.json b/test/fixtures/experimental/class-private-properties/failure-shorthand/options.json
@@ -1,7 +1,4 @@
 {
   "throws": "Unexpected token (4:11)",
-  "plugins": [
-    "classProperties",
-    "classPrivateProperties"
-    ]
+  "plugins": [ "classPrivateProperties" ]
 }
diff --git a/test/fixtures/experimental/class-private-properties/failure-string-literal/options.json b/test/fixtures/experimental/class-private-properties/failure-string-literal/options.json
@@ -1,7 +1,4 @@
 {
   "throws": "Unexpected token (2:3)",
-  "plugins": [
-    "classProperties",
-    "classPrivateProperties"
-    ]
+  "plugins": [ "classPrivateProperties" ]
 }