Merge pull request RustPython#1039 from RustPython/coolreader18/wasm-_js-module

[WASM] Add a JsValue class

Author: windelbouwman

derive/src/compile_bytecode.rs

@@ -163,7 +163,7 @@ pub fn impl_py_compile_bytecode(input: TokenStream2) -> Result<TokenStream2, Dia
 
     let output = quote! {
         ({
-            use ::bincode;
+            use ::rustpython_vm::__exports::bincode;
             bincode::deserialize::<::rustpython_vm::bytecode::CodeObject>(#bytes)
                 .expect("Deserializing CodeObject failed")
         })

vm/src/lib.rs

@@ -66,3 +66,8 @@ mod vm;
 pub use self::exceptions::print_exception;
 pub use self::vm::VirtualMachine;
 pub use rustpython_compiler::*;
+
+#[doc(hidden)]
+pub mod __exports {
+    pub use bincode;
+}

vm/src/pyobject.rs

@@ -1379,7 +1379,11 @@ pub trait PyClassImpl: PyClassDef {
     }
 
     fn make_class(ctx: &PyContext) -> PyClassRef {
-        let py_class = ctx.new_class(Self::NAME, ctx.object());
+        Self::make_class_with_base(ctx, ctx.object())
+    }
+
+    fn make_class_with_base(ctx: &PyContext, base: PyClassRef) -> PyClassRef {
+        let py_class = ctx.new_class(Self::NAME, base);
         Self::extend_class(ctx, &py_class);
         py_class
     }

vm/src/stdlib/mod.rs

@@ -34,6 +34,7 @@ use crate::pyobject::PyObjectRef;
 pub type StdlibInitFunc = Box<dyn Fn(&VirtualMachine) -> PyObjectRef>;
 
 pub fn get_module_inits() -> HashMap<String, StdlibInitFunc> {
+    #[allow(unused_mut)]
     let mut modules = hashmap! {
         "ast".to_string() => Box::new(ast::make_module) as StdlibInitFunc,
         "binascii".to_string() => Box::new(binascii::make_module),

wasm/lib/src/browser.py

@@ -0,0 +1,37 @@
+from _browser import *
+
+from _js import JsValue
+from _window import window
+
+
+jsstr = window.new_from_str
+
+
+_alert = window.get_prop("alert")
+
+
+def alert(msg):
+    if type(msg) != str:
+        raise TypeError("msg must be a string")
+    _alert.call(jsstr(msg))
+
+
+_confirm = window.get_prop("confirm")
+
+
+def confirm(msg):
+    if type(msg) != str:
+        raise TypeError("msg must be a string")
+    return _confirm.call(jsstr(msg)).as_bool()
+
+
+_prompt = window.get_prop("prompt")
+
+
+def prompt(msg, default_val=None):
+    if type(msg) != str:
+        raise TypeError("msg must be a string")
+    if default_val is not None and type(default_val) != str:
+        raise TypeError("default_val must be a string")
+
+    return _prompt.call(*(jsstr(arg) for arg in [msg, default_val] if arg)).as_str()

wasm/lib/src/browser_module.rs

@@ -312,41 +312,6 @@ impl Element {
     }
 }
 
-fn browser_alert(message: PyStringRef, vm: &VirtualMachine) -> PyResult {
-    window()
-        .alert_with_message(message.as_str())
-        .expect("alert() not to fail");
-
-    Ok(vm.get_none())
-}
-
-fn browser_confirm(message: PyStringRef, vm: &VirtualMachine) -> PyResult {
-    let result = window()
-        .confirm_with_message(message.as_str())
-        .expect("confirm() not to fail");
-
-    Ok(vm.new_bool(result))
-}
-
-fn browser_prompt(
-    message: PyStringRef,
-    default: OptionalArg<PyStringRef>,
-    vm: &VirtualMachine,
-) -> PyResult {
-    let result = if let OptionalArg::Present(default) = default {
-        window().prompt_with_message_and_default(message.as_str(), default.as_str())
-    } else {
-        window().prompt_with_message(message.as_str())
-    };
-
-    let result = match result.expect("prompt() not to fail") {
-        Some(result) => vm.new_str(result),
-        None => vm.get_none(),
-    };
-
-    Ok(result)
-}
-
 fn browser_load_module(module: PyStringRef, path: PyStringRef, vm: &VirtualMachine) -> PyResult {
     let weak_vm = weak_vm(vm);
 
@@ -408,15 +373,16 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
         "Document" => document_class,
         "document" => document,
         "Element" => element,
-        "alert" => ctx.new_rustfunc(browser_alert),
-        "confirm" => ctx.new_rustfunc(browser_confirm),
-        "prompt" => ctx.new_rustfunc(browser_prompt),
         "load_module" => ctx.new_rustfunc(browser_load_module),
     })
 }
 
 pub fn setup_browser_module(vm: &VirtualMachine) {
     vm.stdlib_inits
         .borrow_mut()
-        .insert("browser".to_string(), Box::new(make_module));
+        .insert("_browser".to_string(), Box::new(make_module));
+    vm.frozen.borrow_mut().insert(
+        "browser".to_string(),
+        py_compile_bytecode!(file = "src/browser.py"),
+    );
 }

wasm/lib/src/convert.rs

@@ -45,7 +45,7 @@ pub fn py_err_to_js_err(vm: &VirtualMachine, py_err: &PyObjectRef) -> JsValue {
             let elements = objsequence::get_elements_list(&tb).to_vec();
             if let Some(top) = elements.get(0) {
                 if objtype::isinstance(&top, &vm.ctx.tuple_type()) {
-                    let element = objsequence::get_elements_list(&top);
+                    let element = objsequence::get_elements_tuple(&top);
 
                     if let Some(lineno) = objint::to_int(vm, &element[1], 10)
                         .ok()