quickjs 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c0e4a716d292ddbfd58f559f37ddb1d86adb7059779f29bfa0a2b8a8180214
-  data.tar.gz: f45ff31a1913c4ab807ddd5d8f08c17c9bc58236b09308f31f5adbf5d9241ffe
+  metadata.gz: 12a5b713531ad393cb5d16486516f3288eb2b9c88931b8db5fa440a4701393df
+  data.tar.gz: c780fe075e29223e90a4f0183b02506ed2209ed2f17dd33e9e734e753a9b0b3d
 SHA512:
-  metadata.gz: 24c0349dc9e911936932a78e3c7aa0ac75ea36eb776258ae8d8d20d215eaa79a2d79a64c0b1eb0878182033eee8945f7e3f65dd1272e5290a332ac07bde7b7a9
-  data.tar.gz: e7e472520ece228398482ea753157ffc4bf08b2f446b56dd2439b27a9c1006ffc9439ca5d1eb27015e6fa19b68e5663d82339c082b82fa085235e8c8108b5d3b
+  metadata.gz: 524a227ede71099f8da470ae3178df0c63fab2613cb3e9a37ec0215d462dab2fbbb52f69449273cf58ffc58758dbab8743be624c75ce0818335e86b312e49bda
+  data.tar.gz: 9602f54b31a71163ce054aaad3b6da4b5e00d1866b63e98617971d3279ba3a5cef9c8aa2ade1e130dd4499c121c62cc94a8a48dc3eba92a8eaf7bd1a2093ef56

data/ext/quickjsrb/quickjsrb.c

@@ -11,6 +11,7 @@ typedef struct VMData
   struct JSContext *context;
   VALUE defined_functions;
   struct EvalTime *eval_time;
+  VALUE logs;
 } VMData;
 
 static void vm_free(void *ptr)
@@ -36,6 +37,7 @@ static void vm_mark(void *ptr)
 {
   VMData *data = (VMData *)ptr;
   rb_gc_mark_movable(data->defined_functions);
+  rb_gc_mark_movable(data->logs);
 }
 
 static const rb_data_type_t vm_type = {
@@ -53,6 +55,7 @@ static VALUE vm_alloc(VALUE r_self)
   VMData *data;
   VALUE obj = TypedData_Make_Struct(r_self, VMData, &vm_type, data);
   data->defined_functions = rb_hash_new();
+  data->logs = rb_ary_new();
 
   EvalTime *eval_time = malloc(sizeof(EvalTime));
   data->eval_time = eval_time;
@@ -63,7 +66,7 @@ static VALUE vm_alloc(VALUE r_self)
   return obj;
 }
 
-VALUE rb_mQuickjs;
+VALUE rb_cQuickjsVMLog, rb_cQuickjsSyntaxError, rb_cQuickjsRuntimeError, rb_cQuickjsInterruptedError, rb_cQuickjsNoAwaitError, rb_cQuickjsTypeError, rb_cQuickjsReferenceError, rb_cQuickjsRangeError, rb_cQuickjsEvalError, rb_cQuickjsURIError, rb_cQuickjsAggregateError;
 const char *undefinedId = "undefined";
 const char *nanId = "NaN";
 
@@ -78,11 +81,13 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
           rb_intern("is_a?"),
           1, rb_const_get(rb_cClass, rb_intern("Exception")))))
   {
-    VALUE r_str = rb_funcall(r_value, rb_intern("message"), 0, NULL);
-    char *str = StringValueCStr(r_str);
     JSValue j_error = JS_NewError(ctx);
-    JSValue j_str = JS_NewString(ctx, str);
-    JS_SetPropertyStr(ctx, j_error, "message", j_str);
+    VALUE r_str = rb_funcall(r_value, rb_intern("message"), 0, NULL);
+    char *exceptionMessage = StringValueCStr(r_str);
+    VALUE r_exception_name = rb_funcall(rb_funcall(r_value, rb_intern("class"), 0, NULL), rb_intern("name"), 0, NULL);
+    char *exceptionName = StringValueCStr(r_exception_name);
+    JS_SetPropertyStr(ctx, j_error, "name", JS_NewString(ctx, exceptionName));
+    JS_SetPropertyStr(ctx, j_error, "message", JS_NewString(ctx, exceptionMessage));
     return JS_Throw(ctx, j_error);
   }
 
