recursion

Author: abr-egn

src/raw/array.rs

@@ -212,6 +212,11 @@ impl RawArray {
     pub fn is_empty(&self) -> bool {
         self.doc.is_empty()
     }
+
+    /// Returns an iterator over the `RawElement`s in the array.
+    pub fn iter_elements(&self) -> RawIter {
+        RawIter::new(&self.doc)
+    }
 }
 
 impl std::fmt::Debug for RawArray {

src/raw/iter.rs

@@ -9,9 +9,11 @@ use crate::{
     DateTime,
     Decimal128,
     RawArray,
+    RawArrayBuf,
     RawBinaryRef,
     RawBson,
     RawDbPointerRef,
+    RawDocumentBuf,
     RawJavaScriptCodeWithScopeRef,
     RawRegexRef,
     Timestamp,
@@ -268,8 +270,41 @@ impl<'a> RawElement<'a> {
 
     pub fn value_utf8_lossy(&self) -> Result<RawBson> {
         match self.value_utf8_lossy_inner()? {
-            Some(v) => Ok(v.into()),
-            None => Ok(self.value()?.to_raw_bson()),
+            Some(v) => Ok(match v {
+                Utf8LossyBson::JavaScriptCodeWithScope(Utf8LossyJavaScriptCodeWithScope {
+                    code,
+                    scope,
+                }) => {
+                    let mut tmp = RawDocumentBuf::new();
+                    for elem in scope.iter_elements() {
+                        let elem = elem?;
+                        tmp.append(elem.key(), elem.value_utf8_lossy()?);
+                    }
+                    RawBson::JavaScriptCodeWithScope(super::RawJavaScriptCodeWithScope {
+                        code,
+                        scope: tmp,
+                    })
+                }
+                v => v.into(),
+            }),
+            None => Ok(match self.value()? {
+                RawBsonRef::Array(arr) => {
+                    let mut tmp = RawArrayBuf::new();
+                    for elem in arr.iter_elements() {
+                        tmp.push(elem?.value_utf8_lossy()?);
+                    }
+                    RawBson::Array(tmp)
+                }
+                RawBsonRef::Document(doc) => {
+                    let mut tmp = RawDocumentBuf::new();
+                    for elem in doc.iter_elements() {
+                        let elem = elem?;
+                        tmp.append(elem.key(), elem.value_utf8_lossy()?);
+                    }
+                    RawBson::Document(tmp)
+                }
+                v => v.to_raw_bson(),
+            }),
         }
     }
 

src/tests/modules/serializer_deserializer.rs

@@ -68,12 +68,12 @@ fn test_encode_decode_utf8_string_invalid() {
     let bytes = b"\x80\xae".to_vec();
     let src = unsafe { String::from_utf8_unchecked(bytes) };
 
-    let doc = doc! { "key": src };
+    let doc = doc! { "key": &src, "subdoc": { "subkey": &src } };
 
     let mut buf = Vec::new();
     doc.to_writer(&mut buf).unwrap();
 
-    let expected = doc! { "key": "��" };
+    let expected = doc! { "key": "��", "subdoc": { "subkey": "��" } };
     let decoded = RawDocumentBuf::from_reader(&mut Cursor::new(buf))
         .unwrap()
         .to_document_utf8_lossy()