Merge branch 'main' into snippets

CHANGELOG.md

@@ -32,6 +32,7 @@ Unreleased
       which returns a `Result<&'static [ResourceType], StoreObjectConversionError>`
 - Add missing `StoreObject::Reactor` to the `seasonal-season-5` feature
 - Implement `Serialize` and `Deserialize` for `RoomStatus`
+- Add function `JsHashMap::entries`
 
 ### Bugfixes:
 

src/js_collections.rs

@@ -59,6 +59,18 @@ where
     }
 }
 
+impl<K, V> JsHashMap<K, V>
+where
+    K: JsCollectionFromValue,
+    V: JsCollectionFromValue,
+{
+    pub fn entries(&self) -> impl Iterator<Item = (K, V)> {
+        let array = Object::entries(self.map.unchecked_ref());
+
+        OwnedArrayIter::new(array)
+    }
+}
+
 impl<K, V> JsHashMap<K, V>
 where
     K: JsCollectionIntoValue,
@@ -307,3 +319,16 @@ impl JsCollectionFromValue for u8 {
         }
     }
 }
+
+impl<K, V> JsCollectionFromValue for (K, V)
+where
+    K: JsCollectionFromValue,
+    V: JsCollectionFromValue,
+{
+    fn from_value(val: JsValue) -> Self {
+        let val: &Array = val.dyn_ref().expect("expected tuple of length 2");
+        let k = K::from_value(val.get(0));
+        let v = V::from_value(val.get(1));
+        (k, v)
+    }
+}