mirror of
https://github.com/danbulant/oxc
synced 2026-05-24 12:21:58 +00:00
refactor(transformer): wrap_arrow_function_iife receive an owned Expression (#8545)
Follow-on after #8529. Pure refactor. `wrap_arrow_function_iife` receive an owned `Expression`, instead of `&mut Expression`. This does require a bit more repeated code in the caller, but still I think it's more appropriate for a utility function. If we use it again elsewhere, it's non-obvious if it replaces the input `&mut Expression` with a `NullLiteral` via `move_expression`. Better to leave that to the caller.
This commit is contained in:
parent
65c596d002
commit
61077cae9f
3 changed files with 8 additions and 8 deletions
|
|
@ -419,7 +419,7 @@ impl<'a> Traverse<'a> for ArrowFunctionConverter<'a> {
|
||||||
// prop = (() => { return async () => {} })();
|
// prop = (() => { return async () => {} })();
|
||||||
// }
|
// }
|
||||||
// ```
|
// ```
|
||||||
Some(wrap_arrow_function_iife(expr, ctx))
|
Some(wrap_arrow_function_iife(ctx.ast.move_expression(expr), ctx))
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -283,7 +283,7 @@ impl<'a> OptionalChaining<'a, '_> {
|
||||||
// To insert the temp binding in the correct scope, we wrap the expression with
|
// To insert the temp binding in the correct scope, we wrap the expression with
|
||||||
// an arrow function. During the chain expression transformation, the temp binding
|
// an arrow function. During the chain expression transformation, the temp binding
|
||||||
// will be inserted into the arrow function's body.
|
// will be inserted into the arrow function's body.
|
||||||
wrap_arrow_function_iife(expr, ctx)
|
wrap_arrow_function_iife(ctx.ast.move_expression(expr), ctx)
|
||||||
} else {
|
} else {
|
||||||
self.transform_chain_expression_impl(false, expr, ctx)
|
self.transform_chain_expression_impl(false, expr, ctx)
|
||||||
}
|
}
|
||||||
|
|
@ -297,7 +297,7 @@ impl<'a> OptionalChaining<'a, '_> {
|
||||||
) {
|
) {
|
||||||
*expr = if self.is_inside_function_parameter {
|
*expr = if self.is_inside_function_parameter {
|
||||||
// Same as the above `transform_chain_expression` explanation
|
// Same as the above `transform_chain_expression` explanation
|
||||||
wrap_arrow_function_iife(expr, ctx)
|
wrap_arrow_function_iife(ctx.ast.move_expression(expr), ctx)
|
||||||
} else {
|
} else {
|
||||||
// Unfortunately no way to get compiler to see that this branch is provably unreachable.
|
// Unfortunately no way to get compiler to see that this branch is provably unreachable.
|
||||||
// We don't want to inline this function, to keep `enter_expression` as small as possible.
|
// We don't want to inline this function, to keep `enter_expression` as small as possible.
|
||||||
|
|
|
||||||
|
|
@ -37,20 +37,20 @@ pub(crate) fn create_call_call<'a>(
|
||||||
ctx.ast.expression_call(span, callee, NONE, arguments, false)
|
ctx.ast.expression_call(span, callee, NONE, arguments, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Wrap the expression with an arrow function iife.
|
/// Wrap an `Expression` in an arrow function IIFE (immediately invoked function expression)
|
||||||
|
/// with a body block.
|
||||||
///
|
///
|
||||||
/// `expr` -> `(() => { return expr; })()`
|
/// `expr` -> `(() => { return expr; })()`
|
||||||
pub(crate) fn wrap_arrow_function_iife<'a>(
|
pub(crate) fn wrap_arrow_function_iife<'a>(
|
||||||
expr: &mut Expression<'a>,
|
expr: Expression<'a>,
|
||||||
ctx: &mut TraverseCtx<'a>,
|
ctx: &mut TraverseCtx<'a>,
|
||||||
) -> Expression<'a> {
|
) -> Expression<'a> {
|
||||||
let scope_id =
|
let scope_id =
|
||||||
ctx.insert_scope_below_expression(expr, ScopeFlags::Arrow | ScopeFlags::Function);
|
ctx.insert_scope_below_expression(&expr, ScopeFlags::Arrow | ScopeFlags::Function);
|
||||||
|
|
||||||
let kind = FormalParameterKind::ArrowFormalParameters;
|
let kind = FormalParameterKind::ArrowFormalParameters;
|
||||||
let params = ctx.ast.formal_parameters(SPAN, kind, ctx.ast.vec(), NONE);
|
let params = ctx.ast.formal_parameters(SPAN, kind, ctx.ast.vec(), NONE);
|
||||||
let statements =
|
let statements = ctx.ast.vec1(ctx.ast.statement_return(SPAN, Some(expr)));
|
||||||
ctx.ast.vec1(ctx.ast.statement_return(SPAN, Some(ctx.ast.move_expression(expr))));
|
|
||||||
let body = ctx.ast.function_body(SPAN, ctx.ast.vec(), statements);
|
let body = ctx.ast.function_body(SPAN, ctx.ast.vec(), statements);
|
||||||
let arrow = ctx.ast.alloc_arrow_function_expression_with_scope_id(
|
let arrow = ctx.ast.alloc_arrow_function_expression_with_scope_id(
|
||||||
SPAN, false, false, NONE, params, NONE, body, scope_id,
|
SPAN, false, false, NONE, params, NONE, body, scope_id,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue