Fix decorator initProto usage in derived classes #16170

JLHwung · 2023-12-11T22:54:16Z

Q	A
Fixed Issues?	Babel injects `initProto` calls to the nested undecorated class super() call, REPL
Patch: Bug Fix?	Yes
Major: Breaking Change?
Minor: New Feature?
Tests Added + Pass?	Yes
Documentation PR Link
Any Dependency Changes?
License	MIT

In this PR we improve the initProto() injection for the super calls. The updated procedure now takes nested classes into account. For example, we should not emit initProto to the unrelated super() call:

class B {}
class A extends B {
  @dec method() {}
  constructor() {
    super(); // <-- replaced by initProto(super())
    class C extends B {
      constructor() {
        super(); // <-- This call should not be replaced as it is irrelevant to class A
      }
    }
  }
}

The old test cases are now wrapped within {} followed by new test cases. Please ignore the whitespace changes when you review the updated test cases.

babel-bot · 2023-12-11T22:56:18Z

Build successful! You can test your changes in the REPL here: https://babeljs.io/repl/build/56013/

liuxingbaoyu · 2023-12-11T23:30:05Z

packages/babel-plugin-proposal-decorators/src/transformer-2023-05.ts

@@ -961,6 +961,11 @@ function transformClass(
              path.skip();
            },
          },
