Use serde_wasm_bindgen for wasm ser/de

Author: coolreader18

Cargo.lock

@@ -3,7 +3,7 @@ mod binascii;
 mod dis;
 mod imp;
 mod itertools;
-pub(crate) mod json;
+mod json;
 mod keyword;
 mod marshal;
 mod math;

vm/src/stdlib/mod.rs

@@ -718,14 +718,6 @@ impl VirtualMachine {
         })
     }
 
-    pub fn serialize(&self, obj: PyObjectRef) -> PyResult<String> {
-        crate::stdlib::json::json_dumps(obj, self)
-    }
-
-    pub fn deserialize(&self, s: &str) -> PyResult {
-        crate::stdlib::json::json_loads(PyString::from(s).into_ref(self), self)
-    }
-
     pub fn is_callable(&self, obj: &PyObjectRef) -> bool {
         match_class!(obj,
             PyFunction => true,

vm/src/vm.rs

@@ -16,6 +16,8 @@ rustpython_vm = { path = "../../vm" }
 cfg-if = "0.1.2"
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.3"
+serde-wasm-bindgen = "0.1"
+serde = "1.0"
 js-sys = "0.3"
 futures = "0.1"
 num-traits = "0.2"

wasm/lib/Cargo.toml

@@ -1,5 +1,7 @@
 use js_sys::{Array, ArrayBuffer, Object, Promise, Reflect, Uint8Array};
 use num_traits::cast::ToPrimitive;
+use serde::{de::DeserializeSeed, ser::Serialize};
+use serde_wasm_bindgen;
 use wasm_bindgen::{closure::Closure, prelude::*, JsCast};
 
 use rustpython_vm::function::PyFuncArgs;
@@ -130,10 +132,9 @@ pub fn py_to_js(vm: &VirtualMachine, py_obj: PyObjectRef) -> JsValue {
             view.slice(0, bytes.len() as u32).into()
         }
     } else {
-        match vm.serialize(py_obj) {
-            Ok(json) => js_sys::JSON::parse(&json).unwrap_or(JsValue::UNDEFINED),
-            Err(_) => JsValue::UNDEFINED,
-        }
+        rustpython_vm::ser_de::PyObjectSerializer::new(vm, &py_obj)
+            .serialize(&serde_wasm_bindgen::Serializer::new())
+            .unwrap_or(JsValue::UNDEFINED)
     }
 }
 
@@ -224,10 +225,8 @@ pub fn js_to_py(vm: &VirtualMachine, js_val: JsValue) -> PyObjectRef {
         // Because `JSON.stringify(undefined)` returns undefined
         vm.get_none()
     } else {
-        let json = match js_sys::JSON::stringify(&js_val) {
-            Ok(json) => String::from(json),
-            Err(_) => return vm.get_none(),
-        };
-        vm.deserialize(&json).unwrap_or_else(|_| vm.get_none())
+        rustpython_vm::ser_de::PyObjectDeserializer::new(vm)
+            .deserialize(serde_wasm_bindgen::Deserializer::from(js_val))
+            .unwrap_or_else(|_| vm.get_none())
     }
 }