quickjs 0.6.5 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31bcb05285a3c4c80c6e5c06ec043793debf795c75f82362b317d74d3eb8cf96
-  data.tar.gz: 9032bf6cb129ea65dc52ae5df5ff394056f440c9de52947ab3029e5c0626c554
+  metadata.gz: 460654c8f6d8174bf3f7025c0ae6e37a0bed766f3a8bdf57da5b9f5fc4ef8e0b
+  data.tar.gz: 100eb2a30022baada73c5d83eb79675c19ba1df439da494278638917c3df16a2
 SHA512:
-  metadata.gz: 2a12da5b5c71c5d350af754f5b50e47104a379aa53cde68625da76bf6b3e165a804b3ec9d764d52f7e8c87a696a870d948d17381bb044b13536b6e96992e9cea
-  data.tar.gz: 1b0b05872129c9d3850e66b0e5f77c779bb2554801e132380a0937a2d21d393b23317364e775ab9c0779ba074da157d46fdd6779a1b5f0ba690c55e2cbedccbd
+  metadata.gz: 1527a557f744d35f9d79965d51c70f82cba82328351e1ec301ea66fd0293a7cd8bbe713766c470648774c6b589382d4e4357d89b01aa788a8c089e29f974f652
+  data.tar.gz: d06c84aac9d3a440e885d769dfceb3849276c3b93c6d43e60788c8bc476416f61fef2898f1f94c90db44a4e0bc7e847c19c23366983555ee22138feeb9889a75

data/README.md

@@ -49,20 +49,22 @@ Quickjs.eval_code(code, { memory_limit: 1024 ** 3 })
 Quickjs.eval_code(code, { max_stack_size: 1024 ** 2 })
 ```
 
-#### Built-in modules
-
-To enable [std module](https://bellard.org/quickjs/quickjs.html#std-module) and [os module](https://bellard.org/quickjs/quickjs.html#os-module) selectively.
+#### Toggle features
 
 ```rb
-# enable std module
-Quickjs.eval_code(code, { features: [Quickjs::MODULE_STD] })
+# Enable `std` module by quickjs: https://bellard.org/quickjs/quickjs.html#std-module
+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])
 
-# enable os module
-Quickjs.eval_code(code, { features: [Quickjs::MODULE_OS] })
+# Expose `os.setTimouet` and `os.clearTimeout` from `os` module
+vm = Quickjs.eval_code(features: [::Quickjs::FEATURES_TIMEOUT])
 
-# enable timeout features `setTimeout`, `clearTimeout` from os module specifically
-Quickjs.eval_code(code, { features: [Quickjs::FEATURES_TIMEOUT] })
+# Inject the polyfill of Intl
+vm = Quickjs.eval_code(features: [::Quickjs::POLYFILL_INTL])
 ```
+
 </details>
 
 ### `Quickjs::VM`: Maintain a consistent VM/runtime
@@ -87,19 +89,20 @@ vm = Quickjs::VM.new(
 )
 ```
 
