Add .has method to context.access

babel · Feb 3, 2023 · d3bed4d · d3bed4d
1 parent fa1ffc6
commit d3bed4d
Show file tree

Hide file tree

Showing 56 changed files with 259 additions and 98 deletions.
diff --git a/packages/babel-helpers/src/helpers-generated.ts b/packages/babel-helpers/src/helpers-generated.ts
diff --git a/packages/babel-helpers/src/helpers/applyDecs2301.js b/packages/babel-helpers/src/helpers/applyDecs2301.js
@@ -34,7 +34,8 @@ function memberDec(
   kind,
   isStatic,
   isPrivate,
-  value
+  value,
+  privateHas
 ) {
   var kindStr;
 
@@ -71,7 +72,13 @@ function memberDec(
     );
   }
 
-  var get, set;
+  var get, set, has;
+  if (isPrivate) has = privateHas;
+  else {
+    has = function (receiver) {
+      return name in receiver;
+    };
+  }
   if (!isPrivate && (kind === 0 /* FIELD */ || kind === 2) /* METHOD */) {
     get = function (receiver) {
       return receiver[name];
@@ -102,7 +109,11 @@ function memberDec(
     }
   }
   ctx.access =
-    get && set ? { get: get, set: set } : get ? { get: get } : { set: set };
+    get && set
+      ? { get: get, set: set, has: has }
+      : get
+      ? { get: get, has: has }
+      : { set: set, has: has };
 
   try {
     return dec(value, ctx);
@@ -168,26 +179,30 @@ function applyMemberDec(
 ) {
   var decs = decInfo[0];
 
-  var desc, init, value;
+  var desc, init, value, has;
 
   if (isPrivate) {
     if (kind === 0 /* FIELD */ || kind === 1 /* ACCESSOR */) {
       desc = {
         get: decInfo[3],
         set: decInfo[4],
       };
-    } else if (kind === 3 /* GETTER */) {
-      desc = {
-        get: decInfo[3],
-      };
-    } else if (kind === 4 /* SETTER */) {
-      desc = {
-        set: decInfo[3],
-      };
+      has = decInfo[5];
     } else {
-      desc = {
-        value: decInfo[3],
-      };
+      if (kind === 3 /* GETTER */) {
+        desc = {
+          get: decInfo[3],
+        };
+      } else if (kind === 4 /* SETTER */) {
+        desc = {
+          set: decInfo[3],
+        };
+      } else {
+        desc = {
+          value: decInfo[3],
+        };
+      }
+      has = decInfo[4];
     }
   } else if (kind !== 0 /* FIELD */) {
     desc = Object.getOwnPropertyDescriptor(base, name);
@@ -217,7 +232,8 @@ function applyMemberDec(
       kind,
       isStatic,
       isPrivate,
-      value
+      value,
+      has
     );
 
     if (newValue !== void 0) {
@@ -247,7 +263,8 @@ function applyMemberDec(
         kind,
         isStatic,
         isPrivate,
-        value
+        value,
+        has
       );
 
       if (newValue !== void 0) {

diff --git a/packages/babel-plugin-proposal-decorators/src/transformer-2023-01.ts b/packages/babel-plugin-proposal-decorators/src/transformer-2023-01.ts
@@ -231,31 +231,24 @@ function addProxyAccessorsFor(
 
 function extractProxyAccessorsFor(
   targetKey: t.PrivateName,
-): t.FunctionExpression[] {
+  injectHas: boolean,
+): (t.FunctionExpression | t.ArrowFunctionExpression)[] {
   return [
-    t.functionExpression(
-      undefined,
-      [],
-      t.blockStatement([
-        t.returnStatement(
-          t.memberExpression(t.thisExpression(), t.cloneNode(targetKey)),
-        ),
-      ]),
-    ),
-    t.functionExpression(
-      undefined,
-      [t.identifier("value")],
-      t.blockStatement([
-        t.expressionStatement(
-          t.assignmentExpression(
-            "=",
-            t.memberExpression(t.thisExpression(), t.cloneNode(targetKey)),
-            t.identifier("value"),
-          ),
-        ),
-      ]),
-    ),
-  ];
+    template.expression.ast`
+      function () {
+        return this.${t.cloneNode(targetKey)};
+      }
+    ` as t.FunctionExpression,
+    template.expression.ast`
+      function (value) {
+        this.${t.cloneNode(targetKey)} = value;
+      }
+    ` as t.FunctionExpression,
+    injectHas &&
+      (template.expression.ast`
+        _ => ${t.cloneNode(targetKey)} in _
+      ` as t.ArrowFunctionExpression),
+  ].filter(Boolean);
 }
 
 const FIELD = 0;
@@ -299,7 +292,9 @@ interface DecoratorInfo {
   // The name of the decorator
   name: t.StringLiteral | t.Expression;
 
-  privateMethods: t.FunctionExpression | t.FunctionExpression[] | undefined;
+  privateMethods:
+    | (t.FunctionExpression | t.ArrowFunctionExpression)[]
+    | undefined;
 
   // The names of local variables that will be used/returned from the decoration
   locals: t.Identifier | t.Identifier[] | undefined;
@@ -496,6 +491,8 @@ function transformClass(
   const classDecorators = path.node.decorators;
   let hasElementDecorators = false;
 
+  const injectHasChecks = version === "2023-01";
+
   const generateClassPrivateUid = createLazyPrivateUidGeneratorForClass(path);
 
   // Iterate over the class to see if we need to decorate it, and also to
@@ -623,7 +620,9 @@ function transformClass(
 
       if (hasDecorators) {
         let locals: t.Identifier | t.Identifier[];
-        let privateMethods: t.FunctionExpression | t.FunctionExpression[];
+        let privateMethods: Array<
+          t.FunctionExpression | t.ArrowFunctionExpression
+        >;
 
         if (kind === ACCESSOR) {
           const { value } = element.node as t.ClassAccessorProperty;
@@ -646,7 +645,7 @@ function transformClass(
           const [newPath] = element.replaceWith(newField);
 
           if (isPrivate) {
-            privateMethods = extractProxyAccessorsFor(newId);
+            privateMethods = extractProxyAccessorsFor(newId, injectHasChecks);
 
             const getId = newPath.scope.parent.generateDeclaredUidIdentifier(
               `get_${name}`,
@@ -680,7 +679,7 @@ function transformClass(
           locals = initId;
 
           if (isPrivate) {
-            privateMethods = extractProxyAccessorsFor(key);
+            privateMethods = extractProxyAccessorsFor(key, injectHasChecks);
           }
         } else if (isPrivate) {
           locals = element.scope.parent.generateDeclaredUidIdentifier(
@@ -704,12 +703,18 @@ function transformClass(
             async: isAsync,
           } = element.node as t.ClassPrivateMethod;
 
-          privateMethods = t.functionExpression(
-            undefined,
-            params.filter(isNotTsParameter),
-            body,
-            isAsync,
-          );
+          privateMethods = [
+            t.functionExpression(
+              undefined,
+              params.filter(isNotTsParameter),
+              body,
+              isAsync,
+            ),
+            injectHasChecks &&
+              (template.expression.ast`
+                _ => ${t.cloneNode(key)} in _
+              ` as t.ArrowFunctionExpression),
+          ].filter(Boolean);
 
           if (kind === GETTER || kind === SETTER) {
             movePrivateAccessor(

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/private/exec.js b/...bel-plugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/private/exec.js
@@ -31,6 +31,10 @@ let foo = new Foo();
 const aContext = foo['#aContext'];
 const bContext = foo['#bContext'];
 
+expect(aContext.access.has(foo)).toBe(true);
+expect(aContext.access.has({})).toBe(false);
+expect(aContext.access.has(Object.create(foo))).toBe(false);
+
 expect(aContext.access.get(foo)).toBe(2);
 aContext.access.set(foo, 123);
 expect(aContext.access.get(foo)).toBe(125);

diff --git a/...l-plugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/private/output.js b/...l-plugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/private/output.js
@@ -40,8 +40,8 @@ function _get_b2() {
   return babelHelpers.classPrivateFieldGet(this, _A);
 }, function (value) {
   babelHelpers.classPrivateFieldSet(this, _A, value);
-}], [dec, 1, "b", function () {
+}, _ => _A.has(babelHelpers.checkInRHS(_))], [dec, 1, "b", function () {
   return babelHelpers.classPrivateFieldGet(this, _B);
 }, function (value) {
   babelHelpers.classPrivateFieldSet(this, _B, value);
-}]], []).e;
+}, _ => _B.has(babelHelpers.checkInRHS(_))]], []).e;
diff --git a/...abel-plugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/public/exec.js b/...abel-plugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/public/exec.js
@@ -35,6 +35,12 @@ const aContext = foo['aContext'];
 const bContext = foo['bContext'];
 const cContext = foo['cContext'];
 
+expect(aContext.access.has(foo)).toBe(true);
+expect(aContext.access.has({})).toBe(false);
+expect(aContext.access.has(Object.create(foo))).toBe(true);
+expect(aContext.access.has({ a: 1 })).toBe(true);
+expect(aContext.access.has(Object.create({ a: 1 }))).toBe(true);
+
 expect(foo.a).toBe(2);
 expect(aContext.access.get(foo)).toBe(2);
 foo.a = 123;

diff --git a/...gin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/static-private/exec.js b/...gin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/static-private/exec.js
@@ -29,6 +29,10 @@ class Foo {
 const aContext = Foo['#aContext'];
 const bContext = Foo['#bContext'];
 
+expect(aContext.access.has(Foo)).toBe(true);
+expect(aContext.access.has({})).toBe(false);
+expect(aContext.access.has(Object.create(Foo))).toBe(false);
+
 expect(aContext.access.get(Foo)).toBe(2);
 aContext.access.set(Foo, 123);
 expect(aContext.access.get(Foo)).toBe(125);

diff --git a/...n-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/static-private/output.js b/...n-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/static-private/output.js
@@ -31,11 +31,11 @@ function _get_b2() {
     return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _A);
   }, function (value) {
     babelHelpers.classStaticPrivateFieldSpecSet(this, Foo, _A, value);
-  }], [dec, 6, "b", function () {
+  }, _ => babelHelpers.checkInRHS(_) === Foo], [dec, 6, "b", function () {
     return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _B);
   }, function (value) {
     babelHelpers.classStaticPrivateFieldSpecSet(this, Foo, _B, value);
-  }]], []).e;
+  }, _ => babelHelpers.checkInRHS(_) === Foo]], []).e;
   _initStatic(Foo);
 })();
 var _A = {

diff --git a/...ugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/static-public/exec.js b/...ugin-proposal-decorators/test/fixtures/2023-01-accessors--to-es2015/static-public/exec.js
@@ -33,6 +33,12 @@ const aContext = Foo['aContext'];
 const bContext = Foo['bContext'];
 const cContext = Foo['cContext'];
 
+expect(aContext.access.has(Foo)).toBe(true);
+expect(aContext.access.has({})).toBe(false);
+expect(aContext.access.has(Object.create(Foo))).toBe(true);
+expect(aContext.access.has({ a: 1 })).toBe(true);
+expect(aContext.access.has(Object.create({ a: 1 }))).toBe(true);
+
 expect(Foo.a).toBe(2);
 expect(aContext.access.get(Foo)).toBe(2);
 Foo.a = 123;

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2023-01-accessors/private/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2023-01-accessors/private/output.js
@@ -6,11 +6,11 @@ class Foo {
       return this.#A;
     }, function (value) {
       this.#A = value;
-    }], [dec, 1, "b", function () {
+    }, _ => #A in _], [dec, 1, "b", function () {
       return this.#B;
     }, function (value) {
       this.#B = value;
-    }]], []).e;
+    }, _ => #B in _]], []).e;
   }
   #A = (_initProto(this), _init_a(this));
   set #a(v) {

