Revert "fix: active_callback_triggers"

This reverts commit bc18577.

Author: kermanx

crates/jsshaker/src/analyzer/exhaustive.rs

@@ -1,12 +1,10 @@
 use std::{
-  cell::RefCell,
   hash::{Hash, Hasher},
   mem,
   rc::Rc,
 };
 
 use oxc::allocator;
-use rustc_hash::FxHashSet;
 
 use crate::{
   analyzer::{Analyzer, rw_tracking::ReadWriteTarget},
@@ -28,7 +26,6 @@ pub struct ExhaustiveData<'a> {
 pub struct ExhaustiveCallback<'a> {
   pub handler: Rc<dyn Fn(&mut Analyzer<'a>) -> Entity<'a> + 'a>,
   pub drain: bool,
-  pub triggered: Rc<RefCell<FxHashSet<ReadWriteTarget<'a>>>>,
 }
 impl PartialEq for ExhaustiveCallback<'_> {
   fn eq(&self, other: &Self) -> bool {
@@ -136,11 +133,11 @@ impl<'a> Analyzer<'a> {
     deps: allocator::HashSet<ReadWriteTarget<'a>>,
   ) {
     for id in deps {
-      self.exhaustive_callbacks.entry(id).or_default().insert(ExhaustiveCallback {
-        handler: handler.clone(),
-        drain,
-        triggered: Default::default(),
-      });
+      self
+        .exhaustive_callbacks
+        .entry(id)
+        .or_default()
+        .insert(ExhaustiveCallback { handler: handler.clone(), drain });
     }
   }
 
@@ -150,10 +147,7 @@ impl<'a> Analyzer<'a> {
       if let Some(callbacks) = self.exhaustive_callbacks.get_mut(&id)
         && !callbacks.is_empty()
       {
-        for callback in callbacks.drain() {
-          callback.triggered.borrow_mut().insert(id);
-          self.pending_callbacks.insert(callback);
-        }
+        self.pending_deps.extend(callbacks.drain());
         found = true;
       }
     };
@@ -163,17 +157,15 @@ impl<'a> Analyzer<'a> {
   }
 
   pub fn call_exhaustive_callbacks(&mut self) -> bool {
-    if self.pending_callbacks.is_empty() {
+    if self.pending_deps.is_empty() {
       return false;
     }
     let old_try_catch_depth = self.scoping.try_catch_depth.take();
     loop {
-      for callback in mem::take(&mut self.pending_callbacks) {
-        self.active_callback_triggers.extend(&callback.triggered.borrow());
-        self.exec_exhaustively("dep", callback.drain, true, callback.handler.clone());
-        self.active_callback_triggers.unextend(&callback.triggered.borrow());
+      for ExhaustiveCallback { drain, handler } in mem::take(&mut self.pending_deps) {
+        self.exec_exhaustively("dep", drain, true, handler.clone());
       }
-      if self.pending_callbacks.is_empty() {
+      if self.pending_deps.is_empty() {
         self.scoping.try_catch_depth = old_try_catch_depth;
         return true;
       }

crates/jsshaker/src/analyzer/mod.rs

@@ -28,7 +28,7 @@ use crate::{
   mangling::Mangler,
   module::{ModuleId, Modules},
   scope::Scoping,
-  utils::{ExtraData, counter::Counter},
+  utils::ExtraData,
   value::{FnStats, literal::symbol::SymbolRegistry},
   vfs::Vfs,
 };
@@ -55,8 +55,7 @@ pub struct Analyzer<'a> {
   // pub loop_data: LoopDataMap<'a>,
   pub folder: ConstantFolder<'a>,
   pub mangler: Mangler<'a>,
-  pub pending_callbacks: FxHashSet<ExhaustiveCallback<'a>>,
-  pub active_callback_triggers: Counter<ReadWriteTarget<'a>>,
+  pub pending_deps: FxHashSet<ExhaustiveCallback<'a>>,
   pub diagnostics: BTreeSet<String>,
   pub fn_stats: Option<RefCell<FnStats>>,
   pub symbol_registry: SymbolRegistry<'a>,
@@ -90,8 +89,7 @@ impl<'a> Analyzer<'a> {
       // loop_data: Default::default(),
       folder: ConstantFolder::new(allocator),
       mangler,
-      pending_callbacks: Default::default(),
-      active_callback_triggers: Default::default(),
+      pending_deps: Default::default(),
       diagnostics: Default::default(),
       fn_stats: config.enable_fn_stats.then(|| RefCell::new(FnStats::new())),
     }

crates/jsshaker/src/scope/variable_scope.rs

@@ -201,20 +201,19 @@ impl<'a> Analyzer<'a> {
         !self.is_readonly_symbol(symbol)
       };
       drop(variable);
-
-      if self.active_callback_triggers.has(ReadWriteTarget::Variable(scope, symbol)) {
-        value.map(|v| self.factory.computed_unknown(v))
+      let tracker_dep = self.track_read(
+        cf_scope,
+        ReadWriteTarget::Variable(scope, symbol),
+        Some(if may_change {
+          TrackReadCacheable::Mutable(value)
+        } else {
+          TrackReadCacheable::Immutable
+        }),
+      );
+      if let (Some(value), Some(tracker_dep)) = (value, tracker_dep) {
+        Some(self.factory.computed(value, tracker_dep))
       } else {
-        let tracker_dep = self.track_read(
-          cf_scope,
-          ReadWriteTarget::Variable(scope, symbol),
-          Some(if may_change {
-            TrackReadCacheable::Mutable(value)
-          } else {
-            TrackReadCacheable::Immutable
-          }),
-        );
-        value.map(|v| self.factory.optional_computed(v, tracker_dep))
+        value
       }
     };
 

crates/jsshaker/src/utils/counter.rs

@@ -2,7 +2,6 @@ mod annotation;
 pub mod ast;
 pub mod box_bump;
 mod callee_info;
-pub mod counter;
 mod data;
 pub mod effect_builder;
 mod escape_template_element_value;