js 2.6.0 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81f4c9b970a32b1074724040b7cf50b1eb5b92c997ecc85195f6d3cc294da8fb
-  data.tar.gz: 765a9b39f1a77485834a71f6f5cb420d01225a0a8057316a8ec6b622d58578b1
+  metadata.gz: 153c572884d06b66e29644640877fa1b35d8d08725d44cafb0895e0269f40d8d
+  data.tar.gz: 67351a2724d1c4f74aba3506d14334bef7055918e564429ac9eaf73b277dbcac
 SHA512:
-  metadata.gz: 73305608f6fcc88d01fa044ff2eda293165721e8317a93f811aca35bae0b755e2dd0db595487d5f297f4c58bdc9b7e8c61931a77e920323d585f2ee3446f21d6
-  data.tar.gz: bae658a9d87eb2bb1f233dd54c5351b93f2f937253d0c6476006ae184dc80ef6b91ff35488aec1c4e66d26f8fe81515b767b9520fcef316577e2e6a5d7ef24f2
+  metadata.gz: 7f5cfd35ce5a3242d83553dc3fe8e71664fcad0198535d85ee06adbad272cae7d3eddc2ade6e9852b4f81c559056f4f0904474f83ad6d0a000536a9b0d93a10b
+  data.tar.gz: bd603fe5fe568ec47898d1356a1e46f0bde720313c56b24e36b4f1f70d46f3995c87728621463d332ba37fd347f7ae7f78d218c99adf0d594f50954e21515a49

data/README.md

