node: return export property for cached modules

y21 · Jan 17, 2024 · 50ffedf · 50ffedf
1 parent a51af38
commit 50ffedf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/crates/dash_node_impl/src/lib.rs b/crates/dash_node_impl/src/lib.rs
@@ -172,7 +172,7 @@ impl Object for RequireFunction {
             };
 
             if let Some(module) = self.state.ongoing_requires.borrow().get(&canonicalized_path) {
-                return Ok(module.clone().into());
+                return module.get_property(scope, exports.into());
             }
 
             let source = match std::fs::read_to_string(&canonicalized_path) {

diff --git a/crates/dash_vm/src/value/primitive.rs b/crates/dash_vm/src/value/primitive.rs
@@ -206,7 +206,11 @@ impl Object for Undefined {
         sc: &mut LocalScope,
         key: PropertyKey,
     ) -> Result<Option<PropertyValue>, Unrooted> {
-        throw!(sc, TypeError, "Cannot read property {:?} of undefined", key)
+        let key = match key {
+            PropertyKey::String(s) => s.res(sc).to_owned(),
+            PropertyKey::Symbol(s) => sc.interner.resolve(s.sym()).to_owned(),
+        };
+        throw!(sc, TypeError, "Cannot read property {} of undefined", key)
     }
 
     fn set_property(&self, sc: &mut LocalScope, key: PropertyKey, _value: PropertyValue) -> Result<(), Value> {
@@ -258,7 +262,11 @@ impl Object for Null {
         sc: &mut LocalScope,
         key: PropertyKey,
     ) -> Result<Option<PropertyValue>, Unrooted> {
-        throw!(sc, TypeError, "Cannot read property {:?} of null", key)
+        let key = match key {
+            PropertyKey::String(s) => s.res(sc).to_owned(),
+            PropertyKey::Symbol(s) => sc.interner.resolve(s.sym()).to_owned(),
+        };
+        throw!(sc, TypeError, "Cannot read property {} of null", key)
     }
 
     fn set_property(&self, sc: &mut LocalScope, key: PropertyKey, _value: PropertyValue) -> Result<(), Value> {