@@ -225,19 +230,67 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
       JS_FreeValue(ctx, j_errorClassName);
 
       VALUE r_error_message = rb_sprintf("%s: %s", errorClassName, errorClassMessage);
+      VALUE r_error_class = rb_eRuntimeError;
+
+      if (strcmp(errorClassName, "SyntaxError") == 0)
+      {
+        r_error_class = rb_cQuickjsSyntaxError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "TypeError") == 0)
+      {
+        r_error_class = rb_cQuickjsTypeError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "ReferenceError") == 0)
+      {
+        r_error_class = rb_cQuickjsReferenceError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "RangeError") == 0)
+      {
+        r_error_class = rb_cQuickjsRangeError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "EvalError") == 0)
+      {
+        r_error_class = rb_cQuickjsEvalError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "URIError") == 0)
+      {
+        r_error_class = rb_cQuickjsURIError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "AggregateError") == 0)
+      {
+        r_error_class = rb_cQuickjsAggregateError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "InternalError") == 0 && strstr(errorClassMessage, "interrupted") != NULL)
+      {
+        r_error_class = rb_cQuickjsInterruptedError;
+        r_error_message = rb_str_new2("Code evaluation is interrupted by the timeout or something");
+      }
+      else if (strcmp(errorClassName, "Quickjs::InterruptedError") == 0)
+      {
+        r_error_class = rb_cQuickjsInterruptedError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
       JS_FreeCString(ctx, errorClassName);
       JS_FreeCString(ctx, errorClassMessage);
       JS_FreeValue(ctx, j_exceptionVal);
-      rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, r_error_message));
+
+      rb_exc_raise(rb_exc_new_str(r_error_class, r_error_message));
     }
-    else
+    else // exception without Error object
     {
       const char *errorMessage = JS_ToCString(ctx, j_exceptionVal);
       VALUE r_error_message = rb_sprintf("%s", errorMessage);
 
       JS_FreeCString(ctx, errorMessage);
       JS_FreeValue(ctx, j_exceptionVal);
-      rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, r_error_message));
+      rb_exc_raise(rb_exc_new_str(rb_cQuickjsRuntimeError, r_error_message));
     }
     return Qnil;
   }
@@ -287,6 +340,41 @@ static JSValue js_quickjsrb_call_global(JSContext *ctx, JSValueConst _this, int
   return to_js_value(ctx, r_result);
 }
 
+static JSValue js_quickjsrb_log(JSContext *ctx, JSValueConst _this, int _argc, JSValueConst *argv)
+{
+  VMData *data = JS_GetContextOpaque(ctx);
+  JSValue j_severity = JS_ToString(ctx, argv[0]);
+  const char *severity = JS_ToCString(ctx, j_severity);
+  JS_FreeValue(ctx, j_severity);
+
+  VALUE r_log = rb_funcall(rb_cQuickjsVMLog, rb_intern("new"), 0);
+  rb_iv_set(r_log, "@severity", ID2SYM(rb_intern(severity)));
+
+  VALUE r_row = rb_ary_new();
+  int i;
+  JSValue j_length = JS_GetPropertyStr(ctx, argv[1], "length");
+  int count;
+  JS_ToInt32(ctx, &count, j_length);
+  JS_FreeValue(ctx, j_length);
+  for (i = 0; i < count; i++)
+  {
+    JSValue j_logged = JS_GetPropertyUint32(ctx, argv[1], i);
+    const char *body = JS_ToCString(ctx, j_logged);
+    VALUE r_loghash = rb_hash_new();
+    rb_hash_aset(r_loghash, ID2SYM(rb_intern("c")), rb_str_new2(body));
+    rb_hash_aset(r_loghash, ID2SYM(rb_intern("raw")), to_rb_value(ctx, j_logged));
+    rb_ary_push(r_row, r_loghash);
+    JS_FreeValue(ctx, j_logged);
+    JS_FreeCString(ctx, body);
+  }
+
+  rb_iv_set(r_log, "@row", r_row);
+  rb_ary_push(data->logs, r_log);
+  JS_FreeCString(ctx, severity);
+
+  return JS_UNDEFINED;
+}
+
 static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
 {
   VALUE r_opts;
@@ -321,7 +409,6 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
   JS_AddIntrinsicBigDecimal(data->context);
   JS_AddIntrinsicOperators(data->context);
   JS_EnableBignumExt(data->context, TRUE);
-  js_std_add_helpers(data->context, 0, NULL);
 
   JS_SetModuleLoaderFunc(runtime, NULL, js_module_loader, NULL);
   js_std_init_handlers(runtime);
@@ -353,15 +440,29 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
     JS_FreeValue(data->context, j_timeoutEval);
   }
 
