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

feat(oxc_transformer): support jsx pragma that are long member expressions #7538

Merged
merged 1 commit into from
Dec 2, 2024
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
36 changes: 19 additions & 17 deletions crates/oxc_transformer/src/jsx/jsx_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ fn get_import_source(jsx_runtime_importer: &str, react_importer_len: u32) -> Ato
/// Pragma used in classic mode
struct Pragma<'a> {
object: Atom<'a>,
property: Option<Atom<'a>>,
properties: Vec<Atom<'a>>,
}

impl<'a> Pragma<'a> {
Expand All @@ -335,19 +335,10 @@ impl<'a> Pragma<'a> {
if object_name.is_empty() {
return Self::invalid(default_property_name, ctx);
}

let property = match parts.next() {
Some(property_name) => {
if property_name.is_empty() || parts.next().is_some() {
return Self::invalid(default_property_name, ctx);
}
Some(ast.atom(property_name))
}
None => None,
};
let props = parts.map(|item| ast.atom(item)).collect();

let object = ast.atom(object_name);
Self { object, property }
Self { object, properties: props }
} else {
Self::default(default_property_name)
}
Expand All @@ -359,16 +350,27 @@ impl<'a> Pragma<'a> {
}

fn default(default_property_name: &'static str) -> Self {
Self { object: Atom::from("React"), property: Some(Atom::from(default_property_name)) }
Self { object: Atom::from("React"), properties: vec![Atom::from(default_property_name)] }
}

fn create_expression(&self, ctx: &mut TraverseCtx<'a>) -> Expression<'a> {
let object = get_read_identifier_reference(SPAN, self.object.clone(), ctx);
if let Some(property) = self.property.as_ref() {
create_static_member_expression(object, property.clone(), ctx)
} else {
Expression::Identifier(ctx.alloc(object))
Self::create_arbitrary_length_member_expr_or_ident(object, &self.properties, ctx)
}

/// create a static member expression without caring about the referenceId,
/// this function is always used to creat a tail part of a real member expression
fn create_arbitrary_length_member_expr_or_ident(
object: IdentifierReference<'a>,
list: &[Atom<'a>],
ctx: &mut TraverseCtx<'a>,
) -> Expression<'a> {
let mut expr = Expression::Identifier(ctx.alloc(object));
for item in list {
let name = ctx.ast.identifier_name(SPAN, item.clone());
expr = ctx.ast.member_expression_static(SPAN, expr, name, false).into();
}
expr
}
}

Expand Down
4 changes: 2 additions & 2 deletions tasks/transform_conformance/snapshots/oxc.snap.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
commit: 54a8389f

Passed: 90/101
Passed: 91/102

# All Passed:
* babel-plugin-transform-class-static-block
Expand Down Expand Up @@ -170,7 +170,7 @@ rebuilt : SymbolId(2): []
x Output mismatch


# babel-plugin-transform-react-jsx (31/34)
# babel-plugin-transform-react-jsx (32/35)
* refresh/does-not-transform-it-because-it-is-not-used-in-the-AST/input.jsx
x Output mismatch

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<test></test>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"plugins": [
[
"transform-react-jsx",
{
"runtime": "classic",
"pragma": "a.b.c"
IWANABETHATGUY marked this conversation as resolved.
Show resolved Hide resolved
}
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a.b.c("test", null);
Loading