Make to_py recursive (#55)

Author: davidbrochart

python/pycrdt/array.py

@@ -168,8 +168,15 @@ def __str__(self) -> str:
 
     def to_py(self) -> list | None:
         if self._integrated is None:
-            return self._prelim
-        return list(self)
+            py = self._prelim
+            if py is None:
+                return None
+        else:
+            py = list(self)
+        for idx, val in enumerate(py):
+            if isinstance(val, BaseType):
+                py[idx] = val.to_py()
+        return py
 
     def observe(self, callback: Callable[[Any], None]) -> str:
         _callback = partial(observe_callback, callback, self.doc)

python/pycrdt/map.py

@@ -62,8 +62,15 @@ def __str__(self) -> str:
 
     def to_py(self) -> dict | None:
         if self._integrated is None:
-            return self._prelim
-        return dict(self)
+            py = self._prelim
+            if py is None:
+                return None
+        else:
+            py = dict(self)
+        for key, val in py.items():
+            if isinstance(val, BaseType):
+                py[key] = val.to_py()
+        return py
 
     def __delitem__(self, key: str) -> None:
         with self.doc.transaction() as txn:

tests/test_array.py

@@ -135,3 +135,11 @@ def test_move():
     doc["array"] = array = Array([1, 2, 3, 4])
     array.move(1, 3)
     assert str(array) == "[1.0,3.0,2.0,4.0]"
+
+
+def test_to_py():
+    doc = Doc()
+    submap = Map({"foo": "bar"})
+    subarray = Array([1, submap])
+    doc["array"] = array = Array([0, subarray])
+    assert array.to_py() == [0, [1, {"foo": "bar"}]]

tests/test_map.py

@@ -56,3 +56,11 @@ def test_api():
     v = map0.pop("bar")
     assert v == 2
     assert str(map0) == "{}"
+
+
+def test_to_py():
+    doc = Doc()
+    submap = Map({"foo": "bar"})
+    subarray = Array([0, submap])
+    doc["map_"] = map_ = Map({"key0": "val0", "key1": subarray})
+    assert map_.to_py() == {"key0": "val0", "key1": [0, {"foo": "bar"}]}

tests/test_text.py

@@ -39,3 +39,9 @@ def test_api():
     assert str(text) == hello + world + punct
     text[len(hello) : len(hello) + len(world)] = " Sir"
     assert str(text) == hello + " Sir" + punct
+
+
+def test_to_py():
+    doc = Doc()
+    doc["text"] = text = Text(hello)
+    assert text.to_py() == hello