diff --git a/...babel-plugin-proposal-decorators/test/fixtures/2023-01-accessors/static-private/output.js b/...babel-plugin-proposal-decorators/test/fixtures/2023-01-accessors/static-private/output.js
@@ -6,11 +6,11 @@ class Foo {
       return this.#A;
     }, function (value) {
       this.#A = value;
-    }], [dec, 6, "b", function () {
+    }, _ => #A in _], [dec, 6, "b", function () {
       return this.#B;
     }, function (value) {
       this.#B = value;
-    }]], []).e;
+    }, _ => #B in _]], []).e;
     _initStatic(this);
   }
   static #A = _init_a(this);

diff --git a/...rators/test/fixtures/2023-01-assumption-constantSuper/super-in-private-accessor/output.js b/...rators/test/fixtures/2023-01-assumption-constantSuper/super-in-private-accessor/output.js
@@ -4,7 +4,7 @@ class Foo extends Bar {
   static {
     [_call_x, _initProto] = babelHelpers.applyDecs2301(this, [[dec, 3, "x", function () {
       return Bar.prototype.foo.call(this);
-    }]], []).e;
+    }, _ => #x in _]], []).e;
   }
   constructor(...args) {
     super(...args);

diff --git a/...corators/test/fixtures/2023-01-assumption-constantSuper/super-in-private-method/output.js b/...corators/test/fixtures/2023-01-assumption-constantSuper/super-in-private-method/output.js
@@ -4,7 +4,7 @@ class Foo extends Bar {
   static {
     [_call_x, _initProto] = babelHelpers.applyDecs2301(this, [[dec, 2, "x", function () {
       return Bar.prototype.foo.call(this);
-    }]], []).e;
+    }, _ => #x in _]], []).e;
   }
   constructor(...args) {
     super(...args);

diff --git a/.../babel-plugin-proposal-decorators/test/fixtures/2023-01-fields--to-es2015/private/exec.js b/.../babel-plugin-proposal-decorators/test/fixtures/2023-01-fields--to-es2015/private/exec.js
@@ -18,6 +18,10 @@ let foo = new Foo();
 const aContext = foo['#aContext'];
 const bContext = foo['#bContext'];
 
+expect(aContext.access.has(foo)).toBe(true);
+expect(aContext.access.has({})).toBe(false);
+expect(aContext.access.has(Object.create(foo))).toBe(false);
+
 expect(aContext.access.get(foo)).toBe(2);
 aContext.access.set(foo, 123);
 expect(aContext.access.get(foo)).toBe(123);

diff --git a/...abel-plugin-proposal-decorators/test/fixtures/2023-01-fields--to-es2015/private/output.js b/...abel-plugin-proposal-decorators/test/fixtures/2023-01-fields--to-es2015/private/output.js
@@ -18,8 +18,8 @@ class Foo {
   return babelHelpers.classPrivateFieldGet(this, _a);
 }, function (value) {
   babelHelpers.classPrivateFieldSet(this, _a, value);
-}], [dec, 0, "b", function () {
+}, _ => _a.has(babelHelpers.checkInRHS(_))], [dec, 0, "b", function () {
   return babelHelpers.classPrivateFieldGet(this, _b);
 }, function (value) {
   babelHelpers.classPrivateFieldSet(this, _b, value);
-}]], []).e;
+}, _ => _b.has(babelHelpers.checkInRHS(_))]], []).e;
diff --git a/...s/babel-plugin-proposal-decorators/test/fixtures/2023-01-fields--to-es2015/public/exec.js b/...s/babel-plugin-proposal-decorators/test/fixtures/2023-01-fields--to-es2015/public/exec.js
@@ -22,6 +22,12 @@ const aContext = foo['aContext'];
 const bContext = foo['bContext'];
 const cContext = foo['cContext'];
 
+expect(aContext.access.has(foo)).toBe(true);
+expect(aContext.access.has({})).toBe(false);
+expect(aContext.access.has(Object.create(foo))).toBe(true);
+expect(aContext.access.has({ a: 1 })).toBe(true);
+expect(aContext.access.has(Object.create({ a: 1 }))).toBe(true);
+
 expect(foo.a).toBe(2);
 expect(aContext.access.get(foo)).toBe(2);
 foo.a = 123;

diff --git a/...plugin-proposal-decorators/test/fixtures/2023-01-fields--to-es2015/static-private/exec.js b/...plugin-proposal-decorators/test/fixtures/2023-01-fields--to-es2015/static-private/exec.js
@@ -16,6 +16,10 @@ class Foo {
 const aContext = Foo['#aContext'];
 const bContext = Foo['#bContext'];
 
+expect(aContext.access.has(Foo)).toBe(true);
+expect(aContext.access.has({})).toBe(false);
+expect(aContext.access.has(Object.create(Foo))).toBe(false);
+
 expect(aContext.access.get(Foo)).toBe(2);
 aContext.access.set(Foo, 123);
 expect(aContext.access.get(Foo)).toBe(123);