FIX: Boolean Encoding

README.md

@@ -32,8 +32,7 @@ state_vector = Y.encode_state_vector(d2)
 diff = Y.encode_state_as_update(d1, state_vector)
 Y.apply_update(d2, diff)
 
-with d2.begin_transaction() as txn:
-    value = d2.get_text('test').to_string(txn)
+value = str(d2.get_text('test'))
 
 assert value == "hello world!"
 ```

src/type_conversions.rs

@@ -234,18 +234,17 @@ fn py_into_any(v: PyObject) -> Option<Any> {
     Python::with_gil(|py| -> Option<Any> {
         let v = v.as_ref(py);
 
-        if let Ok(s) = v.downcast::<pytypes::PyString>() {
-            let string: String = s.extract().unwrap();
-            Some(Any::String(string.into_boxed_str()))
+        if let Ok(b) = v.downcast::<pytypes::PyBool>() {
+            Some(Any::Bool(b.extract().unwrap()))
         } else if let Ok(l) = v.downcast::<pytypes::PyLong>() {
-            let i: f64 = l.extract().unwrap();
-            Some(Any::BigInt(i as i64))
+            Some(Any::BigInt(l.extract().unwrap()))
         } else if v.is_none() {
             Some(Any::Null)
         } else if let Ok(f) = v.downcast::<pytypes::PyFloat>() {
             Some(Any::Number(f.extract().unwrap()))
-        } else if let Ok(b) = v.downcast::<pytypes::PyBool>() {
-            Some(Any::Bool(b.extract().unwrap()))
+        } else if let Ok(s) = v.downcast::<pytypes::PyString>() {
+            let string: String = s.extract().unwrap();
+            Some(Any::String(string.into_boxed_str()))
         } else if let Ok(list) = v.downcast::<pytypes::PyList>() {
             let mut result = Vec::with_capacity(list.len());
             for value in list.iter() {

tests/test_y_doc.py

@@ -1,4 +1,5 @@
 from y_py import YDoc
+import y_py as Y
 import pytest
 
 
@@ -23,3 +24,56 @@ def test_constructor_options():
         YDoc(offset_kind="UTF-0xDEADBEEF")
     with pytest.raises(ValueError):
         YDoc(offset_kind="😬")
+
+
+def test_encoding():
+    """
+    Tests encoding / decoding all primitive data types in an array.
+    """
+    doc = YDoc()
+    receiver = YDoc()
+    array = doc.get_array("test")
+    contents = [True, 42, "string"]
+    with doc.begin_transaction() as txn:
+        array.insert(txn, 0, contents)
+
+    state_vec = Y.encode_state_vector(receiver)
+    update = Y.encode_state_as_update(doc, state_vec)
+    Y.apply_update(receiver, update)
+    value = receiver.get_array("test").to_json()
+    assert value == contents
+
+
+def test_boolean_encoding():
+    """
+    Makes sure the boolean types are preserved.
+    Added due to bug where bools turn to ints during encoding /decoding.
+    """
+    doc = YDoc()
+    receiver = YDoc()
+    array = doc.get_array("test")
+    contents = [True]
+    with doc.begin_transaction() as txn:
+        array.insert(txn, 0, contents)
+
+    state_vec = Y.encode_state_vector(receiver)
+    update = Y.encode_state_as_update(doc, state_vec)
+    Y.apply_update(receiver, update)
+    value = receiver.get_array("test").to_json()
+    assert type(value[0]) == type(contents[0])
+
+
+def test_tutorial():
+    d1 = Y.YDoc()
+    text = d1.get_text("test")
+    with d1.begin_transaction() as txn:
+        text.push(txn, "hello world!")
+
+    d2 = Y.YDoc()
+    state_vector = Y.encode_state_vector(d2)
+    diff = Y.encode_state_as_update(d1, state_vector)
+    Y.apply_update(d2, diff)
+
+    value = str(d2.get_text("test"))
+
+    assert value == "hello world!"

y_py.pyi

@@ -120,7 +120,9 @@ class YDoc:
         onto `YText` instance.
         """
 
-def encode_state_vector(doc: YDoc) -> List[int]:
+StateVector = List[int]
+
+def encode_state_vector(doc: YDoc) -> StateVector:
     """
     Encodes a state vector of a given Ypy document into its binary representation using lib0 v1
     encoding. State vector is a compact representation of updates performed on a given document and
@@ -143,7 +145,9 @@ def encode_state_vector(doc: YDoc) -> List[int]:
 
     """
 
-def encode_state_as_update(doc: YDoc, vector: Optional[List[int]]) -> List[int]:
+YDocUpdate = List[int]
+
+def encode_state_as_update(doc: YDoc, vector: Optional[StateVector]) -> YDocUpdate:
     """
     Encodes all updates that have happened since a given version `vector` into a compact delta
     representation using lib0 v1 encoding. If `vector` parameter has not been provided, generated
@@ -165,7 +169,7 @@ def encode_state_as_update(doc: YDoc, vector: Optional[List[int]]) -> List[int]:
         apply_update(local_doc, remote_delta)
     """
 
-def apply_update(doc: YDoc, diff: List[int]):
+def apply_update(doc: YDoc, diff: YDocUpdate):
     """
     Applies delta update generated by the remote document replica to a current document. This
     method assumes that a payload maintains lib0 v1 encoding format.