fix: validate rhs of in when transpiling #p in C (#15133)

Co-authored-by: Nicolò Ribaudo <nicolo.ribaudo@gmail.com> Fixes #15013
babel · Nov 11, 2022 · df601f9 · df601f9
1 parent 641f677
commit df601f9
Show file tree

Hide file tree

Showing 74 changed files with 313 additions and 110 deletions.
diff --git a/Makefile b/Makefile
@@ -192,8 +192,8 @@ new-version-checklist:
 	# @echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	# @echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	# @echo "!!!!!!                                                   !!!!!!"
-	# @echo "!!!!!!         Write any message that should             !!!!!!"
-	# @echo "!!!!!!            block the release here                 !!!!!!"
+	# @echo "!!!!!! Update the minVersion of packages/babel-helpers/src/helpers/checkInRHS.js"
+	# @echo "!!!!!!                                                   !!!!!!"
 	# @echo "!!!!!!                                                   !!!!!!"
 	# @echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	# @echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

diff --git a/packages/babel-helper-create-class-features-plugin/src/decorators.ts b/packages/babel-helper-create-class-features-plugin/src/decorators.ts
@@ -142,17 +142,7 @@ function extractElementDescriptor(
 }
 
 function addDecorateHelper(file: File) {
-  try {
-    return file.addHelper("decorate");
-  } catch (err) {
-    if (err.code === "BABEL_HELPER_UNKNOWN") {
-      err.message +=
-        "\n  '@babel/plugin-transform-decorators' in non-legacy mode" +
-        " requires '@babel/core' version ^7.0.2 and you appear to be using" +
-        " an older version.";
-    }
-    throw err;
-  }
+  return file.addHelper("decorate");
 }
 
 type ClassElement = t.Class["body"]["body"][number];

diff --git a/packages/babel-helper-create-class-features-plugin/src/fields.ts b/packages/babel-helper-create-class-features-plugin/src/fields.ts
@@ -206,12 +206,21 @@ function unshadow(
   }
 }
 
