Skip to content

feat(transformer_plugins): add changed field to ReplaceGlobalDefinesReturn #14617

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
merged 1 commit into from
Oct 15, 2025
Merged

feat(transformer_plugins): add changed field to ReplaceGlobalDefinesReturn #14617

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
12 changes: 10 additions & 2 deletions crates/oxc_transformer_plugins/src/replace_global_defines.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ impl ReplaceGlobalDefinesConfig {
#[must_use]
pub struct ReplaceGlobalDefinesReturn {
pub scoping: Scoping,
pub changed: bool,
}

/// Replace Global Defines.
Expand All @@ -227,6 +228,7 @@ pub struct ReplaceGlobalDefines<'a> {
/// When `exit` the node, reset the `Lock` to `None` to make sure not affect other
/// transformation.
ast_node_lock: Option<Address>,
changed: bool,
}

impl<'a> Traverse<'a, ()> for ReplaceGlobalDefines<'a> {
Expand All @@ -237,6 +239,7 @@ impl<'a> Traverse<'a, ()> for ReplaceGlobalDefines<'a> {
let is_replaced =
self.replace_identifier_defines(expr, ctx) || self.replace_dot_defines(expr, ctx);
if is_replaced {
self.mark_as_changed();
self.ast_node_lock = Some(expr.address());
}
}
Expand All @@ -256,6 +259,7 @@ impl<'a> Traverse<'a, ()> for ReplaceGlobalDefines<'a> {
return;
}
if self.replace_define_with_assignment_expr(node, ctx) {
self.mark_as_changed();
// `AssignmentExpression` is stored in a `Box`, so we can use `from_ptr` to get
// the stable address
self.ast_node_lock = Some(Address::from_ptr(node));
Expand All @@ -275,7 +279,11 @@ impl<'a> Traverse<'a, ()> for ReplaceGlobalDefines<'a> {

impl<'a> ReplaceGlobalDefines<'a> {
pub fn new(allocator: &'a Allocator, config: ReplaceGlobalDefinesConfig) -> Self {
Self { allocator, config, ast_node_lock: None }
Self { allocator, config, ast_node_lock: None, changed: false }
}

fn mark_as_changed(&mut self) {
self.changed = true;
}

pub fn build(
Expand All @@ -284,7 +292,7 @@ impl<'a> ReplaceGlobalDefines<'a> {
program: &mut Program<'a>,
) -> ReplaceGlobalDefinesReturn {
let scoping = traverse_mut(self, self.allocator, program, scoping, ());
ReplaceGlobalDefinesReturn { scoping }
ReplaceGlobalDefinesReturn { scoping, changed: self.changed }
}

// Construct a new expression because we don't have ast clone right now.
Expand Down
9 changes: 5 additions & 4 deletions crates/oxc_transformer_plugins/tests/integrations/replace_global_defines.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pub fn test(source_text: &str, expected: &str, config: &ReplaceGlobalDefinesConf
let mut program = ret.program;
let mut scoping = SemanticBuilder::new().build(&program).semantic.into_scoping();
let ret = ReplaceGlobalDefines::new(&allocator, config.clone()).build(scoping, &mut program);
assert_eq!(ret.changed, source_text != expected);
// Use the updated scoping, instead of recreating one.
scoping = ret.scoping;
AssertAst.visit_program(&program);
Expand Down Expand Up @@ -82,18 +83,18 @@ fn dot() {
#[test]
fn dot_with_overlap() {
let config =
config(&[("import.meta.env.FOO", "import.meta.env.FOO"), ("import.meta.env", "__foo__")]);
config(&[("import.meta.env.FOO", "import.meta.env.BAR"), ("import.meta.env", "__foo__")]);
test("const _ = import.meta.env", "__foo__", &config);
test("const _ = import.meta.env.FOO", "import.meta.env.FOO", &config);
test("const _ = import.meta.env.FOO", "import.meta.env.BAR", &config);
test("const _ = import.meta.env.NODE_ENV", "__foo__.NODE_ENV", &config);

test("_ = import.meta.env", "_ = __foo__", &config);
test("_ = import.meta.env.FOO", "_ = import.meta.env.FOO", &config);
test("_ = import.meta.env.FOO", "_ = import.meta.env.BAR", &config);
test("_ = import.meta.env.NODE_ENV", "_ = __foo__.NODE_ENV", &config);

test("import.meta.env = 0", "__foo__ = 0", &config);
test("import.meta.env.NODE_ENV = 0", "__foo__.NODE_ENV = 0", &config);
test("import.meta.env.FOO = 0", "import.meta.env.FOO = 0", &config);
test("import.meta.env.FOO = 0", "import.meta.env.BAR = 0", &config);
}

#[test]
Expand Down
Loading