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

refactor(transformer/decorators): if it is a private method definition, transform it (#2427)

Browse source
This commit is contained in:
Dunqing 2024-02-19 19:17:11 +08:00 committed by GitHub
parent 60db720fa6
commit 27b2c212c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 153 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -118,12 +118,23 @@ impl<'a> Decorators<'a> {
} }
pub fn get_call_with_this(&self, name: Atom) -> Statement<'a> { pub fn get_call_with_this(&self, name: Atom) -> Statement<'a> {
self.get_call_with_arguments(
name,
self.ast.new_vec_single(Argument::Expression(self.ast.this_expression(SPAN))),
)
}
pub fn get_call_with_arguments(
&self,
name: Atom,
arguments: Vec<'a, Argument<'a>>,
) -> Statement<'a> {
self.ast.expression_statement( self.ast.expression_statement(
SPAN, SPAN,
self.ast.call_expression( self.ast.call_expression(
SPAN, SPAN,
self.ast.identifier_reference_expression(IdentifierReference::new(SPAN, name)), self.ast.identifier_reference_expression(IdentifierReference::new(SPAN, name)),
self.ast.new_vec_single(Argument::Expression(self.ast.this_expression(SPAN))), arguments,
false, false,
None, None,
), ),
@ -373,6 +384,7 @@ impl<'a> Decorators<'a> {
let mut is_proto = false; let mut is_proto = false;
let mut is_static = false; let mut is_static = false;
let mut name = Atom::new_inline("");
class.body.body.iter_mut().for_each(|element| { class.body.body.iter_mut().for_each(|element| {
if !element.has_decorator() { if !element.has_decorator() {
return; return;
@ -391,10 +403,71 @@ impl<'a> Decorators<'a> {
def.decorators.iter().for_each(|decorator| { def.decorators.iter().for_each(|decorator| {
member_decorators_vec.push(ArrayExpressionElement::Expression( member_decorators_vec.push(ArrayExpressionElement::Expression(
self.get_decorator_info(&def.key, flag, decorator), self.get_decorator_info(
&def.key,
Some(self.ast.copy(&def.value)),
flag,
decorator,
),
)); ));
}); });
def.decorators.clear(); def.decorators.clear();
if def.key.is_private_identifier() {
name = self.get_unique_name(&if def.computed {
"init_computedKey".into()
} else {
format!("call_{}", def.key.name().unwrap()).into()
});
let mut arguments = self.ast.new_vec_with_capacity(2);
arguments.push(Argument::Expression(self.ast.this_expression(SPAN)));
arguments.push(Argument::Expression(
self.ast.identifier_reference_expression(IdentifierReference::new(
SPAN,
"v".into(),
)),
));
def.value = self.ast.function(
def.value.r#type,
def.value.span,
self.ast.copy(&def.value.id),
def.value.generator,
def.value.r#async,
self.ast.copy(&def.value.this_param),
self.ast.formal_parameters(
SPAN,
FormalParameterKind::FormalParameter,
self.ast.new_vec_single(self.ast.formal_parameter(
SPAN,
self.ast.binding_pattern(
self.ast.binding_pattern_identifier(
BindingIdentifier::new(SPAN, "v".into()),
),
None,
false,
),
None,
false,
self.ast.new_vec(),
)),
None,
),
Some(self.ast.function_body(
SPAN,
self.ast.new_vec(),
self.ast.new_vec_single(
self.get_call_with_arguments(name.clone(), arguments),
),
)),
self.ast.copy(&def.value.type_parameters),
self.ast.copy(&def.value.return_type),
self.ast.copy(&def.value.modifiers),
);
} else {
return;
}
} }
ClassElement::PropertyDefinition(def) => { ClassElement::PropertyDefinition(def) => {
let flag = if def.r#static { let flag = if def.r#static {
@ -403,18 +476,15 @@ impl<'a> Decorators<'a> {
DecoratorFlags::Field DecoratorFlags::Field
}; };
let init_name = self.get_unique_name(&if def.computed { name = self.get_unique_name(&if def.computed {
"init_computedKey".into() "init_computedKey".into()
} else { } else {
format!("init_{}", def.key.name().unwrap()).into() format!("init_{}", def.key.name().unwrap()).into()
}); });
e_elements
.push(self.get_assignment_target_maybe_default(init_name.clone()));
def.decorators.iter().for_each(|decorator| { def.decorators.iter().for_each(|decorator| {
member_decorators_vec.push(ArrayExpressionElement::Expression( member_decorators_vec.push(ArrayExpressionElement::Expression(
self.get_decorator_info(&def.key, flag.bits(), decorator), self.get_decorator_info(&def.key, None, flag.bits(), decorator),
)); ));
}); });
def.decorators.clear(); def.decorators.clear();
@ -431,17 +501,18 @@ impl<'a> Decorators<'a> {
SPAN, SPAN,
self.ast.identifier_reference_expression(IdentifierReference::new( self.ast.identifier_reference_expression(IdentifierReference::new(
SPAN, SPAN,
init_name.clone(), name.clone(),
)), )),
arguments, arguments,
false, false,
None, None,
)); ));
declarations.push(self.get_variable_declarator(init_name));
} }
_ => {} _ => return,
} }
e_elements.push(self.get_assignment_target_maybe_default(name.clone()));
declarations.push(self.get_variable_declarator(name.clone()));
}); });
if is_proto { if is_proto {
@ -668,6 +739,7 @@ impl<'a> Decorators<'a> {
fn get_decorator_info( fn get_decorator_info(
&self, &self,
key: &PropertyKey<'a>, key: &PropertyKey<'a>,
value: Option<Box<'a, Function<'a>>>,
flag: u8, flag: u8,
decorator: &Decorator<'a>, decorator: &Decorator<'a>,
) -> Expression<'a> { ) -> Expression<'a> {
@ -690,9 +762,13 @@ impl<'a> Decorators<'a> {
)); ));
if key.is_private_identifier() { if key.is_private_identifier() {
// (o) => o.#a if let Some(value) = value {
let mut items = decorator_elements.push(ArrayExpressionElement::Expression(
self.ast.new_vec_single(self.ast.formal_parameter( Expression::FunctionExpression(value),
));
} else {
// o => o.#a
let mut items = self.ast.new_vec_single(self.ast.formal_parameter(
SPAN, SPAN,
self.ast.binding_pattern( self.ast.binding_pattern(
self.ast.binding_pattern_identifier(BindingIdentifier::new( self.ast.binding_pattern_identifier(BindingIdentifier::new(
@ -706,64 +782,21 @@ impl<'a> Decorators<'a> {
false, false,
self.ast.new_vec(), self.ast.new_vec(),
)); ));
let private_field = self.ast.private_field( let private_field = self.ast.private_field(
SPAN,
self.ast.identifier_reference_expression(IdentifierReference::new(
SPAN, SPAN,
"o".into(), self.ast.identifier_reference_expression(IdentifierReference::new(
)),
PrivateIdentifier::new(SPAN, name),
false,
);
let params = self.ast.formal_parameters(
SPAN,
FormalParameterKind::ArrowFormalParameters,
self.ast.copy(&items),
None,
);
decorator_elements.push(ArrayExpressionElement::Expression(
self.ast.arrow_expression(
SPAN,
true,
false,
params,
self.ast.function_body(
SPAN, SPAN,
self.ast.new_vec(), "o".into(),
self.ast.new_vec_single(self.ast.expression_statement( )),
SPAN, PrivateIdentifier::new(SPAN, name),
self.ast.member_expression(self.ast.copy(&private_field)),
)),
),
None,
None,
),
));
{
// (o, v) => o.#a = v
items.push(self.ast.formal_parameter(
SPAN,
self.ast.binding_pattern(
self.ast.binding_pattern_identifier(BindingIdentifier::new(
SPAN,
"v".into(),
)),
None,
false,
),
None,
false, false,
self.ast.new_vec(), );
));
let params = self.ast.formal_parameters( let params = self.ast.formal_parameters(
SPAN, SPAN,
FormalParameterKind::ArrowFormalParameters, FormalParameterKind::ArrowFormalParameters,
items, self.ast.copy(&items),
None, None,
); );
decorator_elements.push(ArrayExpressionElement::Expression( decorator_elements.push(ArrayExpressionElement::Expression(
self.ast.arrow_expression( self.ast.arrow_expression(
SPAN, SPAN,
@ -775,22 +808,66 @@ impl<'a> Decorators<'a> {
self.ast.new_vec(), self.ast.new_vec(),
self.ast.new_vec_single(self.ast.expression_statement( self.ast.new_vec_single(self.ast.expression_statement(
SPAN, SPAN,
self.ast.assignment_expression( self.ast.member_expression(self.ast.copy(&private_field)),
SPAN,
AssignmentOperator::Assign,
self.ast.simple_assignment_target_member_expression(
private_field,
),
self.ast.identifier_reference_expression(
IdentifierReference::new(SPAN, "v".into()),
),
),
)), )),
), ),
None, None,
None, None,
), ),
)); ));
{
// (o, v) => o.#a = v
items.push(self.ast.formal_parameter(
SPAN,
self.ast.binding_pattern(
self.ast.binding_pattern_identifier(BindingIdentifier::new(
SPAN,
"v".into(),
)),
None,
false,
),
None,
false,
self.ast.new_vec(),
));
let params = self.ast.formal_parameters(
SPAN,
FormalParameterKind::ArrowFormalParameters,
items,
None,
);
decorator_elements.push(ArrayExpressionElement::Expression(
self.ast.arrow_expression(
SPAN,
true,
false,
params,
self.ast.function_body(
SPAN,
self.ast.new_vec(),
self.ast.new_vec_single(self.ast.expression_statement(
SPAN,
self.ast.assignment_expression(
SPAN,
AssignmentOperator::Assign,
self.ast.simple_assignment_target_member_expression(
private_field,
),
self.ast.identifier_reference_expression(
IdentifierReference::new(SPAN, "v".into()),
),
),
)),
),
None,
None,
),
));
}
} }
} }
} }

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

@ -1,4 +1,4 @@
Passed: 341/1369 Passed: 342/1369
# All Passed: # All Passed:
* babel-plugin-transform-numeric-separator * babel-plugin-transform-numeric-separator
@ -911,7 +911,7 @@ Passed: 341/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 (17/190) # babel-plugin-proposal-decorators (18/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
@ -1074,7 +1074,6 @@ Passed: 341/1369
* 2023-05-ordering--to-es2015/initializers-and-static-blocks/input.js * 2023-05-ordering--to-es2015/initializers-and-static-blocks/input.js
* 2023-05-setters/context-name/input.js * 2023-05-setters/context-name/input.js
* 2023-05-setters/private/input.js * 2023-05-setters/private/input.js
* 2023-05-setters/static-private/input.js
* 2023-05-setters--to-es2015/context-name/input.js * 2023-05-setters--to-es2015/context-name/input.js
* 2023-05-setters--to-es2015/private/input.js * 2023-05-setters--to-es2015/private/input.js
* 2023-05-setters--to-es2015/public/input.js * 2023-05-setters--to-es2015/public/input.js