upgrade quickjs-ng

Author: andrieshiemstra

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.17.1
+
+* upgrade to quickjs-ng 0.12.0
+
 # 0.17.0
 
 * upgrade to quickjs-ng 0.11.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "quickjs_runtime"
-version = "0.17.0"
+version = "0.17.1"
 authors = ["Andries Hiemstra <andries@hiemstra-software.nl>"]
 edition = "2021"
 description = "Wrapper API and utils for the QuickJS JavaScript engine with support for Promise, Modules, Async/await"
@@ -31,7 +31,7 @@ backtrace = "0.3"
 
 #libquickjs-sys = {package="hirofa-quickjs-sys", git='https://github.com/HiRoFa/quickjs-sys'}
 #libquickjs-sys = { package = "hirofa-quickjs-sys", path = '../quickjs-sys', default-features = false }
-libquickjs-sys = { package = "hirofa-quickjs-sys", version = "0.12", default-features = false }
+libquickjs-sys = { package = "hirofa-quickjs-sys", version = "0.13", default-features = false }
 lazy_static = "1.5.0"
 log = "0.4"
 num_cpus = "1"

src/quickjs_utils/errors.rs

@@ -312,16 +312,29 @@ pub mod tests {
             Script::new(
                 "test_ex3.js",
                 r#"
+
+async function sleep(ms) {
+    return await new Promise((res) => {
+        setTimeout(res, ms);
+    });
+}
+
 async function a() {
     await b();
 }
 
 async function b() {
-    //await 1;
+    await sleep(50);
     throw Error("poof");
 }
 
-a().catch((ex) => {
+async function c() {
+    await sleep(10);
+}
+
+const ap = a();
+c();
+ap.catch((ex) => {
     console.error(ex);
 });
         "#,

src/quickjs_utils/mod.rs

@@ -79,52 +79,55 @@ pub mod class_ids {
     pub const JS_CLASS_BYTECODE_FUNCTION: u32 = 13;
     pub const JS_CLASS_BOUND_FUNCTION: u32 = 14;
     pub const JS_CLASS_C_FUNCTION_DATA: u32 = 15;
-    pub const JS_CLASS_GENERATOR_FUNCTION: u32 = 16;
-    pub const JS_CLASS_FOR_IN_ITERATOR: u32 = 17;
-    pub const JS_CLASS_REGEXP: u32 = 18;
-    pub const JS_CLASS_ARRAY_BUFFER: u32 = 19;
-    pub const JS_CLASS_SHARED_ARRAY_BUFFER: u32 = 20;
-    pub const JS_CLASS_UINT8C_ARRAY: u32 = 21;
-    pub const JS_CLASS_INT8_ARRAY: u32 = 22;
-    pub const JS_CLASS_UINT8_ARRAY: u32 = 23;
-    pub const JS_CLASS_INT16_ARRAY: u32 = 24;
-    pub const JS_CLASS_UINT16_ARRAY: u32 = 25;
-    pub const JS_CLASS_INT32_ARRAY: u32 = 26;
-    pub const JS_CLASS_UINT32_ARRAY: u32 = 27;
-    pub const JS_CLASS_BIG_INT64_ARRAY: u32 = 28;
-    pub const JS_CLASS_BIG_UINT64_ARRAY: u32 = 29;
-    pub const JS_CLASS_FLOAT16_ARRAY: u32 = 30;
-    pub const JS_CLASS_FLOAT32_ARRAY: u32 = 31;
-    pub const JS_CLASS_FLOAT64_ARRAY: u32 = 32;
-    pub const JS_CLASS_DATAVIEW: u32 = 33;
-    pub const JS_CLASS_BIG_INT: u32 = 34;
-    pub const JS_CLASS_MAP: u32 = 35;
-    pub const JS_CLASS_SET: u32 = 36;
-    pub const JS_CLASS_WEAKMAP: u32 = 37;
-    pub const JS_CLASS_WEAKSET: u32 = 38;
-    pub const JS_CLASS_ITERATOR: u32 = 39;
-    pub const JS_CLASS_ITERATOR_HELPER: u32 = 40;
-    pub const JS_CLASS_ITERATOR_WRAP: u32 = 41;
-    pub const JS_CLASS_MAP_ITERATOR: u32 = 42;
-    pub const JS_CLASS_SET_ITERATOR: u32 = 43;
-    pub const JS_CLASS_ARRAY_ITERATOR: u32 = 44;
-    pub const JS_CLASS_STRING_ITERATOR: u32 = 45;
-    pub const JS_CLASS_REGEXP_STRING_ITERATOR: u32 = 46;
-    pub const JS_CLASS_GENERATOR: u32 = 47;
-    pub const JS_CLASS_PROXY: u32 = 48;
-    pub const JS_CLASS_PROMISE: u32 = 49;
-    pub const JS_CLASS_PROMISE_RESOLVE_FUNCTION: u32 = 50;
-    pub const JS_CLASS_PROMISE_REJECT_FUNCTION: u32 = 51;
-    pub const JS_CLASS_ASYNC_FUNCTION: u32 = 52;
-    pub const JS_CLASS_ASYNC_FUNCTION_RESOLVE: u32 = 53;
-    pub const JS_CLASS_ASYNC_FUNCTION_REJECT: u32 = 54;
-    pub const JS_CLASS_ASYNC_FROM_SYNC_ITERATOR: u32 = 55;
-    pub const JS_CLASS_ASYNC_GENERATOR_FUNCTION: u32 = 56;
-    pub const JS_CLASS_ASYNC_GENERATOR: u32 = 57;
-    pub const JS_CLASS_WEAK_REF: u32 = 58;
-    pub const JS_CLASS_FINALIZATION_REGISTRY: u32 = 59;
-    pub const JS_CLASS_CALL_SITE: u32 = 60;
-    pub const JS_CLASS_INIT_COUNT: u32 = 61;
+    pub const JS_CLASS_C_CLOSURE: u32 = 16;
+    pub const JS_CLASS_GENERATOR_FUNCTION: u32 = 17;
+    pub const JS_CLASS_FOR_IN_ITERATOR: u32 = 18;
+    pub const JS_CLASS_REGEXP: u32 = 19;
+    pub const JS_CLASS_ARRAY_BUFFER: u32 = 20;
+    pub const JS_CLASS_SHARED_ARRAY_BUFFER: u32 = 21;
+    pub const JS_CLASS_UINT8C_ARRAY: u32 = 22;
+    pub const JS_CLASS_INT8_ARRAY: u32 = 23;
+    pub const JS_CLASS_UINT8_ARRAY: u32 = 24;
+    pub const JS_CLASS_INT16_ARRAY: u32 = 25;
+    pub const JS_CLASS_UINT16_ARRAY: u32 = 26;
+    pub const JS_CLASS_INT32_ARRAY: u32 = 27;
+    pub const JS_CLASS_UINT32_ARRAY: u32 = 28;
+    pub const JS_CLASS_BIG_INT64_ARRAY: u32 = 29;
+    pub const JS_CLASS_BIG_UINT64_ARRAY: u32 = 30;
+    pub const JS_CLASS_FLOAT16_ARRAY: u32 = 31;
+    pub const JS_CLASS_FLOAT32_ARRAY: u32 = 32;
+    pub const JS_CLASS_FLOAT64_ARRAY: u32 = 33;
+    pub const JS_CLASS_DATAVIEW: u32 = 34;
+    pub const JS_CLASS_BIG_INT: u32 = 35;
+    pub const JS_CLASS_MAP: u32 = 36;
+    pub const JS_CLASS_SET: u32 = 37;
+    pub const JS_CLASS_WEAKMAP: u32 = 38;
+    pub const JS_CLASS_WEAKSET: u32 = 39;
+    pub const JS_CLASS_ITERATOR: u32 = 40;
+    pub const JS_CLASS_ITERATOR_CONCAT: u32 = 41;
+    pub const JS_CLASS_ITERATOR_HELPER: u32 = 42;
+    pub const JS_CLASS_ITERATOR_WRAP: u32 = 43;
+    pub const JS_CLASS_MAP_ITERATOR: u32 = 44;
+    pub const JS_CLASS_SET_ITERATOR: u32 = 45;
+    pub const JS_CLASS_ARRAY_ITERATOR: u32 = 46;
+    pub const JS_CLASS_STRING_ITERATOR: u32 = 47;
+    pub const JS_CLASS_REGEXP_STRING_ITERATOR: u32 = 48;
+    pub const JS_CLASS_GENERATOR: u32 = 49;
+    pub const JS_CLASS_PROXY: u32 = 50;
+    pub const JS_CLASS_PROMISE: u32 = 51;
+    pub const JS_CLASS_PROMISE_RESOLVE_FUNCTION: u32 = 52;
+    pub const JS_CLASS_PROMISE_REJECT_FUNCTION: u32 = 53;
+    pub const JS_CLASS_ASYNC_FUNCTION: u32 = 54;
+    pub const JS_CLASS_ASYNC_FUNCTION_RESOLVE: u32 = 55;
+    pub const JS_CLASS_ASYNC_FUNCTION_REJECT: u32 = 56;
+    pub const JS_CLASS_ASYNC_FROM_SYNC_ITERATOR: u32 = 57;
+    pub const JS_CLASS_ASYNC_GENERATOR_FUNCTION: u32 = 58;
+    pub const JS_CLASS_ASYNC_GENERATOR: u32 = 59;
+    pub const JS_CLASS_WEAK_REF: u32 = 60;
+    pub const JS_CLASS_FINALIZATION_REGISTRY: u32 = 61;
+    pub const JS_CLASS_DOM_EXCEPTION: u32 = 62;
+    pub const JS_CLASS_CALL_SITE: u32 = 63;
+    pub const JS_CLASS_INIT_COUNT: u32 = 64;
 }
 
 pub mod arrays;

src/quickjsvalueadapter.rs

@@ -263,7 +263,6 @@ pub(crate) const TAG_SHORT_BIG_INT: i64 = libquickjs_sys::JS_TAG_SHORT_BIG_INT a
 
 pub(crate) const TAG_STRING: i64 = libquickjs_sys::JS_TAG_STRING as i64;
 
-#[cfg(feature = "bellard")]
 pub(crate) const TAG_STRING_ROPE: i64 = libquickjs_sys::JS_TAG_STRING_ROPE as i64;
 
 pub(crate) const TAG_MODULE: i64 = libquickjs_sys::JS_TAG_MODULE as i64;
@@ -299,7 +298,6 @@ impl QuickJsValueAdapter {
             TAG_INT => JsValueType::I32,
             TAG_FLOAT64 => JsValueType::F64,
             TAG_STRING => JsValueType::String,
-            #[cfg(feature = "bellard")]
             TAG_STRING_ROPE => JsValueType::String,
             TAG_OBJECT => {
                 // todo get classProto.name and match