-  const char *setupGlobalRuby = "globalThis.__ruby = {};\n";
-  JSValue j_rubyEval = JS_Eval(data->context, setupGlobalRuby, strlen(setupGlobalRuby), "<vm>", JS_EVAL_TYPE_MODULE);
-  JS_FreeValue(data->context, j_rubyEval);
-
   JSValue j_global = JS_GetGlobalObject(data->context);
-  JSValue j_func = JS_NewCFunction(data->context, js_quickjsrb_call_global, "rubyGlobal", 2);
-  JS_SetPropertyStr(data->context, j_global, "rubyGlobal", j_func);
+  JSValue j_quickjsrbGlobal = JS_NewObject(data->context);
+  JS_SetPropertyStr(
+      data->context, j_quickjsrbGlobal, "runRubyMethod",
+      JS_NewCFunction(data->context, js_quickjsrb_call_global, "runRubyMethod", 2));
+
+  JS_SetPropertyStr(data->context, j_global, "__quickjsrb", j_quickjsrbGlobal);
+
+  JSValue j_console = JS_NewObject(data->context);
+  JS_SetPropertyStr(
+      data->context, j_quickjsrbGlobal, "log",
+      JS_NewCFunction(data->context, js_quickjsrb_log, "log", 2));
+  JS_SetPropertyStr(data->context, j_global, "console", j_console);
   JS_FreeValue(data->context, j_global);
 
+  const char *defineLoggers = "console.log = (...args) => __quickjsrb.log('info', args);\n"
+                              "console.debug = (...args) => __quickjsrb.log('verbose', args);\n"
+                              "console.info = (...args) => __quickjsrb.log('info', args);\n"
+                              "console.warn = (...args) => __quickjsrb.log('warning', args);\n"
+                              "console.error = (...args) => __quickjsrb.log('error', args);\n";
+  JSValue j_defineLoggers = JS_Eval(data->context, defineLoggers, strlen(defineLoggers), "<vm>", JS_EVAL_TYPE_GLOBAL);
+  JS_FreeValue(data->context, j_defineLoggers);
+
   return r_self;
 }
 
@@ -389,7 +490,7 @@ static VALUE vm_m_evalCode(VALUE r_self, VALUE r_code)
     JS_FreeValue(data->context, j_returnedValue);
     JS_FreeValue(data->context, j_awaitedResult);
     VALUE r_error_message = rb_str_new2("An unawaited Promise was returned to the top-level");
-    rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, r_error_message));
+    rb_exc_raise(rb_exc_new_str(rb_cQuickjsNoAwaitError, r_error_message));
     return Qnil;
   }
   else
@@ -414,11 +515,10 @@ static VALUE vm_m_defineGlobalFunction(VALUE r_self, VALUE r_name)
     rb_hash_aset(data->defined_functions, r_name, r_proc);
     char *funcName = StringValueCStr(r_name);
 
-    const char *template = "globalThis.__ruby['%s'] = (...args) => rubyGlobal('%s', args);\n"
-                           "globalThis['%s'] = globalThis.__ruby['%s'];\n";
-    int length = snprintf(NULL, 0, template, funcName, funcName, funcName, funcName);
+    const char *template = "globalThis['%s'] = (...args) => __quickjsrb.runRubyMethod('%s', args);\n";
+    int length = snprintf(NULL, 0, template, funcName, funcName);
     char *result = (char *)malloc(length + 1);
