wasm append output

Author: lamb

.github/workflows/build.yaml

@@ -50,7 +50,9 @@ jobs:
       - name: Run Tests (univ)
         run: cargo test --features univ
       - name: Run Tests (wasm)
-        run: wasm-pack test --node ./lib --features wasm
+        run: | 
+          cargo install wasm-pack --force
+          wasm-pack test --node ./lib --features wasm
       - name: Clippy Check
         run: cargo clippy --all-targets
       - name: Format Check

cmd/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cmd"
 version = "0.1.0"
-description = "basjoofan command"
+description = "continuous test"
 repository = "https://github.com/basjoofan/lib"
 license = "MIT OR Apache-2.0"
 authors = ["Lamb <lamb@basjoofan.com>"]

cmd/src/main.rs

@@ -4,7 +4,7 @@ use lib::Source;
 use std::{path::PathBuf, time::Duration};
 
 #[derive(Parser)]
-#[command(version, about, long_about = None)]
+#[command(name = env!("CARGO_BIN_NAME"), version, about, long_about = None)]
 struct Interface {
     #[command(subcommand)]
     command: Option<Commands>,

lib/src/http/wasm/client.rs

@@ -90,6 +90,7 @@ async fn fetch(request: &Request, content: Option<JsValue>, timeout: u32) -> Res
 #[cfg(test)]
 mod tests {
     use crate::http::Client;
+    use js_sys::eval;
     use js_sys::BigInt;
     use wasm_bindgen::JsValue;
     use wasm_bindgen_test::*;
@@ -98,19 +99,19 @@ mod tests {
     // wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 
     fn setup() {
-        let _ = js_sys::eval(
+        let _ = eval(
             r#"
-        globalThis.readFileContent = async function(filePath) {
+        global.readFileContent = async function(filePath) {
             console.log(`Mock reading file in test: ${filePath}`);
-            return new TextEncoder().encode(`Test content for ${filePath}`);
+            return new TextEncoder().encode(`Mock content for ${filePath}`);
         };
         "#,
         );
-        let _ = js_sys::eval(
+        let _ = eval(
             r#"
         window.readFileContent = async function(filePath) {
             console.log(`Mock reading file in test: ${filePath}`);
-            return new TextEncoder().encode(`Test content for ${filePath}`);
+            return new TextEncoder().encode(`Mock content for ${filePath}`);
         };
         "#,
         );

lib/src/native.rs

@@ -1,22 +1,67 @@
 use crate::Context;
 use crate::Value;
 
-pub fn println(values: Vec<Value>, context: &Context) -> Result<Value, String> {
-    match format(values, context) {
-        error @ Err(_) => error,
-        Ok(value) => {
-            println!("{value}");
-            Ok(Value::Null)
+#[cfg(feature = "univ")]
+pub use univ::*;
+#[cfg(feature = "univ")]
+mod univ {
+    use super::format;
+    use crate::Context;
+    use crate::Value;
+
+    pub fn println(values: Vec<Value>, context: &Context) -> Result<Value, String> {
+        match format(values, context) {
+            error @ Err(_) => error,
+            Ok(value) => {
+                println!("{value}");
+                Ok(Value::Null)
+            }
+        }
+    }
+
+    pub fn print(values: Vec<Value>, context: &Context) -> Result<Value, String> {
+        match format(values, context) {
+            error @ Err(_) => error,
+            Ok(value) => {
+                print!("{value}");
+                Ok(Value::Null)
+            }
         }
     }
 }
 
-pub fn print(values: Vec<Value>, context: &Context) -> Result<Value, String> {
-    match format(values, context) {
-        error @ Err(_) => error,
-        Ok(value) => {
-            print!("{value}");
-            Ok(Value::Null)
+#[cfg(feature = "wasm")]
+pub use wasm::*;
+#[cfg(feature = "wasm")]
+mod wasm {
+    use super::format;
+    use crate::Context;
+    use crate::Value;
+    use wasm_bindgen::prelude::wasm_bindgen;
+
+    #[wasm_bindgen]
+    extern "C" {
+        #[wasm_bindgen(js_name = appendOutput)]
+        fn append_output(output: &str);
+    }
+
+    pub fn println(values: Vec<Value>, context: &Context) -> Result<Value, String> {
+        match format(values, context) {
+            error @ Err(_) => error,
+            Ok(value) => {
+                append_output(format!("{value}\r\n").as_str());
+                Ok(Value::Null)
+            }
+        }
+    }
+
+    pub fn print(values: Vec<Value>, context: &Context) -> Result<Value, String> {
+        match format(values, context) {
+            error @ Err(_) => error,
+            Ok(value) => {
+                append_output(format!("{value}").as_str());
+                Ok(Value::Null)
+            }
         }
     }
 }