dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-25 04:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(transformer/decorators): support for static and private member decorators (#2246)

Browse source
This commit is contained in:
Dunqing 2024-02-01 15:19:14 +08:00 committed by GitHub
parent 2beacd3f4d
commit 02c18d8506
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 143 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/oxc_ast/src/ast/js.rs
View file

@ -2096,6 +2096,12 @@ pub struct PrivateIdentifier {
pub name: Atom, pub name: Atom,
} }
impl PrivateIdentifier {
pub fn new(span: Span, name: Atom) -> Self {
Self { span, name }
}
}
#[derive(Debug, Hash)] #[derive(Debug, Hash)]
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))] #[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
#[cfg_attr(all(feature = "serde", feature = "wasm"), derive(tsify::Tsify))] #[cfg_attr(all(feature = "serde", feature = "wasm"), derive(tsify::Tsify))]

150
crates/oxc_transformer/src/proposals/decorators.rs
View file

@ -370,8 +370,14 @@ impl<'a> Decorators<'a> {
class.body.body.insert(0, static_block); class.body.body.insert(0, static_block);
} }
} else if has_member_decorator { } else if has_member_decorator {
// https://github.com/babel/babel/blob/eccbd203383487f6957dcf086aa83d773691560b/packages/babel-helpers/src/helpers/applyDecs2305.ts#L7-L45
let get_decorator_info = let get_decorator_info =
|name: Option<Atom>, flag: u8, decorator: &Decorator<'a>, ast: &AstBuilder<'a>| { |key: &PropertyKey<'a>,
flag: u8,
decorator: &Decorator<'a>,
ast: &AstBuilder<'a>| {
let name = key.name();
// [dec, flag, name, defaultValue | (o) => o.#a, (o, v) => o.#a = v]
let mut decorator_elements = ast.new_vec_with_capacity(2); let mut decorator_elements = ast.new_vec_with_capacity(2);
decorator_elements decorator_elements
.push(ArrayExpressionElement::Expression(ast.copy(&decorator.expression))); .push(ArrayExpressionElement::Expression(ast.copy(&decorator.expression)));
@ -385,8 +391,120 @@ impl<'a> Decorators<'a> {
)); ));
if let Some(name) = name { if let Some(name) = name {
decorator_elements.push(ArrayExpressionElement::Expression( decorator_elements.push(ArrayExpressionElement::Expression(
ast.literal_string_expression(StringLiteral::new(SPAN, name)), ast.literal_string_expression(StringLiteral::new(SPAN, name.clone())),
)); ));
if key.is_private_identifier() {
// (o) => o.#a
let mut items = ast.new_vec_single(ast.formal_parameter(
SPAN,
ast.binding_pattern(
ast.binding_pattern_identifier(BindingIdentifier::new(
SPAN,
"o".into(),
)),
None,
false,
),
None,
false,
ast.new_vec(),
));
let private_identifier = ast.private_field_expression(
SPAN,
ast.identifier_reference_expression(IdentifierReference::new(
SPAN,
"o".into(),
)),
PrivateIdentifier::new(SPAN, name),
false,
);
let params = ast.formal_parameters(
SPAN,
FormalParameterKind::ArrowFormalParameters,
ast.copy(&items),
None,
);
decorator_elements.push(ArrayExpressionElement::Expression(
ast.arrow_expression(
SPAN,
true,
false,
false,
params,
ast.function_body(
SPAN,
ast.new_vec(),
ast.new_vec_single(ast.expression_statement(
SPAN,
ast.copy(&private_identifier),
)),
),
None,
None,
),
));
{
// (o, v) => o.#a = v
items.push(ast.formal_parameter(
SPAN,
ast.binding_pattern(
ast.binding_pattern_identifier(BindingIdentifier::new(
SPAN,
"v".into(),
)),
None,
false,
),
None,
false,
ast.new_vec(),
));
let params = ast.formal_parameters(
SPAN,
FormalParameterKind::ArrowFormalParameters,
ast.copy(&items),
None,
);
decorator_elements.push(ArrayExpressionElement::Expression(
ast.arrow_expression(
SPAN,
true,
false,
false,
params,
ast.function_body(
SPAN,
ast.new_vec(),
ast.new_vec_single(
ast.expression_statement(
SPAN,
ast.assignment_expression(
SPAN,
AssignmentOperator::Assign,
ast.simple_assignment_target_member_expression(
ast.copy(
private_identifier
.get_member_expr()
.unwrap(),
),
),
ast.identifier_reference_expression(
IdentifierReference::new(SPAN, "v".into()),
),
),
),
),
),
None,
None,
),
));
}
}
} }
ast.array_expression(SPAN, decorator_elements, None) ast.array_expression(SPAN, decorator_elements, None)
}; };
@ -405,17 +523,17 @@ impl<'a> Decorators<'a> {
} else { } else {
is_proto = true; is_proto = true;
} }
let name = def.key.name();
let mut flag = DecoratorFlags::get_flag_by_kind(def.kind).bits(); let mut flag = DecoratorFlags::get_flag_by_kind(def.kind).bits();
if def.r#static { if def.r#static {
flag += DecoratorFlags::Static.bits(); flag += DecoratorFlags::Static.bits();
} }
def.decorators.drain(..).for_each(|decorator| { def.decorators.iter().for_each(|decorator| {
member_decorators_vec.push(ArrayExpressionElement::Expression( member_decorators_vec.push(ArrayExpressionElement::Expression(
get_decorator_info(name.clone(), flag, &decorator, &self.ast), get_decorator_info(&def.key, flag, decorator, &self.ast),
)); ));
}); });
def.decorators.clear();
} }
ClassElement::PropertyDefinition(def) => { ClassElement::PropertyDefinition(def) => {
let flag = if def.r#static { let flag = if def.r#static {
@ -424,27 +542,21 @@ impl<'a> Decorators<'a> {
DecoratorFlags::Field DecoratorFlags::Field
}; };
let name = def.key.name();
let init_name = self.get_unique_name(&if def.computed { let init_name = self.get_unique_name(&if def.computed {
"init_computedKey".into() "init_computedKey".into()
} else { } else {
format!("init_{}", name.clone().unwrap()).into() format!("init_{}", def.key.name().unwrap()).into()
}); });
e_elements e_elements
.push(self.get_assignment_target_maybe_default(init_name.clone())); .push(self.get_assignment_target_maybe_default(init_name.clone()));
def.decorators.drain(..).for_each(|decorator| { def.decorators.iter().for_each(|decorator| {
member_decorators_vec.push(ArrayExpressionElement::Expression( member_decorators_vec.push(ArrayExpressionElement::Expression(
get_decorator_info( get_decorator_info(&def.key, flag.bits(), decorator, &self.ast),
name.clone(),
flag.bits(),
&decorator,
&self.ast,
),
)); ));
}); });
def.decorators.clear();
let mut arguments = self let mut arguments = self
.ast .ast
@ -546,6 +658,14 @@ impl<'a> Decorators<'a> {
} }
{ {
// applyDecs2305(
// targetClass: any,
// memberDecs: DecoratorInfo[],
// classDecs: Function[],
// classDecsHaveThis: number,
// instanceBrand: Function,
// parentClass: any,
// ) {}
// call babelHelpers.applyDecs2305 // call babelHelpers.applyDecs2305
let callee = self.ast.static_member_expression( let callee = self.ast.static_member_expression(
SPAN, SPAN,

5
tasks/transform_conformance/babel.snap.md
View file

@ -1,4 +1,4 @@
Passed: 340/1369 Passed: 341/1369
# All Passed: # All Passed:
* babel-plugin-transform-numeric-separator * babel-plugin-transform-numeric-separator
@ -911,7 +911,7 @@ Passed: 340/1369
* spread-transform/transform-to-babel-extend/input.js * spread-transform/transform-to-babel-extend/input.js
* spread-transform/transform-to-object-assign/input.js * spread-transform/transform-to-object-assign/input.js
# babel-plugin-proposal-decorators (16/190) # babel-plugin-proposal-decorators (17/190)
* 2018-09-transformation/async-generator-method/input.js * 2018-09-transformation/async-generator-method/input.js
* 2018-09-transformation/class-decorators-yield-await/input.js * 2018-09-transformation/class-decorators-yield-await/input.js
* 2021-12-accessors/context-name/input.js * 2021-12-accessors/context-name/input.js
@ -1021,7 +1021,6 @@ Passed: 340/1369
* 2023-05-exported/member-decorator/input.mjs * 2023-05-exported/member-decorator/input.mjs
* 2023-05-fields/context-name/input.js * 2023-05-fields/context-name/input.js
* 2023-05-fields/private/input.js * 2023-05-fields/private/input.js
* 2023-05-fields/static-private/input.js
* 2023-05-fields--to-es2015/context-name/input.js * 2023-05-fields--to-es2015/context-name/input.js
* 2023-05-fields--to-es2015/private/input.js * 2023-05-fields--to-es2015/private/input.js
* 2023-05-fields--to-es2015/public/input.js * 2023-05-fields--to-es2015/public/input.js