quickjs 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460654c8f6d8174bf3f7025c0ae6e37a0bed766f3a8bdf57da5b9f5fc4ef8e0b
-  data.tar.gz: 100eb2a30022baada73c5d83eb79675c19ba1df439da494278638917c3df16a2
+  metadata.gz: a7de66a3eb1ddd2b9ab50dcbf88f083e42466a8b91343a79af6f01b847d99d01
+  data.tar.gz: f0bab5aa5a676731737633e67c463572dc5b52f959bf9f897883f0034927d314
 SHA512:
-  metadata.gz: 1527a557f744d35f9d79965d51c70f82cba82328351e1ec301ea66fd0293a7cd8bbe713766c470648774c6b589382d4e4357d89b01aa788a8c089e29f974f652
-  data.tar.gz: d06c84aac9d3a440e885d769dfceb3849276c3b93c6d43e60788c8bc476416f61fef2898f1f94c90db44a4e0bc7e847c19c23366983555ee22138feeb9889a75
+  metadata.gz: 52f0a7a7419f0b7bb3cb1efb0f6b33442b7446d95cee7567dcb5e959c0ccdbf12ceaa02144e1d66730e411eba734bfd06923b1f2ce83b5d96611bb11c6e49964
+  data.tar.gz: 9f32de511d5dfcaff34dc2cf63970743d8d933286a617178e188bc2d56407159b694af92f7a5466c32a69a618a25f1c365d10a435051e7a05b588a750e9f5a7c

data/README.md

@@ -58,8 +58,8 @@ vm = Quickjs.eval_code(features: [::Quickjs::MODULE_STD])
 # Enable `os` module by quickjs: https://bellard.org/quickjs/quickjs.html#os-module
 vm = Quickjs.eval_code(features: [::Quickjs::MODULE_OS])
 
-# Expose `os.setTimouet` and `os.clearTimeout` from `os` module
-vm = Quickjs.eval_code(features: [::Quickjs::FEATURES_TIMEOUT])
+# Provide `setTimeout` managed by CRuby
+vm = Quickjs.eval_code(features: [::Quickjs::FEATURE_TIMEOUT])
 
 # Inject the polyfill of Intl
 vm = Quickjs.eval_code(features: [::Quickjs::POLYFILL_INTL])
@@ -98,8 +98,8 @@ vm = Quickjs::VM.new(features: [::Quickjs::MODULE_STD])
 # Enable `os` module by quickjs: https://bellard.org/quickjs/quickjs.html#os-module
 vm = Quickjs::VM.new(features: [::Quickjs::MODULE_OS])
 
-# Expose `os.setTimouet` and `os.clearTimeout` from `os` module
-vm = Quickjs::VM.new(features: [::Quickjs::FEATURES_TIMEOUT])
+# Provide `setTimeout` managed by CRuby
+vm = Quickjs::VM.new(features: [::Quickjs::FEATURE_TIMEOUT])
 
 # Inject the polyfill of Intl
 vm = Quickjs::VM.new(features: [::Quickjs::POLYFILL_INTL])

data/ext/quickjsrb/quickjsrb.c

