Patch es6 iterators not having Symbol.iterator function

tonsky · Oct 14, 2024 · 71a4502 · 71a4502
1 parent c6216fb
commit 71a4502
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/datascript/impl/entity.cljc b/src/datascript/impl/entity.cljc
@@ -45,6 +45,16 @@
          [a (multival->js v)]
          [a v]))))
 
+#?(:cljs
+  (unchecked-set (.-prototype ES6Iterator) cljs.core/ITER_SYMBOL
+     (fn []
+       (this-as this# this#))))
+
+#?(:cljs
+  (unchecked-set (.-prototype ES6EntriesIterator) cljs.core/ITER_SYMBOL
+     (fn []
+       (this-as this# this#))))
+
 (deftype Entity [db eid touched cache]
   #?@(:cljs
       [Object

diff --git a/test/js/tests.js b/test/js/tests.js
@@ -304,6 +304,22 @@ function test_entity_refs() {
   assert_eq_refs([1],        e(100).get("_children")[0].get("_children"));
 }
 
+function test_entity_iterators() {
+  var schema = {"aka": {":db/cardinality": ":db.cardinality/many"}};
+  var db = d.db_with(d.empty_db(schema),
+                         [{":db/id": 1,
+                           "name": "Ivan",
+                           "aka": ["X", "Y"]},
+                          {":db/id": 2}]);
+  var e = d.entity(db, 1);
+  var keys = [...e.keys()];
+  assert_eq_set(["name", "aka"], keys);
+  var values = [...e.values()];
+  assert_eq_set(["Ivan", ["X", "Y"]], values);
+  var entries = [...e.entries()];
+  assert_eq_set([["name", "Ivan"], ["aka", ["X", "Y"]]], entries);
+}
+
 function test_pull() {
   var schema = {"father":   {":db/valueType":   ":db.type/ref"},
                 "children": {":db/valueType":   ":db.type/ref",
@@ -547,6 +563,7 @@ function test_datascript_js() {
                     test_conn,
                     test_entity,
                     test_entity_refs,
+                    test_entity_iterators,
                     test_pull,
                     test_lookup_refs,
                     test_resolve_current_tx,