Fix pyExec not returning errors, remove typescript hack

coolreader18 · coolreader18 · commit 6f43d22b5604 · 2020-01-08T18:50:48.000-06:00
diff --git a/wasm/demo/src/style.css b/wasm/demo/src/style.css
@@ -24,6 +24,7 @@ textarea {
     color: tomato;
     margin-top: 10px;
     font-family: monospace;
+    white-space: pre;
 }
 
 #code-wrapper {
diff --git a/wasm/lib/src/lib.rs b/wasm/lib/src/lib.rs
@@ -45,10 +45,6 @@ pub fn setup_console_error() {
     std::panic::set_hook(Box::new(panic_hook));
 }
 
-// Hack to comment out wasm-bindgen's generated typescript definitons
-#[wasm_bindgen(typescript_custom_section)]
-const TS_CMT_START: &'static str = "/*";
-
 fn run_py(source: &str, options: Option<Object>, mode: Mode) -> Result<JsValue, JsValue> {
     let vm = VMStore::init(PY_EVAL_VM_ID.into(), Some(true));
     let options = options.unwrap_or_else(Object::new);
@@ -70,7 +66,7 @@ fn run_py(source: &str, options: Option<Object>, mode: Mode) -> Result<JsValue,
     }
     vm.run(source, mode)
 }
-#[wasm_bindgen(js_name = pyEval)]
+
 /// Evaluate Python code
 ///
 /// ```js
@@ -87,12 +83,11 @@ fn run_py(source: &str, options: Option<Object>, mode: Mode) -> Result<JsValue,
 /// -   `stdout?`: `"console" | ((out: string) => void) | null`: A function to replace the
 ///     native print native print function, and it will be `console.log` when giving
 ///     `undefined` or "console", and it will be a dumb function when giving null.
-
+#[wasm_bindgen(js_name = pyEval)]
 pub fn eval_py(source: &str, options: Option<Object>) -> Result<JsValue, JsValue> {
     run_py(source, options, Mode::Eval)
 }
 
-#[wasm_bindgen(js_name = pyExec)]
 /// Evaluate Python code
 ///
 /// ```js
@@ -102,11 +97,11 @@ pub fn eval_py(source: &str, options: Option<Object>) -> Result<JsValue, JsValue
 /// `code`: `string`: The Python code to run in exec mode
 ///
 /// `options`: The options are the same as eval mode
-pub fn exec_py(source: &str, options: Option<Object>) {
-    let _ = run_py(source, options, Mode::Exec);
+#[wasm_bindgen(js_name = pyExec)]
+pub fn exec_py(source: &str, options: Option<Object>) -> Result<(), JsValue> {
+    run_py(source, options, Mode::Exec).map(drop)
 }
 
-#[wasm_bindgen(js_name = pyExecSingle)]
 /// Evaluate Python code
 ///
 /// ```js
@@ -116,17 +111,7 @@ pub fn exec_py(source: &str, options: Option<Object>) {
 /// `code`: `string`: The Python code to run in exec single mode
 ///
 /// `options`: The options are the same as eval mode
+#[wasm_bindgen(js_name = pyExecSingle)]
 pub fn exec_single_py(source: &str, options: Option<Object>) -> Result<JsValue, JsValue> {
     run_py(source, options, Mode::Single)
 }
-
-#[wasm_bindgen(typescript_custom_section)]
-const TYPESCRIPT_DEFS: &'static str = r#"
-*/
-export interface PyEvalOptions {
-    stdout: (out: string) => void;
-    vars: { [key: string]: any };
-}
-
-export function pyEval(code: string, options?: PyEvalOptions): any;
-"#;

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ textarea {`
`24`	`24`	`color: tomato;`
`25`	`25`	`margin-top: 10px;`
`26`	`26`	`font-family: monospace;`
	`27`	`+ white-space: pre;`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`#code-wrapper {`