quickjs 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 362c16217cefda63b3d8a4e0c41bdf4036c24e49540e5c223efc0751d5c84e44
-  data.tar.gz: 0415d93639765ffc7191964418e3a12f3c5fd51a547e854ff68141f1239c8e91
+  metadata.gz: 30027c93cb2dd5dbb85d43ab40700f7ee06679a824b503bee42786a42bc5dc26
+  data.tar.gz: 51c60a962c82bbbbaa3a3fc4202255809751848d1474f9a4e9f6b7ebe4df0277
 SHA512:
-  metadata.gz: d03afbf875aa53a7bbda02ed4ad84bab4f264b77446373f352c0c19d0d6c7cf824e3fd8b5c108cb0dd13872b8f8e53b12488052bd5f80190287c685f8f5bd6b0
-  data.tar.gz: 2fa7eae61259f74229e1ee71c2dd4a6016ef7f26cb1e47cdbe2646b871bb7a0eb41c8e74b3805d4471e5e953153fab2f8ab14f17e934969264cb231ae5a08556
+  metadata.gz: e1f248cbafcc56ceba481f658aae542660ac8de6036b7fc1e9425e5f214f4f51a918a3051b82e796a075ed83726f59ba6b8dcc85e8b1c38ee1369b089ebd410a
+  data.tar.gz: 7c7346da3a318d3ed07bfd490561ced7deda800678bda0cb23c4f2b19b84b9720191a7999a7d9a5225d91d4c2140b7fffae03f16d75b791cd4d3b746bbab50a9

data/README.md

@@ -104,6 +104,16 @@ vm = Quickjs::VM.new(
 )
 ```
 
+#### ⚡️ Import ESM from source
+
+```rb
+vm = Quickjs::VM.new
+vm.import({ default: 'aliasedDefault', member: 'member' }, from: File.read('exports.esm.js'))
+
+vm.eval_code("aliasedDefault()") #=> Exported `default` of the ESM is called
+vm.eval_code("member()") #=> Exported `member` of the ESM is called
+```
+
 #### ⚡️ Define a global function for JS by Ruby
 
 ```rb

data/ext/quickjsrb/quickjsrb.c

@@ -191,7 +191,7 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
     if (promiseState != -1)
     {
       VALUE r_error_message = rb_str_new2("cannot translate a Promise to Ruby. await within JavaScript's end");
-      rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, r_error_message));
+      rb_exc_raise(rb_funcall(rb_cQuickjsRuntimeError, rb_intern("new"), 2, r_error_message, Qnil));
       return Qnil;
     }
 
@@ -229,43 +229,35 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
       JS_FreeValue(ctx, j_errorClassMessage);
       JS_FreeValue(ctx, j_errorClassName);
 
-      VALUE r_error_message = rb_sprintf("%s: %s", errorClassName, errorClassMessage);
-      VALUE r_error_class = rb_eRuntimeError;
+      VALUE r_error_class, r_error_message = rb_str_new2(errorClassMessage);
 
       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)
       {
@@ -275,13 +267,16 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
       else if (strcmp(errorClassName, "Quickjs::InterruptedError") == 0)
       {
         r_error_class = rb_cQuickjsInterruptedError;
-        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else
+      {
+        r_error_class = rb_cQuickjsRuntimeError;
       }
       JS_FreeCString(ctx, errorClassName);
       JS_FreeCString(ctx, errorClassMessage);
       JS_FreeValue(ctx, j_exceptionVal);
 
-      rb_exc_raise(rb_exc_new_str(r_error_class, r_error_message));
+      rb_exc_raise(rb_funcall(r_error_class, rb_intern("new"), 2, r_error_message, rb_str_new2(errorClassName)));
     }
     else // exception without Error object
     {
@@ -290,7 +285,7 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
 
       JS_FreeCString(ctx, errorMessage);
       JS_FreeValue(ctx, j_exceptionVal);
-      rb_exc_raise(rb_exc_new_str(rb_cQuickjsRuntimeError, r_error_message));
+      rb_exc_raise(rb_funcall(rb_cQuickjsRuntimeError, rb_intern("new"), 2, r_error_message, Qnil));
     }
     return Qnil;
   }
@@ -362,6 +357,7 @@ static JSValue js_quickjsrb_log(JSContext *ctx, JSValueConst _this, int _argc, J
     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);
