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.

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

refactor(transformer/class-properties): make transform_instance_assignment_expression more generic #7956

Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,20 @@ impl<'a, 'ctx> ClassProperties<'a, 'ctx> {
ctx,
);
} else {
self.transform_instance_assignment_expression(expr, prop_binding, ctx);
let getter =
|s: &mut Self, object: Expression<'a>, span: Span, ctx: &mut TraverseCtx<'a>| {
let ident = prop_binding.create_read_expression(ctx);
s.create_private_field_get(ident, object, span, ctx)
};
let setter = |s: &mut Self,
object: Expression<'a>,
value: Expression<'a>,
span: Span,
ctx: &mut TraverseCtx<'a>| {
let ident = prop_binding.create_read_expression(ctx);
s.create_private_field_set(ident, object, value, span, ctx)
};
self.transform_instance_assignment_expression(expr, getter, setter, ctx);
}
}

Expand Down Expand Up @@ -578,11 +591,20 @@ impl<'a, 'ctx> ClassProperties<'a, 'ctx> {
// `AssignmentTarget::PrivateFieldExpression` on left, and that clones in
// `transform_assignment_expression` can be elided.
#[inline]
#[expect(clippy::needless_pass_by_value)]
fn transform_instance_assignment_expression(
pub(super) fn transform_instance_assignment_expression<
Getter: FnOnce(&mut Self, Expression<'a>, Span, &mut TraverseCtx<'a>) -> Expression<'a>,
Setter: FnOnce(
&mut Self,
Expression<'a>,
Expression<'a>,
Span,
&mut TraverseCtx<'a>,
) -> Expression<'a>,
>(
&mut self,
expr: &mut Expression<'a>,
prop_binding: BoundIdentifier<'a>,
getter: Getter,
setter: Setter,
ctx: &mut TraverseCtx<'a>,
) {
let assign_expr = match ctx.ast.move_expression(expr) {
Expand All @@ -595,46 +617,41 @@ impl<'a, 'ctx> ClassProperties<'a, 'ctx> {
_ => unreachable!(),
};

let prop_ident = prop_binding.create_read_expression(ctx);

if operator == AssignmentOperator::Assign {
// `object.#prop = value` -> `_classPrivateFieldSet2(_prop, object, value)`
*expr = self.create_private_field_set(prop_ident, object, value, span, ctx);
*expr = setter(self, object, value, span, ctx);
} else {
// Make 2 copies of `object`
let (object1, object2) = self.duplicate_object(object, ctx);

let prop_ident2 = prop_binding.create_read_expression(ctx);

if let Some(operator) = operator.to_binary_operator() {
// `object.#prop += value`
// -> `_classPrivateFieldSet2(_prop, object, _classPrivateFieldGet2(_prop, object) + value)`

// `_classPrivateFieldGet2(_prop, object)`
let get_call = self.create_private_field_get(prop_ident, object2, SPAN, ctx);
let get_call = getter(self, object2, SPAN, ctx);

// `_classPrivateFieldGet2(_prop, object) + value`
let value = ctx.ast.expression_binary(SPAN, get_call, operator, value);

// `_classPrivateFieldSet2(_prop, object, _classPrivateFieldGet2(_prop, object) + value)`
*expr = self.create_private_field_set(prop_ident2, object1, value, span, ctx);
*expr = setter(self, object1, value, span, ctx);
} else if let Some(operator) = operator.to_logical_operator() {
// `object.#prop &&= value`
// -> `_classPrivateFieldGet2(_prop, object) && _classPrivateFieldSet2(_prop, object, value)`

// `_classPrivateFieldGet2(_prop, object)`
let get_call = self.create_private_field_get(prop_ident, object1, SPAN, ctx);
let get_call = getter(self, object1, SPAN, ctx);

// `_classPrivateFieldSet2(_prop, object, value)`
let set_call =
self.create_private_field_set(prop_ident2, object2, value, SPAN, ctx);
let set_call = setter(self, object2, value, SPAN, ctx);
// `_classPrivateFieldGet2(_prop, object) && _classPrivateFieldSet2(_prop, object, value)`
*expr = ctx.ast.expression_logical(span, get_call, operator, set_call);
} else {
// The above covers all types of `AssignmentOperator`
unreachable!();
}
}
};
}

/// Transform update expression (`++` or `--`) where argument is private field.
Expand Down
Loading