fix: Decorators when super() exists and protoInit is not needed

packages/babel-helper-create-class-features-plugin/src/decorators.ts

@@ -475,26 +475,28 @@ function optimizeSuperCallAndExpressions(
   expressions: t.Expression[],
   protoInitLocal: t.Identifier,
 ) {
-  // Merge `super(), protoInit(this)` into `protoInit(super())`
-  if (
-    expressions.length >= 2 &&
-    isProtoInitCallExpression(expressions[1], protoInitLocal)
-  ) {
-    const mergedSuperCall = t.callExpression(t.cloneNode(protoInitLocal), [
-      expressions[0],
-    ]);
-    expressions.splice(0, 2, mergedSuperCall);
-  }
-  // Merge `protoInit(super()), this` into `protoInit(super())`
-  if (
-    expressions.length >= 2 &&
-    t.isThisExpression(expressions[expressions.length - 1]) &&
-    isProtoInitCallExpression(
-      expressions[expressions.length - 2],
-      protoInitLocal,
-    )
-  ) {
-    expressions.splice(expressions.length - 1, 1);
+  if (protoInitLocal) {
+    if (
+      expressions.length >= 2 &&
+      isProtoInitCallExpression(expressions[1], protoInitLocal)
+    ) {
+      // Merge `super(), protoInit(this)` into `protoInit(super())`
+      const mergedSuperCall = t.callExpression(t.cloneNode(protoInitLocal), [
+        expressions[0],
+      ]);
+      expressions.splice(0, 2, mergedSuperCall);
+    }
+    // Merge `protoInit(super()), this` into `protoInit(super())`
+    if (
+      expressions.length >= 2 &&
+      t.isThisExpression(expressions[expressions.length - 1]) &&
+      isProtoInitCallExpression(
+        expressions[expressions.length - 2],
+        protoInitLocal,
+      )
+    ) {
+      expressions.splice(expressions.length - 1, 1);
+    }
   }
   return maybeSequenceExpression(expressions);
 }

packages/babel-plugin-proposal-decorators/test/fixtures/2023-11-misc--to-es2015/super/exec.js

@@ -0,0 +1,24 @@
+function decorate() {
+  return function (target, context) {}
+}
+
+class Test {
+  @decorate()
+  accessor foo = 42;
+
+  constructor() {
+  }
+}
+
+new Test()
+
+class TestChild extends Test {
+  @decorate()
+  accessor bar = 1;
+
+  constructor() {
+    super();
+  }
+}
+
+const r = new TestChild();

packages/babel-plugin-proposal-decorators/test/fixtures/2023-11-misc--to-es2015/super/input.js

@@ -0,0 +1,25 @@
+function decorate() {
+  return function (target, context) {}
+}
+
+class Test {
+  @decorate()
+  accessor foo = 42;
+
+  constructor() {
+    console.log('hello');
+  }
+}
+
+new Test()
+
+class TestChild extends Test {
+  @decorate()
+  accessor bar = 1;
+
+  constructor() {
+    super();
+  }
+}
+
+const r = new TestChild();

packages/babel-plugin-proposal-decorators/test/fixtures/2023-11-misc--to-es2015/super/output.js

@@ -0,0 +1,37 @@
+var _Test, _TestChild;
+let _init_foo, _init_extra_foo, _init_bar, _init_extra_bar;
+function decorate() {
+  return function (target, context) {};
+}
+var _A = /*#__PURE__*/new WeakMap();
+class Test {
+  get foo() {
+    return babelHelpers.classPrivateFieldGet2(_A, this);
+  }
+  set foo(v) {
+    babelHelpers.classPrivateFieldSet2(_A, this, v);
+  }
+  constructor() {
+    babelHelpers.classPrivateFieldInitSpec(this, _A, _init_foo(this, 42));
+    _init_extra_foo(this);
+    console.log('hello');
+  }
+}
+_Test = Test;
+[_init_foo, _init_extra_foo] = babelHelpers.applyDecs2311(_Test, [], [[decorate(), 1, "foo"]]).e;
+new Test();
+var _A2 = /*#__PURE__*/new WeakMap();
+class TestChild extends Test {
+  get bar() {
+    return babelHelpers.classPrivateFieldGet2(_A2, this);
+  }
+  set bar(v) {
+    babelHelpers.classPrivateFieldSet2(_A2, this, v);
+  }
+  constructor() {
+    (super(), babelHelpers.classPrivateFieldInitSpec(this, _A2, _init_bar(this, 1)), this), _init_extra_bar(this);
+  }
+}
+_TestChild = TestChild;
+[_init_bar, _init_extra_bar] = babelHelpers.applyDecs2311(_TestChild, [], [[decorate(), 1, "bar"]], 0, void 0, Test).e;
+const r = new TestChild();

packages/babel-plugin-proposal-decorators/test/fixtures/2023-11-misc/super/exec.js

@@ -0,0 +1,24 @@
+function decorate() {
+  return function (target, context) {}
+}
+
+class Test {
+  @decorate()
+  accessor foo = 42;
+
+  constructor() {
+  }
+}
+
+new Test()
+
+class TestChild extends Test {
+  @decorate()
+  accessor bar = 1;
+
+  constructor() {
+    super();
+  }
+}
+
+const r = new TestChild();

packages/babel-plugin-proposal-decorators/test/fixtures/2023-11-misc/super/input.js

@@ -0,0 +1,25 @@
+function decorate() {
+  return function (target, context) {}
+}
+
+class Test {
+  @decorate()
+  accessor foo = 42;
+
+  constructor() {
+    console.log('hello');
+  }
+}
+
+new Test()
+
+class TestChild extends Test {
+  @decorate()
+  accessor bar = 1;
+
+  constructor() {
+    super();
+  }
+}
+
+const r = new TestChild();

packages/babel-plugin-proposal-decorators/test/fixtures/2023-11-misc/super/output.js

@@ -0,0 +1,37 @@
+let _init_foo, _init_extra_foo, _init_bar, _init_extra_bar;
+function decorate() {
+  return function (target, context) {};
+}
+class Test {
+  static {
+    [_init_foo, _init_extra_foo] = babelHelpers.applyDecs2311(this, [], [[decorate(), 1, "foo"]]).e;
+  }
+  #A = _init_foo(this, 42);
+  get foo() {
+    return this.#A;
+  }
+  set foo(v) {
+    this.#A = v;
+  }
+  constructor() {
+    _init_extra_foo(this);
+    console.log('hello');
+  }
+}
+new Test();
+class TestChild extends Test {
+  static {
+    [_init_bar, _init_extra_bar] = babelHelpers.applyDecs2311(this, [], [[decorate(), 1, "bar"]], 0, void 0, Test).e;
+  }
+  #A = _init_bar(this, 1);
+  get bar() {
+    return this.#A;
+  }
+  set bar(v) {
+    this.#A = v;
+  }
+  constructor() {
+    super(), _init_extra_bar(this);
+  }
+}
+const r = new TestChild();