Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(es/ast): Add definite and is_override to AutoAccessor #8436

Merged
merged 21 commits into from
Jan 19, 2024
+633 −62
Merged

fix(es/ast): Add definite and is_override to AutoAccessor #8436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a0db3f3
fix(es/ast): Add definite to AutoAccessor
dsherret Dec 19, 2023
501a5d7
Format
dsherret Dec 19, 2023
0dd58fc
Add transform test
dsherret Dec 19, 2023
78ffec7
Forgot to add accessibility test
dsherret Dec 19, 2023
c76b372
Emit accessibility for accessor
dsherret Dec 19, 2023
8f757e6
Run --all-features
dsherret Dec 19, 2023
e083fe6
Merge branch 'main' into fix_auto_accessor_definite
dsherret Dec 21, 2023
9e4710d
Revert and add test elsewhere
dsherret Dec 21, 2023
5b730f0
Parse auto accessors in test
dsherret Dec 21, 2023
72da781
Merge branch 'main' into fix_auto_accessor_definite
dsherret Dec 22, 2023
f476da7
add is_override
dsherret Dec 22, 2023
5c195c6
Strip override on transform
dsherret Dec 22, 2023
be4d924
Merge branch 'main' into fix_auto_accessor_definite
dsherret Dec 24, 2023
20ba286
Fix test
dsherret Dec 24, 2023
003ace7
Actually fix
dsherret Dec 24, 2023
70f0494
Merge branch 'main' into fix_auto_accessor_definite
dsherret Jan 2, 2024
0a0bfdb
Merge branch 'main' into fix_auto_accessor_definite
dsherret Jan 2, 2024
3bfb750
Merge branch 'main' into fix_auto_accessor_definite
dsherret Jan 3, 2024
27e6526
Fix conflicts
dsherret Jan 3, 2024
43eb75a
Merge branch 'main' into fix_auto_accessor_definite
dsherret Jan 4, 2024
cdb5ecb
Update
dsherret Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions crates/swc_ecma_ast/src/class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,12 @@ pub struct AutoAccessor {
/// Typescript extension.
#[cfg_attr(feature = "serde-impl", serde(default))]
pub accessibility: Option<Accessibility>,

#[cfg_attr(feature = "serde-impl", serde(default))]
pub is_override: bool,

#[cfg_attr(feature = "serde-impl", serde(default))]
pub definite: bool,
}

impl Take for AutoAccessor {
Expand All @@ -343,6 +349,8 @@ impl Take for AutoAccessor {
is_static: false,
decorators: Take::dummy(),
accessibility: None,
is_override: false,
definite: false,
}
}
}
16 changes: 16 additions & 0 deletions crates/swc_ecma_codegen/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,16 +1353,32 @@ where
fn emit_auto_accessor(&mut self, n: &AutoAccessor) -> Result {
self.emit_list(n.span, Some(&n.decorators), ListFormat::Decorators)?;

self.emit_accessibility(n.accessibility)?;

if n.is_static {
keyword!("static");
space!();
}

if n.is_override {
keyword!("override");
space!();
}

keyword!("accessor");
space!();

emit!(n.key);

if let Some(type_ann) = &n.type_ann {
if n.definite {
punct!("!");
}
punct!(":");
space!();
emit!(type_ann);
}

if let Some(init) = &n.value {
formatting_space!();
punct!("=");
Expand Down
6 changes: 6 additions & 0 deletions crates/swc_ecma_codegen/tests/fixture/typescript/class_prop/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,11 @@ class MyClass extends Base {
public abstract override readonly prop7 = 5;
override readonly #prop8 = 5;
declare public static readonly prop9: string;
accessor prop10!: string = "";
public accessor prop11 = "";
public static accessor prop12 = "";
public prop13: string;
private static prop14: string;
protected override accessor prop15 = 5;
[value]?: string[];
}
6 changes: 6 additions & 0 deletions crates/swc_ecma_codegen/tests/fixture/typescript/class_prop/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,11 @@ class MyClass extends Base {
public abstract override readonly prop7 = 5;
override readonly #prop8 = 5;
declare public static readonly prop9: string;
accessor prop10!: string = "";
public accessor prop11 = "";
public static accessor prop12 = "";
public prop13: string;
private static prop14: string;
protected override accessor prop15 = 5;
[value]?: string[];
}
2 changes: 1 addition & 1 deletion crates/swc_ecma_codegen/tests/fixture/typescript/class_prop/output.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions crates/swc_ecma_parser/src/parser/class_and_fn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,8 @@ impl<I: Tokens> Parser<I> {
is_static,
decorators,
accessibility,
is_override,
definite,
}));
}

Expand Down
16 changes: 12 additions & 4 deletions crates/swc_ecma_parser/tests/tsc/autoAccessor1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
},
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -95,7 +97,9 @@
"typeAnnotation": null,
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -134,7 +138,9 @@
},
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -166,7 +172,9 @@
"typeAnnotation": null,
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": null,
Expand Down
20 changes: 15 additions & 5 deletions crates/swc_ecma_parser/tests/tsc/autoAccessor10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@
"typeAnnotation": null,
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": null,
Expand Down Expand Up @@ -159,7 +161,9 @@
"typeAnnotation": null,
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": null,
Expand Down Expand Up @@ -297,7 +301,9 @@
"typeAnnotation": null,
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "StaticBlock",
Expand Down Expand Up @@ -429,7 +435,9 @@
"typeAnnotation": null,
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": null,
Expand Down Expand Up @@ -488,7 +496,9 @@
"typeAnnotation": null,
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": null,
Expand Down
16 changes: 12 additions & 4 deletions crates/swc_ecma_parser/tests/tsc/autoAccessor2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@
},
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -111,7 +113,9 @@
"typeAnnotation": null,
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -158,7 +162,9 @@
},
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -198,7 +204,9 @@
"typeAnnotation": null,
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "Constructor",
Expand Down
16 changes: 12 additions & 4 deletions crates/swc_ecma_parser/tests/tsc/autoAccessor3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
},
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -95,7 +97,9 @@
"typeAnnotation": null,
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -134,7 +138,9 @@
},
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -166,7 +172,9 @@
"typeAnnotation": null,
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": null,
Expand Down
16 changes: 12 additions & 4 deletions crates/swc_ecma_parser/tests/tsc/autoAccessor4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
},
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -95,7 +97,9 @@
"typeAnnotation": null,
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -134,7 +138,9 @@
},
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
},
{
"type": "AutoAccessor",
Expand Down Expand Up @@ -166,7 +172,9 @@
"typeAnnotation": null,
"isStatic": true,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": null,
Expand Down
4 changes: 3 additions & 1 deletion crates/swc_ecma_parser/tests/tsc/autoAccessor6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
},
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": null,
Expand Down
8 changes: 6 additions & 2 deletions crates/swc_ecma_parser/tests/tsc/autoAccessor7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
},
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": null,
Expand Down Expand Up @@ -122,7 +124,9 @@
"typeAnnotation": null,
"isStatic": false,
"decorators": [],
"accessibility": null
"accessibility": null,
"isOverride": false,
"definite": false
}
],
"superClass": {
Expand Down
Loading
Loading