-    snprintf(result, length + 1, template, funcName, funcName, funcName, funcName);
+    snprintf(result, length + 1, template, funcName, funcName);
 
     JSValue j_codeResult = JS_Eval(data->context, result, strlen(result), "<vm>", JS_EVAL_TYPE_MODULE);
 
@@ -430,21 +530,117 @@ static VALUE vm_m_defineGlobalFunction(VALUE r_self, VALUE r_name)
   return Qnil;
 }
 
+// WISH: vm.import('hey', from: '...source...') imports just default
+// WISH: vm.import('{ member, member2 }', from: '...source...')
+// WISH: vm.import('{ member as aliasedName }', from: '...source...')
+// WISH: vm.import('defaultMember, { member }', from: '...source...')
+// WISH: vm.import('* as all', from: '...source...')
+static VALUE vm_m_import(int argc, VALUE *argv, VALUE r_self)
+{
+  VALUE r_import_string, r_opts;
+  rb_scan_args(argc, argv, "10:", &r_import_string, &r_opts);
+  if (NIL_P(r_opts))
+    r_opts = rb_hash_new();
+  VALUE r_from = rb_hash_aref(r_opts, ID2SYM(rb_intern("from")));
+  if (NIL_P(r_from))
+  {
+    VALUE r_error_message = rb_str_new2("missing import source");
+    rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, r_error_message));
+    return Qnil;
+  }
+
+  VMData *data;
+  TypedData_Get_Struct(r_self, VMData, &vm_type, data);
+
+  char *source = StringValueCStr(r_from);
+  char *import_name = StringValueCStr(r_import_string);
+  JSValue func = JS_Eval(data->context, source, strlen(source), "mmmodule", JS_EVAL_TYPE_MODULE | JS_EVAL_FLAG_COMPILE_ONLY);
+  js_module_set_import_meta(data->context, func, TRUE, FALSE);
+  JS_FreeValue(data->context, func);
+
+  const char *importAndGlobalizeModule = "import * as %s from 'mmmodule';\n"
+                                         "globalThis['%s'] = %s;\n";
+  int length = snprintf(NULL, 0, importAndGlobalizeModule, import_name, import_name, import_name);
+  char *result = (char *)malloc(length + 1);
+  snprintf(result, length + 1, importAndGlobalizeModule, import_name, import_name, import_name);
+
+  JSValue j_codeResult = JS_Eval(data->context, result, strlen(result), "<vm>", JS_EVAL_TYPE_MODULE);
+  free(result);
+  JS_FreeValue(data->context, j_codeResult);
+
+  return Qtrue;
+}
+
+static VALUE vm_m_getLogs(VALUE r_self)
+{
+  VMData *data;
+  TypedData_Get_Struct(r_self, VMData, &vm_type, data);
+
+  return data->logs;
+}
+
+static VALUE pick_raw(VALUE block_arg, VALUE data, int argc, const VALUE *argv, VALUE blockarg)
+{
+  return rb_hash_aref(block_arg, ID2SYM(rb_intern("raw")));
+}
+
+static VALUE vm_m_raw(VALUE r_self)
+{
+  VALUE row = rb_iv_get(r_self, "@row");
+  VALUE r_ary = rb_block_call(row, rb_intern("map"), 0, NULL, pick_raw, Qnil);
+
+  return r_ary;
+}
+
+static VALUE pick_c(VALUE block_arg, VALUE data, int argc, const VALUE *argv, VALUE blockarg)
+{
+  return rb_hash_aref(block_arg, ID2SYM(rb_intern("c")));
+}
+
+static VALUE vm_m_to_s(VALUE r_self)
+{
+  VALUE row = rb_iv_get(r_self, "@row");
+  VALUE r_ary = rb_block_call(row, rb_intern("map"), 0, NULL, pick_c, Qnil);
+
+  return rb_funcall(r_ary, rb_intern("join"), 1, rb_str_new2(" "));
+}
+
 RUBY_FUNC_EXPORTED void
 Init_quickjsrb(void)
 {
-  rb_mQuickjs = rb_define_module("Quickjs");
+  VALUE rb_mQuickjs = rb_define_module("Quickjs");
   rb_define_const(rb_mQuickjs, "MODULE_STD", ID2SYM(rb_intern(featureStdId)));
   rb_define_const(rb_mQuickjs, "MODULE_OS", ID2SYM(rb_intern(featureOsId)));
   rb_define_const(rb_mQuickjs, "FEATURES_TIMEOUT", ID2SYM(rb_intern(featureOsTimeoutId)));
 
-  VALUE valueClass = rb_define_class_under(rb_mQuickjs, "Value", rb_cObject);
-  rb_define_const(valueClass, "UNDEFINED", ID2SYM(rb_intern(undefinedId)));
-  rb_define_const(valueClass, "NAN", ID2SYM(rb_intern(nanId)));
-
-  VALUE vmClass = rb_define_class_under(rb_mQuickjs, "VM", rb_cObject);
-  rb_define_alloc_func(vmClass, vm_alloc);
-  rb_define_method(vmClass, "initialize", vm_m_initialize, -1);
-  rb_define_method(vmClass, "eval_code", vm_m_evalCode, 1);
-  rb_define_method(vmClass, "define_function", vm_m_defineGlobalFunction, 1);
+  VALUE rb_cQuickjsValue = rb_define_class_under(rb_mQuickjs, "Value", rb_cObject);
+  rb_define_const(rb_cQuickjsValue, "UNDEFINED", ID2SYM(rb_intern(undefinedId)));
+  rb_define_const(rb_cQuickjsValue, "NAN", ID2SYM(rb_intern(nanId)));
+
+  VALUE rb_cQuickjsVM = rb_define_class_under(rb_mQuickjs, "VM", rb_cObject);
+  rb_define_alloc_func(rb_cQuickjsVM, vm_alloc);
+  rb_define_method(rb_cQuickjsVM, "initialize", vm_m_initialize, -1);
+  rb_define_method(rb_cQuickjsVM, "eval_code", vm_m_evalCode, 1);
+  rb_define_method(rb_cQuickjsVM, "define_function", vm_m_defineGlobalFunction, 1);
+  rb_define_method(rb_cQuickjsVM, "import", vm_m_import, -1);
+  rb_define_method(rb_cQuickjsVM, "logs", vm_m_getLogs, 0);
+
+  rb_cQuickjsVMLog = rb_define_class_under(rb_cQuickjsVM, "Log", rb_cObject);
+  rb_define_attr(rb_cQuickjsVMLog, "severity", 1, 0);
+  rb_define_method(rb_cQuickjsVMLog, "raw", vm_m_raw, 0);
+  rb_define_method(rb_cQuickjsVMLog, "to_s", vm_m_to_s, 0);
+  rb_define_method(rb_cQuickjsVMLog, "inspect", vm_m_to_s, 0);
+
+  rb_cQuickjsRuntimeError = rb_define_class_under(rb_mQuickjs, "RuntimeError", rb_eRuntimeError);
+
+  rb_cQuickjsSyntaxError = rb_define_class_under(rb_mQuickjs, "SyntaxError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsTypeError = rb_define_class_under(rb_mQuickjs, "TypeError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsRangeError = rb_define_class_under(rb_mQuickjs, "RangeError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsReferenceError = rb_define_class_under(rb_mQuickjs, "ReferenceError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsURIError = rb_define_class_under(rb_mQuickjs, "URIError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsEvalError = rb_define_class_under(rb_mQuickjs, "EvalError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsAggregateError = rb_define_class_under(rb_mQuickjs, "AggregateError", rb_cQuickjsRuntimeError);
+
+  rb_cQuickjsInterruptedError = rb_define_class_under(rb_mQuickjs, "InterruptedError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsNoAwaitError = rb_define_class_under(rb_mQuickjs, "NoAwaitError", rb_cQuickjsRuntimeError);
 }

data/lib/quickjs/version.rb

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

data/lib/quickjs.rb

@@ -17,7 +17,7 @@ module Quickjs
   def _with_timeout(msec, proc, args)
     Timeout.timeout(msec / 1_000.0) { proc.call(*args) }
   rescue Timeout::Error
-    RuntimeError.new('interrupted')
+    Quickjs::InterruptedError.new('Ruby runtime got timeout')
   rescue => e
     e
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json