quickjs 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc8aa4eddd6aca97baf0e773c4880b4479b4ac4597e0edf811d256eeb61aeb9
-  data.tar.gz: 37c8eeef2cad6e0d7773e89759c7d2d1659219247883cfd1817f2603ffbf1543
+  metadata.gz: 49e231625e712ca98ffcab031b747d11392608eb840b2cafa6881173a5be9ac8
+  data.tar.gz: '099960b9c78f6f7a75990386186a0b149102d73ccbbbb7a1db7e52e120c57833'
 SHA512:
-  metadata.gz: 2728bcbae59fae1138bdb5aef4e2f22290db93ce6c1e81f031e25c43108287a4f4d93d20afcfd9cb19a0e55593e1ccdadf1d83ebfbb430ee802368b73994cc2b
-  data.tar.gz: d06939ece851f9f4fb1311846826cad5c92e594511948ac9659bb190ebe6f905fdce15b4b9d16cf5df3b08bc5483a6f27d847f3ddf752aaa18bfcf74fec087e1
+  metadata.gz: 3cad539bfe3b3a7e254ef4c1a2919c7a12afd29e67e5729acc2f8356896898eef71f1f46c35a62e351b1ac03ba0b8e9fe357c4f69781d5b8a203525068e22261
+  data.tar.gz: d4fcdfe872d91b0fd86bcccd9e58262b233ee99d31a529ba288583e2953ea191f4b9269dacbac9a47256f5d2111f737741fce4d5d26cba5e4fcc97bc450be96b

data/ext/quickjsrb/quickjsrb.c

@@ -87,6 +87,23 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   }
 }
 
