refactor(es): Deduplicate EvalFinder (#10472)

Author: bvanjoi

crates/swc_ecma_minifier/src/compress/optimize/mod.rs

@@ -7,6 +7,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use swc_atoms::Atom;
 use swc_common::{pass::Repeated, util::take::Take, Spanned, SyntaxContext, DUMMY_SP};
 use swc_ecma_ast::*;
+use swc_ecma_transforms_base::rename::contains_eval;
 use swc_ecma_transforms_optimization::debug_assert_valid;
 use swc_ecma_usage_analyzer::{analyzer::UsageAnalyzer, marks::Marks};
 use swc_ecma_utils::{
@@ -31,9 +32,7 @@ use crate::{
     mode::Mode,
     option::{CompressOptions, MangleOptions},
     program_data::{ProgramData, ScopeData, VarUsageInfoFlags},
-    util::{
-        contains_eval, contains_leaping_continue_with_label, make_number, ExprOptExt, ModuleItemExt,
-    },
+    util::{contains_leaping_continue_with_label, make_number, ExprOptExt, ModuleItemExt},
 };
 
 mod arguments;

crates/swc_ecma_minifier/src/util/mod.rs

@@ -7,7 +7,7 @@ use swc_atoms::Atom;
 use swc_common::{util::take::Take, Span, Spanned, DUMMY_SP};
 use swc_ecma_ast::*;
 use swc_ecma_transforms_base::{fixer::fixer, hygiene::hygiene};
-use swc_ecma_utils::{stack_size::maybe_grow_default, DropSpan, ModuleItemLike, StmtLike, Value};
+use swc_ecma_utils::{DropSpan, ModuleItemLike, StmtLike, Value};
 use swc_ecma_visit::{noop_visit_type, visit_mut_pass, visit_obj_and_computed, Visit, VisitWith};
 
 pub(crate) mod base54;
@@ -476,48 +476,6 @@ pub fn now() -> Option<Instant> {
     }
 }
 
-pub(crate) fn contains_eval<N>(node: &N, include_with: bool) -> bool
-where
-    N: VisitWith<EvalFinder>,
-{
-    let mut v = EvalFinder {
-        found: false,
-        include_with,
-    };
-
-    node.visit_with(&mut v);
-    v.found
-}
-
-pub(crate) struct EvalFinder {
-    found: bool,
-    include_with: bool,
-}
-
-impl Visit for EvalFinder {
-    noop_visit_type!();
-
-    visit_obj_and_computed!();
-
-    fn visit_expr(&mut self, n: &Expr) {
-        maybe_grow_default(|| n.visit_children_with(self));
-    }
-
-    fn visit_ident(&mut self, i: &Ident) {
-        if i.sym == "eval" {
-            self.found = true;
-        }
-    }
-
-    fn visit_with_stmt(&mut self, s: &WithStmt) {
-        if self.include_with {
-            self.found = true;
-        } else {
-            s.visit_children_with(self);
-        }
-    }
-}
-
 #[allow(unused)]
 pub(crate) fn dump_program(p: &Program) -> String {
     #[cfg(feature = "debug")]

crates/swc_ecma_transforms_base/src/rename/eval.rs

@@ -2,7 +2,7 @@ use swc_ecma_ast::*;
 use swc_ecma_utils::stack_size::maybe_grow_default;
 use swc_ecma_visit::{noop_visit_type, visit_obj_and_computed, Visit, VisitWith};
 
-pub(crate) fn contains_eval<N>(node: &N, include_with: bool) -> bool
+pub fn contains_eval<N>(node: &N, include_with: bool) -> bool
 where
     N: VisitWith<EvalFinder>,
 {
@@ -15,7 +15,7 @@ where
     v.found
 }
 
-pub(crate) struct EvalFinder {
+pub struct EvalFinder {
     found: bool,
     include_with: bool,
 }

crates/swc_ecma_transforms_base/src/rename/mod.rs

@@ -10,14 +10,14 @@ use swc_ecma_visit::{
     noop_visit_mut_type, visit_mut_pass, Fold, VisitMut, VisitMutWith, VisitWith,
 };
 
+pub use self::eval::contains_eval;
 #[cfg(feature = "concurrent-renamer")]
 use self::renamer_concurrent::{Send, Sync};
 #[cfg(not(feature = "concurrent-renamer"))]
 use self::renamer_single::{Send, Sync};
 use self::{
     analyzer::Analyzer,
     collector::{collect_decls, CustomBindingCollector, IdCollector},
-    eval::contains_eval,
     ops::Operator,
 };
 use crate::hygiene::Config;