quickjs 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d674410910d349e2516908eb9856497e150d762b43d4ef8166fa057735164b
-  data.tar.gz: 4f605447ac29745e811f6892d0328b1423b8e3d456d278ed4ad0358273a581c5
+  metadata.gz: 31bcb05285a3c4c80c6e5c06ec043793debf795c75f82362b317d74d3eb8cf96
+  data.tar.gz: 9032bf6cb129ea65dc52ae5df5ff394056f440c9de52947ab3029e5c0626c554
 SHA512:
-  metadata.gz: d135b91487315a81758b37550bb3213a3ec9b565f552ad670b07420bbb06733fc635446b82e89a2f7dd79c7d4bfe3228933655874829f3c8f76d4b3b9f96c3ff
-  data.tar.gz: acad0e1cd26f6f8b55e2596bdb616d6c93ed49190af6ff3e9e4bc4b886fd6756c51f98a8d9b40e8bb442f70521f0fc283e375eb682dd75036d3436581a7f285f
+  metadata.gz: 2a12da5b5c71c5d350af754f5b50e47104a379aa53cde68625da76bf6b3e165a804b3ec9d764d52f7e8c87a696a870d948d17381bb044b13536b6e96992e9cea
+  data.tar.gz: 1b0b05872129c9d3850e66b0e5f77c779bb2554801e132380a0937a2d21d393b23317364e775ab9c0779ba074da157d46fdd6779a1b5f0ba690c55e2cbedccbd

data/README.md

@@ -153,7 +153,7 @@ vm.eval_code('console.log("log me", null)')
 vm.logs #=> Array of Quickjs::VM::Log
 vm.logs.last.severity #=> :info
 vm.logs.last.to_s #=> 'log me null'
-vm,logs.last.raw #=> ['log me', nil]
+vm.logs.last.raw #=> ['log me', nil]
 ```
 
 ## License

data/ext/quickjsrb/quickjsrb.c

@@ -58,17 +58,9 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   {
     VALUE r_json_str = rb_funcall(r_value, rb_intern("to_json"), 0, NULL);
     char *str = StringValueCStr(r_json_str);
-    JSValue j_global = JS_GetGlobalObject(ctx);
-    JSValue j_jsonClass = JS_GetPropertyStr(ctx, j_global, "JSON");
-    JSValue j_parseFunc = JS_GetPropertyStr(ctx, j_jsonClass, "parse");
-    JSValue j_str = JS_NewString(ctx, str);
-    JSValue j_stringified = JS_Call(ctx, j_parseFunc, j_jsonClass, 1, (JSValueConst *)&j_str);
-    JS_FreeValue(ctx, j_global);
-    JS_FreeValue(ctx, j_jsonClass);
-    JS_FreeValue(ctx, j_parseFunc);
-    JS_FreeValue(ctx, j_str);
+    JSValue j_parsed = JS_ParseJSON(ctx, str, strlen(str), "<quickjsrb.c>");
 
-    return j_stringified;
+    return j_parsed;
   }
   default:
   {
@@ -115,19 +107,13 @@ VALUE r_try_json_parse(VALUE r_str)
 
 VALUE to_r_json(JSContext *ctx, JSValue j_val)
 {
-  JSValue j_global = JS_GetGlobalObject(ctx);
-  JSValue j_jsonClass = JS_GetPropertyStr(ctx, j_global, "JSON");
-  JSValue j_stringifyFunc = JS_GetPropertyStr(ctx, j_jsonClass, "stringify");
-  JSValue j_strigified = JS_Call(ctx, j_stringifyFunc, j_jsonClass, 1, (JSValueConst *)&j_val);
+  JSValue j_stringified = JS_JSONStringify(ctx, j_val, JS_UNDEFINED, JS_UNDEFINED);
 
-  const char *msg = JS_ToCString(ctx, j_strigified);
+  const char *msg = JS_ToCString(ctx, j_stringified);
   VALUE r_str = rb_str_new2(msg);
   JS_FreeCString(ctx, msg);
 
-  JS_FreeValue(ctx, j_strigified);
-  JS_FreeValue(ctx, j_stringifyFunc);
-  JS_FreeValue(ctx, j_jsonClass);
-  JS_FreeValue(ctx, j_global);
+  JS_FreeValue(ctx, j_stringified);
 
   return r_str;
 }
@@ -138,9 +124,7 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
   {
   case JS_TAG_INT:
   {
-    int int_res = 0;
-    JS_ToInt32(ctx, &int_res, j_val);
-    return INT2NUM(int_res);
+    return INT2NUM(JS_VALUE_GET_INT(j_val));
   }
   case JS_TAG_FLOAT64:
   {
@@ -148,9 +132,7 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
     {
       return QUICKJSRB_SYM(nanId);
     }
-    double double_res;
-    JS_ToFloat64(ctx, &double_res, j_val);
-    return DBL2NUM(double_res);
+    return DBL2NUM(JS_VALUE_GET_FLOAT64(j_val));
   }
   case JS_TAG_BOOL:
   {
@@ -406,7 +388,40 @@ static JSValue js_quickjsrb_log(JSContext *ctx, JSValueConst _this, int argc, JS
   for (int i = 0; i < argc; i++)
   {
     JSValue j_logged = JS_DupValue(ctx, argv[i]);
-    VALUE r_raw = JS_VALUE_GET_NORM_TAG(j_logged) == JS_TAG_OBJECT && JS_PromiseState(ctx, j_logged) != -1 ? rb_str_new2("Promise") : to_rb_value(ctx, j_logged);
+    VALUE r_raw;
+    if (JS_VALUE_GET_NORM_TAG(j_logged) == JS_TAG_OBJECT && JS_PromiseState(ctx, j_logged) != -1)
+    {
+      r_raw = rb_str_new2("Promise");
+    }
+    else if (JS_IsError(ctx, j_logged))
+    {
+      JSValue j_errorClassName = JS_GetPropertyStr(ctx, j_logged, "name");
+      const char *errorClassName = JS_ToCString(ctx, j_errorClassName);
+      JS_FreeValue(ctx, j_errorClassName);
+
+      JSValue j_errorClassMessage = JS_GetPropertyStr(ctx, j_logged, "message");
+      const char *errorClassMessage = JS_ToCString(ctx, j_errorClassMessage);
+      JS_FreeValue(ctx, j_errorClassMessage);
+
+      JSValue j_stackTrace = JS_GetPropertyStr(ctx, j_logged, "stack");
+      const char *stackTrace = JS_ToCString(ctx, j_stackTrace);
+      JS_FreeValue(ctx, j_stackTrace);
+
+      const char *headlineTemplate = "%s: %s\n%s";
+      int length = snprintf(NULL, 0, headlineTemplate, errorClassName, errorClassMessage, stackTrace);
+      char *headline = (char *)malloc(length + 1);
+      snprintf(headline, length + 1, headlineTemplate, errorClassName, errorClassMessage, stackTrace);
+      JS_FreeCString(ctx, errorClassName);
+      JS_FreeCString(ctx, errorClassMessage);
+      JS_FreeCString(ctx, stackTrace);
+
+      r_raw = rb_str_new2(headline);
+      free(headline);
+    }
+    else
+    {
+      r_raw = to_rb_value(ctx, j_logged);
+    }
     const char *body = JS_ToCString(ctx, j_logged);
     VALUE r_c = rb_str_new2(body);
     JS_FreeCString(ctx, body);

data/lib/quickjs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quickjs
-  VERSION = "0.6.3"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json