@@ -489,7 +485,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_cQuickjsNoAwaitError, r_error_message));
+    rb_exc_raise(rb_funcall(rb_cQuickjsNoAwaitError, rb_intern("new"), 2, r_error_message, Qnil));
     return Qnil;
   }
   else
@@ -529,11 +525,6 @@ 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;
@@ -544,7 +535,7 @@ static VALUE vm_m_import(int argc, VALUE *argv, VALUE r_self)
   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));
+    rb_exc_raise(rb_funcall(rb_cQuickjsRuntimeError, rb_intern("new"), 2, r_error_message, Qnil));
     return Qnil;
   }
 
@@ -552,16 +543,25 @@ static VALUE vm_m_import(int argc, VALUE *argv, VALUE r_self)
   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);
+  VALUE r_import_settings = rb_funcall(
+      rb_const_get(rb_cClass, rb_intern("Quickjs")),
+      rb_intern("_build_import"),
+      1,
+      r_import_string);
+  VALUE r_import_name = rb_ary_entry(r_import_settings, 0);
+  char *import_name = StringValueCStr(r_import_name);
+  VALUE r_globalize = rb_ary_entry(r_import_settings, 1);
+  char *globalize = StringValueCStr(r_globalize);
+
+  const char *importAndGlobalizeModule = "import %s from 'mmmodule';\n"
+                                         "%s\n";
+  int length = snprintf(NULL, 0, importAndGlobalizeModule, import_name, globalize);
   char *result = (char *)malloc(length + 1);
-  snprintf(result, length + 1, importAndGlobalizeModule, import_name, import_name, import_name);
+  snprintf(result, length + 1, importAndGlobalizeModule, import_name, globalize);
 
   JSValue j_codeResult = JS_Eval(data->context, result, strlen(result), "<vm>", JS_EVAL_TYPE_MODULE);
   free(result);
@@ -578,6 +578,19 @@ static VALUE vm_m_getLogs(VALUE r_self)
   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")));
@@ -591,8 +604,15 @@ static VALUE vm_m_to_s(VALUE r_self)
   return rb_funcall(r_ary, rb_intern("join"), 1, rb_str_new2(" "));
 }
 
-RUBY_FUNC_EXPORTED void
-Init_quickjsrb(void)
+VALUE vm_m_initialize_quickjs_error(VALUE self, VALUE r_message, VALUE r_js_name)
+{
+  rb_call_super(1, &r_message);
+  rb_iv_set(self, "@js_name", r_js_name);
+
+  return self;
+}
+
+RUBY_FUNC_EXPORTED void Init_quickjsrb(void)
 {
   VALUE rb_mQuickjs = rb_define_module("Quickjs");
   rb_define_const(rb_mQuickjs, "MODULE_STD", ID2SYM(rb_intern(featureStdId)));
@@ -613,10 +633,13 @@ Init_quickjsrb(void)
 
   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_define_method(rb_cQuickjsRuntimeError, "initialize", vm_m_initialize_quickjs_error, 2);
+  rb_define_attr(rb_cQuickjsRuntimeError, "js_name", 1, 0);
 
   rb_cQuickjsSyntaxError = rb_define_class_under(rb_mQuickjs, "SyntaxError", rb_cQuickjsRuntimeError);
   rb_cQuickjsTypeError = rb_define_class_under(rb_mQuickjs, "TypeError", rb_cQuickjsRuntimeError);

data/lib/quickjs/version.rb

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

data/lib/quickjs.rb

@@ -17,9 +17,21 @@ module Quickjs
   def _with_timeout(msec, proc, args)
     Timeout.timeout(msec / 1_000.0) { proc.call(*args) }
   rescue Timeout::Error
-    Quickjs::InterruptedError.new('Ruby runtime got timeout')
+    Quickjs::InterruptedError.new('Ruby runtime got timeout', nil)
   rescue => e
     e
   end
   module_function :_with_timeout
+
+  def _build_import(mappings)
+    imports, aliases = mappings.to_a.map do |imp|
+      ["#{imp[0]} as #{imp[1]}", imp[1].to_s]
+    end.transpose
+
+    [
+      imports.join(", ").yield_self{|s| '{ %s }' % s },
+      aliases.map {|name| "globalThis['#{name}'] = #{name};"}.join("\n")
+    ]
+  end
+  module_function :_build_import
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json