fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-21 16:51:33 +00:00
Code Issues Projects Releases Wiki Activity

fix: simplify signatures to avoid Result usage

Browse Source
This commit is contained in:
Jannik Keye
2018-07-04 16:10:17 +02:00
parent 40b7b069bc
commit 7790b34c07
2 changed files with 49 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/js.rs
View File

@ -986,18 +986,18 @@ extern "C" {
/// The static Reflect.apply() method calls a target function with arguments as specified. /// The static Reflect.apply() method calls a target function with arguments as specified.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/apply /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/apply
#[wasm_bindgen(static_method_of = Reflect, catch)] #[wasm_bindgen(static_method_of = Reflect)]
pub fn apply(target: &Function, this_argument: &JsValue, arguments_list: &Array) -> Result<JsValue, JsValue>; pub fn apply(target: &Function, this_argument: &JsValue, arguments_list: &Array) -> JsValue;
/// The static Reflect.construct() method acts like the new operator, but as a function. /// The static Reflect.construct() method acts like the new operator, but as a function.
/// It is equivalent to calling new target(...args). It gives also the added option to /// It is equivalent to calling new target(...args). It gives also the added option to
/// specify a different prototype. /// specify a different prototype.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/construct /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/construct
#[wasm_bindgen(static_method_of = Reflect, catch)] #[wasm_bindgen(static_method_of = Reflect)]
pub fn construct(target: &Function, arguments_list: &Array) -> Result<JsValue, JsValue>; pub fn construct(target: &Function, arguments_list: &Array) -> JsValue;
#[wasm_bindgen(static_method_of = Reflect, js_name = construct, catch)] #[wasm_bindgen(static_method_of = Reflect, js_name = construct)]
pub fn construct_with_new_target(target: &Function, arguments_list: &Array, new_target: &Function) -> Result<JsValue, JsValue>; pub fn construct_with_new_target(target: &Function, arguments_list: &Array, new_target: &Function) -> JsValue;
/// The static Reflect.defineProperty() method is like Object.defineProperty() /// The static Reflect.defineProperty() method is like Object.defineProperty()
/// but returns a Boolean. /// but returns a Boolean.
@ -1010,23 +1010,23 @@ extern "C" {
/// It is like the delete operator as a function. /// It is like the delete operator as a function.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/deleteProperty /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/deleteProperty
#[wasm_bindgen(static_method_of = Reflect, js_name = deleteProperty, catch)] #[wasm_bindgen(static_method_of = Reflect, js_name = deleteProperty)]
pub fn delete_property(target: &JsValue, key: &JsValue) -> Result<JsValue, JsValue>; pub fn delete_property(target: &Object, key: &JsValue) -> bool;
/// The static Reflect.get() method works like getting a property from /// The static Reflect.get() method works like getting a property from
/// an object (target[propertyKey]) as a function. /// an object (target[propertyKey]) as a function.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/get /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/get
#[wasm_bindgen(static_method_of = Reflect, catch)] #[wasm_bindgen(static_method_of = Reflect)]
pub fn get(target: &JsValue, key: &JsValue) -> Result<JsValue, JsValue>; pub fn get(target: &Object, key: &JsValue) -> JsValue;
/// The static Reflect.getOwnPropertyDescriptor() method is similar to /// The static Reflect.getOwnPropertyDescriptor() method is similar to
/// Object.getOwnPropertyDescriptor(). It returns a property descriptor /// Object.getOwnPropertyDescriptor(). It returns a property descriptor
/// of the given property if it exists on the object, undefined otherwise. /// of the given property if it exists on the object, undefined otherwise.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/getOwnPropertyDescriptor /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/getOwnPropertyDescriptor
#[wasm_bindgen(static_method_of = Reflect, js_name = getOwnPropertyDescriptor, catch)] #[wasm_bindgen(static_method_of = Reflect, js_name = getOwnPropertyDescriptor)]
pub fn get_own_property_descriptor(target: &JsValue, property_key: &JsValue) -> Result<JsValue, JsValue>; pub fn get_own_property_descriptor(target: &Object, property_key: &JsValue) -> JsValue;
/// The static Reflect.getPrototypeOf() method is almost the same /// The static Reflect.getPrototypeOf() method is almost the same
/// method as Object.getPrototypeOf(). It returns the prototype /// method as Object.getPrototypeOf(). It returns the prototype
@ -1034,8 +1034,8 @@ extern "C" {
/// the specified object. /// the specified object.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/getPrototypeOf /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/getPrototypeOf
#[wasm_bindgen(static_method_of = Reflect, js_name = getPrototypeOf, catch)] #[wasm_bindgen(static_method_of = Reflect, js_name = getPrototypeOf)]
pub fn get_prototype_of(target: &JsValue) -> Result<JsValue, JsValue>; pub fn get_prototype_of(target: &Object) -> Object;
/// The static Reflect.has() method works like the in operator as a function. /// The static Reflect.has() method works like the in operator as a function.
/// ///
@ -1048,15 +1048,15 @@ extern "C" {
/// Object.isExtensible(), but with some differences. /// Object.isExtensible(), but with some differences.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/isExtensible /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/isExtensible
#[wasm_bindgen(static_method_of = Reflect, js_name = isExtensible, catch)] #[wasm_bindgen(static_method_of = Reflect, js_name = isExtensible)]
pub fn is_extensible(target: &Object) -> Result<JsValue, JsValue>; pub fn is_extensible(target: &Object) -> bool;
/// The static Reflect.ownKeys() method returns an array of the /// The static Reflect.ownKeys() method returns an array of the
/// target object's own property keys. /// target object's own property keys.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/ownKeys /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/ownKeys
#[wasm_bindgen(static_method_of = Reflect, js_name = ownKeys, catch)] #[wasm_bindgen(static_method_of = Reflect, js_name = ownKeys)]
pub fn own_keys(target: &Object) -> Result<JsValue, JsValue>; pub fn own_keys(target: &Object) -> Array;
/// The static Reflect.preventExtensions() method prevents new /// The static Reflect.preventExtensions() method prevents new
/// properties from ever being added to an object (i.e. prevents /// properties from ever being added to an object (i.e. prevents
@ -1064,17 +1064,17 @@ extern "C" {
/// Object.preventExtensions(), but with some differences. /// Object.preventExtensions(), but with some differences.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/preventExtensions /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/preventExtensions
#[wasm_bindgen(static_method_of = Reflect, js_name = preventExtensions, catch)] #[wasm_bindgen(static_method_of = Reflect, js_name = preventExtensions)]
pub fn prevent_extensions(target: &Object) -> Result<JsValue, JsValue>; pub fn prevent_extensions(target: &Object) -> bool;
/// The static Reflect.set() method works like setting a /// The static Reflect.set() method works like setting a
/// property on an object. /// property on an object.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/set /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/set
#[wasm_bindgen(static_method_of = Reflect, catch)] #[wasm_bindgen(static_method_of = Reflect)]
pub fn set(target: &JsValue, property_key: &JsValue, value: &JsValue) -> Result<JsValue, JsValue>; pub fn set(target: &Object, property_key: &JsValue, value: &JsValue) -> bool;
#[wasm_bindgen(static_method_of = Reflect, js_name = set, catch)] #[wasm_bindgen(static_method_of = Reflect, js_name = set)]
pub fn set_with_receiver(target: &JsValue, property_key: &JsValue, value: &JsValue, receiver: &JsValue) -> Result<JsValue, JsValue>; pub fn set_with_receiver(target: &Object, property_key: &JsValue, value: &JsValue, receiver: &Object) -> bool;
/// The static Reflect.setPrototypeOf() method is the same /// The static Reflect.setPrototypeOf() method is the same
/// method as Object.setPrototypeOf(). It sets the prototype /// method as Object.setPrototypeOf(). It sets the prototype
@ -1082,8 +1082,8 @@ extern "C" {
/// object to another object or to null. /// object to another object or to null.
/// ///
/// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/setPrototypeOf /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Reflect/setPrototypeOf
#[wasm_bindgen(static_method_of = Reflect, js_name = setPrototypeOf, catch)] #[wasm_bindgen(static_method_of = Reflect, js_name = setPrototypeOf)]
pub fn set_prototype_of(target: &JsValue, prototype: &JsValue) -> Result<JsValue, JsValue>; pub fn set_prototype_of(target: &Object, prototype: &JsValue) -> bool;
} }
// Set // Set

125
tests/all/js_globals/Reflect.rs
View File

@ -16,12 +16,7 @@ fn apply() {
#[wasm_bindgen] #[wasm_bindgen]
pub fn apply(target: &js::Function, this_argument: &JsValue, arguments_list: &js::Array) -> JsValue { pub fn apply(target: &js::Function, this_argument: &JsValue, arguments_list: &js::Array) -> JsValue {
let result = js::Reflect::apply(target, this_argument, arguments_list); js::Reflect::apply(target, this_argument, arguments_list)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -33,7 +28,6 @@ fn apply() {
export function test() { export function test() {
assert.equal(wasm.apply("".charAt, "ponies", [3]), "i"); assert.equal(wasm.apply("".charAt, "ponies", [3]), "i");
assert.equal(wasm.apply("", "ponies", [3]), "TypeError: Function.prototype.apply was called on , which is a string and not a function");
} }
"#, "#,
) )
@ -54,12 +48,7 @@ fn construct() {
#[wasm_bindgen] #[wasm_bindgen]
pub fn construct(target: &js::Function, arguments_list: &js::Array) -> JsValue { pub fn construct(target: &js::Function, arguments_list: &js::Array) -> JsValue {
let result = js::Reflect::construct(target, arguments_list); js::Reflect::construct(target, arguments_list)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -88,7 +77,6 @@ fn construct() {
const args = [10, 10]; const args = [10, 10];
assert.equal(wasm.construct(Rectangle, args).x, 10); assert.equal(wasm.construct(Rectangle, args).x, 10);
assert.equal(wasm.construct("", args), "TypeError: is not a constructor");
} }
"#, "#,
) )
@ -109,12 +97,7 @@ fn construct_with_new_target() {
#[wasm_bindgen] #[wasm_bindgen]
pub fn construct_with_new_target(target: &js::Function, arguments_list: &js::Array, new_target: &js::Function) -> JsValue { pub fn construct_with_new_target(target: &js::Function, arguments_list: &js::Array, new_target: &js::Function) -> JsValue {
let result = js::Reflect::construct_with_new_target(target, arguments_list, new_target); js::Reflect::construct_with_new_target(target, arguments_list, new_target)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -158,7 +141,6 @@ fn construct_with_new_target() {
const args = [10, 10]; const args = [10, 10];
assert.equal(wasm.construct_with_new_target(Rectangle, args, Rectangle2).x, 10); assert.equal(wasm.construct_with_new_target(Rectangle, args, Rectangle2).x, 10);
assert.equal(wasm.construct_with_new_target(Rectangle, args, ""), "TypeError: is not a constructor");
} }
"#, "#,
) )
@ -218,13 +200,8 @@ fn delete_property() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn delete_property(target: &JsValue, property_key: &JsValue) -> JsValue { pub fn delete_property(target: &js::Object, property_key: &JsValue) -> bool {
let result = js::Reflect::delete_property(target, property_key); js::Reflect::delete_property(target, property_key)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -247,8 +224,6 @@ fn delete_property() {
wasm.delete_property(array, 3); wasm.delete_property(array, 3);
assert.equal(array[3], undefined); assert.equal(array[3], undefined);
assert.equal(wasm.delete_property("", 3), "TypeError: Reflect.deleteProperty called on non-object");
} }
"#, "#,
) )
@ -268,13 +243,8 @@ fn get() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn get(target: &JsValue, property_key: &JsValue) -> JsValue { pub fn get(target: &js::Object, property_key: &JsValue) -> JsValue {
let result = js::Reflect::get(target, property_key); js::Reflect::get(target, property_key)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -294,8 +264,6 @@ fn get() {
const array = [1, 2, 3, 4, 5]; const array = [1, 2, 3, 4, 5];
assert.equal(wasm.get(array, 3), 4); assert.equal(wasm.get(array, 3), 4);
assert.equal(wasm.get("", 3), "TypeError: Reflect.get called on non-object");
} }
"#, "#,
) )
@ -315,13 +283,8 @@ fn get_own_property_descriptor() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn get_own_property_descriptor(target: &JsValue, property_key: &JsValue) -> JsValue { pub fn get_own_property_descriptor(target: &js::Object, property_key: &JsValue) -> JsValue {
let result = js::Reflect::get_own_property_descriptor(target, property_key); js::Reflect::get_own_property_descriptor(target, property_key)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -338,7 +301,6 @@ fn get_own_property_descriptor() {
assert.equal(wasm.get_own_property_descriptor(object, "property").value, 42); assert.equal(wasm.get_own_property_descriptor(object, "property").value, 42);
assert.equal(wasm.get_own_property_descriptor(object, "property1"), undefined); assert.equal(wasm.get_own_property_descriptor(object, "property1"), undefined);
assert.equal(wasm.get_own_property_descriptor("", "property1"), "TypeError: Reflect.getOwnPropertyDescriptor called on non-object");
} }
"#, "#,
) )
@ -358,13 +320,8 @@ fn get_prototype_of() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn get_prototype_of(target: &JsValue) -> JsValue { pub fn get_prototype_of(target: &js::Object) -> js::Object {
let result = js::Reflect::get_prototype_of(target); js::Reflect::get_prototype_of(target)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -382,7 +339,6 @@ fn get_prototype_of() {
assert.equal(wasm.get_prototype_of(object), Object.prototype); assert.equal(wasm.get_prototype_of(object), Object.prototype);
assert.equal(wasm.get_prototype_of(array), Array.prototype); assert.equal(wasm.get_prototype_of(array), Array.prototype);
assert.equal(wasm.get_prototype_of(""), "TypeError: Reflect.getPrototypeOf called on non-object");
} }
"#, "#,
) )
@ -442,13 +398,8 @@ fn is_extensible() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn is_extensible(target: &js::Object) -> JsValue { pub fn is_extensible(target: &js::Object) -> bool {
let result = js::Reflect::is_extensible(target); js::Reflect::is_extensible(target)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -472,7 +423,6 @@ fn is_extensible() {
const object2 = Object.seal({}); const object2 = Object.seal({});
assert.equal(wasm.is_extensible(object2), false); assert.equal(wasm.is_extensible(object2), false);
assert.equal(wasm.is_extensible(""), "TypeError: Reflect.isExtensible called on non-object");
} }
"#, "#,
) )
@ -492,13 +442,8 @@ fn own_keys() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn own_keys(target: &js::Object) -> JsValue { pub fn own_keys(target: &js::Object) -> js::Array {
let result = js::Reflect::own_keys(target); js::Reflect::own_keys(target)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -516,8 +461,6 @@ fn own_keys() {
assert.equal(wasm.own_keys(object)[0], "property"); assert.equal(wasm.own_keys(object)[0], "property");
assert.equal(wasm.own_keys(array)[0], "length"); assert.equal(wasm.own_keys(array)[0], "length");
assert.equal(wasm.own_keys(""), "TypeError: Reflect.ownKeys called on non-object");
} }
"#, "#,
) )
@ -537,12 +480,8 @@ fn prevent_extensions() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn prevent_extensions(target: &js::Object) -> JsValue { pub fn prevent_extensions(target: &js::Object) -> bool {
let result = js::Reflect::prevent_extensions(target); js::Reflect::prevent_extensions(target)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -558,7 +497,6 @@ fn prevent_extensions() {
wasm.prevent_extensions(object1); wasm.prevent_extensions(object1);
assert.equal(Reflect.isExtensible(object1), false); assert.equal(Reflect.isExtensible(object1), false);
assert.equal(wasm.prevent_extensions(""), "TypeError: Reflect.preventExtensions called on non-object");
} }
"#, "#,
) )
@ -578,12 +516,8 @@ fn set() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn set(target: &JsValue, property_key: &JsValue, value: &JsValue) -> JsValue { pub fn set(target: &js::Object, property_key: &JsValue, value: &JsValue) -> bool {
let result = js::Reflect::set(target, property_key, value); js::Reflect::set(target, property_key, value)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -601,7 +535,6 @@ fn set() {
assert.equal(Reflect.get(object, "key"), "value"); assert.equal(Reflect.get(object, "key"), "value");
assert.equal(array[0], 100); assert.equal(array[0], 100);
assert.equal(wasm.set("", "key", "value"), "TypeError: Reflect.set called on non-object");
} }
"#, "#,
) )
@ -621,12 +554,8 @@ fn set_with_receiver() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn set_with_receiver(target: &JsValue, property_key: &JsValue, value: &JsValue, receiver: &JsValue) -> JsValue { pub fn set_with_receiver(target: &js::Object, property_key: &JsValue, value: &JsValue, receiver: &js::Object) -> bool {
let result = js::Reflect::set_with_receiver(target, property_key, value, receiver); js::Reflect::set_with_receiver(target, property_key, value, receiver)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -644,7 +573,6 @@ fn set_with_receiver() {
assert.equal(Reflect.get(object, "key"), "value"); assert.equal(Reflect.get(object, "key"), "value");
assert.equal(array[0], 100); assert.equal(array[0], 100);
assert.equal(wasm.set_with_receiver("", "key", "value", ""), "TypeError: Reflect.set called on non-object");
} }
"#, "#,
) )
@ -664,13 +592,8 @@ fn set_prototype_of() {
use wasm_bindgen::js; use wasm_bindgen::js;
#[wasm_bindgen] #[wasm_bindgen]
pub fn set_prototype_of(target: &JsValue, prototype: &JsValue) -> JsValue { pub fn set_prototype_of(target: &js::Object, prototype: &JsValue) -> bool {
let result = js::Reflect::set_prototype_of(target, prototype); js::Reflect::set_prototype_of(target, prototype)
match result {
Ok(val) => val,
Err(_err) => _err
}
} }
"#, "#,
) )
@ -686,8 +609,6 @@ fn set_prototype_of() {
assert.equal(Object.getPrototypeOf(object), Object.prototype); assert.equal(Object.getPrototypeOf(object), Object.prototype);
assert.equal(wasm.set_prototype_of(object, null), true); assert.equal(wasm.set_prototype_of(object, null), true);
assert.equal(Object.getPrototypeOf(object), null); assert.equal(Object.getPrototypeOf(object), null);
assert.equal(wasm.set_prototype_of("", Object.prototype), "TypeError: Reflect.setPrototypeOf called on non-object");
} }
"#, "#,
) )