+export function buildCheckInRHS(
+  rhs: t.Expression,
+  file: File,
+  inRHSIsObject?: boolean,
+) {
+  if (inRHSIsObject || !file.availableHelper?.("checkInRHS")) return rhs;
+  return t.callExpression(file.addHelper("checkInRHS"), [rhs]);
+}
+
 const privateInVisitor = privateNameVisitorFactory<{
   classRef: t.Identifier;
   file: File;
   innerBinding?: t.Identifier;
 }>({
-  BinaryExpression(path) {
+  BinaryExpression(path, { file }) {
     const { operator, left, right } = path.node;
     if (operator !== "in") return;
     if (!t.isPrivateName(left)) return;
@@ -230,19 +239,32 @@ const privateInVisitor = privateNameVisitorFactory<{
     if (privateFieldsAsProperties) {
       const { id } = privateNamesMap.get(name);
       path.replaceWith(template.expression.ast`
-        Object.prototype.hasOwnProperty.call(${right}, ${t.cloneNode(id)})
+        Object.prototype.hasOwnProperty.call(${buildCheckInRHS(
+          right,
+          file,
+        )}, ${t.cloneNode(id)})
       `);
       return;
     }
 
     const { id, static: isStatic } = privateNamesMap.get(name);
 
     if (isStatic) {
-      path.replaceWith(template.expression.ast`${right} === ${this.classRef}`);
+      path.replaceWith(
+        template.expression.ast`${buildCheckInRHS(
+          right,
+          file,
+        )} === ${t.cloneNode(this.classRef)}`,
+      );
       return;
     }
 
-    path.replaceWith(template.expression.ast`${t.cloneNode(id)}.has(${right})`);
+    path.replaceWith(
+      template.expression.ast`${t.cloneNode(id)}.has(${buildCheckInRHS(
+        right,
+        file,
+      )})`,
+    );
   },
 });
 

diff --git a/packages/babel-helper-create-class-features-plugin/src/index.ts b/packages/babel-helper-create-class-features-plugin/src/index.ts
@@ -8,14 +8,15 @@ import {
   buildPrivateNamesMap,
   transformPrivateNamesUsage,
   buildFieldsInitNodes,
+  buildCheckInRHS,
 } from "./fields";
 import type { PropPath } from "./fields";
 import { buildDecoratedClass, hasDecorators } from "./decorators";
 import { injectInitialization, extractComputedKeys } from "./misc";
 import { enableFeature, FEATURES, isLoose, shouldTransform } from "./features";
 import { assertFieldTransformed } from "./typescript";
 
-export { FEATURES, enableFeature, injectInitialization };
+export { FEATURES, enableFeature, injectInitialization, buildCheckInRHS };
 
 declare const PACKAGE_JSON: { name: string; version: string };
 

diff --git a/packages/babel-helpers/src/helpers-generated.ts b/packages/babel-helpers/src/helpers-generated.ts
@@ -41,6 +41,10 @@ export default Object.freeze({
     "7.0.0-beta.0",
     'import OverloadYield from"OverloadYield";export default function _awaitAsyncGenerator(value){return new OverloadYield(value,0)}',
   ),
+  checkInRHS: helper(
+    "7.20.1",
+    'export default function _checkInRHS(value){if(Object(value)!==value)throw TypeError("right-hand side of \'in\' should be an object, got "+(null!==value?typeof value:"null"));return value}',
+  ),
   jsx: helper(
     "7.0.0-beta.0",
     'var REACT_ELEMENT_TYPE;export default function _createRawReactElement(type,props,key,children){REACT_ELEMENT_TYPE||(REACT_ELEMENT_TYPE="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103);var defaultProps=type&&type.defaultProps,childrenLength=arguments.length-3;if(props||0===childrenLength||(props={children:void 0}),1===childrenLength)props.children=children;else if(childrenLength>1){for(var childArray=new Array(childrenLength),i=0;i<childrenLength;i++)childArray[i]=arguments[i+3];props.children=childArray}if(props&&defaultProps)for(var propName in defaultProps)void 0===props[propName]&&(props[propName]=defaultProps[propName]);else props||(props=defaultProps||{});return{$$typeof:REACT_ELEMENT_TYPE,type:type,key:void 0===key?null:""+key,ref:null,props:props,_owner:null}}',

diff --git a/packages/babel-helpers/src/helpers/checkInRHS.js b/packages/babel-helpers/src/helpers/checkInRHS.js
@@ -0,0 +1,11 @@
+/* @minVersion 7.20.1 */
+
+export default function _checkInRHS(value) {
+  if (Object(value) !== value) {
+    throw TypeError(
+      "right-hand side of 'in' should be an object, got " +
+        (value !== null ? typeof value : "null")
+    );
+  }
+  return value;
+}
diff --git a/packages/babel-plugin-proposal-decorators/src/index.ts b/packages/babel-plugin-proposal-decorators/src/index.ts
@@ -40,6 +40,7 @@ export default declare((api, options: Options) => {
   } else if (version === "2021-12" || version === "2022-03") {
     return transformer2022_03(api, options, version);
   } else if (!process.env.BABEL_8_BREAKING) {
+    api.assertVersion("^7.0.2");
     return createClassFeaturePlugin({
       name: "proposal-decorators",
 

diff --git a/...xtures/2021-12-classes--to-es2015/replacement-static-installed-on-correct-class/output.js b/...xtures/2021-12-classes--to-es2015/replacement-static-installed-on-correct-class/output.js
@@ -8,8 +8,8 @@ new (_x = /*#__PURE__*/new WeakMap(), _m = /*#__PURE__*/new WeakSet(), (_temp =
       writable: true,
       value: void 0
     }), babelHelpers.defineProperty(this, "x", void 0)), (() => {
-      hasX = o => _x.has(o);
-      hasM = o => _m.has(o);
+      hasX = o => _x.has(babelHelpers.checkInRHS(o));
+      hasM = o => _m.has(babelHelpers.checkInRHS(o));
     })(), _initClass();
   }
 }, (() => {

diff --git a/...xtures/2022-03-classes--to-es2015/replacement-static-installed-on-correct-class/output.js b/...xtures/2022-03-classes--to-es2015/replacement-static-installed-on-correct-class/output.js
@@ -8,8 +8,8 @@ new (_x = /*#__PURE__*/new WeakMap(), _m = /*#__PURE__*/new WeakSet(), (_temp =
       writable: true,
       value: void 0
     }), babelHelpers.defineProperty(this, "x", void 0)), (() => {
-      hasX = o => _x.has(o);
-      hasM = o => _m.has(o);
+      hasX = o => _x.has(babelHelpers.checkInRHS(o));
+      hasM = o => _m.has(babelHelpers.checkInRHS(o));
     })(), _initClass();
   }
 }, (() => {

diff --git a/packages/babel-plugin-proposal-private-property-in-object/src/index.ts b/packages/babel-plugin-proposal-private-property-in-object/src/index.ts
@@ -4,6 +4,7 @@ import {
   enableFeature,
   FEATURES,
   injectInitialization as injectConstructorInit,
+  buildCheckInRHS,
 } from "@babel/helper-create-class-features-plugin";
 import annotateAsPure from "@babel/helper-annotate-as-pure";
 import type * as t from "@babel/types";
@@ -119,8 +120,9 @@ export default declare((api, opt: Options) => {
       enableFeature(this.file, FEATURES.privateIn, loose);
     },
     visitor: {
-      BinaryExpression(path) {
+      BinaryExpression(path, state) {
         const { node } = path;
+        const { file } = state;
         if (node.operator !== "in") return;
         if (!t.isPrivateName(node.left)) return;
 
@@ -158,7 +160,10 @@ export default declare((api, opt: Options) => {
             }
             path.replaceWith(
               template.expression.ast`
-                ${t.cloneNode(outerClass.node.id)} === ${path.node.right}
+                ${t.cloneNode(outerClass.node.id)} === ${buildCheckInRHS(
+                node.right,
+                file,
+              )}
               `,
             );
           } else {
@@ -171,7 +176,10 @@ export default declare((api, opt: Options) => {
             );
 
             path.replaceWith(
-              template.expression.ast`${id}.has(${path.node.right})`,
+              template.expression.ast`${id}.has(${buildCheckInRHS(
+                node.right,
+                file,
+              )})`,
             );
           }
         } else {
@@ -187,7 +195,10 @@ export default declare((api, opt: Options) => {
           );
 
           path.replaceWith(
-            template.expression.ast`${id}.has(${path.node.right})`,
+            template.expression.ast`${id}.has(${buildCheckInRHS(
+              node.right,
+              file,
+            )})`,
           );
         }
       },

diff --git a/...-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/accessor/output.js b/...-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/accessor/output.js
@@ -7,7 +7,7 @@ class Foo {
     });
   }
   test(other) {
-    return Object.prototype.hasOwnProperty.call(other, _foo);
+    return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(other), _foo);
   }
 }
 function _get_foo() {}
diff --git a/...y-in-object/test/fixtures/assumption-privateFieldsAsProperties/compiled-classes/output.js b/...y-in-object/test/fixtures/assumption-privateFieldsAsProperties/compiled-classes/output.js
@@ -13,12 +13,12 @@ let Foo = /*#__PURE__*/function () {
   babelHelpers.createClass(Foo, [{
     key: "test",
     value: function test() {
-      return Object.prototype.hasOwnProperty.call(this, _bar);
+      return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(this), _bar);
     }
   }], [{
     key: "test",
     value: function test() {
-      return Object.prototype.hasOwnProperty.call(Foo, _foo);
+      return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(Foo), _foo);
     }
   }]);
   return Foo;

diff --git a/...ate-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/field/output.js b/...ate-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/field/output.js
@@ -7,6 +7,6 @@ class Foo {
     });
   }
   test(other) {
-    return Object.prototype.hasOwnProperty.call(other, _foo);
+    return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(other), _foo);
   }
 }
diff --git a/...te-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/method/output.js b/...te-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/method/output.js
@@ -6,7 +6,7 @@ class Foo {
     });
   }
   test(other) {
-    return Object.prototype.hasOwnProperty.call(other, _foo);
+    return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(other), _foo);
   }
 }
 function _foo2() {}
