environmentVisitor should skip decorator expressions

packages/babel-helper-environment-visitor/package.json

@@ -17,11 +17,9 @@
     ".": "./lib/index.js",
     "./package.json": "./package.json"
   },
-  "dependencies": {
-    "@babel/types": "workspace:^"
-  },
   "devDependencies": {
-    "@babel/traverse": "workspace:^"
+    "@babel/traverse": "workspace:^",
+    "@babel/types": "workspace:^"
   },
   "engines": {
     "node": ">=6.9.0"

packages/babel-helper-environment-visitor/src/index.ts

@@ -1,38 +1,56 @@
-import type { NodePath } from "@babel/traverse";
-import { VISITOR_KEYS, staticBlock } from "@babel/types";
+import type { NodePath, Visitor } from "@babel/traverse";
 import type * as t from "@babel/types";
 
 // TODO (Babel 8): Don't export this function.
 export function skipAllButComputedKey(
   path: NodePath<t.Method | t.ClassProperty>,
 ) {
-  // If the path isn't computed, just skip everything.
-  if (!path.node.computed) {
-    path.skip();
-    return;
+  path.skip();
+  if (path.node.computed) {
+    // requeue the computed key
+    path.context.maybeQueue(path.get("key"));
   }
+}
 
-  // So it's got a computed key. Make sure to skip every other key the
-  // traversal would visit.
-  const keys = VISITOR_KEYS[path.type];
-  for (const key of keys) {
-    if (key !== "key") path.skipKey(key);
+export function requeueComputedKeyAndDecorators(
+  path: NodePath<t.Method | t.Property>,
+) {
+  const { context, node } = path;
+  //@ts-ignore ClassPrivateProperty does not have computed
+  if (node.computed) {
+    // requeue the computed key
+    context.maybeQueue(path.get("key"));
+  }
+  if (node.decorators) {
+    for (const decorator of path.get("decorators")) {
+      // requeue the decorators
+      context.maybeQueue(decorator);
+    }
   }
 }
 
-// Methods are handled by the Method visitor; arrows are not skipped because they inherit the context.
-const skipKey = process.env.BABEL_8_BREAKING
-  ? "StaticBlock|ClassPrivateProperty|TypeAnnotation|FunctionDeclaration|FunctionExpression"
-  : (staticBlock ? "StaticBlock|" : "") +
-    "ClassPrivateProperty|TypeAnnotation|FunctionDeclaration|FunctionExpression";
-
 // environmentVisitor should be used when traversing the whole class and not for specific class elements/methods.
 // For perf reasons, the environmentVisitor might be traversed with `{ noScope: true }`, which means `path.scope` is undefined.
 // Avoid using `path.scope` here
-export default {
-  [skipKey]: path => path.skip(),
-
-  "Method|ClassProperty"(path: NodePath<t.Method | t.ClassProperty>) {
-    skipAllButComputedKey(path);
+const visitor: Visitor = {
+  FunctionParent(path) {
+    if (path.isArrowFunctionExpression()) {
+      // arrows are not skipped because they inherit the context.
+      return;
+    } else {
+      path.skip();
+      if (path.isMethod()) {
+        requeueComputedKeyAndDecorators(path);
+      }
+    }
+  },
+  Property(path) {
+    if (path.isObjectProperty()) {
+      return;
+    }
+    path.skip();
+    requeueComputedKeyAndDecorators(path);
   },
 };
+
+export default visitor;

packages/babel-helper-replace-supers/src/index.ts

@@ -57,7 +57,9 @@ const visitor = traverse.visitors.merge<
   },
 ]);
 
-const unshadowSuperBindingVisitor = traverse.visitors.merge([
+const unshadowSuperBindingVisitor = traverse.visitors.merge<{
+  refName: string;
+}>([
   environmentVisitor,
   {
     Scopable(path, { refName }) {

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/options.json

@@ -1,3 +1,8 @@
 {
-  "plugins": ["proposal-class-properties", "transform-classes"]
+  "plugins": [
+    ["proposal-decorators", { "version": "2021-12" }],
+    "proposal-class-static-block",
+    "proposal-class-properties",
+    "transform-classes"
+  ]
 }

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-decorator/exec.js

@@ -0,0 +1,18 @@
+"use strict";
+class Hello {
+  constructor() {
+    return () => () => "hello";
+  }
+}
+
+class Outer extends Hello {
+  constructor() {
+    class Inner {
+      @(super()) hello;
+    }
+
+    return new Inner();
+  }
+}
+
+expect(new Outer().hello).toBe('hello');

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-decorator/input.js

@@ -0,0 +1,18 @@
+"use strict";
+class Hello {
+  constructor() {
+    return () => () => "hello";
+  }
+}
+
+class Outer extends Hello {
+  constructor() {
+    class Inner {
+      @(super()) hello;
+    }
+
+    return new Inner();
+  }
+}
+
+expect(new Outer().hello).toBe('hello');

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-decorator/output.js

@@ -0,0 +1,31 @@
+"use strict";
+
+let Hello = /*#__PURE__*/babelHelpers.createClass(function Hello() {
+  babelHelpers.classCallCheck(this, Hello);
+  return () => () => "hello";
+});
+
+let Outer = /*#__PURE__*/function (_Hello) {
+  babelHelpers.inherits(Outer, _Hello);
+
+  var _super = babelHelpers.createSuper(Outer);
+
+  function Outer() {
+    var _dec, _init_hello;
+
+    var _this;
+
+    babelHelpers.classCallCheck(this, Outer);
+    _dec = _this = _super.call(this);
+    let Inner = /*#__PURE__*/babelHelpers.createClass(function Inner() {
+      babelHelpers.classCallCheck(this, Inner);
+      babelHelpers.defineProperty(this, "hello", _init_hello(this));
+    });
+    [_init_hello] = babelHelpers.applyDecs(Inner, [[_dec, 0, "hello"]], []);
+    return babelHelpers.possibleConstructorReturn(_this, new Inner());
+  }
+
+  return babelHelpers.createClass(Outer);
+}(Hello);
+
+expect(new Outer().hello).toBe('hello');

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-accessor-key/exec.js

@@ -0,0 +1,19 @@
+"use strict";
+class Hello {
+  toString() {
+    return 'hello';
+  }
+}
+
+class Outer extends Hello {
+  constructor() {
+    super();
+    class Inner {
+      accessor [super.toString()] = 'hello';
+    }
+
+    return new Inner();
+  }
+}
+
+expect(new Outer().hello).toBe('hello');

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-accessor-key/input.js

@@ -0,0 +1,19 @@
+"use strict";
+class Hello {
+  toString() {
+    return 'hello';
+  }
+}
+
+class Outer extends Hello {
+  constructor() {
+    super();
+    class Inner {
+      accessor [super.toString()] = 'hello';
+    }
+
+    return new Inner();
+  }
+}
+
+expect(new Outer().hello).toBe('hello');

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-accessor-key/options.json

@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    ["proposal-decorators", { "version": "2021-12" }],
+    "proposal-class-static-block",
+    "proposal-class-properties",
+    "transform-classes"
+  ]
+}

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-accessor-key/output.js

@@ -0,0 +1,64 @@
+"use strict";
+
+let Hello = /*#__PURE__*/function () {
+  function Hello() {
+    babelHelpers.classCallCheck(this, Hello);
+  }
+
+  babelHelpers.createClass(Hello, [{
+    key: "toString",
+    value: function toString() {
+      return 'hello';
+    }
+  }]);
+  return Hello;
+}();
+
+let Outer = /*#__PURE__*/function (_Hello) {
+  babelHelpers.inherits(Outer, _Hello);
+
+  var _super = babelHelpers.createSuper(Outer);
+
+  function Outer() {
+    let _babelHelpers$get$cal, _babelHelpers$get$cal2;
+
+    var _thisSuper, _this;
+
+    babelHelpers.classCallCheck(this, Outer);
+    _this = _super.call(this);
+
+    var _A = /*#__PURE__*/new WeakMap();
+
+    _babelHelpers$get$cal = babelHelpers.get((_thisSuper = babelHelpers.assertThisInitialized(_this), babelHelpers.getPrototypeOf(Outer.prototype)), "toString", _thisSuper).call(_thisSuper);
+    _babelHelpers$get$cal2 = babelHelpers.get((_thisSuper = babelHelpers.assertThisInitialized(_this), babelHelpers.getPrototypeOf(Outer.prototype)), "toString", _thisSuper).call(_thisSuper);
+
+    let Inner = /*#__PURE__*/function () {
+      function Inner() {
+        babelHelpers.classCallCheck(this, Inner);
+        babelHelpers.classPrivateFieldInitSpec(this, _A, {
+          writable: true,
+          value: 'hello'
+        });
+      }
+
+      babelHelpers.createClass(Inner, [{
+        key: _babelHelpers$get$cal,
+        get: function () {
+          return babelHelpers.classPrivateFieldGet(this, _A);
+        }
+      }, {
+        key: _babelHelpers$get$cal2,
+        set: function (v) {
+          babelHelpers.classPrivateFieldSet(this, _A, v);
+        }
+      }]);
+      return Inner;
+    }();
+
+    return babelHelpers.possibleConstructorReturn(_this, new Inner());
+  }
+
+  return babelHelpers.createClass(Outer);
+}(Hello);
+
+expect(new Outer().hello).toBe('hello');

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-decorator/exec.js

@@ -0,0 +1,17 @@
+"use strict";
+class Hello {
+  dec() { return () => "hello" }
+}
+
+class Outer extends Hello {
+  constructor() {
+    super();
+    class Inner {
+      @(super.dec) hello;
+    }
+
+    return new Inner();
+  }
+}
+
+expect(new Outer().hello).toBe('hello');

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-decorator/input.js

@@ -0,0 +1,17 @@
+"use strict";
+class Hello {
+  dec() { return () => "hello" }
+}
+
+class Outer extends Hello {
+  constructor() {
+    super();
+    class Inner {
+      @(super.dec) hello;
+    }
+
+    return new Inner();
+  }
+}
+
+expect(new Outer().hello).toBe('hello');

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-decorator/output.js

@@ -0,0 +1,41 @@
+"use strict";
+
+let Hello = /*#__PURE__*/function () {
+  function Hello() {
+    babelHelpers.classCallCheck(this, Hello);
+  }
+
+  babelHelpers.createClass(Hello, [{
+    key: "dec",
+    value: function dec() {
+      return () => "hello";
+    }
+  }]);
+  return Hello;
+}();
+
+let Outer = /*#__PURE__*/function (_Hello) {
+  babelHelpers.inherits(Outer, _Hello);
+
+  var _super = babelHelpers.createSuper(Outer);
+
+  function Outer() {
+    var _dec, _init_hello;
+
+    var _thisSuper, _this;
+
+    babelHelpers.classCallCheck(this, Outer);
+    _this = _super.call(this);
+    _dec = babelHelpers.get((_thisSuper = babelHelpers.assertThisInitialized(_this), babelHelpers.getPrototypeOf(Outer.prototype)), "dec", _thisSuper);
+    let Inner = /*#__PURE__*/babelHelpers.createClass(function Inner() {
+      babelHelpers.classCallCheck(this, Inner);
+      babelHelpers.defineProperty(this, "hello", _init_hello(this));
+    });
+    [_init_hello] = babelHelpers.applyDecs(Inner, [[_dec, 0, "hello"]], []);
+    return babelHelpers.possibleConstructorReturn(_this, new Inner());
+  }
+
+  return babelHelpers.createClass(Outer);
+}(Hello);
+
+expect(new Outer().hello).toBe('hello');

packages/babel-plugin-proposal-decorators/src/transformer-2021-12.ts

@@ -502,7 +502,7 @@ function transformClass(
     if (element.node.decorators && element.node.decorators.length > 0) {
       hasElementDecorators = true;
     } else if (element.node.type === "ClassAccessorProperty") {
-      const { key, value, static: isStatic } = element.node;
+      const { key, value, static: isStatic, computed } = element.node;
 
       const newId = generateClassPrivateUid();
 
@@ -511,7 +511,7 @@ function transformClass(
       const newField = generateClassProperty(newId, valueNode, isStatic);
 
       const [newPath] = element.replaceWith(newField);
-      addProxyAccessorsFor(newPath, key, newId, element.node.computed);
+      addProxyAccessorsFor(newPath, key, newId, computed);
     }
   }