refactor: entity and value

Author: kermanx

crates/tree_shaker/src/builtins/globals/object_constructor.rs

@@ -26,7 +26,7 @@ impl<'a> Builtins<'a> {
       "defineProperty" => self.create_object_define_property_impl(),
     });
 
-    self.globals.borrow_mut().insert("Object", object);
+    self.globals.borrow_mut().insert("Object", object.into());
   }
 
   fn create_object_assign_impl(&self) -> Entity<'a> {
@@ -76,7 +76,7 @@ impl<'a> Builtins<'a> {
         }
       }
 
-      analyzer.factory.computed(array, deps)
+      analyzer.factory.computed(array.into(), deps)
     })
   }
 
@@ -91,7 +91,7 @@ impl<'a> Builtins<'a> {
         array.init_rest(value);
       }
 
-      analyzer.factory.computed(array, deps)
+      analyzer.factory.computed(array.into(), deps)
     })
   }
 
@@ -106,10 +106,10 @@ impl<'a> Builtins<'a> {
         let entry = analyzer.new_empty_array();
         entry.push_element(key.get_to_string(analyzer));
         entry.push_element(value);
-        array.init_rest(entry);
+        array.init_rest(entry.into());
       }
 
-      analyzer.factory.computed(array, deps)
+      analyzer.factory.computed(array.into(), deps)
     })
   }
 

crates/tree_shaker/src/builtins/globals/symbol_constructor.rs

@@ -34,6 +34,6 @@ impl<'a> Builtins<'a> {
       // "toString" => factory.string("__#toString__"),
     });
 
-    self.globals.borrow_mut().insert("Symbol", object);
+    self.globals.borrow_mut().insert("Symbol", object.into());
   }
 }

crates/tree_shaker/src/builtins/import_meta.rs

@@ -31,6 +31,6 @@ impl<'a> Builtins<'a> {
       },
     );
 
-    object
+    object.into()
   }
 }

crates/tree_shaker/src/builtins/prototypes/function.rs

@@ -1,6 +1,6 @@
 use super::{object::create_object_prototype, BuiltinPrototype};
 use crate::{
-  entity::{Entity, EntityFactory, ObjectId},
+  entity::{EntityFactory, ObjectId},
   init_prototype,
 };
 
@@ -14,11 +14,11 @@ pub fn create_function_prototype<'a>(factory: &EntityFactory<'a>) -> BuiltinProt
         // This can be any value
         let arguments_object_id = ObjectId::from_usize(0);
         match arg.test_is_undefined() {
-          Some(true) => analyzer.factory.array(cf_scope, arguments_object_id),
+          Some(true) => analyzer.factory.array(cf_scope, arguments_object_id).into(),
           Some(false) => arg,
           None => analyzer.factory.union((
             arg,
-            analyzer.factory.array(cf_scope, arguments_object_id) as Entity<'a>,
+            analyzer.factory.array(cf_scope, arguments_object_id).into(),
           )),
         }
       };

crates/tree_shaker/src/builtins/react/context.rs

@@ -60,7 +60,7 @@ pub fn create_react_create_context_impl<'a>(factory: &'a EntityFactory<'a>) -> E
       "Consumer" => create_react_context_consumer_impl(analyzer, context_id),
     });
 
-    context
+    context.into()
   })
 }
 

crates/tree_shaker/src/builtins/react/create_element.rs

@@ -6,13 +6,14 @@ pub fn create_react_create_element_impl<'a>(factory: &'a EntityFactory<'a>) -> E
     let [tag, props] = args[..] else { unreachable!() };
     let props = match props.test_nullish() {
       Some(true) => analyzer
-        .new_empty_object(ObjectPrototype::Builtin(&analyzer.builtins.prototypes.object), None),
+        .new_empty_object(ObjectPrototype::Builtin(&analyzer.builtins.prototypes.object), None)
+        .into(),
       Some(false) => props,
       None => analyzer.factory.union((
         props,
         analyzer
           .new_empty_object(ObjectPrototype::Builtin(&analyzer.builtins.prototypes.object), None)
-          as Entity<'a>,
+          .into(),
       )),
     };
 

crates/tree_shaker/src/builtins/react/mod.rs

@@ -51,7 +51,7 @@ pub fn create_react_namespace<'a>(
     "useMemo" => create_react_use_memo_impl(factory),
   });
 
-  namespace
+  namespace.into()
 }
 
 pub fn create_react_jsx_runtime_namespace<'a>(
@@ -70,5 +70,5 @@ pub fn create_react_jsx_runtime_namespace<'a>(
     "jsxs" => create_react_jsxs_impl(factory),
   });
 
-  object
+  object.into()
 }

crates/tree_shaker/src/entity/array.rs

@@ -290,7 +290,7 @@ impl<'a> EntityTrait<'a> for ArrayEntity<'a> {
     if self.consumed.get() {
       return consumed_object::r#await(analyzer, dep);
     }
-    analyzer.factory.computed(self, dep)
+    analyzer.factory.computed(self.into(), dep)
   }
 
   fn iterate(&'a self, analyzer: &mut Analyzer<'a>, dep: Consumable<'a>) -> IteratedElements<'a> {
@@ -342,7 +342,7 @@ impl<'a> EntityTrait<'a> for ArrayEntity<'a> {
   }
 
   fn get_to_jsx_child(&'a self, _analyzer: &Analyzer<'a>) -> Entity<'a> {
-    self
+    self.into()
   }
 
   fn test_typeof(&self) -> TypeofResult {

crates/tree_shaker/src/entity/builtin_fn.rs

@@ -40,7 +40,7 @@ impl<'a, T: BuiltinFnEntity<'a>> EntityTrait<'a> for T {
     if let Some(object) = self.object() {
       object.get_property(analyzer, dep, key)
     } else {
-      analyzer.builtins.prototypes.function.get_property(analyzer, self, key, dep)
+      analyzer.builtins.prototypes.function.get_property(analyzer, self.into(), key, dep)
     }
   }
 
@@ -109,7 +109,7 @@ impl<'a, T: BuiltinFnEntity<'a>> EntityTrait<'a> for T {
   }
 
   fn r#await(&'a self, _analyzer: &mut Analyzer<'a>, _dep: Consumable<'a>) -> Entity<'a> {
-    self
+    self.into()
   }
 
   fn iterate(&'a self, analyzer: &mut Analyzer<'a>, dep: Consumable<'a>) -> IteratedElements<'a> {
@@ -221,12 +221,15 @@ impl<'a> Analyzer<'a> {
     _name: &'static str,
     implementation: F,
   ) -> Entity<'a> {
-    self.factory.alloc(ImplementedBuiltinFnEntity {
-      #[cfg(feature = "flame")]
-      name: _name,
-      implementation,
-      object: Some(self.new_function_object(None).0),
-    })
+    self
+      .factory
+      .alloc(ImplementedBuiltinFnEntity {
+        #[cfg(feature = "flame")]
+        name: _name,
+        implementation,
+        object: Some(self.new_function_object(None).0),
+      })
+      .into()
   }
 }