Enable ergonomic brand checks (#priv in) by default (#13554)

* Enable ergonomic brand checks by default in `@babel/parser` * Enable ergonomic brand checks by default in `preset-env` * Fix error position * Update Babel 8 tests
babel · Aug 3, 2021 · a254ea3 · a254ea3
1 parent 5f4b58f
commit a254ea3
Show file tree

Hide file tree

Showing 180 changed files with 281 additions and 61 deletions.
diff --git a/packages/babel-compat-data/scripts/data/plugin-features.js b/packages/babel-compat-data/scripts/data/plugin-features.js
@@ -134,8 +134,7 @@ const es2021 = {
   "proposal-logical-assignment-operators": "Logical Assignment",
 };
 
-const shippedProposal = {
-  "proposal-class-static-block": "Class static initialization blocks",
+const es2022 = {
   "proposal-private-property-in-object":
     "Ergonomic brand checks for private fields",
   "proposal-class-properties": {
@@ -149,10 +148,15 @@ const shippedProposal = {
   "proposal-private-methods": "private class methods",
 };
 
+const shippedProposal = {
+  "proposal-class-static-block": "Class static initialization blocks",
+};
+
 // Run plugins for modern features first
 module.exports = Object.assign(
   {},
   shippedProposal,
+  es2022,
   es2021,
   es2020,
   es2019,

diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
@@ -1154,16 +1154,12 @@ export default class ExpressionParser extends LValParser {
         // https://tc39.es/proposal-private-fields-in-in
         // RelationalExpression [In, Yield, Await]
         //   [+In] PrivateIdentifier in ShiftExpression[?Yield, ?Await]
-        const start = this.state.start;
-        const value = this.state.value;
+        const { value, start } = this.state;
         node = this.parsePrivateName();
         if (this.match(tt._in)) {
-          this.expectPlugin("privateIn");
-          this.classScope.usePrivateName(value, node.start);
-        } else if (this.hasPlugin("privateIn")) {
-          this.raise(this.state.start, Errors.PrivateInExpectedIn, value);
+          this.classScope.usePrivateName(value, start);
         } else {
-          throw this.unexpected(start);
+          this.raise(start, Errors.PrivateInExpectedIn, value);
         }
         return node;
       }

diff --git a/...abel-parser/test/fixtures/es2022/class-private-methods/asi-failure-generator/options.json b/...abel-parser/test/fixtures/es2022/class-private-methods/asi-failure-generator/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (3:3)"
-}
+  "throws": "Unexpected token (3:9)"
+}
diff --git a/...babel-parser/test/fixtures/es2022/class-private-properties/failure-shorthand/options.json b/...babel-parser/test/fixtures/es2022/class-private-properties/failure-shorthand/options.json
diff --git a/.../babel-parser/test/fixtures/es2022/class-private-properties/failure-shorthand/output.json b/.../babel-parser/test/fixtures/es2022/class-private-properties/failure-shorthand/output.json
@@ -0,0 +1,89 @@
+{
+  "type": "File",
+  "start":0,"end":56,"loc":{"start":{"line":1,"column":0},"end":{"line":6,"column":1}},
+  "errors": [
+    "SyntaxError: Private names are only allowed in property accesses (`obj.#x`) or in `in` expressions (`#x in obj`). (4:11)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":56,"loc":{"start":{"line":1,"column":0},"end":{"line":6,"column":1}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start":0,"end":56,"loc":{"start":{"line":1,"column":0},"end":{"line":6,"column":1}},
+        "id": {
+          "type": "Identifier",
+          "start":6,"end":9,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":9},"identifierName":"Foo"},
+          "name": "Foo"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start":10,"end":56,"loc":{"start":{"line":1,"column":10},"end":{"line":6,"column":1}},
+          "body": [
+            {
+              "type": "ClassPrivateProperty",
+              "start":14,"end":17,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":5}},
+              "static": false,
+              "key": {
+                "type": "PrivateName",
+                "start":14,"end":16,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":4}},
+                "id": {
+                  "type": "Identifier",
+                  "start":15,"end":16,"loc":{"start":{"line":2,"column":3},"end":{"line":2,"column":4},"identifierName":"x"},
+                  "name": "x"
+                }
+              },
+              "value": null
+            },
+            {
+              "type": "ClassMethod",
+              "start":20,"end":54,"loc":{"start":{"line":3,"column":2},"end":{"line":5,"column":3}},
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start":20,"end":31,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":13},"identifierName":"constructor"},
+                "name": "constructor"
+              },
+              "computed": false,
+              "kind": "constructor",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start":34,"end":54,"loc":{"start":{"line":3,"column":16},"end":{"line":5,"column":3}},
+                "body": [
+                  {
+                    "type": "ExpressionStatement",
+                    "start":40,"end":50,"loc":{"start":{"line":4,"column":4},"end":{"line":4,"column":14}},
+                    "expression": {
+                      "type": "UnaryExpression",
+                      "start":40,"end":49,"loc":{"start":{"line":4,"column":4},"end":{"line":4,"column":13}},
+                      "operator": "delete",
+                      "prefix": true,
+                      "argument": {
+                        "type": "PrivateName",
+                        "start":47,"end":49,"loc":{"start":{"line":4,"column":11},"end":{"line":4,"column":13}},
+                        "id": {
+                          "type": "Identifier",
+                          "start":48,"end":49,"loc":{"start":{"line":4,"column":12},"end":{"line":4,"column":13},"identifierName":"x"},
+                          "name": "x"
+                        }
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/estree/private-in/basic/options.json b/packages/babel-parser/test/fixtures/estree/private-in/basic/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["estree", "privateIn"]
+  "plugins": ["estree"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/private-in/input.js b/packages/babel-parser/test/fixtures/experimental/_no-plugin/private-in/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/private-in/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/private-in/options.json
diff --git a/...-parser/test/fixtures/experimental/private-in/private-binary-expression-left/options.json b/...-parser/test/fixtures/experimental/private-in/private-binary-expression-left/options.json
diff --git a/...l-parser/test/fixtures/experimental/private-in/private-binary-expression-left/output.json b/...l-parser/test/fixtures/experimental/private-in/private-binary-expression-left/output.json
@@ -2,7 +2,7 @@
   "type": "File",
   "start":0,"end":50,"loc":{"start":{"line":1,"column":0},"end":{"line":6,"column":1}},
   "errors": [
-    "SyntaxError: Private names are only allowed in property accesses (`obj.#x`) or in `in` expressions (`#x in obj`). (4:7)"
+    "SyntaxError: Private names are only allowed in property accesses (`obj.#x`) or in `in` expressions (`#x in obj`). (4:4)"
   ],
   "program": {
     "type": "Program",

diff --git a/...parser/test/fixtures/experimental/private-in/private-binary-expression-right/options.json b/...parser/test/fixtures/experimental/private-in/private-binary-expression-right/options.json
diff --git a/...-parser/test/fixtures/experimental/private-in/private-binary-expression-right/output.json b/...-parser/test/fixtures/experimental/private-in/private-binary-expression-right/output.json
@@ -2,7 +2,7 @@
   "type": "File",
   "start":0,"end":50,"loc":{"start":{"line":1,"column":0},"end":{"line":6,"column":1}},
   "errors": [
-    "SyntaxError: Private names are only allowed in property accesses (`obj.#x`) or in `in` expressions (`#x in obj`). (4:10)"
+    "SyntaxError: Private names are only allowed in property accesses (`obj.#x`) or in `in` expressions (`#x in obj`). (4:8)"
   ],
   "program": {
     "type": "Program",

diff --git a/packages/babel-parser/test/fixtures/experimental/private-in/private-expression/options.json b/packages/babel-parser/test/fixtures/experimental/private-in/private-expression/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/private-in/private-expression/output.json b/packages/babel-parser/test/fixtures/experimental/private-in/private-expression/output.json
@@ -2,7 +2,7 @@
   "type": "File",
   "start":0,"end":46,"loc":{"start":{"line":1,"column":0},"end":{"line":6,"column":1}},
   "errors": [
-    "SyntaxError: Private names are only allowed in property accesses (`obj.#x`) or in `in` expressions (`#x in obj`). (4:6)"
+    "SyntaxError: Private names are only allowed in property accesses (`obj.#x`) or in `in` expressions (`#x in obj`). (4:4)"
   ],
   "program": {
     "type": "Program",

diff --git a/...babel-parser/test/fixtures/experimental/private-in/private-in-class-heritage/options.json b/...babel-parser/test/fixtures/experimental/private-in/private-in-class-heritage/options.json
diff --git a/...bel-parser/test/fixtures/experimental/private-in/private-in-escaped-sequence/options.json b/...bel-parser/test/fixtures/experimental/private-in/private-in-escaped-sequence/options.json
diff --git a/.../babel-parser/test/fixtures/experimental/private-in/private-in-parenthesized/options.json b/.../babel-parser/test/fixtures/experimental/private-in/private-in-parenthesized/options.json
diff --git a/...s/babel-parser/test/fixtures/experimental/private-in/private-in-parenthesized/output.json b/...s/babel-parser/test/fixtures/experimental/private-in/private-in-parenthesized/output.json
@@ -2,7 +2,7 @@
   "type": "File",
   "start":0,"end":54,"loc":{"start":{"line":1,"column":0},"end":{"line":6,"column":1}},
   "errors": [
-    "SyntaxError: Private names are only allowed in property accesses (`obj.#x`) or in `in` expressions (`#x in obj`). (4:7)"
+    "SyntaxError: Private names are only allowed in property accesses (`obj.#x`) or in `in` expressions (`#x in obj`). (4:5)"
   ],
   "program": {
     "type": "Program",

diff --git a/.../babel-parser/test/fixtures/experimental/private-in/private-in-without-field/options.json b/.../babel-parser/test/fixtures/experimental/private-in/private-in-without-field/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/private-in/private-in/options.json b/packages/babel-parser/test/fixtures/experimental/private-in/private-in/options.json
diff --git a/packages/babel-parser/typings/babel-parser.d.ts b/packages/babel-parser/typings/babel-parser.d.ts
@@ -141,7 +141,7 @@ export type ParserPlugin =
   | "partialApplication"
   | "pipelineOperator"
   | "placeholders"
-  | "privateIn"
+  | "privateIn" // Enabled by default
   | "throwExpressions"
   | "topLevelAwait"
   | "typescript"

diff --git a/packages/babel-preset-env/data/shipped-proposals.js b/packages/babel-preset-env/data/shipped-proposals.js
@@ -4,7 +4,6 @@
 
 const proposalPlugins = new Set([
   "proposal-class-static-block",
-  "proposal-private-property-in-object",
 ]);
 
 // use intermediary object to enforce alphabetical key order

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/_esmodules-no-bugfixes/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/_esmodules-no-bugfixes/stdout.txt
@@ -16,6 +16,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios, node, opera, safari, samsung }
   proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
   proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
   proposal-numeric-separator { android, chrome < 75, edge < 79, firefox < 70, ios < 13, opera < 62, safari < 13, samsung < 11 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/_esmodules/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/_esmodules/stdout.txt
@@ -16,6 +16,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { android, chrome < 91, edge, firefox < 90, ios, node, opera, safari, samsung }
   proposal-class-properties { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
   proposal-private-methods { android, chrome < 84, edge < 84, firefox < 90, ios, node < 14.6, opera < 70, safari < 15, samsung }
   proposal-numeric-separator { android, chrome < 75, edge < 79, firefox < 70, ios < 13, opera < 62, safari < 13, samsung < 11 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-chrome-40/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-chrome-40/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { chrome < 91 }
   proposal-class-properties { chrome < 84 }
   proposal-private-methods { chrome < 84 }
   proposal-numeric-separator { chrome < 75 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-chrome-70/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-chrome-70/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { chrome < 91 }
   proposal-class-properties { chrome < 84 }
   proposal-private-methods { chrome < 84 }
   proposal-numeric-separator { chrome < 75 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-14/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-14/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }
   proposal-numeric-separator { edge < 79 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-15/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-15/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }
   proposal-numeric-separator { edge < 79 }

diff --git a/...abel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-17-no-bugfixes/stdout.txt b/...abel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-17-no-bugfixes/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }
   proposal-numeric-separator { edge < 79 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-17/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-17/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }
   proposal-numeric-separator { edge < 79 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-18/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-default-params-edge-18/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }
   proposal-numeric-separator { edge < 79 }

diff --git a/...babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-14-no-bugfixes/stdout.txt b/...babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-14-no-bugfixes/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }
   proposal-numeric-separator { edge < 79 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-14/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-14/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }
   proposal-numeric-separator { edge < 79 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-15/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/edge-function-name-edge-15/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { edge }
   proposal-class-properties { edge < 84 }
   proposal-private-methods { edge < 84 }
   proposal-numeric-separator { edge < 79 }

diff --git a/...l-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-10-no-bugfixes/stdout.txt b/...l-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-10-no-bugfixes/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { safari }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }
   proposal-numeric-separator { safari < 13 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-10/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-10/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { safari }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }
   proposal-numeric-separator { safari < 13 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-11/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-11/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { safari }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }
   proposal-numeric-separator { safari < 13 }

diff --git a/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-9/stdout.txt b/packages/babel-preset-env/test/fixtures/bugfixes/safari-block-scoping-safari-9/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { safari }
   proposal-class-properties { safari < 15 }
   proposal-private-methods { safari < 15 }
   proposal-numeric-separator { safari < 13 }

diff --git a/...tures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89-no-bugfixes/stdout.txt b/...tures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89-no-bugfixes/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { chrome < 91 }
   syntax-class-properties
   syntax-numeric-separator
   syntax-nullish-coalescing-operator

diff --git a/...env/test/fixtures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89/stdout.txt b/...env/test/fixtures/bugfixes/v8-spread-parameters-in-optional-chaining-chrome-89/stdout.txt
@@ -8,6 +8,7 @@ Using targets:
 Using modules transform: auto
 
 Using plugins:
+  proposal-private-property-in-object { chrome < 91 }
   syntax-class-properties
   syntax-numeric-separator
   syntax-nullish-coalescing-operator