js 2.5.1 → 2.6.0

data/ext/{witapi → js}/witapi-core.c

@@ -17,7 +17,7 @@ static VALUE rb_eval_string_value_protect(VALUE str, int *pstate) {
 
 #define TAG_NONE 0
 
-#include "bindgen/rb-abi-guest.h"
+#include "types.h"
 
 __attribute__((import_module("asyncify"), import_name("start_unwind"))) void
 asyncify_start_unwind(void *buf);
@@ -55,10 +55,18 @@ void *rb_wasm_handle_fiber_unwind(void (**new_fiber_entry)(void *, void *),
 
 static bool rb_should_prohibit_rewind = false;
 
+#ifdef JS_ENABLE_COMPONENT_MODEL
+void rb_wasm_throw_prohibit_rewind_exception(const char *c_msg,
+                                             size_t msg_len) {
+  ext_string_t message = {.ptr = (uint8_t *)c_msg, .len = msg_len};
+  ruby_js_js_runtime_throw_prohibit_rewind_exception(&message);
+}
+#else
 __attribute__((import_module("rb-js-abi-host"),
                import_name("rb_wasm_throw_prohibit_rewind_exception")))
 __attribute__((noreturn)) void
 rb_wasm_throw_prohibit_rewind_exception(const char *c_msg, size_t msg_len);
+#endif
 
 #define RB_WASM_CHECK_REWIND_PROHIBITED(msg)                                   \
   /*                                                                           \
@@ -122,7 +130,7 @@ rb_wasm_throw_prohibit_rewind_exception(const char *c_msg, size_t msg_len);
   {                                                                            \
     new_args = alloca(sizeof(char *) * ((list)->len + 1));                     \
     for (size_t i = 0; i < (list)->len; i++) {                                 \
-      new_args[i] = (list)->ptr[i].ptr;                                        \
+      new_args[i] = (char *)((list)->ptr[i].ptr);                              \
     }                                                                          \
   }
 
@@ -176,6 +184,16 @@ void rb_abi_guest_rb_abi_value_dtor(void *data) {
   assert(state == TAG_NONE && "rb_abi_guest_rb_abi_value_dtor_internal failed");
 }
 
+#ifdef JS_ENABLE_COMPONENT_MODEL
+void exports_ruby_js_ruby_runtime_rb_iseq_destructor(
+    exports_ruby_js_ruby_runtime_rb_iseq_t *rep) {}
+
+void exports_ruby_js_ruby_runtime_rb_abi_value_destructor(
+    exports_ruby_js_ruby_runtime_rb_abi_value_t *rep) {
+  rb_abi_guest_rb_abi_value_dtor((void *)rep);
+}
+#endif
+
 // MARK: - Exported functions
 // NOTE: Assume that callers always pass null terminated string by
 // rb_abi_guest_string_t
@@ -209,7 +227,7 @@ rb_abi_guest_ruby_options(rb_abi_guest_list_string_t *args) {
 }
 
 void rb_abi_guest_ruby_script(rb_abi_guest_string_t *name) {
-  RB_WASM_LIB_RT(ruby_script(name->ptr))
+  RB_WASM_LIB_RT(ruby_script((const char *)name->ptr))
 }
 
 void rb_abi_guest_ruby_init_loadpath(void) {
@@ -220,7 +238,7 @@ void rb_abi_guest_rb_eval_string_protect(
     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(str->ptr, str->len);
+  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));
   RB_WASM_DEBUG_LOG("rb_eval_string_protect: retval = %p, state = %d\n",
                     (void *)retval, ret0->f1);
@@ -266,10 +284,10 @@ 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(name->ptr);
+  return rb_intern((const char *)name->ptr);
 }
 
-rb_abi_guest_rb_abi_value_t rb_abi_guest_rb_errinfo(void) {
+rb_abi_guest_own_rb_abi_value_t rb_abi_guest_rb_errinfo(void) {
   VALUE retval;
   RB_WASM_LIB_RT(retval = rb_errinfo());
   rb_abi_lend_object(retval);
@@ -322,4 +340,123 @@ bool rb_abi_guest_rb_set_should_prohibit_rewind(bool value) {
   return old;
 }
 
+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;
+  rb_abi_export_stage = Qnil;
+  rb_abi_lend_object(staged);
+  return rb_abi_guest_rb_abi_value_new((void *)staged);
+}
+
+void rb_abi_stage_rb_value_to_js(VALUE value) {
+  assert(rb_abi_export_stage == Qnil &&
+         "rb_abi_stage_rb_value_to_js: stage is not empty!?");
+  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;
+  if (!__wasm_call_ctors_done) {
+    __wasm_call_ctors_done = true;
+    __wasm_call_ctors();
+
+    // Initialize VFS runtime if it's used
+    // NOTE: We don't use wasi-vfs for PIC build. Instead, we use
+    // Component Model-native wasi-virt.
+#  ifndef __PIC__
+    __attribute__((weak)) extern void __wasi_vfs_rt_init(void);
+    if (__wasi_vfs_rt_init) {
+      __wasi_vfs_rt_init();
+    }
+#  endif
+  }
+}
+
+// Exported Functions from `ruby:js/ruby-runtime`
+void exports_ruby_js_ruby_runtime_ruby_show_version(void) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_ruby_show_version();
+}
+void exports_ruby_js_ruby_runtime_ruby_init(void) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_ruby_init();
+}
+void exports_ruby_js_ruby_runtime_ruby_sysinit(ext_list_string_t *args) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_ruby_sysinit(args);
+}
+exports_ruby_js_ruby_runtime_own_rb_iseq_t
+exports_ruby_js_ruby_runtime_ruby_options(ext_list_string_t *args) {
+  __wasm_call_ctors_if_needed();
+  return rb_abi_guest_ruby_options(args);
+}
+void exports_ruby_js_ruby_runtime_ruby_script(ext_string_t *name) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_ruby_script(name);
+}
+void exports_ruby_js_ruby_runtime_ruby_init_loadpath(void) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_ruby_init_loadpath();
+}
+void exports_ruby_js_ruby_runtime_rb_eval_string_protect(
+    ext_string_t *str,
+    exports_ruby_js_ruby_runtime_tuple2_own_rb_abi_value_s32_t *ret) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_rb_eval_string_protect(str, ret);
+}
+void exports_ruby_js_ruby_runtime_rb_funcallv_protect(
+    exports_ruby_js_ruby_runtime_borrow_rb_abi_value_t recv,
+    exports_ruby_js_ruby_runtime_rb_id_t mid,
+    exports_ruby_js_ruby_runtime_list_borrow_rb_abi_value_t *args,
+    exports_ruby_js_ruby_runtime_tuple2_own_rb_abi_value_s32_t *ret) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_rb_funcallv_protect(recv, mid, args, ret);
+}
+exports_ruby_js_ruby_runtime_rb_id_t
+exports_ruby_js_ruby_runtime_rb_intern(ext_string_t *name) {
+  __wasm_call_ctors_if_needed();
+  return rb_abi_guest_rb_intern(name);
+}
+exports_ruby_js_ruby_runtime_own_rb_abi_value_t
+exports_ruby_js_ruby_runtime_rb_errinfo(void) {
+  __wasm_call_ctors_if_needed();
+  return rb_abi_guest_rb_errinfo();
+}
+void exports_ruby_js_ruby_runtime_rb_clear_errinfo(void) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_rb_clear_errinfo();
+}
+void exports_ruby_js_ruby_runtime_rstring_ptr(
+    exports_ruby_js_ruby_runtime_borrow_rb_abi_value_t value,
+    ext_string_t *ret) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_rstring_ptr(value, ret);
+}
+void exports_ruby_js_ruby_runtime_rb_vm_bugreport(void) {
+  __wasm_call_ctors_if_needed();
+  rb_abi_guest_rb_vm_bugreport();
+}
+bool exports_ruby_js_ruby_runtime_rb_gc_enable(void) {
+  __wasm_call_ctors_if_needed();
+  return rb_abi_guest_rb_gc_enable();
+}
+bool exports_ruby_js_ruby_runtime_rb_gc_disable(void) {
+  __wasm_call_ctors_if_needed();
+  return rb_abi_guest_rb_gc_disable();
+}
+bool exports_ruby_js_ruby_runtime_rb_set_should_prohibit_rewind(
+    bool new_value) {
+  __wasm_call_ctors_if_needed();
+  return rb_abi_guest_rb_set_should_prohibit_rewind(new_value);
+}
+exports_ruby_js_ruby_runtime_own_rb_abi_value_t
+exports_ruby_js_ruby_runtime_export_rb_value_to_js(void) {
+  __wasm_call_ctors_if_needed();
+  return rb_abi_export_rb_value_to_js();
+}
+#endif
+
 void Init_witapi(void) {}

data/js.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
     end
   end
   spec.require_paths = ["lib"]
-  spec.extensions = ["ext/js/extconf.rb", "ext/witapi/extconf.rb"]
+  spec.extensions = ["ext/js/extconf.rb"]
 end

data/lib/js/version.rb

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

data/lib/js.rb

@@ -173,7 +173,11 @@ class JS::Object
     if sym_str.end_with?("?")
       # When a JS method is called with a ? suffix, it is treated as a predicate method,
       # and the return value is converted to a Ruby boolean value automatically.
-      self.call(sym_str[0..-2].to_sym, *args, &block) == JS::True
+      result = self.call(sym_str[0..-2].to_sym, *args, &block)
+
+      # Type coerce the result to boolean type
+      # to match the true/false determination in JavaScript's if statement.
+      JS.global.Boolean(result) == JS::True
     elsif self[sym].typeof == "function"
       self.call(sym, *args, &block)
     else

data/wit/js-runtime.wit

@@ -0,0 +1,45 @@
+package ruby:js;
+
+interface js-runtime {
+
+    resource js-abi-value {}
+
+    variant js-abi-result {
+        success(js-abi-value),
+        failure(js-abi-value),
+    }
+
+    eval-js: func(code: string) -> js-abi-result;
+    is-js: func(value: borrow<js-abi-value>) -> bool;
+    instance-of: func(value: borrow<js-abi-value>, klass: borrow<js-abi-value>) -> bool;
+    global-this: func() -> js-abi-value;
+    int-to-js-number: func(value: s32) -> js-abi-value;
+    float-to-js-number: func(value: float64) -> js-abi-value;
+    string-to-js-string: func(value: string) -> js-abi-value;
+    bool-to-js-bool: func(value: bool) -> js-abi-value;
+    proc-to-js-function: func() -> js-abi-value;
+    rb-object-to-js-rb-value: func() -> js-abi-value;
+
+    js-value-to-string: func(value: borrow<js-abi-value>) -> string;
+
+    variant raw-integer {
+        as-float(float64),
+        bignum(string),
+    }
+
+    js-value-to-integer: func(value: borrow<js-abi-value>) -> raw-integer;
+
+    export-js-value-to-host: func(value: borrow<js-abi-value>);
+    import-js-value-from-host: func() -> js-abi-value;
+
+    js-value-typeof: func(value: borrow<js-abi-value>) -> string;
+
+    js-value-equal: func(lhs: borrow<js-abi-value>, rhs: borrow<js-abi-value>) -> bool;
+    js-value-strictly-equal: func(lhs: borrow<js-abi-value>, rhs: borrow<js-abi-value>) -> bool;
+
+    reflect-apply: func(target: borrow<js-abi-value>, this-argument: borrow<js-abi-value>, arguments: list<borrow<js-abi-value>>) -> js-abi-result;
+    reflect-get: func(target: borrow<js-abi-value>, property-key: string) -> js-abi-result;
+    reflect-set: func(target: borrow<js-abi-value>, property-key: string, value: borrow<js-abi-value>) -> js-abi-result;
+
+    throw-prohibit-rewind-exception: func(message: string);
+}

data/wit/ruby-runtime.wit

@@ -0,0 +1,43 @@
+package ruby:js;
+
+interface ruby-runtime {
+    use js-runtime.{js-abi-value};
+
+    resource rb-iseq {}
+    resource rb-abi-value {}
+
+    type rb-errno = s32;
+    type rb-id = u32;
+
+    ruby-show-version: func();
+    ruby-init: func();
+    ruby-sysinit: func(args: list<string>);
+    ruby-options: func(args: list<string>) -> rb-iseq;
+    ruby-script: func(name: string);
+    ruby-init-loadpath: func();
+    rb-eval-string-protect: func(str: string) -> tuple<rb-abi-value, s32>;
+    rb-funcallv-protect: func(recv: borrow<rb-abi-value>, mid: rb-id, args: list<borrow<rb-abi-value>>) -> tuple<rb-abi-value, s32>;
+    rb-intern: func(name: string) -> rb-id;
+    rb-errinfo: func() -> rb-abi-value;
+    rb-clear-errinfo: func();
+
+    rstring-ptr: func(value: borrow<rb-abi-value>) -> string;
+
+    rb-vm-bugreport: func();
+
+    rb-gc-enable: func() -> bool;
+    rb-gc-disable: func() -> bool;
+
+    rb-set-should-prohibit-rewind: func(new-value: bool) -> bool;
+    // XXX: Do we really need them?
+    // wrap-js-value: func(value: js-abi-value) -> rb-abi-value;
+    // to-js-value: func(value: borrow<rb-abi-value>) -> js-abi-value;
+
+    // Transfer the value from Ruby to JS
+    //
+    // 1. Ruby side registers the value in the stage
+    // 2. Ruby side calls JS's `import-rb-value-from-rb()`
+    // 3. `import-rb-value-from-rb()` calls `export-rb-value-to-js()`
+    // 4. `export-rb-value-to-js()` returns the staged value
+    export-rb-value-to-js: func() -> rb-abi-value;
+}

data/wit/world.wit

@@ -0,0 +1,6 @@
+package ruby:js;
+
+world ext {
+  import js-runtime;
+  export ruby-runtime;
+}

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: js
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Yuta Saito
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-05-05 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.
@@ -17,23 +16,23 @@ email:
 executables: []
 extensions:
 - ext/js/extconf.rb
-- ext/witapi/extconf.rb
 extra_rdoc_files: []
 files:
 - ext/js/bindgen/.clang-format
-- ext/js/bindgen/rb-js-abi-host.c
-- ext/js/bindgen/rb-js-abi-host.h
-- ext/js/bindgen/rb-js-abi-host.wit
+- ext/js/bindgen/ext.c
+- ext/js/bindgen/ext.h
+- ext/js/bindgen/ext_component_type.o
+- ext/js/bindgen/legacy/rb-abi-guest.c
+- ext/js/bindgen/legacy/rb-abi-guest.h
+- ext/js/bindgen/legacy/rb-abi-guest.wit
+- ext/js/bindgen/legacy/rb-js-abi-host.c
+- ext/js/bindgen/legacy/rb-js-abi-host.h
+- ext/js/bindgen/legacy/rb-js-abi-host.wit
 - ext/js/depend
 - ext/js/extconf.rb
 - ext/js/js-core.c
-- ext/witapi/bindgen/.clang-format
-- ext/witapi/bindgen/rb-abi-guest.c
-- ext/witapi/bindgen/rb-abi-guest.h
-- ext/witapi/bindgen/rb-abi-guest.wit
-- ext/witapi/depend
-- ext/witapi/extconf.rb
-- ext/witapi/witapi-core.c
+- ext/js/types.h
+- ext/js/witapi-core.c
 - js.gemspec
 - lib/js.rb
 - lib/js/array.rb
@@ -43,12 +42,14 @@ files:
 - lib/js/require_remote/evaluator.rb
 - lib/js/require_remote/url_resolver.rb
 - lib/js/version.rb
+- wit/js-runtime.wit
+- wit/ruby-runtime.wit
+- wit/world.wit
 homepage: https://github.com/ruby/ruby.wasm
 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
@@ -63,8 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: JavaScript bindings for ruby.wasm
 test_files: []

data/ext/witapi/bindgen/.clang-format

@@ -1,2 +0,0 @@
-DisableFormat: true
-SortIncludes: false

data/ext/witapi/depend

@@ -1,11 +0,0 @@
-link.filelist:
-	echo $(foreach obj,$(OBJS),$(abspath $(obj))) > $@
-	echo -mexec-model=reactor >> $@
-
-witapi.a: link.filelist
-
-witapi-core.o: $(srcdir)/bindgen/rb-abi-guest.h
-
-bindgen/%.o: $(srcdir)/bindgen/%.c
-	@mkdir -p "$(@D)"
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$< -I$(srcdir)/bindgen

data/ext/witapi/extconf.rb

@@ -1,3 +0,0 @@
-require "mkmf"
-$objs = %w[witapi-core.o bindgen/rb-abi-guest.o]
-create_makefile("witapi")