Remove raw-rb-abi-value from JS wit interface

kateinoigakukun · kateinoigakukun · commit d2edc9ff8d39 · 2024-04-28T11:47:53.000Z
diff --git a/packages/gems/js/ext/js/bindgen/ext.c b/packages/gems/js/ext/js/bindgen/ext.c
@@ -30,10 +30,10 @@ __attribute__((__import_module__("ruby:js/js-runtime"), __import_name__("bool-to
 extern int32_t __wasm_import_ruby_js_js_runtime_bool_to_js_bool(int32_t);
 
 __attribute__((__import_module__("ruby:js/js-runtime"), __import_name__("proc-to-js-function")))
-extern int32_t __wasm_import_ruby_js_js_runtime_proc_to_js_function(int32_t);
+extern int32_t __wasm_import_ruby_js_js_runtime_proc_to_js_function(void);
 
 __attribute__((__import_module__("ruby:js/js-runtime"), __import_name__("rb-object-to-js-rb-value")))
-extern int32_t __wasm_import_ruby_js_js_runtime_rb_object_to_js_rb_value(int32_t);
+extern int32_t __wasm_import_ruby_js_js_runtime_rb_object_to_js_rb_value(void);
 
 __attribute__((__import_module__("ruby:js/js-runtime"), __import_name__("js-value-to-string")))
 extern void __wasm_import_ruby_js_js_runtime_js_value_to_string(int32_t, uint8_t *);
@@ -92,6 +92,7 @@ void __wasm_export_exports_ruby_js_ruby_runtime_rstring_ptr_post_return(uint8_t
 
 
 
+
 // Canonical ABI intrinsics
 
 __attribute__((__weak__, __export_name__("cabi_realloc")))
@@ -301,13 +302,13 @@ ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_bool_to_js_bool(bool va
   return (ruby_js_js_runtime_own_js_abi_value_t) { ret };
 }
 
-ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_proc_to_js_function(uint32_t value) {
-  int32_t ret = __wasm_import_ruby_js_js_runtime_proc_to_js_function((int32_t) (value));
+ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_proc_to_js_function(void) {
+  int32_t ret = __wasm_import_ruby_js_js_runtime_proc_to_js_function();
   return (ruby_js_js_runtime_own_js_abi_value_t) { ret };
 }
 
-ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_rb_object_to_js_rb_value(uint32_t raw_rb_abi_value) {
-  int32_t ret = __wasm_import_ruby_js_js_runtime_rb_object_to_js_rb_value((int32_t) (raw_rb_abi_value));
+ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_rb_object_to_js_rb_value(void) {
+  int32_t ret = __wasm_import_ruby_js_js_runtime_rb_object_to_js_rb_value();
   return (ruby_js_js_runtime_own_js_abi_value_t) { ret };
 }
 
@@ -537,6 +538,12 @@ int32_t __wasm_export_exports_ruby_js_ruby_runtime_rb_set_should_prohibit_rewind
   return ret;
 }
 
+__attribute__((__export_name__("ruby:js/ruby-runtime#export-rb-value-to-js")))
+int32_t __wasm_export_exports_ruby_js_ruby_runtime_export_rb_value_to_js(void) {
+  exports_ruby_js_ruby_runtime_own_rb_abi_value_t ret = exports_ruby_js_ruby_runtime_export_rb_value_to_js();
+  return (ret).__handle;
+}
+
 // Ensure that the *_component_type.o object is linked in
 
 extern void __component_type_object_force_link_ext(void);
diff --git a/packages/gems/js/ext/js/bindgen/ext.h b/packages/gems/js/ext/js/bindgen/ext.h
@@ -92,8 +92,8 @@ extern ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_int_to_js_number
 extern ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_float_to_js_number(double value);
 extern ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_string_to_js_string(ext_string_t *value);
 extern ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_bool_to_js_bool(bool value);
-extern ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_proc_to_js_function(uint32_t value);
-extern ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_rb_object_to_js_rb_value(uint32_t raw_rb_abi_value);
+extern ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_proc_to_js_function(void);
+extern ruby_js_js_runtime_own_js_abi_value_t ruby_js_js_runtime_rb_object_to_js_rb_value(void);
 extern void ruby_js_js_runtime_js_value_to_string(ruby_js_js_runtime_borrow_js_abi_value_t value, ext_string_t *ret);
 extern void ruby_js_js_runtime_js_value_to_integer(ruby_js_js_runtime_borrow_js_abi_value_t value, ruby_js_js_runtime_raw_integer_t *ret);
 extern void ruby_js_js_runtime_export_js_value_to_host(ruby_js_js_runtime_borrow_js_abi_value_t value);
@@ -123,6 +123,7 @@ void exports_ruby_js_ruby_runtime_rb_vm_bugreport(void);
 bool exports_ruby_js_ruby_runtime_rb_gc_enable(void);
 bool exports_ruby_js_ruby_runtime_rb_gc_disable(void);
 bool exports_ruby_js_ruby_runtime_rb_set_should_prohibit_rewind(bool new_value);
+exports_ruby_js_ruby_runtime_own_rb_abi_value_t exports_ruby_js_ruby_runtime_export_rb_value_to_js(void);
 
 // Helper Functions
 
diff --git a/packages/gems/js/ext/js/bindgen/ext_component_type.o b/packages/gems/js/ext/js/bindgen/ext_component_type.o
diff --git a/packages/gems/js/ext/js/js-core.c b/packages/gems/js/ext/js/js-core.c
@@ -438,9 +438,14 @@ 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
+  rb_abi_stage_rb_value_to_js(obj);
+  return jsvalue_s_new(rb_js_abi_host_rb_object_to_js_rb_value());
+#else
   rb_abi_lend_object(wrapping);
   return jsvalue_s_new(
       rb_js_abi_host_rb_object_to_js_rb_value((uint32_t)wrapping));
+#endif
 }
 
 /*
@@ -506,8 +511,13 @@ 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
+  rb_abi_stage_rb_value_to_js(obj);
+  return jsvalue_s_new(ruby_js_js_runtime_proc_to_js_function());
+#else
   rb_abi_lend_object(obj);
   return jsvalue_s_new(rb_js_abi_host_proc_to_js_function((uint32_t)obj));
+#endif
 }
 
 /*
diff --git a/packages/gems/js/ext/js/types.h b/packages/gems/js/ext/js/types.h
@@ -55,8 +55,6 @@ typedef ext_list_string_t rb_abi_guest_list_string_t;
     ruby_js_js_runtime_string_to_js_string(val)
 #  define rb_js_abi_host_bool_to_js_bool(val)                                  \
     ruby_js_js_runtime_bool_to_js_bool(val)
-#  define rb_js_abi_host_proc_to_js_function(val)                              \
-    ruby_js_js_runtime_proc_to_js_function(val)
 #  define rb_js_abi_host_import_js_value_from_host()                           \
     ruby_js_js_runtime_import_js_value_from_host()
 #  define rb_js_abi_host_js_value_to_string(value, ret)                        \
@@ -88,6 +86,8 @@ typedef ext_list_string_t rb_abi_guest_list_string_t;
 #  define RB_JS_ABI_HOST_JS_ABI_RESULT_FAILURE                                 \
     RUBY_JS_JS_RUNTIME_JS_ABI_RESULT_FAILURE
 
+void rb_abi_stage_rb_value_to_js(VALUE value);
+
 #else
 #  include "bindgen/legacy/rb-abi-guest.h"
 #  include "bindgen/legacy/rb-js-abi-host.h"
diff --git a/packages/gems/js/ext/js/witapi-core.c b/packages/gems/js/ext/js/witapi-core.c
@@ -340,6 +340,20 @@ 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);
@@ -428,7 +442,11 @@ bool exports_ruby_js_ruby_runtime_rb_set_should_prohibit_rewind(
   __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) {}
diff --git a/packages/gems/js/wit/js-runtime.wit b/packages/gems/js/wit/js-runtime.wit
@@ -17,8 +17,8 @@ interface js-runtime {
     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(value: u32) -> js-abi-value;
-    rb-object-to-js-rb-value: func(raw-rb-abi-value: u32) -> 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;
 
diff --git a/packages/gems/js/wit/ruby-runtime.wit b/packages/gems/js/wit/ruby-runtime.wit
@@ -32,4 +32,12 @@ interface ruby-runtime {
     // 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;
 }
diff --git a/packages/npm-packages/ruby-wasm-wasi/src/bindgen/interfaces/ruby-js-js-runtime.d.ts b/packages/npm-packages/ruby-wasm-wasi/src/bindgen/interfaces/ruby-js-js-runtime.d.ts
@@ -7,8 +7,8 @@ export namespace RubyJsJsRuntime {
   export function floatToJsNumber(value: number): JsAbiValue;
   export function stringToJsString(value: string): JsAbiValue;
   export function boolToJsBool(value: boolean): JsAbiValue;
-  export function procToJsFunction(value: number): JsAbiValue;
-  export function rbObjectToJsRbValue(rawRbAbiValue: number): JsAbiValue;
+  export function procToJsFunction(): JsAbiValue;
+  export function rbObjectToJsRbValue(): JsAbiValue;
   export function jsValueToString(value: JsAbiValue): string;
   export function jsValueToInteger(value: JsAbiValue): RawInteger;
   export function exportJsValueToHost(value: JsAbiValue): void;
diff --git a/packages/npm-packages/ruby-wasm-wasi/src/bindgen/interfaces/ruby-js-ruby-runtime.d.ts b/packages/npm-packages/ruby-wasm-wasi/src/bindgen/interfaces/ruby-js-ruby-runtime.d.ts
@@ -15,6 +15,18 @@ export namespace RubyJsRubyRuntime {
   export function rbGcEnable(): boolean;
   export function rbGcDisable(): boolean;
   export function rbSetShouldProhibitRewind(newValue: boolean): boolean;
+  /**
+   * 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 function exportRbValueToJs(): RbAbiValue;
   export { RbIseq };
   export { RbAbiValue };
 }
diff --git a/packages/npm-packages/ruby-wasm-wasi/src/vm.ts b/packages/npm-packages/ruby-wasm-wasi/src/vm.ts
@@ -98,6 +98,16 @@ export class RubyVM {
       throwProhibitRewindException: (message: string) => {
         vm.throwProhibitRewindException(message);
       },
+      procToJsFunction: () => {
+        const rbValue = new RbValue(component.exportRbValueToJs(), vm, vm.privateObject());
+        return new JsAbiValue((...args) => {
+          return rbValue.call("call", ...args.map((arg) => vm.wrap(arg))).toJS();
+        });
+      },
+      rbObjectToJsRbValue: () => {
+        const rbValue = new RbValue(component.exportRbValueToJs(), vm, vm.privateObject());
+        return new JsAbiValue(rbValue);
+      },
       JsAbiValue: JsAbiValue as any,
     });
     binding.setUnderlying(component);
diff --git a/rakelib/check.rake b/rakelib/check.rake
@@ -26,7 +26,7 @@ namespace :check do
          "--export",
          "packages/gems/js/ext/js/bindgen/legacy/rb-js-abi-host.wit",
          "--out-dir",
-         "packages/npm-packages/ruby-wasm-wasi/src/bindgen"
+         "packages/npm-packages/ruby-wasm-wasi/src/bindgen/legacy"
        ]
   end
 