-#### Built-in modules
-
-To enable [std module](https://bellard.org/quickjs/quickjs.html#std-module) and [os module](https://bellard.org/quickjs/quickjs.html#os-module) selectively.
+#### Toggle features
 
 ```rb
-# enable std module
+# Enable `std` module by quickjs: https://bellard.org/quickjs/quickjs.html#std-module
 vm = Quickjs::VM.new(features: [::Quickjs::MODULE_STD])
 
-# enable os module
+# Enable `os` module by quickjs: https://bellard.org/quickjs/quickjs.html#os-module
 vm = Quickjs::VM.new(features: [::Quickjs::MODULE_OS])
 
-# enable timeout features `setTimeout`, `clearTimeout`
+# Expose `os.setTimouet` and `os.clearTimeout` from `os` module
 vm = Quickjs::VM.new(features: [::Quickjs::FEATURES_TIMEOUT])
+
+# Inject the polyfill of Intl
+vm = Quickjs::VM.new(features: [::Quickjs::POLYFILL_INTL])
 ```
 
 #### VM timeout
@@ -158,6 +161,16 @@ vm.logs.last.raw #=> ['log me', nil]
 
 ## License
 
-Every file in `ext/quickjsrb/quickjs` is licensed under [the MIT License Copyright 2017-2021 by Fabrice Bellard and Charlie Gordon](https://github.com/bellard/quickjs/blob/6e2e68fd0896957f92eb6c242a2e048c1ef3cae0/LICENSE).
-
-For otherwise, [the MIT License, Copyright 2024 by Kengo Hamasaki](/LICENSE).
+- `ext/quickjsrb/quickjs`
+  - [MIT License Copyright (c) 2017-2021 by Fabrice Bellard and Charlie Gordon](https://github.com/bellard/quickjs/blob/6e2e68fd0896957f92eb6c242a2e048c1ef3cae0/LICENSE).
+- `ext/quickjsrb/vendor/polyfill-intl-en.min.js` (bundled and minified)
+  - MIT License Copyright (c) 2023 FormatJS
+    - [@formatjs/intl-getcanonicallocales](https://github.com/formatjs/formatjs/blob/main/packages/intl-getcanonicallocales/LICENSE.md)
+    - [@formatjs/intl-locale](https://github.com/formatjs/formatjs/blob/main/packages/intl-locale/LICENSE.md)
+    - [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs/blob/main/packages/intl-pluralrules/LICENSE.md)
+    - [@formatjs/intl-numberformat](https://github.com/formatjs/formatjs/blob/main/packages/intl-numberformat/LICENSE.md)
+    - [@formatjs/intl-datetimeformat](https://github.com/formatjs/formatjs/blob/main/packages/intl-datetimeformat/LICENSE.md)
+  - MIT License Copyright (c) 2025 Michael Mclaughlin
+    - [decimal.js](https://www.npmjs.com/package/decimal.js)
+
+Otherwise, [the MIT License, Copyright 2024 by Kengo Hamasaki](/LICENSE).

data/ext/quickjsrb/extconf.rb

@@ -11,12 +11,12 @@ $srcs = [
   'cutils.c',
   'quickjs.c',
   'quickjs-libc.c',
+  'polyfill-intl-en.min.c',
   'quickjsrb.c',
 ]
 
 append_cflags('-I$(srcdir)/quickjs')
 
-
 append_cflags('-g')
 append_cflags('-O2')
 append_cflags('-Wall')
@@ -51,4 +51,17 @@ abort('could not find quickjs-libc.h') unless find_header('quickjs-libc.h')
 append_cflags('-fvisibility=hidden')
 $warnflags = ''
 
-create_makefile('quickjs/quickjsrb')
+create_makefile('quickjs/quickjsrb') do |conf|
+  conf.push <<COMPILE_POLYFILL
+QJS_LIB_OBJS= quickjs.o libregexp.o libunicode.o cutils.o quickjs-libc.o libbf.o
+POLYFILL_OPTS=-fno-string-normalize -fno-typedarray -fno-typedarray -fno-eval -fno-proxy -fno-module-loader -fno-bigint
+
+qjsc: ./qjsc.o $(QJS_LIB_OBJS)
+		$(CC) -g -o $@ $^ -lm -ldl -lpthread
+polyfill-intl-en.min.js:
+		$(COPY) $(srcdir)/vendor/$@ $@
+polyfill-intl-en.min.c: ./qjsc polyfill-intl-en.min.js
+		./qjsc $(POLYFILL_OPTS) -c -M polyfill/intl-en.so,intlen -m -o $@ polyfill-intl-en.min.js
+COMPILE_POLYFILL
+  conf
+end

data/ext/quickjsrb/quickjsrb.c

@@ -4,11 +4,11 @@ JSValue j_error_from_ruby_error(JSContext *ctx, VALUE r_error)
 {
   JSValue j_error = JS_NewError(ctx); // may wanna have custom error class to determine in JS' end
 
-  VALUE r_object_id = rb_funcall(r_error, rb_intern("object_id"), 0, NULL);
+  VALUE r_object_id = rb_funcall(r_error, rb_intern("object_id"), 0);
   int objectId = NUM2INT(r_object_id);
   JS_SetPropertyStr(ctx, j_error, "rb_object_id", JS_NewInt32(ctx, objectId));
 
-  VALUE r_exception_message = rb_funcall(r_error, rb_intern("message"), 0, NULL);
+  VALUE r_exception_message = rb_funcall(r_error, rb_intern("message"), 0);
   const char *errorMessage = StringValueCStr(r_exception_message);
   JS_SetPropertyStr(ctx, j_error, "message", JS_NewString(ctx, errorMessage));
 
@@ -24,7 +24,7 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   case T_FIXNUM:
   case T_FLOAT:
   {
-    VALUE r_str = rb_funcall(r_value, rb_intern("to_s"), 0, NULL);
+    VALUE r_str = rb_funcall(r_value, rb_intern("to_s"), 0);
     char *str = StringValueCStr(r_str);
     JSValue j_global = JS_GetGlobalObject(ctx);
     JSValue j_numberClass = JS_GetPropertyStr(ctx, j_global, "Number");
@@ -44,7 +44,7 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   }
   case T_SYMBOL:
   {
-    VALUE r_str = rb_funcall(r_value, rb_intern("to_s"), 0, NULL);
+    VALUE r_str = rb_funcall(r_value, rb_intern("to_s"), 0);
     char *str = StringValueCStr(r_str);
 
     return JS_NewString(ctx, str);
@@ -56,7 +56,7 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   case T_HASH:
   case T_ARRAY:
   {
-    VALUE r_json_str = rb_funcall(r_value, rb_intern("to_json"), 0, NULL);
+    VALUE r_json_str = rb_funcall(r_value, rb_intern("to_json"), 0);
     char *str = StringValueCStr(r_json_str);
     JSValue j_parsed = JS_ParseJSON(ctx, str, strlen(str), "<quickjsrb.c>");
 
@@ -71,7 +71,7 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
     {
       return j_error_from_ruby_error(ctx, r_value);
     }
-    VALUE r_inspect_str = rb_funcall(r_value, rb_intern("inspect"), 0, NULL);
+    VALUE r_inspect_str = rb_funcall(r_value, rb_intern("inspect"), 0);
     char *str = StringValueCStr(r_inspect_str);
 
     return JS_NewString(ctx, str);
@@ -284,7 +284,7 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
     JS_FreeValue(ctx, j_strigified);
     JS_FreeCString(ctx, msg);
 
-    return rb_funcall(r_str, rb_intern("to_i"), 0, NULL);
+    return rb_funcall(r_str, rb_intern("to_i"), 0);
   }
   case JS_TAG_BIG_FLOAT:
   case JS_TAG_BIG_DECIMAL:
@@ -381,6 +381,37 @@ static JSValue js_quickjsrb_call_global(JSContext *ctx, JSValueConst _this, int
   }
 }
 
+static JSValue js_delay_and_eval_job(JSContext *ctx, int argc, JSValueConst *argv)
+{
+  VALUE rb_delay_msec = to_rb_value(ctx, argv[1]);
+  VALUE rb_delay_sec = rb_funcall(rb_delay_msec, rb_intern("/"), 1, rb_float_new(1000));
+  rb_thread_wait_for(rb_time_interval(rb_delay_sec));
+  JS_Call(ctx, argv[0], JS_UNDEFINED, 0, NULL);
+
+  return JS_UNDEFINED;
+}
+
+static JSValue js_quickjsrb_set_timeout(JSContext *ctx, JSValueConst _this, int argc, JSValueConst *argv)
+{
+  JSValueConst func;
+  int64_t delay;
+
+  func = argv[0];
+  if (!JS_IsFunction(ctx, func))
+    return JS_ThrowTypeError(ctx, "not a function");
+  if (JS_ToInt64(ctx, &delay, argv[1])) // TODO: should be lower than global timeout
+    return JS_EXCEPTION;
+
+  JSValueConst args[2];
+  args[0] = func;
+  args[1] = argv[1]; // delay
+  // TODO: implement timer manager and poll with quickjs' queue
+  // Currently, queueing multiple js_delay_and_eval_job is not parallelized
+  JS_EnqueueJob(ctx, js_delay_and_eval_job, 2, args);
+
+  return JS_UNDEFINED;
+}
+
 static JSValue js_quickjsrb_log(JSContext *ctx, JSValueConst _this, int argc, JSValueConst *argv, const char *severity)
 {
   VMData *data = JS_GetContextOpaque(ctx);
@@ -492,6 +523,8 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
   JS_SetModuleLoaderFunc(runtime, NULL, js_module_loader, NULL);
   js_std_init_handlers(runtime);
 
+  JSValue j_global = JS_GetGlobalObject(data->context);
+
   if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, QUICKJSRB_SYM(featureStdId))))
   {
     js_init_module_std(data->context, "std");
@@ -524,6 +557,23 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
     free(enableTimeout);
     JS_FreeValue(data->context, j_timeoutEval);
   }
+  else if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, QUICKJSRB_SYM(featureOsTimeoutBetaId))))
+  {
+    JS_SetPropertyStr(
+        data->context, j_global, "setTimeout",
+        JS_NewCFunction(data->context, js_quickjsrb_set_timeout, "setTimeout", 2));
+  }
+
+  if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, QUICKJSRB_SYM(featurePolyfillIntlId))))
+  {
+    const char *defineIntl = "Object.defineProperty(globalThis, 'Intl', { value:{} });\n";
+    JSValue j_defineIntl = JS_Eval(data->context, defineIntl, strlen(defineIntl), "<vm>", JS_EVAL_TYPE_GLOBAL);
+    JS_FreeValue(data->context, j_defineIntl);
+
+    JSValue j_polyfillIntlObject = JS_ReadObject(data->context, &qjsc_polyfill_intl_en_min, qjsc_polyfill_intl_en_min_size, JS_READ_OBJ_BYTECODE);
+    JSValue j_polyfillIntlResult = JS_EvalFunction(data->context, j_polyfillIntlObject); // Frees polyfillIntlObject
+    JS_FreeValue(data->context, j_polyfillIntlResult);
+  }
 
   JSValue j_console = JS_NewObject(data->context);
   JS_SetPropertyStr(
@@ -542,7 +592,6 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
       data->context, j_console, "error",
       JS_NewCFunction(data->context, js_console_error, "error", 1));
 
-  JSValue j_global = JS_GetGlobalObject(data->context);
   JS_SetPropertyStr(data->context, j_global, "console", j_console);
   JS_FreeValue(data->context, j_global);
 
@@ -612,7 +661,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, NULL);
+  return rb_funcall(r_name, rb_intern("to_sym"), 0);
 }
 
 static VALUE vm_m_import(int argc, VALUE *argv, VALUE r_self)

data/ext/quickjsrb/quickjsrb.h

@@ -12,9 +12,14 @@
 #include <string.h>
 #include <time.h>
 
+extern const uint32_t qjsc_polyfill_intl_en_min_size;
+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 *featurePolyfillIntlId = "feature_polyfill_intl";
 
 const char *undefinedId = "undefined";
 const char *nanId = "NaN";
@@ -133,6 +138,8 @@ 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, "POLYFILL_INTL", QUICKJSRB_SYM(featurePolyfillIntlId));
 
   VALUE rb_cQuickjsValue = rb_define_class_under(r_parent_class, "Value", rb_cObject);
   rb_define_const(rb_cQuickjsValue, "UNDEFINED", QUICKJSRB_SYM(undefinedId));