Move confirm and prompt to browser.py

Author: coolreader18

wasm/lib/src/browser.py

@@ -1,4 +1,5 @@
 from _browser import *
+
 from _js import JsValue
 from _window import window
 
@@ -10,3 +11,27 @@ def alert(msg):
     if type(msg) != str:
         raise TypeError("msg must be a string")
     _alert.call(JsValue.fromstr(msg))
+
+
+_confirm = window.get_prop("confirm")
+
+
+def confirm(msg):
+    if type(msg) != str:
+        raise TypeError("msg must be a string")
+    return _confirm.call(JsValue.fromstr(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(
+        JsValue.fromstr(arg) for arg in [msg, default_val] if arg
+    ).as_str()
+

wasm/lib/src/browser_module.rs

@@ -312,22 +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>,
@@ -408,9 +392,6 @@ 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),
     })
 }

wasm/lib/src/js_module.rs

@@ -130,6 +130,11 @@ impl PyJsValue {
     fn as_float(&self, _vm: &VirtualMachine) -> Option<f64> {
         self.value.as_f64()
     }
+    
+    #[pymethod]
+    fn as_bool(&self, _vm: &VirtualMachine) -> Option<bool> {
+        self.value.as_bool()
+    }
 
     #[pymethod]
     /// Checks that `typeof self == "object" && self !== null`. Use instead
@@ -186,6 +191,7 @@ impl PyJsValue {
         } else {
             Reflect::construct(ctor, &js_args)
         };
+
         constructed_result
             .map(PyJsValue::new)
             .map_err(|err| convert::js_to_py(vm, err))