Catch exceptions in getter/setter

Author: kateinoigakukun

ext/js/bindgen/rb-js-abi-host.c

@@ -244,11 +244,27 @@ bool rb_js_abi_host_reflect_delete_property(rb_js_abi_host_js_abi_value_t target
   int32_t ret = __wasm_import_rb_js_abi_host_reflect_delete_property((target).idx, (int32_t) (*property_key).ptr, (int32_t) (*property_key).len);
   return ret;
 }
-__attribute__((import_module("rb-js-abi-host"), import_name("reflect-get: func(target: handle<js-abi-value>, property-key: string) -> handle<js-abi-value>")))
-int32_t __wasm_import_rb_js_abi_host_reflect_get(int32_t, int32_t, int32_t);
-rb_js_abi_host_js_abi_value_t rb_js_abi_host_reflect_get(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key) {
-  int32_t ret = __wasm_import_rb_js_abi_host_reflect_get((target).idx, (int32_t) (*property_key).ptr, (int32_t) (*property_key).len);
-  return (rb_js_abi_host_js_abi_value_t){ ret };
+__attribute__((import_module("rb-js-abi-host"), import_name("reflect-get: func(target: handle<js-abi-value>, property-key: string) -> variant { success(handle<js-abi-value>), failure(handle<js-abi-value>) }")))
+void __wasm_import_rb_js_abi_host_reflect_get(int32_t, int32_t, int32_t, int32_t);
+void rb_js_abi_host_reflect_get(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key, rb_js_abi_host_js_abi_result_t *ret0) {
+  
+  __attribute__((aligned(4)))
+  uint8_t ret_area[8];
+  int32_t ptr = (int32_t) &ret_area;
+  __wasm_import_rb_js_abi_host_reflect_get((target).idx, (int32_t) (*property_key).ptr, (int32_t) (*property_key).len, ptr);
+  rb_js_abi_host_js_abi_result_t variant;
+  variant.tag = (int32_t) (*((uint8_t*) (ptr + 0)));
+  switch ((int32_t) variant.tag) {
+    case 0: {
+      variant.val.success = (rb_js_abi_host_js_abi_value_t){ *((int32_t*) (ptr + 4)) };
+      break;
+    }
+    case 1: {
+      variant.val.failure = (rb_js_abi_host_js_abi_value_t){ *((int32_t*) (ptr + 4)) };
+      break;
+    }
+  }
+  *ret0 = variant;
 }
 __attribute__((import_module("rb-js-abi-host"), import_name("reflect-get-own-property-descriptor: func(target: handle<js-abi-value>, property-key: string) -> handle<js-abi-value>")))
 int32_t __wasm_import_rb_js_abi_host_reflect_get_own_property_descriptor(int32_t, int32_t, int32_t);
@@ -290,11 +306,27 @@ bool rb_js_abi_host_reflect_prevent_extensions(rb_js_abi_host_js_abi_value_t tar
   int32_t ret = __wasm_import_rb_js_abi_host_reflect_prevent_extensions((target).idx);
   return ret;
 }
-__attribute__((import_module("rb-js-abi-host"), import_name("reflect-set: func(target: handle<js-abi-value>, property-key: string, value: handle<js-abi-value>) -> bool")))
-int32_t __wasm_import_rb_js_abi_host_reflect_set(int32_t, int32_t, int32_t, int32_t);
-bool rb_js_abi_host_reflect_set(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key, rb_js_abi_host_js_abi_value_t value) {
-  int32_t ret = __wasm_import_rb_js_abi_host_reflect_set((target).idx, (int32_t) (*property_key).ptr, (int32_t) (*property_key).len, (value).idx);
-  return ret;
+__attribute__((import_module("rb-js-abi-host"), import_name("reflect-set: func(target: handle<js-abi-value>, property-key: string, value: handle<js-abi-value>) -> variant { success(handle<js-abi-value>), failure(handle<js-abi-value>) }")))
+void __wasm_import_rb_js_abi_host_reflect_set(int32_t, int32_t, int32_t, int32_t, int32_t);
+void rb_js_abi_host_reflect_set(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key, rb_js_abi_host_js_abi_value_t value, rb_js_abi_host_js_abi_result_t *ret0) {
+  
+  __attribute__((aligned(4)))
+  uint8_t ret_area[8];
+  int32_t ptr = (int32_t) &ret_area;
+  __wasm_import_rb_js_abi_host_reflect_set((target).idx, (int32_t) (*property_key).ptr, (int32_t) (*property_key).len, (value).idx, ptr);
+  rb_js_abi_host_js_abi_result_t variant;
+  variant.tag = (int32_t) (*((uint8_t*) (ptr + 0)));
+  switch ((int32_t) variant.tag) {
+    case 0: {
+      variant.val.success = (rb_js_abi_host_js_abi_value_t){ *((int32_t*) (ptr + 4)) };
+      break;
+    }
+    case 1: {
+      variant.val.failure = (rb_js_abi_host_js_abi_value_t){ *((int32_t*) (ptr + 4)) };
+      break;
+    }
+  }
+  *ret0 = variant;
 }
 __attribute__((import_module("rb-js-abi-host"), import_name("reflect-set-prototype-of: func(target: handle<js-abi-value>, prototype: handle<js-abi-value>) -> bool")))
 int32_t __wasm_import_rb_js_abi_host_reflect_set_prototype_of(int32_t, int32_t);

ext/js/bindgen/rb-js-abi-host.h

@@ -66,14 +66,14 @@ extern "C"
   void rb_js_abi_host_reflect_apply(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_js_abi_value_t this_argument, rb_js_abi_host_list_js_abi_value_t *arguments, rb_js_abi_host_js_abi_result_t *ret0);
   rb_js_abi_host_js_abi_value_t rb_js_abi_host_reflect_construct(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_list_js_abi_value_t *arguments);
   bool rb_js_abi_host_reflect_delete_property(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key);
-  rb_js_abi_host_js_abi_value_t rb_js_abi_host_reflect_get(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key);
+  void rb_js_abi_host_reflect_get(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key, rb_js_abi_host_js_abi_result_t *ret0);
   rb_js_abi_host_js_abi_value_t rb_js_abi_host_reflect_get_own_property_descriptor(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key);
   rb_js_abi_host_js_abi_value_t rb_js_abi_host_reflect_get_prototype_of(rb_js_abi_host_js_abi_value_t target);
   bool rb_js_abi_host_reflect_has(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key);
   bool rb_js_abi_host_reflect_is_extensible(rb_js_abi_host_js_abi_value_t target);
   void rb_js_abi_host_reflect_own_keys(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_list_js_abi_value_t *ret0);
   bool rb_js_abi_host_reflect_prevent_extensions(rb_js_abi_host_js_abi_value_t target);
-  bool rb_js_abi_host_reflect_set(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key, rb_js_abi_host_js_abi_value_t value);
+  void rb_js_abi_host_reflect_set(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_string_t *property_key, rb_js_abi_host_js_abi_value_t value, rb_js_abi_host_js_abi_result_t *ret0);
   bool rb_js_abi_host_reflect_set_prototype_of(rb_js_abi_host_js_abi_value_t target, rb_js_abi_host_js_abi_value_t prototype);
   #ifdef __cplusplus
 }

ext/js/bindgen/rb-js-abi-host.wit

@@ -35,12 +35,12 @@ js-value-strictly-equal: func(lhs: js-abi-value, rhs: js-abi-value) -> bool
 reflect-apply: func(target: js-abi-value, this-argument: js-abi-value, arguments: list<js-abi-value>) -> js-abi-result
 reflect-construct: func(target: js-abi-value, arguments: list<js-abi-value>) -> js-abi-value
 reflect-delete-property: func(target: js-abi-value, property-key: string) -> bool
-reflect-get: func(target: js-abi-value, property-key: string) -> js-abi-value
+reflect-get: func(target: js-abi-value, property-key: string) -> js-abi-result
 reflect-get-own-property-descriptor: func(target: js-abi-value, property-key: string) -> js-abi-value
 reflect-get-prototype-of: func(target: js-abi-value) -> js-abi-value
 reflect-has: func(target: js-abi-value, property-key: string) -> bool
 reflect-is-extensible: func(target: js-abi-value) -> bool
 reflect-own-keys: func(target: js-abi-value) -> list<js-abi-value>
 reflect-prevent-extensions: func(target: js-abi-value) -> bool
-reflect-set: func(target: js-abi-value, property-key: string, value: js-abi-value) -> bool
+reflect-set: func(target: js-abi-value, property-key: string, value: js-abi-value) -> js-abi-result
 reflect-set-prototype-of: func(target: js-abi-value, prototype: js-abi-value) -> bool

ext/js/js-core.c

@@ -180,7 +180,10 @@ static VALUE _rb_js_obj_aref(VALUE obj, VALUE key) {
   rb_js_abi_host_string_t key_abi_str;
   key = rb_obj_as_string(key);
   rstring_to_abi_string(key, &key_abi_str);
-  return jsvalue_s_new(rb_js_abi_host_reflect_get(p->abi, &key_abi_str));
+  rb_js_abi_host_js_abi_result_t ret;
+  rb_js_abi_host_reflect_get(p->abi, &key_abi_str, &ret);
+  raise_js_error_if_failure(&ret);
+  return jsvalue_s_new(ret.val.success);
 }
 
 /*
@@ -199,7 +202,10 @@ static VALUE _rb_js_obj_aset(VALUE obj, VALUE key, VALUE val) {
   rb_js_abi_host_string_t key_abi_str;
   key = rb_obj_as_string(key);
   rstring_to_abi_string(key, &key_abi_str);
-  rb_js_abi_host_reflect_set(p->abi, &key_abi_str, v->abi);
+  rb_js_abi_host_js_abi_result_t ret;
+  rb_js_abi_host_reflect_set(p->abi, &key_abi_str, v->abi, &ret);
+  raise_js_error_if_failure(&ret);
+  rb_js_abi_host_js_abi_value_free(&ret.val.success);
   RB_GC_GUARD(rv);
   return val;
 }

packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.d.ts

@@ -37,14 +37,14 @@ export interface RbJsAbiHost {
   reflectApply(target: JsAbiValue, thisArgument: JsAbiValue, arguments: JsAbiValue[]): JsAbiResult;
   reflectConstruct(target: JsAbiValue, arguments: JsAbiValue[]): JsAbiValue;
   reflectDeleteProperty(target: JsAbiValue, propertyKey: string): boolean;
-  reflectGet(target: JsAbiValue, propertyKey: string): JsAbiValue;
+  reflectGet(target: JsAbiValue, propertyKey: string): JsAbiResult;
   reflectGetOwnPropertyDescriptor(target: JsAbiValue, propertyKey: string): JsAbiValue;
   reflectGetPrototypeOf(target: JsAbiValue): JsAbiValue;
   reflectHas(target: JsAbiValue, propertyKey: string): boolean;
   reflectIsExtensible(target: JsAbiValue): boolean;
   reflectOwnKeys(target: JsAbiValue): JsAbiValue[];
   reflectPreventExtensions(target: JsAbiValue): boolean;
-  reflectSet(target: JsAbiValue, propertyKey: string, value: JsAbiValue): boolean;
+  reflectSet(target: JsAbiValue, propertyKey: string, value: JsAbiValue): JsAbiResult;
   reflectSetPrototypeOf(target: JsAbiValue, prototype: JsAbiValue): boolean;
   dropJsAbiValue?: (val: JsAbiValue) => void;
 }

packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-js-abi-host.js

@@ -168,13 +168,29 @@ export function addRbJsAbiHostToImports(imports, obj, get_export) {
     const ret0 = obj.reflectDeleteProperty(resources0.get(arg0), result0);
     return ret0 ? 1 : 0;
   };
-  imports["rb-js-abi-host"]["reflect-get: func(target: handle<js-abi-value>, property-key: string) -> handle<js-abi-value>"] = function(arg0, arg1, arg2) {
+  imports["rb-js-abi-host"]["reflect-get: func(target: handle<js-abi-value>, property-key: string) -> variant { success(handle<js-abi-value>), failure(handle<js-abi-value>) }"] = function(arg0, arg1, arg2, arg3) {
     const memory = get_export("memory");
     const ptr0 = arg1;
     const len0 = arg2;
     const result0 = UTF8_DECODER.decode(new Uint8Array(memory.buffer, ptr0, len0));
     const ret0 = obj.reflectGet(resources0.get(arg0), result0);
-    return resources0.insert(ret0);
+    const variant1 = ret0;
+    switch (variant1.tag) {
+      case "success": {
+        const e = variant1.val;
+        data_view(memory).setInt8(arg3 + 0, 0, true);
+        data_view(memory).setInt32(arg3 + 4, resources0.insert(e), true);
+        break;
+      }
+      case "failure": {
+        const e = variant1.val;
+        data_view(memory).setInt8(arg3 + 0, 1, true);
+        data_view(memory).setInt32(arg3 + 4, resources0.insert(e), true);
+        break;
+      }
+      default:
+      throw new RangeError("invalid variant specified for JsAbiResult");
+    }
   };
   imports["rb-js-abi-host"]["reflect-get-own-property-descriptor: func(target: handle<js-abi-value>, property-key: string) -> handle<js-abi-value>"] = function(arg0, arg1, arg2) {
     const memory = get_export("memory");
@@ -219,13 +235,29 @@ export function addRbJsAbiHostToImports(imports, obj, get_export) {
     const ret0 = obj.reflectPreventExtensions(resources0.get(arg0));
     return ret0 ? 1 : 0;
   };
-  imports["rb-js-abi-host"]["reflect-set: func(target: handle<js-abi-value>, property-key: string, value: handle<js-abi-value>) -> bool"] = function(arg0, arg1, arg2, arg3) {
+  imports["rb-js-abi-host"]["reflect-set: func(target: handle<js-abi-value>, property-key: string, value: handle<js-abi-value>) -> variant { success(handle<js-abi-value>), failure(handle<js-abi-value>) }"] = function(arg0, arg1, arg2, arg3, arg4) {
     const memory = get_export("memory");
     const ptr0 = arg1;
     const len0 = arg2;
     const result0 = UTF8_DECODER.decode(new Uint8Array(memory.buffer, ptr0, len0));
     const ret0 = obj.reflectSet(resources0.get(arg0), result0, resources0.get(arg3));
-    return ret0 ? 1 : 0;
+    const variant1 = ret0;
+    switch (variant1.tag) {
+      case "success": {
+        const e = variant1.val;
+        data_view(memory).setInt8(arg4 + 0, 0, true);
+        data_view(memory).setInt32(arg4 + 4, resources0.insert(e), true);
+        break;
+      }
+      case "failure": {
+        const e = variant1.val;
+        data_view(memory).setInt8(arg4 + 0, 1, true);
+        data_view(memory).setInt32(arg4 + 4, resources0.insert(e), true);
+        break;
+      }
+      default:
+      throw new RangeError("invalid variant specified for JsAbiResult");
+    }
   };
   imports["rb-js-abi-host"]["reflect-set-prototype-of: func(target: handle<js-abi-value>, prototype: handle<js-abi-value>) -> bool"] = function(arg0, arg1) {
     const ret0 = obj.reflectSetPrototypeOf(resources0.get(arg0), resources0.get(arg1));

packages/npm-packages/ruby-wasm-wasi/src/index.ts

@@ -162,9 +162,9 @@ export class RubyVM {
         reflectDeleteProperty: function (target, propertyKey): boolean {
           throw new Error("Function not implemented.");
         },
-        reflectGet: function (target, propertyKey) {
+        reflectGet: wrapTry((target, propertyKey) => {
           return target[propertyKey];
-        },
+        }),
         reflectGetOwnPropertyDescriptor: function (
           target,
           propertyKey: string
@@ -186,9 +186,9 @@ export class RubyVM {
         reflectPreventExtensions: function (target): boolean {
           throw new Error("Function not implemented.");
         },
-        reflectSet: function (target, propertyKey, value): boolean {
+        reflectSet: wrapTry((target, propertyKey, value) => {
           return Reflect.set(target, propertyKey, value);
-        },
+        }),
         reflectSetPrototypeOf: function (target, prototype): boolean {
           throw new Error("Function not implemented.");
         },

packages/npm-packages/ruby-wasm-wasi/test/unit/test_object.rb

@@ -202,6 +202,10 @@ def test_member_get
     JS
     assert_equal 42.to_s, object[:foo].to_s
     assert_equal 42.to_s, object["foo"].to_s
+
+    assert_raise(JS::Error) do
+      JS::Undefined[:foo]
+    end
   end
 
   def test_member_set
@@ -212,6 +216,10 @@ def test_member_set
     assert_equal 24.to_s, object[:foo].to_s
     object["foo"] = 42
     assert_equal 42.to_s, object["foo"].to_s
+
+    assert_raise(JS::Error) do
+      JS::Undefined[:foo] = 42
+    end
   end
 
   def test_member_set_with_stress_gc