Adds the `@init:` modifier to decorator plugins by pzuraq · Pull Request #13859 · babel/babel

pzuraq · 2021-10-18T02:27:06Z

Q	A
Fixed Issues?	No
Patch: Bug Fix?	No
Major: Breaking Change?	No
Minor: New Feature?	Yes
Tests Added + Pass?	Yes
Documentation PR Link
Any Dependency Changes?	No
License	MIT

Adds the @init: modifier to the decorator plugins. If present, this
adds init: true to the decorator node. This currently works in both
plugins, the idea being that we can error for legacy versions of
decorators which do not support @init: in the Babel plugin.

codesandbox-ci · 2021-10-18T02:29:58Z

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 3fec3c6:

Sandbox	Source
babel-repl-custom-plugin	Configuration
babel-plugin-multi-config	Configuration

babel-bot · 2021-10-18T02:31:54Z

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

JLHwung · 2021-10-18T13:36:53Z

packages/babel-parser/src/parser/statement.js

@@ -446,14 +446,42 @@ export default class StatementParser extends ExpressionParser {



Nit: Can you put a spec link as comment before hasPlugin("decorators")? For example https://arai-a.github.io/ecma262-compare/?pr=2417&id=sec-decorators.

packages/babel-parser/src/parser/statement.js

packages/babel-parser/ast/spec.md

JLHwung · 2021-11-08T19:44:29Z

packages/babel-parser/src/parser/statement.js

  shouldParseExportDeclaration(): boolean {
    const { type } = this.state;
-    if (type === tt.at) {
+    if (type === tt.at || type === tt.atInit) {


We don't need to expect decorators-legacy plugin when type is tt.atInit, since the token is invalid in the legacy decorators. Maybe we can move the expectPlugin check to the tokenizer so we don't have to take care of that in parsing level.

JLHwung · 2021-11-08T20:03:34Z

packages/babel-parser/src/tokenizer/index.js

+      // Replace the previous state
+      this.state = old;
+
+      if (wordNext === charCodes.colon) {


We need to check the next character after : because it may form a doubleColon token ::, e.g.

class C { @init::b p; }

is valid given that decorators-legacy and functionBind are enabled.

packages/babel-parser/src/parser/expression.js

packages/babel-parser/src/parser/statement.js

packages/babel-parser/src/tokenizer/index.js

nicolo-ribaudo · 2021-11-09T22:55:11Z

packages/babel-parser/src/tokenizer/index.js

+
+      if (wordNext === charCodes.colon) {
+        if (word !== "init" || containsEsc) {
+          throw this.raise(this.state.pos, Errors.UnsupportedDecoratorModifier);


No need to throw, we can recover by parsing it as if it was @init: (which is what would already happen by just removing throw).

nicolo-ribaudo

It looks like some fixtures need to be updated!

nicolo-ribaudo · 2021-11-16T22:35:42Z

packages/babel-parser/src/parser/statement.js

  shouldParseExportDeclaration(): boolean {
    const { type } = this.state;
-    if (type === tt.at) {
+    if (type === tt.at || type === tt.atInit) {


Suggested change

if (type === tt.at || type === tt.atInit) {

if (tokenIsDecorator(type)) {

Adds the `@init:` modifier to the decorator plugins. If present, this adds `init: true` to the decorator node. This currently works in both plugins, the idea being that we can error for legacy versions of decorators which do not support `@init:` in the Babel plugin.

nicolo-ribaudo · 2021-11-24T09:04:19Z

I have rebased feat-7.16.0/decorators since it should solve most CI failures; I'm rebasing this one now.

nicolo-ribaudo · 2021-11-24T09:18:42Z

The last commit fixes #13859 (comment).

nicolo-ribaudo · 2021-11-24T09:29:41Z

The last commit does #13859 (comment)

Co-authored-by: Nicolò Ribaudo <nicolo.ribaudo@gmail.com>

fedeci approved these changes Oct 18, 2021

View reviewed changes

JLHwung added PR: New Feature 🚀 A type of pull request used for our changelog categories Spec: Decorators labels Oct 18, 2021

JLHwung reviewed Oct 18, 2021

View reviewed changes

packages/babel-parser/src/parser/statement.js Outdated Show resolved Hide resolved

JLHwung reviewed Oct 18, 2021

View reviewed changes

packages/babel-parser/ast/spec.md Show resolved Hide resolved

fedeci self-requested a review October 18, 2021 15:57

JLHwung reviewed Nov 8, 2021

View reviewed changes

JLHwung approved these changes Nov 8, 2021

View reviewed changes

nicolo-ribaudo reviewed Nov 9, 2021

View reviewed changes

pzuraq force-pushed the add-init branch from 3fec3c6 to ea0d5d1 Compare November 16, 2021 16:32

nicolo-ribaudo reviewed Nov 16, 2021

View reviewed changes

pzuraq force-pushed the add-init branch 2 times, most recently from 5dd248e to 56a5229 Compare November 23, 2021 16:55

nicolo-ribaudo force-pushed the feat-7.16.0/decorators branch from 0f5663a to e6f6d3b Compare November 24, 2021 09:00

pzuraq added 2 commits November 24, 2021 10:01

make atInit token

39594ef

Update fixture

db77bd6

nicolo-ribaudo force-pushed the add-init branch from 56a5229 to db77bd6 Compare November 24, 2021 09:11

Fix regression when using legacy decorators with functionBind

c1d77c4

Move @init: plugin check to the tokenizer

b698917

nicolo-ribaudo approved these changes Nov 24, 2021

View reviewed changes

nicolo-ribaudo merged commit e292ecc into babel:feat-7.16.0/decorators Nov 24, 2021

nicolo-ribaudo mentioned this pull request Nov 24, 2021

Implement support for the new decorators proposal #13827

Merged

4 tasks

nicolo-ribaudo added a commit that referenced this pull request Dec 5, 2021

Adds the @init: modifier to decorator plugins (#13859)

28087b7

Co-authored-by: Nicolò Ribaudo <nicolo.ribaudo@gmail.com>

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

github-actions bot locked as resolved and limited conversation to collaborators Feb 24, 2022

		@@ -446,14 +446,42 @@ export default class StatementParser extends ExpressionParser {

	if (type === tt.at \|\| type === tt.atInit) {
	if (tokenIsDecorator(type)) {

Uh oh!

Conversation

pzuraq commented Oct 18, 2021 • edited by gitpod-io bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codesandbox-ci bot commented Oct 18, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

babel-bot commented Oct 18, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JLHwung Oct 18, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JLHwung Nov 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JLHwung Nov 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nicolo-ribaudo Nov 9, 2021

Choose a reason for hiding this comment

Uh oh!

nicolo-ribaudo left a comment

Choose a reason for hiding this comment

Uh oh!

nicolo-ribaudo Nov 16, 2021

Choose a reason for hiding this comment

Uh oh!

nicolo-ribaudo commented Nov 24, 2021

Uh oh!

nicolo-ribaudo commented Nov 24, 2021

Uh oh!

nicolo-ribaudo commented Nov 24, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

pzuraq commented Oct 18, 2021 •

edited by gitpod-io bot

Loading

codesandbox-ci bot commented Oct 18, 2021 •

edited

Loading

babel-bot commented Oct 18, 2021 •

edited

Loading

JLHwung Nov 8, 2021 •

edited

Loading

JLHwung Nov 8, 2021 •

edited

Loading