WIp wasm-bindgen serde-serialize

coolreader18 · coolreader18 · commit fd693ad334f1 · 2019-03-20T14:50:09.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/vm/src/stdlib/json.rs b/vm/src/stdlib/json.rs
@@ -19,13 +19,17 @@ use num_traits::cast::ToPrimitive;
 
 // We need to have a VM available to serialise a PyObject based on its subclass, so we implement
 // PyObject serialisation via a proxy object which holds a reference to a VM
-struct PyObjectSerializer<'s> {
+pub struct PyObjectSerializer<'s> {
     pyobject: &'s PyObjectRef,
     vm: &'s VirtualMachine,
 }
 
 impl<'s> PyObjectSerializer<'s> {
-    fn clone_with_object(&self, pyobject: &'s PyObjectRef) -> PyObjectSerializer {
+    pub fn new(vm: &'s VirtualMachine, pyobject: &'s PyObjectRef) -> PyObjectSerializer<'s> {
+        PyObjectSerializer { pyobject, vm }
+    }
+
+    pub fn clone_with_object(&self, pyobject: &'s PyObjectRef) -> PyObjectSerializer {
         PyObjectSerializer {
             pyobject,
             vm: self.vm,
@@ -83,10 +87,16 @@ impl<'s> serde::Serialize for PyObjectSerializer<'s> {
 // This object is used as the seed for deserialization so we have access to the PyContext for type
 // creation
 #[derive(Clone)]
-struct PyObjectDeserializer<'c> {
+pub struct PyObjectDeserializer<'c> {
     vm: &'c VirtualMachine,
 }
 
+impl PyObjectDeserializer<'_> {
+    fn new(vm: &VirtualMachine) -> PyObjectDeserializer<'_> {
+        PyObjectDeserializer { vm }
+    }
+}
+
 impl<'de> serde::de::DeserializeSeed<'de> for PyObjectDeserializer<'de> {
     type Value = PyObjectRef;
 
@@ -188,31 +198,31 @@ impl<'de> Visitor<'de> for PyObjectDeserializer<'de> {
     }
 }
 
-pub fn ser_pyobject(vm: &mut VirtualMachine, obj: &PyObjectRef) -> serde_json::Result<String> {
-    let serializer = PyObjectSerializer { pyobject: obj, vm };
-    serde_json::to_string(&serializer)
-}
-
-pub fn de_pyobject(vm: &mut VirtualMachine, s: &str) -> serde_json::Result<PyObjectRef> {
-    let de = PyObjectDeserializer { vm };
-    // TODO: Support deserializing string sub-classes
-    de.deserialize(&mut serde_json::Deserializer::from_str(s))
-}
-
 /// Implement json.dumps
 fn json_dumps(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     // TODO: Implement non-trivial serialisation case
     arg_check!(vm, args, required = [(obj, None)]);
-    let string = ser_pyobject(vm, obj).map_err(|err| vm.new_type_error(err.to_string()))?;
+    let res = {
+        let serializer = PyObjectSerializer::new(vm, obj);
+        serde_json::to_string(&serializer)
+    };
+    let string = res.map_err(|err| vm.new_type_error(format!("{}", err)))?;
     Ok(vm.context().new_str(string))
 }
 
 /// Implement json.loads
 fn json_loads(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     // TODO: Implement non-trivial deserialization case
     arg_check!(vm, args, required = [(string, Some(vm.ctx.str_type()))]);
-
-    de_pyobject(vm, &objstr::get_value(&string)).map_err(|err| {
+    let res = {
+        let de = PyObjectDeserializer::new(vm);
+        // TODO: Support deserializing string sub-classes
+        de.deserialize(&mut serde_json::Deserializer::from_str(&objstr::get_value(
+            &string,
+        )))
+    };
+
+    res.map_err(|err| {
         let json_decode_error = vm
             .sys_module
             .get_item("modules")
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ["cdylib", "rlib"]
 rustpython_parser = { path = "../../parser" }
 rustpython_vm = { path = "../../vm" }
 cfg-if = "0.1.2"
-wasm-bindgen = "0.2"
+wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.3"
 js-sys = "0.3"
 futures = "0.1"
diff --git a/wasm/lib/src/convert.rs b/wasm/lib/src/convert.rs
@@ -130,10 +130,8 @@ pub fn py_to_js(vm: &mut VirtualMachine, py_obj: PyObjectRef) -> JsValue {
         }
         arr.into()
     } else {
-        match rustpython_vm::stdlib::json::ser_pyobject(vm, &py_obj) {
-            Ok(json) => js_sys::JSON::parse(&json).unwrap_or(JsValue::UNDEFINED),
-            Err(_) => JsValue::UNDEFINED,
-        }
+        let ser = rustpython_vm::stdlib::json::PyObjectSerializer::new(vm, &py_obj);
+        JsValue::from_serde(&ser).unwrap_or(JsValue::UNDEFINED)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,8 @@ pub fn py_to_js(vm: &mut VirtualMachine, py_obj: PyObjectRef) -> JsValue {`
`130`	`130`	`}`
`131`	`131`	`arr.into()`
`132`	`132`	`} else {`
`133`		`- match rustpython_vm::stdlib::json::ser_pyobject(vm, &py_obj) {`
`134`		`- Ok(json) => js_sys::JSON::parse(&json).unwrap_or(JsValue::UNDEFINED),`
`135`		`- Err(_) => JsValue::UNDEFINED,`
`136`		`- }`
	`133`	`+ let ser = rustpython_vm::stdlib::json::PyObjectSerializer::new(vm, &py_obj);`
	`134`	`+ JsValue::from_serde(&ser).unwrap_or(JsValue::UNDEFINED)`
`137`	`135`	`}`
`138`	`136`	`}`
`139`	`137`