diff --git a/...est/fixtures/assumption-privateFieldsAsProperties/nested-class-other-redeclared/output.js b/...est/fixtures/assumption-privateFieldsAsProperties/nested-class-other-redeclared/output.js
@@ -21,11 +21,11 @@ class Foo {
         });
       }
       test() {
-        Object.prototype.hasOwnProperty.call(this, _foo);
-        Object.prototype.hasOwnProperty.call(this, _bar2);
+        Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(this), _foo);
+        Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(this), _bar2);
       }
     }
-    Object.prototype.hasOwnProperty.call(this, _foo);
-    Object.prototype.hasOwnProperty.call(this, _bar);
+    Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(this), _foo);
+    Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(this), _bar);
   }
 }
diff --git a/...ject/test/fixtures/assumption-privateFieldsAsProperties/nested-class-redeclared/output.js b/...ject/test/fixtures/assumption-privateFieldsAsProperties/nested-class-redeclared/output.js
@@ -16,9 +16,9 @@ class Foo {
         });
       }
       test() {
-        Object.prototype.hasOwnProperty.call(this, _foo2);
+        Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(this), _foo2);
       }
     }
-    Object.prototype.hasOwnProperty.call(this, _foo);
+    Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(this), _foo);
   }
 }
diff --git a/...perty-in-object/test/fixtures/assumption-privateFieldsAsProperties/nested-class/output.js b/...perty-in-object/test/fixtures/assumption-privateFieldsAsProperties/nested-class/output.js
@@ -9,9 +9,9 @@ class Foo {
   test() {
     class Nested {
       test() {
-        Object.prototype.hasOwnProperty.call(this, _foo);
+        Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(this), _foo);
       }
     }
-    Object.prototype.hasOwnProperty.call(this, _foo);
+    Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(this), _foo);
   }
 }