@@ -0,0 +1,9 @@
+# js
+
+[![Gem Version](https://badge.fury.io/rb/js.svg)](https://badge.fury.io/rb/js)
+
+JavaScript bindings for ruby.wasm. This gem provides a way to use JavaScript functionalities from Ruby through WebAssembly.
+
+## Versioning and Compatibility
+
+This gem follows the versioning of ruby.wasm. The version of this gem is the same as the version of ruby.wasm it is compatible with.

data/ext/js/bindgen/ext.c

@@ -150,7 +150,7 @@ void ruby_js_js_runtime_list_borrow_js_abi_value_free(ruby_js_js_runtime_list_bo
   }
 }
 
-__attribute__((__import_module__("ruby:js/ruby-runtime"), __import_name__("[resource-drop]rb-iseq")))
+__attribute__((__import_module__("[export]ruby:js/ruby-runtime"), __import_name__("[resource-drop]rb-iseq")))
 extern void __wasm_import_exports_ruby_js_ruby_runtime_rb_iseq_drop(int32_t handle);
 
 void exports_ruby_js_ruby_runtime_rb_iseq_drop_own(exports_ruby_js_ruby_runtime_own_rb_iseq_t handle) {
@@ -176,7 +176,7 @@ void __wasm_export_exports_ruby_js_ruby_runtime_rb_iseq_dtor(exports_ruby_js_rub
   exports_ruby_js_ruby_runtime_rb_iseq_destructor(arg);
 }
 
-__attribute__((__import_module__("ruby:js/ruby-runtime"), __import_name__("[resource-drop]rb-abi-value")))
+__attribute__((__import_module__("[export]ruby:js/ruby-runtime"), __import_name__("[resource-drop]rb-abi-value")))
 extern void __wasm_import_exports_ruby_js_ruby_runtime_rb_abi_value_drop(int32_t handle);
 
 void exports_ruby_js_ruby_runtime_rb_abi_value_drop_own(exports_ruby_js_ruby_runtime_own_rb_abi_value_t handle) {

data/ext/js/extconf.rb

@@ -3,6 +3,8 @@ require "mkmf"
 MakeMakefile::RbConfig ||= RbConfig
 unless MakeMakefile::RbConfig::CONFIG["platform"] =~ /wasm/
   $stderr.puts "This extension is only for WebAssembly. Creating a dummy Makefile."
+  # Explicitly set $srcs to avoid the default '*.c' globbing.
+  $srcs = []
   create_makefile("js")
   return
 end

data/ext/js/js-core.c

@@ -438,7 +438,7 @@ static VALUE _rb_js_import_from_js(VALUE obj) {
  *  Returns +obj+ wrapped by JS class RbValue.
  */
 static VALUE _rb_js_obj_wrap(VALUE obj, VALUE wrapping) {
-#if JS_ENABLE_COMPONENT_MODEL
+#ifdef JS_ENABLE_COMPONENT_MODEL
   rb_abi_stage_rb_value_to_js(wrapping);
   return jsvalue_s_new(rb_js_abi_host_rb_object_to_js_rb_value());
 #else
@@ -511,7 +511,7 @@ static VALUE _rb_js_false_to_js(VALUE obj) {
  *  Returns +self+ as a JS::Object.
  */
 static VALUE _rb_js_proc_to_js(VALUE obj) {
-#if JS_ENABLE_COMPONENT_MODEL
+#ifdef JS_ENABLE_COMPONENT_MODEL
   rb_abi_stage_rb_value_to_js(obj);
   return jsvalue_s_new(ruby_js_js_runtime_proc_to_js_function());
 #else

data/ext/js/witapi-core.c

@@ -3,7 +3,11 @@
 #include "ruby.h"
 #include "ruby/version.h"
 
-static VALUE rb_eval_string_value_protect_thunk(VALUE str) {
+#include "types.h"
+
+static VALUE rb_eval_string_value_protect_thunk(VALUE ctx) {
+  const rb_abi_guest_string_t *cabi_str = (const rb_abi_guest_string_t *)ctx;
+  VALUE str = rb_utf8_str_new((const char *)cabi_str->ptr, cabi_str->len);
   const ID id_eval = rb_intern("eval");
   VALUE binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING"));
   const VALUE file = rb_utf8_str_new("eval", 4);
@@ -11,14 +15,13 @@ static VALUE rb_eval_string_value_protect_thunk(VALUE str) {
   return rb_funcallv(rb_mKernel, id_eval, 3, args);
 }
 
-static VALUE rb_eval_string_value_protect(VALUE str, int *pstate) {
-  return rb_protect(rb_eval_string_value_protect_thunk, str, pstate);
+static VALUE rb_eval_string_value_protect(const rb_abi_guest_string_t *str,
+                                          int *pstate) {
+  return rb_protect(rb_eval_string_value_protect_thunk, (VALUE)str, pstate);
 }
 
 #define TAG_NONE 0
 
-#include "types.h"
-
 __attribute__((import_module("asyncify"), import_name("start_unwind"))) void
 asyncify_start_unwind(void *buf);
 #define asyncify_start_unwind(buf)                                             \
@@ -200,15 +203,17 @@ void exports_ruby_js_ruby_runtime_rb_abi_value_destructor(
 
 void rb_abi_guest_ruby_show_version(void) { ruby_show_version(); }
 
-void rb_abi_guest_ruby_init(void) {
-  RB_WASM_LIB_RT(ruby_init())
-
+__attribute__((noinline)) static void rb_abi_guest_ruby_init_thunk(void) {
+  ruby_init();
   rb_abi_guest_arena_hash = rb_hash_new();
   rb_abi_guest_refcount_hash = rb_hash_new();
 
   rb_gc_register_mark_object(rb_abi_guest_arena_hash);
   rb_gc_register_mark_object(rb_abi_guest_refcount_hash);
 }
+void rb_abi_guest_ruby_init(void) {
+  RB_WASM_LIB_RT(rb_abi_guest_ruby_init_thunk())
+}
 
 void rb_abi_guest_ruby_sysinit(rb_abi_guest_list_string_t *args) {
   char **c_args;
@@ -234,12 +239,11 @@ void rb_abi_guest_ruby_init_loadpath(void) {
   RB_WASM_LIB_RT(ruby_init_loadpath())
 }
 
-void rb_abi_guest_rb_eval_string_protect(
+__attribute__((noinline)) static void rb_abi_guest_rb_eval_string_protect_thunk(
     rb_abi_guest_string_t *str, rb_abi_guest_tuple2_rb_abi_value_s32_t *ret0) {
   VALUE retval;
   RB_WASM_DEBUG_LOG("rb_eval_string_protect: str = %s\n", str->ptr);
-  VALUE utf8_str = rb_utf8_str_new((const char *)str->ptr, str->len);
-  RB_WASM_LIB_RT(retval = rb_eval_string_value_protect(utf8_str, &ret0->f1));
+  retval = rb_eval_string_value_protect(str, &ret0->f1);
   RB_WASM_DEBUG_LOG("rb_eval_string_protect: retval = %p, state = %d\n",
                     (void *)retval, ret0->f1);
 
@@ -248,6 +252,10 @@ void rb_abi_guest_rb_eval_string_protect(
   }
   ret0->f0 = rb_abi_guest_rb_abi_value_new((void *)retval);
 }
+void rb_abi_guest_rb_eval_string_protect(
+    rb_abi_guest_string_t *str, rb_abi_guest_tuple2_rb_abi_value_s32_t *ret0) {
+  RB_WASM_LIB_RT(rb_abi_guest_rb_eval_string_protect_thunk(str, ret0));
+}
 
 struct rb_funcallv_thunk_ctx {
   VALUE recv;
@@ -284,7 +292,9 @@ void rb_abi_guest_rb_funcallv_protect(
 }
 
 rb_abi_guest_rb_id_t rb_abi_guest_rb_intern(rb_abi_guest_string_t *name) {
-  return rb_intern((const char *)name->ptr);
+  VALUE retval;
+  RB_WASM_LIB_RT(retval = rb_intern((const char *)name->ptr));
+  return (rb_abi_guest_rb_id_t)retval;
 }
 
 rb_abi_guest_own_rb_abi_value_t rb_abi_guest_rb_errinfo(void) {
@@ -294,16 +304,24 @@ rb_abi_guest_own_rb_abi_value_t rb_abi_guest_rb_errinfo(void) {
   return rb_abi_guest_rb_abi_value_new((void *)retval);
 }
 
-void rb_abi_guest_rb_clear_errinfo(void) { rb_set_errinfo(Qnil); }
+void rb_abi_guest_rb_clear_errinfo(void) {
+  RB_WASM_LIB_RT(rb_set_errinfo(Qnil));
+}
 
-void rb_abi_guest_rstring_ptr(rb_abi_guest_rb_abi_value_t value,
-                              rb_abi_guest_string_t *ret0) {
+__attribute__((noinline)) static void
+rb_abi_guest_rstring_ptr_thunk(rb_abi_guest_rb_abi_value_t value,
+                               rb_abi_guest_string_t *ret0) {
   VALUE r_str = (VALUE)rb_abi_guest_rb_abi_value_get(&value);
   ret0->len = RSTRING_LEN(r_str);
   ret0->ptr = xmalloc(ret0->len);
   memcpy(ret0->ptr, RSTRING_PTR(r_str), ret0->len);
 }
 
+void rb_abi_guest_rstring_ptr(rb_abi_guest_rb_abi_value_t value,
+                              rb_abi_guest_string_t *ret0) {
+  RB_WASM_LIB_RT(rb_abi_guest_rstring_ptr_thunk(value, ret0));
+}
+
 uint32_t rb_abi_guest_rb_abi_value_data_ptr(rb_abi_guest_rb_abi_value_t self) {
   VALUE obj = (VALUE)rb_abi_guest_rb_abi_value_get(&self);
   return (uint32_t)DATA_PTR(obj);
@@ -340,6 +358,8 @@ bool rb_abi_guest_rb_set_should_prohibit_rewind(bool value) {
   return old;
 }
 
+#ifdef JS_ENABLE_COMPONENT_MODEL
+
 static VALUE rb_abi_export_stage = Qnil;
 static rb_abi_guest_own_rb_abi_value_t rb_abi_export_rb_value_to_js(void) {
   VALUE staged = rb_abi_export_stage;
@@ -354,8 +374,6 @@ void rb_abi_stage_rb_value_to_js(VALUE value) {
   rb_abi_export_stage = value;
 }
 
-#ifdef JS_ENABLE_COMPONENT_MODEL
-
 extern void __wasm_call_ctors(void);
 static inline void __wasm_call_ctors_if_needed(void) {
   static bool __wasm_call_ctors_done = false;

data/lib/js/version.rb

@@ -1,3 +1,3 @@
 module JS
-  VERSION = "2.6.0"
+  VERSION = "2.6.2"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.2
 platform: ruby
 authors:
 - Yuta Saito
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-05 00:00:00.000000000 Z
+date: 2024-06-29 00:00:00.000000000 Z
 dependencies: []
 description: JavaScript bindings for ruby.wasm. This gem provides a way to use JavaScript
   functionalities from Ruby through WebAssembly.
@@ -18,6 +19,7 @@ extensions:
 - ext/js/extconf.rb
 extra_rdoc_files: []
 files:
+- README.md
 - ext/js/bindgen/.clang-format
 - ext/js/bindgen/ext.c
 - ext/js/bindgen/ext.h
@@ -50,6 +52,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/ruby/ruby.wasm/tree/main/packages/gems/js
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -64,7 +67,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: JavaScript bindings for ruby.wasm
 test_files: []