Skip to content

perf(transformer): faster checks if JSX plugin enabled #3577

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

Merged
graphite-app merged 1 commit into from
Jun 7, 2024
Merged

perf(transformer): faster checks if JSX plugin enabled #3577

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions crates/oxc_transformer/src/options/transformer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ impl TransformOptions {
ReactOptions::default()
})
};
react_options.development = options.has_plugin("transform-react-jsx-development");
react_options.jsx_plugin = has_jsx_plugin || has_jsx_development_plugin;
react_options.development = has_jsx_development_plugin;
react_options.jsx_plugin = has_jsx_plugin;
react_options.display_name_plugin = options.has_plugin("transform-react-display-name");
react_options.jsx_self_plugin = options.has_plugin("transform-react-jsx-self");
react_options.jsx_source_plugin = options.has_plugin("transform-react-jsx-source");
Expand Down
16 changes: 6 additions & 10 deletions crates/oxc_transformer/src/react/jsx/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub use super::{
/// * <https://babeljs.io/docs/babel-plugin-transform-react-jsx>
/// * <https://github.com/babel/babel/tree/main/packages/babel-helper-builder-react-jsx>
pub struct ReactJsx<'a> {
options: Rc<ReactOptions>,
options: ReactOptions,

ctx: Ctx<'a>,

Expand Down Expand Up @@ -310,7 +310,7 @@ impl<'a> Pragma<'a> {

// Transforms
impl<'a> ReactJsx<'a> {
pub fn new(options: Rc<ReactOptions>, ctx: Ctx<'a>) -> Self {
pub fn new(options: ReactOptions, ctx: Ctx<'a>) -> Self {
let bindings = match options.runtime {
ReactJsxRuntime::Classic => {
if options.import_source.is_some() {
Expand Down Expand Up @@ -612,17 +612,15 @@ impl<'a> ReactJsx<'a> {

// React.createElement's second argument
if !is_fragment && is_classic {
if self.options.is_jsx_self_plugin_enabled()
&& self.jsx_self.can_add_self_attribute(ctx)
{
if self.options.jsx_self_plugin && self.jsx_self.can_add_self_attribute(ctx) {
if let Some(span) = self_attr_span {
self.jsx_self.report_error(span);
} else {
properties.push(self.jsx_self.get_object_property_kind_for_jsx_plugin());
}
}

if self.options.is_jsx_source_plugin_enabled() {
if self.options.jsx_source_plugin {
if let Some(span) = source_attr_span {
self.jsx_source.report_error(span);
} else {
Expand Down Expand Up @@ -678,7 +676,7 @@ impl<'a> ReactJsx<'a> {
// Fragment doesn't have source and self
if !is_fragment {
// { __source: { fileName, lineNumber, columnNumber } }
if self.options.is_jsx_source_plugin_enabled() {
if self.options.jsx_source_plugin {
if let Some(span) = source_attr_span {
self.jsx_source.report_error(span);
} else {
Expand All @@ -690,9 +688,7 @@ impl<'a> ReactJsx<'a> {
}

// this
if self.options.is_jsx_self_plugin_enabled()
&& self.jsx_self.can_add_self_attribute(ctx)
{
if self.options.jsx_self_plugin && self.jsx_self.can_add_self_attribute(ctx) {
if let Some(span) = self_attr_span {
self.jsx_self.report_error(span);
} else {
Expand Down
46 changes: 27 additions & 19 deletions crates/oxc_transformer/src/react/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,48 +27,58 @@ pub use self::{
/// * [plugin-transform-react-jsx-source](https://babel.dev/docs/babel-plugin-transform-react-jsx-source)
/// * [plugin-transform-react-display-name](https://babeljs.io/docs/babel-plugin-transform-react-display-name)
pub struct React<'a> {
options: Rc<ReactOptions>,
jsx: ReactJsx<'a>,
display_name: ReactDisplayName<'a>,
jsx_plugin: bool,
display_name_plugin: bool,
jsx_self_plugin: bool,
jsx_source_plugin: bool,
}

// Constructors
impl<'a> React<'a> {
pub fn new(options: ReactOptions, ctx: Ctx<'a>) -> Self {
let mut options = options;
if options.is_jsx_plugin_enabled() {
pub fn new(mut options: ReactOptions, ctx: Ctx<'a>) -> Self {
if options.jsx_plugin || options.development {
options.update_with_comments(&ctx);
options.conform();
}
let options = Rc::new(options);
let ReactOptions {
jsx_plugin,
display_name_plugin,
jsx_self_plugin,
jsx_source_plugin,
..
} = options;
Self {
options: Rc::clone(&options),
jsx: ReactJsx::new(options, Rc::clone(&ctx)),
display_name: ReactDisplayName::new(ctx),
jsx_plugin,
display_name_plugin,
jsx_self_plugin,
jsx_source_plugin,
}
}
}

// Transforms
impl<'a> React<'a> {
pub fn transform_program_on_exit(&mut self, program: &mut Program<'a>) {
if self.options.is_jsx_plugin_enabled() {
if self.jsx_plugin {
self.jsx.transform_program_on_exit(program);
}
}

pub fn transform_expression(&mut self, expr: &mut Expression<'a>, ctx: &mut TraverseCtx<'a>) {
match expr {
Expression::JSXElement(e) => {
if self.options.is_jsx_plugin_enabled() {
if self.jsx_plugin {
match expr {
Expression::JSXElement(e) => {
*expr = self.jsx.transform_jsx_element(e, ctx);
}
}
Expression::JSXFragment(e) => {
if self.options.is_jsx_plugin_enabled() {
Expression::JSXFragment(e) => {
*expr = self.jsx.transform_jsx_fragment(e, ctx);
}
_ => {}
}
_ => {}
}
}

Expand All @@ -77,7 +87,7 @@ impl<'a> React<'a> {
call_expr: &mut CallExpression<'a>,
ctx: &TraverseCtx<'a>,
) {
if self.options.display_name_plugin {
if self.display_name_plugin {
self.display_name.transform_call_expression(call_expr, ctx);
}
}
Expand All @@ -87,12 +97,10 @@ impl<'a> React<'a> {
elem: &mut JSXOpeningElement<'a>,
ctx: &TraverseCtx<'a>,
) {
if self.options.is_jsx_self_plugin_enabled()
&& self.jsx.jsx_self.can_add_self_attribute(ctx)
{
if self.jsx_self_plugin && self.jsx.jsx_self.can_add_self_attribute(ctx) {
self.jsx.jsx_self.transform_jsx_opening_element(elem);
}
if self.options.is_jsx_source_plugin_enabled() {
if self.jsx_source_plugin {
self.jsx.jsx_source.transform_jsx_opening_element(elem);
}
}
Expand Down
16 changes: 6 additions & 10 deletions crates/oxc_transformer/src/react/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,12 @@ impl Default for ReactOptions {
}

impl ReactOptions {
pub fn is_jsx_plugin_enabled(&self) -> bool {
self.jsx_plugin || self.development
}

pub fn is_jsx_self_plugin_enabled(&self) -> bool {
self.jsx_self_plugin || self.development
}

pub fn is_jsx_source_plugin_enabled(&self) -> bool {
self.jsx_source_plugin || self.development
pub fn conform(&mut self) {
if self.development {
self.jsx_plugin = true;
self.jsx_self_plugin = true;
self.jsx_source_plugin = true;
}
}

/// Scan through all comments and find the following pragmas
Expand Down