diff --git a/...perty-in-object/test/fixtures/assumption-privateFieldsAsProperties/rhs-not-object/exec.js b/...perty-in-object/test/fixtures/assumption-privateFieldsAsProperties/rhs-not-object/exec.js
@@ -0,0 +1,31 @@
+expect(() => class { static #p = #p in 0 }).toThrowError(`right-hand side of 'in' should be an object, got number`);
+expect(() => class { static #p = #p in "" }).toThrowError(`right-hand side of 'in' should be an object, got string`);
+expect(() => class { static #p = #p in true }).toThrowError(`right-hand side of 'in' should be an object, got boolean`);
+expect(() => class { static #p = #p in void 0 }).toThrowError(`right-hand side of 'in' should be an object, got undefined`);
+expect(() => class { static #p = #p in null }).toThrowError(`right-hand side of 'in' should be an object, got null`);
+expect(() => class { static #p = #p in Symbol.iterator }).toThrowError(`right-hand side of 'in' should be an object, got symbol`);
+expect(() => class { static #p = #p in 0n }).toThrowError(`right-hand side of 'in' should be an object, got bigint`);
+
+expect(() => class { static #p() {}; static q = #p in 0 }).toThrowError(`right-hand side of 'in' should be an object, got number`);
+expect(() => class { static #p() {}; static q = #p in "" }).toThrowError(`right-hand side of 'in' should be an object, got string`);
+expect(() => class { static #p() {}; static q = #p in true }).toThrowError(`right-hand side of 'in' should be an object, got boolean`);
+expect(() => class { static #p() {}; static q = #p in void 0 }).toThrowError(`right-hand side of 'in' should be an object, got undefined`);
+expect(() => class { static #p() {}; static q = #p in null }).toThrowError(`right-hand side of 'in' should be an object, got null`);
+expect(() => class { static #p() {}; static q = #p in Symbol.iterator }).toThrowError(`right-hand side of 'in' should be an object, got symbol`);
+expect(() => class { static #p() {}; static q = #p in 0n }).toThrowError(`right-hand side of 'in' should be an object, got bigint`);
+
+expect(() => new class { #p = #p in 0 }).toThrowError(`right-hand side of 'in' should be an object, got number`);
+expect(() => new class { #p = #p in "" }).toThrowError(`right-hand side of 'in' should be an object, got string`);
+expect(() => new class { #p = #p in true }).toThrowError(`right-hand side of 'in' should be an object, got boolean`);
+expect(() => new class { #p = #p in void 0 }).toThrowError(`right-hand side of 'in' should be an object, got undefined`);
+expect(() => new class { #p = #p in null }).toThrowError(`right-hand side of 'in' should be an object, got null`);
+expect(() => new class { #p = #p in Symbol.iterator }).toThrowError(`right-hand side of 'in' should be an object, got symbol`);
+expect(() => new class { #p = #p in 0n }).toThrowError(`right-hand side of 'in' should be an object, got bigint`);
+
+expect(() => new class { #p() {}; q = #p in 0 }).toThrowError(`right-hand side of 'in' should be an object, got number`);
+expect(() => new class { #p() {}; q = #p in "" }).toThrowError(`right-hand side of 'in' should be an object, got string`);
+expect(() => new class { #p() {}; q = #p in true }).toThrowError(`right-hand side of 'in' should be an object, got boolean`);
+expect(() => new class { #p() {}; q = #p in void 0 }).toThrowError(`right-hand side of 'in' should be an object, got undefined`);
+expect(() => new class { #p() {}; q = #p in null }).toThrowError(`right-hand side of 'in' should be an object, got null`);
+expect(() => new class { #p() {}; q = #p in Symbol.iterator }).toThrowError(`right-hand side of 'in' should be an object, got symbol`);
+expect(() => new class { #p() {}; q = #p in 0n }).toThrowError(`right-hand side of 'in' should be an object, got bigint`);
diff --git a/...-in-object/test/fixtures/assumption-privateFieldsAsProperties/rhs-not-object/options.json b/...-in-object/test/fixtures/assumption-privateFieldsAsProperties/rhs-not-object/options.json
@@ -0,0 +1,3 @@
+{
+  "minNodeVersion": "12.0.0"
+}
diff --git a/...ty-in-object/test/fixtures/assumption-privateFieldsAsProperties/static-accessor/output.js b/...ty-in-object/test/fixtures/assumption-privateFieldsAsProperties/static-accessor/output.js
@@ -1,7 +1,7 @@
 var _foo = /*#__PURE__*/babelHelpers.classPrivateFieldLooseKey("foo");
 class Foo {
   test(other) {
-    return Object.prototype.hasOwnProperty.call(other, _foo);
+    return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(other), _foo);
   }
 }
 function _get_foo() {}

diff --git a/...perty-in-object/test/fixtures/assumption-privateFieldsAsProperties/static-field/output.js b/...perty-in-object/test/fixtures/assumption-privateFieldsAsProperties/static-field/output.js
@@ -1,7 +1,7 @@
 var _foo = /*#__PURE__*/babelHelpers.classPrivateFieldLooseKey("foo");
 class Foo {
   test(other) {
-    return Object.prototype.hasOwnProperty.call(other, _foo);
+    return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(other), _foo);
   }
 }
 Object.defineProperty(Foo, _foo, {

diff --git a/...erty-in-object/test/fixtures/assumption-privateFieldsAsProperties/static-method/output.js b/...erty-in-object/test/fixtures/assumption-privateFieldsAsProperties/static-method/output.js
@@ -1,7 +1,7 @@
 var _foo = /*#__PURE__*/babelHelpers.classPrivateFieldLooseKey("foo");
 class Foo {
   test(other) {
-    return Object.prototype.hasOwnProperty.call(other, _foo);
+    return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(other), _foo);
   }
 }
 function _foo2() {}

diff --git a/...plugin-proposal-private-property-in-object/test/fixtures/private-loose/accessor/output.js b/...plugin-proposal-private-property-in-object/test/fixtures/private-loose/accessor/output.js
@@ -12,7 +12,7 @@ let Foo = /*#__PURE__*/function () {
   babelHelpers.createClass(Foo, [{
     key: "test",
     value: function test(other) {
-      return Object.prototype.hasOwnProperty.call(other, _foo);
+      return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(other), _foo);
     }
   }]);
   return Foo;

diff --git a/...el-plugin-proposal-private-property-in-object/test/fixtures/private-loose/field/output.js b/...el-plugin-proposal-private-property-in-object/test/fixtures/private-loose/field/output.js
@@ -12,7 +12,7 @@ let Foo = /*#__PURE__*/function () {
   babelHelpers.createClass(Foo, [{
     key: "test",
     value: function test(other) {
-      return Object.prototype.hasOwnProperty.call(other, _foo);
+      return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(other), _foo);
     }
   }]);
   return Foo;

diff --git a/...l-plugin-proposal-private-property-in-object/test/fixtures/private-loose/method/output.js b/...l-plugin-proposal-private-property-in-object/test/fixtures/private-loose/method/output.js
@@ -11,7 +11,7 @@ let Foo = /*#__PURE__*/function () {
   babelHelpers.createClass(Foo, [{
     key: "test",
     value: function test(other) {
-      return Object.prototype.hasOwnProperty.call(other, _foo);
+      return Object.prototype.hasOwnProperty.call(babelHelpers.checkInRHS(other), _foo);
     }
   }]);
   return Foo;

diff --git a/...-proposal-private-property-in-object/test/fixtures/private-loose/native-classes/output.js b/...-proposal-private-property-in-object/test/fixtures/private-loose/native-classes/output.js
@@ -7,10 +7,10 @@ class Foo {
     });
   }
   static test() {
-    return Foo === Foo;
+    return babelHelpers.checkInRHS(Foo) === Foo;
   }
   test() {
-    return _bar.has(this);
+    return _bar.has(babelHelpers.checkInRHS(this));
   }
 }
 var _foo = {