quickjs 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a2c456cd81f2a2d5085e720a1872ffc7ee873c49319db8fc0459f2c6336e437
-  data.tar.gz: a2881627264f8d69bdf04f3773630f17eacd9c03d5fbaa59c521ce7590ff3778
+  metadata.gz: 44eedd9a617b8106c963b40fde4ffd9e9c3093be07a9d1528ae3cdac357abd9d
+  data.tar.gz: 83821e76a40a152fea3516c4720e5a5240129f866dc44db2d2ef8350672ff80b
 SHA512:
-  metadata.gz: 1733ef77baf22132775c06ea988ad66f8e29712a92221513894ab31173fcd165edfa6ca2a32ca855ba5d641abda6613a0419f34baf32a59a47886b98385b4836
-  data.tar.gz: 910f2e1d364f873261a3a4caa092427101dd64bfeaefb497fafc6caa64dd5ae4fc2d42559f31829a350d7329bef3f887f557afe1449e934516ed10d7e638b25a
+  metadata.gz: 5b8f7d797869c7f02a7c529f47d0340831b700e7c91fd0f351df040e8e09f4e4a0e8ae42c9da0609603cd451d50246d6f491619c512e383ecd1f4a6a53c14feb
+  data.tar.gz: 71bf4c8fd5d6f94db5edb6f341005dcc153b1bba13b4dbcdc1974b3eca01be2893de6dee5cf3a4e9be815afe1777febf2cd0c718df334f4e175fd25e01267ca6

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
@@ -153,11 +156,21 @@ vm.eval_code('console.log("log me", null)')
 vm.logs #=> Array of Quickjs::VM::Log
 vm.logs.last.severity #=> :info
 vm.logs.last.to_s #=> 'log me null'
-vm,logs.last.raw #=> ['log me', nil]
+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`
+  - 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

@@ -58,17 +58,9 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   {
     VALUE r_json_str = rb_funcall(r_value, rb_intern("to_json"), 0, NULL);
     char *str = StringValueCStr(r_json_str);
-    JSValue j_global = JS_GetGlobalObject(ctx);
-    JSValue j_jsonClass = JS_GetPropertyStr(ctx, j_global, "JSON");
-    JSValue j_parseFunc = JS_GetPropertyStr(ctx, j_jsonClass, "parse");
-    JSValue j_str = JS_NewString(ctx, str);
-    JSValue j_stringified = JS_Call(ctx, j_parseFunc, j_jsonClass, 1, (JSValueConst *)&j_str);
-    JS_FreeValue(ctx, j_global);
-    JS_FreeValue(ctx, j_jsonClass);
-    JS_FreeValue(ctx, j_parseFunc);
-    JS_FreeValue(ctx, j_str);
+    JSValue j_parsed = JS_ParseJSON(ctx, str, strlen(str), "<quickjsrb.c>");
 
-    return j_stringified;
+    return j_parsed;
   }
   default:
   {
@@ -132,9 +124,7 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
   {
   case JS_TAG_INT:
   {
-    int int_res = 0;
-    JS_ToInt32(ctx, &int_res, j_val);
-    return INT2NUM(int_res);
+    return INT2NUM(JS_VALUE_GET_INT(j_val));
   }
   case JS_TAG_FLOAT64:
   {
@@ -142,9 +132,7 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
     {
       return QUICKJSRB_SYM(nanId);
     }
-    double double_res;
-    JS_ToFloat64(ctx, &double_res, j_val);
-    return DBL2NUM(double_res);
+    return DBL2NUM(JS_VALUE_GET_FLOAT64(j_val));
   }
   case JS_TAG_BOOL:
   {
@@ -400,7 +388,40 @@ static JSValue js_quickjsrb_log(JSContext *ctx, JSValueConst _this, int argc, JS
   for (int i = 0; i < argc; i++)
   {
     JSValue j_logged = JS_DupValue(ctx, argv[i]);
-    VALUE r_raw = JS_VALUE_GET_NORM_TAG(j_logged) == JS_TAG_OBJECT && JS_PromiseState(ctx, j_logged) != -1 ? rb_str_new2("Promise") : to_rb_value(ctx, j_logged);
+    VALUE r_raw;
+    if (JS_VALUE_GET_NORM_TAG(j_logged) == JS_TAG_OBJECT && JS_PromiseState(ctx, j_logged) != -1)
+    {
+      r_raw = rb_str_new2("Promise");
+    }
+    else if (JS_IsError(ctx, j_logged))
+    {
+      JSValue j_errorClassName = JS_GetPropertyStr(ctx, j_logged, "name");
+      const char *errorClassName = JS_ToCString(ctx, j_errorClassName);
+      JS_FreeValue(ctx, j_errorClassName);
+
+      JSValue j_errorClassMessage = JS_GetPropertyStr(ctx, j_logged, "message");
+      const char *errorClassMessage = JS_ToCString(ctx, j_errorClassMessage);
+      JS_FreeValue(ctx, j_errorClassMessage);
+
+      JSValue j_stackTrace = JS_GetPropertyStr(ctx, j_logged, "stack");
+      const char *stackTrace = JS_ToCString(ctx, j_stackTrace);
+      JS_FreeValue(ctx, j_stackTrace);
+
+      const char *headlineTemplate = "%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);
+      JS_FreeCString(ctx, errorClassName);
+      JS_FreeCString(ctx, errorClassMessage);
+      JS_FreeCString(ctx, stackTrace);
+
+      r_raw = rb_str_new2(headline);
+      free(headline);
+    }
+    else
+    {
+      r_raw = to_rb_value(ctx, j_logged);
+    }
     const char *body = JS_ToCString(ctx, j_logged);
     VALUE r_c = rb_str_new2(body);
     JS_FreeCString(ctx, body);
@@ -504,6 +525,17 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
     JS_FreeValue(data->context, j_timeoutEval);
   }
 
+  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(
       data->context, j_console, "log",

data/ext/quickjsrb/quickjsrb.h

@@ -12,9 +12,13 @@
 #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 *featurePolyfillIntlId = "feature_polyfill_intl";
 
 const char *undefinedId = "undefined";
 const char *nanId = "NaN";
@@ -133,6 +137,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, "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));