feat: UnionHint::Object

Author: kermanx

crates/jsshaker/src/value/function/mod.rs

@@ -20,7 +20,10 @@ use crate::{
   entity::Entity,
   scope::VariableScopeId,
   utils::{CalleeInfo, CalleeNode},
-  value::cache::{FnCache, FnCacheTrackDeps},
+  value::{
+    UnionHint,
+    cache::{FnCache, FnCacheTrackDeps},
+  },
 };
 pub use arguments::*;
 pub use builtin::*;
@@ -194,6 +197,10 @@ impl<'a> ValueTrait<'a> for FunctionValue<'a> {
     Some(false)
   }
 
+  fn get_union_hint(&self) -> UnionHint {
+    UnionHint::Object
+  }
+
   fn as_cacheable(&self, _analyzer: &Analyzer<'a>) -> Option<Cacheable<'a>> {
     Some(Cacheable::Function(self.callee.instance_id))
   }

crates/jsshaker/src/value/mod.rs

@@ -66,6 +66,7 @@ pub type IteratedElements<'a> = (Vec<Entity<'a>>, Option<Entity<'a>>, Dep<'a>);
 pub enum UnionHint {
   Unknown,
   Never,
+  Object,
   Other,
 }
 

crates/jsshaker/src/value/object/mod.rs

@@ -28,7 +28,7 @@ use crate::{
   scope::CfScopeId,
   use_consumed_flag,
   utils::ast::AstKind2,
-  value::literal::PossibleLiterals,
+  value::{UnionHint, literal::PossibleLiterals},
 };
 
 #[derive(Debug, Clone, Copy)]
@@ -267,6 +267,10 @@ impl<'a> ValueTrait<'a> for ObjectValue<'a> {
   fn as_cacheable(&self, _analyzer: &Analyzer<'a>) -> Option<Cacheable<'a>> {
     Some(Cacheable::Object(self.object_id()))
   }
+
+  fn get_union_hint(&self) -> UnionHint {
+    UnionHint::Object
+  }
 }
 
 impl<'a> ObjectValue<'a> {

crates/jsshaker/src/value/union.rs

@@ -389,6 +389,11 @@ impl<'a> UnionValues<'a> for allocator::Vec<'a, Entity<'a>> {
           has_unknown = true;
           filtered.push(*value)
         }
+        UnionHint::Object => {
+          filtered = self;
+          has_unknown = false;
+          break;
+        }
         _ => filtered.push(*value),
       }
     }
@@ -435,17 +440,21 @@ impl<'a> UnionValues<'a> for (Entity<'a>, Entity<'a>) {
     (f(self.0), f(self.1))
   }
   fn union(self, factory: &Factory<'a>) -> Entity<'a> {
-    match (self.0.get_union_hint(), self.1.get_union_hint()) {
-      (UnionHint::Never, _) => self.1,
-      (_, UnionHint::Never) => self.0,
-      (UnionHint::Unknown, _) | (_, UnionHint::Unknown) => factory.computed_unknown(self),
-      _ => factory
+    let no_merge = || {
+      factory
         .alloc(UnionValue {
           values: self,
           consumed: Cell::new(false),
           phantom: std::marker::PhantomData,
         })
-        .into(),
+        .into()
+    };
+    match (self.0.get_union_hint(), self.1.get_union_hint()) {
+      (UnionHint::Object, _) | (_, UnionHint::Object) => no_merge(),
+      (UnionHint::Never, _) => self.1,
+      (_, UnionHint::Never) => self.0,
+      (UnionHint::Unknown, _) | (_, UnionHint::Unknown) => factory.computed_unknown(self),
+      _ => no_merge(),
     }
   }
 }