@@ -311,7 +311,7 @@ static JSValue js_quickjsrb_call_global(JSContext *ctx, JSValueConst _this, int
   const char *funcName = JS_ToCString(ctx, func_data[0]);
 
   VMData *data = JS_GetContextOpaque(ctx);
-  VALUE r_proc = rb_hash_aref(data->defined_functions, rb_str_new2(funcName));
+  VALUE r_proc = rb_hash_aref(data->defined_functions, ID2SYM(rb_intern(funcName)));
   // Shouldn't happen
   if (r_proc == Qnil)
   {
@@ -542,22 +542,7 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
     JSValue j_osEval = JS_Eval(data->context, enableOs, strlen(enableOs), "<vm>", JS_EVAL_TYPE_MODULE);
     JS_FreeValue(data->context, j_osEval);
   }
-  else if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, QUICKJSRB_SYM(featureOsTimeoutId))))
-  {
-    char *filename = random_string();
-    js_init_module_os(data->context, filename); // Better if this is limited just only for setTimeout and clearTimeout
-    const char *enableTimeoutTemplate = "import * as _os from '%s';\n"
-                                        "globalThis.setTimeout = _os.setTimeout;\n"
-                                        "globalThis.clearTimeout = _os.clearTimeout;\n";
-    int length = snprintf(NULL, 0, enableTimeoutTemplate, filename);
-    char *enableTimeout = (char *)malloc(length + 1);
-    snprintf(enableTimeout, length + 1, enableTimeoutTemplate, filename);
-
-    JSValue j_timeoutEval = JS_Eval(data->context, enableTimeout, strlen(enableTimeout), "<vm>", JS_EVAL_TYPE_MODULE);
-    free(enableTimeout);
-    JS_FreeValue(data->context, j_timeoutEval);
-  }
-  else if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, QUICKJSRB_SYM(featureOsTimeoutBetaId))))
+  else if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, QUICKJSRB_SYM(featureTimeoutId))))
   {
     JS_SetPropertyStr(
         data->context, j_global, "setTimeout",
@@ -643,11 +628,19 @@ static VALUE vm_m_defineGlobalFunction(int argc, VALUE *argv, VALUE r_self)
   VALUE r_block;
   rb_scan_args(argc, argv, "10*&", &r_name, &r_flags, &r_block);
 
+  if (!(SYMBOL_P(r_name) || RB_TYPE_P(r_name, T_STRING)))
+  {
+    rb_raise(rb_eTypeError, "function's name should be a Symbol or a String");
+  }
+
   VMData *data;
   TypedData_Get_Struct(r_self, VMData, &vm_type, data);
 
-  rb_hash_aset(data->defined_functions, r_name, r_block);
-  char *funcName = StringValueCStr(r_name);
+  VALUE r_name_sym = rb_funcall(r_name, rb_intern("to_sym"), 0);
+
+  rb_hash_aset(data->defined_functions, r_name_sym, r_block);
+  VALUE r_name_str = rb_funcall(r_name, rb_intern("to_s"), 0);
+  char *funcName = StringValueCStr(r_name_str);
 
   JSValueConst ruby_data[2];
   ruby_data[0] = JS_NewString(data->context, funcName);
@@ -661,7 +654,7 @@ static VALUE vm_m_defineGlobalFunction(int argc, VALUE *argv, VALUE r_self)
   JS_FreeValue(data->context, ruby_data[0]);
   JS_FreeValue(data->context, ruby_data[1]);
 
-  return rb_funcall(r_name, rb_intern("to_sym"), 0);
+  return r_name_sym;
 }
 
 static VALUE vm_m_import(int argc, VALUE *argv, VALUE r_self)

data/ext/quickjsrb/quickjsrb.h

@@ -17,8 +17,7 @@ extern const uint8_t qjsc_polyfill_intl_en_min;
 
 const char *featureStdId = "feature_std";
 const char *featureOsId = "feature_os";
-const char *featureOsTimeoutId = "feature_os_timeout";
-const char *featureOsTimeoutBetaId = "feature_os_timeout_beta";
+const char *featureTimeoutId = "feature_timeout";
 const char *featurePolyfillIntlId = "feature_polyfill_intl";
 
 const char *undefinedId = "undefined";
@@ -137,8 +136,7 @@ static void r_define_constants(VALUE r_parent_class)
 {
   rb_define_const(r_parent_class, "MODULE_STD", QUICKJSRB_SYM(featureStdId));
   rb_define_const(r_parent_class, "MODULE_OS", QUICKJSRB_SYM(featureOsId));
-  rb_define_const(r_parent_class, "FEATURES_TIMEOUT", QUICKJSRB_SYM(featureOsTimeoutId));
-  rb_define_const(r_parent_class, "FEATURES_TIMEOUT_BETA", QUICKJSRB_SYM(featureOsTimeoutBetaId));
+  rb_define_const(r_parent_class, "FEATURE_TIMEOUT", QUICKJSRB_SYM(featureTimeoutId));
   rb_define_const(r_parent_class, "POLYFILL_INTL", QUICKJSRB_SYM(featurePolyfillIntlId));
 
   VALUE rb_cQuickjsValue = rb_define_class_under(r_parent_class, "Value", rb_cObject);

data/lib/quickjs/version.rb

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

metadata

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