+          ClassMethod(path) {


Can we skip ClassExpression?

JLHwung · 2023-12-12T00:57:48Z

...orators/test/fixtures/2021-12-misc--to-es2015/initProto-existing-derived-constructor/exec.js

+  }
+
+  {
+    ("super() within decorated derived constructor should be transformed: computed key");


This test will fail if we skip the whole ClassExpression, ditto for ClassDeclaration.

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@babel/traverse](https://babel.dev/docs/en/next/babel-traverse) ([source](https://github.com/babel/babel)) | resolutions | patch | [`7.23.5` -> `7.23.7`](https://renovatebot.com/diffs/npm/@babel%2ftraverse/7.23.5/7.23.7) | --- ### Release Notes <details> <summary>babel/babel (@babel/traverse)</summary> ### [`v7.23.7`](https://github.com/babel/babel/blob/HEAD/CHANGELOG.md#v7237-2023-12-29) [Compare Source](babel/babel@v7.23.6...v7.23.7) ##### 🐛 Bug Fix - `babel-traverse` - [#16191](babel/babel#16191) fix: Crash when removing without `Program` ([@liuxingbaoyu](https://github.com/liuxingbaoyu)) - `babel-helpers`, `babel-plugin-proposal-decorators` - [#16180](babel/babel#16180) fix: Class decorator `ctx.kind` is wrong ([@liuxingbaoyu](https://github.com/liuxingbaoyu)) - `babel-plugin-proposal-decorators` - [#16170](babel/babel#16170) Fix decorator initProto usage in derived classes ([@JLHwung](https://github.com/JLHwung)) - `babel-core` - [#16167](babel/babel#16167) Avoid unpreventable `unhandledRejection` events ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo)) ##### 🏠 Internal - `babel-helper-create-class-features-plugin` - [#16186](babel/babel#16186) chore: Update deps ([@liuxingbaoyu](https://github.com/liuxingbaoyu)) - `babel-helper-create-class-features-plugin`, `babel-plugin-proposal-decorators` - [#16177](babel/babel#16177) Merge decorators into class features ([@JLHwung](https://github.com/JLHwung)) ### [`v7.23.6`](https://github.com/babel/babel/blob/HEAD/CHANGELOG.md#v7236-2023-12-11) [Compare Source](babel/babel@v7.23.5...v7.23.6) ##### 👓 Spec Compliance - `babel-generator`, `babel-parser`, `babel-types` - [#16154](babel/babel#16154) Remove `TSPropertySignature.initializer` ([@fisker](https://github.com/fisker)) - `babel-helpers`, `babel-plugin-proposal-decorators`, `babel-plugin-transform-class-properties`, `babel-plugin-transform-class-static-block`, `babel-plugin-transform-runtime`, `babel-preset-env`, `babel-runtime-corejs2`, `babel-runtime-corejs3`, `babel-runtime`, `babel-types` - [#16139](babel/babel#16139) Apply `toPropertyKey` on decorator context name ([@JLHwung](https://github.com/JLHwung)) ##### 🐛 Bug Fix - `babel-generator` - [#16166](babel/babel#16166) fix: Correctly indenting when `retainLines` is enabled ([@liuxingbaoyu](https://github.com/liuxingbaoyu)) - `babel-helpers`, `babel-plugin-proposal-explicit-resource-management` - [#16150](babel/babel#16150) `using`: Allow looking up `Symbol.dispose` on a function ([@odinho](https://github.com/odinho)) - `babel-plugin-proposal-decorators`, `babel-plugin-transform-class-properties` - [#16161](babel/babel#16161) Ensure the `[[@@toPrimitive]]` call of a decorated class member key is invoked once ([@JLHwung](https://github.com/JLHwung)) - [#16148](babel/babel#16148) Support named evaluation for decorated anonymous class exp ([@JLHwung](https://github.com/JLHwung)) - `babel-plugin-transform-for-of`, `babel-preset-env` - [#16011](babel/babel#16011) fix: `for of` with `iterableIsArray` and shadowing variable ([@liuxingbaoyu](https://github.com/liuxingbaoyu)) - `babel-helpers`, `babel-plugin-proposal-decorators`, `babel-runtime-corejs2`, `babel-runtime-corejs3`, `babel-runtime` - [#16144](babel/babel#16144) Set function name for decorated private non-field elements ([@JLHwung](https://github.com/JLHwung)) - `babel-plugin-transform-typescript` - [#16137](babel/babel#16137) Fix references to enum values with merging ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo)) ##### 🔬 Output optimization - `babel-helper-create-class-features-plugin`, `babel-plugin-transform-class-properties` - [#16159](babel/babel#16159) Reuse computed key memoiser ([@JLHwung](https://github.com/JLHwung)) - `babel-helpers`, `babel-plugin-proposal-decorators` - [#16160](babel/babel#16160) Optimize decorator helper size ([@liuxingbaoyu](https://github.com/liuxingbaoyu)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/random-bunny/pulls/129 Co-authored-by: Renovate Bot <renovate@vylpes.com> Co-committed-by: Renovate Bot <renovate@vylpes.com>

JLHwung added 4 commits December 11, 2023 17:18

small cleanup

78a7d7e

fix: inject initProto call for super() within current constructor

5ceb7d3

Add test cases

ec42338

update test snapshot

f8097a9

JLHwung added PR: Bug Fix 🐛 A type of pull request used for our changelog categories Spec: Decorators labels Dec 11, 2023

ignore old node versions

e151932

liuxingbaoyu reviewed Dec 11, 2023

View reviewed changes

JLHwung commented Dec 12, 2023

View reviewed changes

liuxingbaoyu approved these changes Dec 12, 2023

View reviewed changes

nicolo-ribaudo approved these changes Dec 12, 2023

View reviewed changes

JLHwung merged commit 3284897 into babel:main Dec 12, 2023
47 checks passed

JLHwung deleted the fix-decorator-super-call-init branch December 12, 2023 14:37

github-actions bot added the outdated A closed issue/PR that is archived due to age. Recommended to make a new issue label Mar 13, 2024

github-actions bot locked as resolved and limited conversation to collaborators Mar 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix decorator initProto usage in derived classes #16170

Fix decorator initProto usage in derived classes #16170

JLHwung commented Dec 11, 2023

babel-bot commented Dec 11, 2023 •

edited

liuxingbaoyu Dec 11, 2023

JLHwung Dec 12, 2023

Fix decorator initProto usage in derived classes #16170

Fix decorator initProto usage in derived classes #16170

Conversation

JLHwung commented Dec 11, 2023

babel-bot commented Dec 11, 2023 • edited

liuxingbaoyu Dec 11, 2023

Choose a reason for hiding this comment

JLHwung Dec 12, 2023

Choose a reason for hiding this comment

babel-bot commented Dec 11, 2023 •

edited