Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion crates/oxc_transformer/src/common/helper_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ impl HelperLoaderStore<'_> {
// Public methods implemented directly on `TransformCtx`, as they need access to `TransformCtx::module_imports`.
impl<'a> TransformCtx<'a> {
/// Load and call a helper function and return a `CallExpression`.
#[expect(dead_code)]
pub fn helper_call(
&self,
helper: Helper,
Expand Down
16 changes: 7 additions & 9 deletions crates/oxc_transformer/src/es2018/object_rest_spread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -515,21 +515,19 @@ impl<'a, 'ctx> ObjectRestSpread<'a, 'ctx> {
) {
let had_props = !props.is_empty();
let obj = ctx.ast.expression_object(SPAN, ctx.ast.vec_from_iter(props.drain(..)), None);
let new_expr = if let Some(call_expr) = expr.take() {
let callee = transform_ctx.helper_load(Helper::ObjectSpread2, ctx);
let arguments = if let Some(call_expr) = expr.take() {
let arg = Expression::CallExpression(ctx.ast.alloc(call_expr));
let mut arguments = ctx.ast.vec1(Argument::from(arg));
let arg = Argument::from(arg);
if had_props {
let empty_object = ctx.ast.expression_object(SPAN, ctx.ast.vec(), None);
arguments.push(Argument::from(empty_object));
arguments.push(Argument::from(obj));
ctx.ast.vec_from_array([arg, Argument::from(empty_object), Argument::from(obj)])
} else {
ctx.ast.vec1(arg)
}
ctx.ast.call_expression(SPAN, callee, NONE, arguments, false)
} else {
let callee = transform_ctx.helper_load(Helper::ObjectSpread2, ctx);
let arguments = ctx.ast.vec1(Argument::from(obj));
ctx.ast.call_expression(SPAN, callee, NONE, arguments, false)
ctx.ast.vec1(Argument::from(obj))
};
let new_expr = transform_ctx.helper_call(Helper::ObjectSpread2, SPAN, arguments, ctx);
expr.replace(new_expr);
}
}
Expand Down
Loading