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.

Sign up for GitHub

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): JSX: merge transform_jsx_attribute_item into transform_jsx #5861

Merged
merged 1 commit into from
Sep 19, 2024
+25 −35
Merged

refactor(transformer): JSX: merge transform_jsx_attribute_item into transform_jsx #5861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 25 additions & 35 deletions crates/oxc_transformer/src/react/jsx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,15 @@ impl<'a> ReactJsx<'a> {
continue;
}
}

// Add attribute to prop object
let kind = PropertyKind::Init;
let key = self.get_attribute_name(&attr.name);
let value = self.transform_jsx_attribute_value(attr.value.as_ref(), ctx);
let object_property = self.ast().object_property_kind_object_property(
attr.span, kind, key, value, None, false, false, false,
);
properties.push(object_property);
}
// optimize `{...prop}` to `prop` in static mode
JSXAttributeItem::SpreadAttribute(spread) => {
Expand All @@ -495,11 +504,24 @@ impl<'a> ReactJsx<'a> {
continue;
}
}

// Add attribute to prop object
match &spread.argument {
Expression::ObjectExpression(expr) if !expr.has_proto() => {
// SAFETY: `ast.copy` is unsound! We need to fix.
properties.extend(unsafe { self.ast().copy(&expr.properties) });
}
expr => {
// SAFETY: `ast.copy` is unsound! We need to fix.
let argument = unsafe { self.ast().copy(expr) };
let object_property = self
.ast()
.object_property_kind_spread_element(spread.span, argument);
properties.push(object_property);
}
}
}
}

// Add attribute to prop object
self.transform_jsx_attribute_item(&mut properties, attribute, ctx);
}
}

Expand Down Expand Up @@ -732,38 +754,6 @@ impl<'a> ReactJsx<'a> {
self.ast().member_expression_static(expr.span, object, property, false).into()
}

fn transform_jsx_attribute_item(
&mut self,
properties: &mut Vec<'a, ObjectPropertyKind<'a>>,
attribute: &JSXAttributeItem<'a>,
ctx: &mut TraverseCtx<'a>,
) {
match attribute {
JSXAttributeItem::Attribute(attr) => {
let kind = PropertyKind::Init;
let key = self.get_attribute_name(&attr.name);
let value = self.transform_jsx_attribute_value(attr.value.as_ref(), ctx);
let object_property = self.ast().object_property_kind_object_property(
attr.span, kind, key, value, None, false, false, false,
);
properties.push(object_property);
}
JSXAttributeItem::SpreadAttribute(attr) => match &attr.argument {
Expression::ObjectExpression(expr) if !expr.has_proto() => {
// SAFETY: `ast.copy` is unsound! We need to fix.
properties.extend(unsafe { self.ast().copy(&expr.properties) });
}
expr => {
// SAFETY: `ast.copy` is unsound! We need to fix.
let argument = unsafe { self.ast().copy(expr) };
let object_property =
self.ast().object_property_kind_spread_element(attr.span, argument);
properties.push(object_property);
}
},
}
}

fn transform_jsx_attribute_value(
&mut self,
value: Option<&JSXAttributeValue<'a>>,
Expand Down