+VALUE find_ruby_error(JSContext *ctx, JSValue j_error)
+{
+  JSValue j_errorOriginalRubyObjectId = JS_GetPropertyStr(ctx, j_error, "rb_object_id");
+  int errorOriginalRubyObjectId = 0;
+  if (JS_VALUE_GET_NORM_TAG(j_errorOriginalRubyObjectId) == JS_TAG_INT)
+  {
+    JS_ToInt32(ctx, &errorOriginalRubyObjectId, j_errorOriginalRubyObjectId);
+    JS_FreeValue(ctx, j_errorOriginalRubyObjectId);
+    if (errorOriginalRubyObjectId > 0)
+    {
+      // may be nice if cover the case of object is missing
+      return rb_funcall(rb_const_get(rb_cClass, rb_intern("ObjectSpace")), rb_intern("_id2ref"), 1, INT2NUM(errorOriginalRubyObjectId));
+    }
+  }
+  return Qnil;
+}
+
 VALUE r_try_json_parse(VALUE r_str)
 {
   return rb_funcall(rb_const_get(rb_cClass, rb_intern("JSON")), rb_intern("parse"), 1, r_str);
@@ -135,19 +152,12 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
 
     if (JS_IsError(ctx, j_val))
     {
-      JSValue j_errorOriginalRubyObjectId = JS_GetPropertyStr(ctx, j_val, "rb_object_id");
-      int errorOriginalRubyObjectId = 0;
-      if (JS_VALUE_GET_NORM_TAG(j_errorOriginalRubyObjectId) == JS_TAG_INT)
+      VALUE r_maybe_ruby_error = find_ruby_error(ctx, j_val);
+      if (!NIL_P(r_maybe_ruby_error))
       {
-        JS_ToInt32(ctx, &errorOriginalRubyObjectId, j_errorOriginalRubyObjectId);
-        JS_FreeValue(ctx, j_errorOriginalRubyObjectId);
-        if (errorOriginalRubyObjectId > 0)
-        {
-          // may be nice if cover the case of object is missing
-          return rb_funcall(rb_const_get(rb_cClass, rb_intern("ObjectSpace")), rb_intern("_id2ref"), 1, INT2NUM(errorOriginalRubyObjectId));
-        }
+        return r_maybe_ruby_error;
       }
-      // will support other errors
+      // will support other errors like just returning an instance of Error
     }
 
     JSValue j_global = JS_GetGlobalObject(ctx);
@@ -189,19 +199,12 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
     JSValue j_exceptionVal = JS_GetException(ctx);
     if (JS_IsError(ctx, j_exceptionVal))
     {
-      JSValue j_errorOriginalRubyObjectId = JS_GetPropertyStr(ctx, j_exceptionVal, "rb_object_id");
-      int errorOriginalRubyObjectId = 0;
-      if (JS_VALUE_GET_NORM_TAG(j_errorOriginalRubyObjectId) == JS_TAG_INT)
+      VALUE r_maybe_ruby_error = find_ruby_error(ctx, j_exceptionVal);
+      if (!NIL_P(r_maybe_ruby_error))
       {
-        JS_ToInt32(ctx, &errorOriginalRubyObjectId, j_errorOriginalRubyObjectId);
-        JS_FreeValue(ctx, j_errorOriginalRubyObjectId);
-        if (errorOriginalRubyObjectId > 0)
-        {
-          JS_FreeValue(ctx, j_exceptionVal);
-          // may be nice if cover the case of object is missing
-          rb_exc_raise(rb_funcall(rb_const_get(rb_cClass, rb_intern("ObjectSpace")), rb_intern("_id2ref"), 1, INT2NUM(errorOriginalRubyObjectId)));
-          return Qnil;
-        }
+        JS_FreeValue(ctx, j_exceptionVal);
+        rb_exc_raise(r_maybe_ruby_error);
+        return Qnil;
       }
 
       JSValue j_errorClassName = JS_GetPropertyStr(ctx, j_exceptionVal, "name");
@@ -210,8 +213,30 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
       JSValue j_errorClassMessage = JS_GetPropertyStr(ctx, j_exceptionVal, "message");
       const char *errorClassMessage = JS_ToCString(ctx, j_errorClassMessage);
 
+      JSValue j_stackTrace = JS_GetPropertyStr(ctx, j_exceptionVal, "stack");
+      const char *stackTrace = JS_ToCString(ctx, j_stackTrace);
+      const char *headlineTemplate = "Uncaught %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);
+
+      VMData *data = JS_GetContextOpaque(ctx);
+      VALUE r_log_class = rb_const_get(rb_const_get(rb_const_get(rb_cClass, rb_intern("Quickjs")), rb_intern("VM")), rb_intern("Log"));
+      VALUE r_log = rb_funcall(r_log_class, rb_intern("new"), 0);
+      rb_iv_set(r_log, "@severity", ID2SYM(rb_intern("error")));
+      VALUE r_row = rb_ary_new();
+      VALUE r_loghash = rb_hash_new();
+      rb_hash_aset(r_loghash, ID2SYM(rb_intern("raw")), rb_str_new2(headline));
+      rb_hash_aset(r_loghash, ID2SYM(rb_intern("c")), rb_str_new2(headline));
+      rb_ary_push(r_row, r_loghash);
+      rb_iv_set(r_log, "@row", r_row);
+      rb_ary_push(data->logs, r_log);
+
       JS_FreeValue(ctx, j_errorClassMessage);
       JS_FreeValue(ctx, j_errorClassName);
+      JS_FreeValue(ctx, j_stackTrace);
+      JS_FreeCString(ctx, stackTrace);
+      free(headline);
 
       VALUE r_error_class, r_error_message = rb_str_new2(errorClassMessage);
       if (is_native_error_name(errorClassName))
@@ -240,8 +265,26 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
     else // exception without Error object
     {
       const char *errorMessage = JS_ToCString(ctx, j_exceptionVal);
-      VALUE r_error_message = rb_sprintf("%s", errorMessage);
+      const char *headlineTemplate = "Uncaught '%s'";
+      int length = snprintf(NULL, 0, headlineTemplate, errorMessage);
+      char *headline = (char *)malloc(length + 1);
+      snprintf(headline, length + 1, headlineTemplate, errorMessage);
+
+      VMData *data = JS_GetContextOpaque(ctx);
+      VALUE r_log_class = rb_const_get(rb_const_get(rb_const_get(rb_cClass, rb_intern("Quickjs")), rb_intern("VM")), rb_intern("Log"));
+      VALUE r_log = rb_funcall(r_log_class, rb_intern("new"), 0);
+      rb_iv_set(r_log, "@severity", ID2SYM(rb_intern("error")));
+      VALUE r_row = rb_ary_new();
+      VALUE r_loghash = rb_hash_new();
+      rb_hash_aset(r_loghash, ID2SYM(rb_intern("raw")), rb_str_new2(headline));
+      rb_hash_aset(r_loghash, ID2SYM(rb_intern("c")), rb_str_new2(headline));
+      rb_ary_push(r_row, r_loghash);
+      rb_iv_set(r_log, "@row", r_row);
+      rb_ary_push(data->logs, r_log);
+
+      free(headline);
 
+      VALUE r_error_message = rb_sprintf("%s", errorMessage);
       JS_FreeCString(ctx, errorMessage);
       JS_FreeValue(ctx, j_exceptionVal);
       rb_exc_raise(rb_funcall(QUICKJSRB_ERROR_FOR(QUICKJSRB_ROOT_RUNTIME_ERROR), rb_intern("new"), 2, r_error_message, Qnil));

data/lib/quickjs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json