quickjs-ng update

Author: andrieshiemstra

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.13.1
+
+* update quickjs-ng to 4.0.1
+* fixed bigint support for quickjs-ng
+
 # 0.13.0
 
 * support quickjs-ng (v 0.3.0) as feature, it compiles, some test cases fail (bigint) but should be a nice first step 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "quickjs_runtime"
-version = "0.13.0"
+version = "0.13.1"
 authors = ["Andries Hiemstra <[email protected]>"]
 edition = "2021"
 description = "Wrapper API and utils for the QuickJS JavaScript engine with support for Promise, Modules, Async/await"
@@ -32,7 +32,7 @@ backtrace = "0.3.67"
 
 #libquickjs-sys = {package="hirofa-quickjs-sys", git='https://github.com/HiRoFa/quickjs-sys'}
 #libquickjs-sys = {package="hirofa-quickjs-sys", path='../quickjs-sys'}
-libquickjs-sys = {package="hirofa-quickjs-sys", version="0.3.0", default-features=false}
+libquickjs-sys = {package="hirofa-quickjs-sys", version="0.4.0", default-features=false}
 lazy_static = "1.4.0"
 log = "0.4"
 num_cpus = "1"

README.md

@@ -89,7 +89,7 @@ The fun stuff about QuickJS:
 Cargo.toml
 ```toml
 [dependencies]
-quickjs_runtime = "0.12"
+quickjs_runtime = "0.13.1"
 ```
 
 Here are some quickstarts:

src/quickjs_utils/bigints.rs

@@ -12,6 +12,13 @@ pub fn new_bigint_i64_q(
     unsafe { new_bigint_i64(context.context, int) }
 }
 
+pub fn new_bigint_u64_q(
+    context: &QuickJsRealmAdapter,
+    int: u64,
+) -> Result<QuickJsValueAdapter, JsError> {
+    unsafe { new_bigint_u64(context.context, int) }
+}
+
 #[allow(dead_code)]
 /// # Safety
 /// When passing a context pointer please make sure the corresponding QuickJsContext is still valid
@@ -83,17 +90,34 @@ pub unsafe fn to_string(
 #[cfg(test)]
 pub mod tests {
     use crate::facades::tests::init_test_rt;
+    use crate::jsutils::Script;
     use crate::quickjs_utils::bigints;
     use crate::quickjs_utils::bigints::new_bigint_str_q;
 
-    //#[test]
-    fn _test_bigint() {
+    #[test]
+    fn test_bigint() {
         let rt = init_test_rt();
         rt.exe_rt_task_in_event_loop(|q_js_rt| {
             let q_ctx = q_js_rt.get_main_realm();
 
-            let bi_ref = bigints::new_bigint_i64_q(q_ctx, 659863456456)
+            let res = q_ctx
+                .eval(Script::new("createABigInt.js", "BigInt(1234567890)"))
+                .expect("script failed");
+            log::info!(
+                "script bi was {} {}",
+                res.get_tag(),
+                res.to_string().expect("could not toString")
+            );
+
+            let bi_ref = bigints::new_bigint_u64_q(q_ctx, 659863456456)
                 .expect("could not create bigint from u64");
+
+            unsafe {
+                if let Some(e) = crate::quickjs_utils::errors::get_exception(q_ctx.context) {
+                    log::error!("ex: {}", e);
+                }
+            }
+
             let to_str = bigints::to_string_q(q_ctx, &bi_ref).expect("could not tostring bigint");
             assert_eq!(to_str, "659863456456");
             let bi_ref = bigints::new_bigint_i64_q(q_ctx, 659863456457)

src/quickjs_utils/errors.rs

@@ -147,6 +147,7 @@ pub mod tests {
     use crate::jsutils::{JsError, Script};
     use crate::quickjs_utils::functions;
     use crate::values::{JsValueConvertable, JsValueFacade};
+    use std::thread;
     //use log::LevelFilter;
     use std::time::Duration;
 
@@ -162,9 +163,12 @@ pub mod tests {
                 "console.log('foo');\nconsole.log('bar');let a = __c_v__ * 7;",
             ),
         );
-        let ex = res.expect_err("sciprt should have failed;");
+        let ex = res.expect_err("script should have failed;");
 
+        #[cfg(feature = "bellard")]
         assert_eq!(ex.get_message(), "'__c_v__' is not defined");
+        #[cfg(feature = "quickjs-ng")]
+        assert_eq!(ex.get_message(), "__c_v__ is not defined");
     }
 
     #[test]
@@ -179,9 +183,12 @@ pub mod tests {
                 "console.log('foo');\nconsole.log('bar');let a = __c_v__ * 7;",
             ),
         );
-        let ex = res.expect_err("sciprt should have failed;");
+        let ex = res.expect_err("script should have failed;");
 
+        #[cfg(feature = "bellard")]
         assert_eq!(ex.get_message(), "'__c_v__' is not defined");
+        #[cfg(feature = "quickjs-ng")]
+        assert_eq!(ex.get_message(), "__c_v__ is not defined");
     }
 
     #[test]
@@ -221,6 +228,71 @@ pub mod tests {
         std::thread::sleep(Duration::from_secs(1));
     }
 
+    #[test]
+    fn test_ex3() {
+        let rt = init_test_rt();
+        rt.eval_sync(
+            None,
+            Script::new(
+                "test_ex3.js",
+                r#"              
+async function asyncDebugStackPreserve(delegate, invokerName) {
+
+    const startStack = new Error().stack;
+    try {
+        return await delegate();
+    } catch (ex) {
+        const err = Error(ex.message);
+        
+        err.fileName = ex.fileName;
+        err.lineNumber = ex.lineNumber;
+        err.columnNumber = ex.columnNumber;
+        err.cause = ex.cause;
+        
+        err.stack = ex.stack + startStack;
+        throw err;
+    }
+
+}
+
+async function sleep(ms) {
+    return new Promise((res) => {
+        setTimeout(res, ms);
+    });
+}
+
+async function a(){
+	
+	return new Promise(async (res, rej) => {
+		try {
+			let ret = await asyncDebugStackPreserve(async function aInner() {
+			    await sleep(100);
+			    let ret = await b();
+     		});
+			res(ret);
+		} catch(ex) {
+			rej(ex);
+			}
+		});
+	}
+	
+	async function b(){
+        throw Error("poof");
+	}
+	
+		a().catch((ex) => {
+			console.error(ex);
+			});
+	
+       
+       
+        "#,
+            ),
+        )
+        .expect("script failed");
+        thread::sleep(Duration::from_secs(1));
+    }
+
     #[test]
     fn test_ex2() {
         // check if stacktrace is preserved when invoking native methods

src/quickjsvalueadapter.rs

@@ -250,7 +250,10 @@ impl QuickJsValueAdapter {
     }
 }
 
+#[cfg(feature = "bellard")]
 pub(crate) const TAG_BIG_INT: i64 = -10;
+#[cfg(feature = "quickjs-ng")]
+pub(crate) const TAG_BIG_INT: i64 = -9;
 //pub(crate) const TAG_BIG_FLOAT: i64 = -9;
 //pub(crate) const TAG_SYMBOL: i64 = -8;
 pub(crate) const TAG_STRING: i64 = -7;