Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add methods for Typed Array and Array #3888

Merged
merged 5 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions crates/js-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,28 @@ extern "C" {
#[wasm_bindgen(method, js_name = findIndex)]
pub fn find_index(this: &Array, predicate: &mut dyn FnMut(JsValue, u32, Array) -> bool) -> i32;

/// The `findLast()` method of Array instances iterates the array in reverse order
/// and returns the value of the first element that satisfies the provided testing function.
/// If no elements satisfy the testing function, undefined is returned.
///
/// [MDN documentation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findLast)
#[wasm_bindgen(method, js_name = findLast)]
pub fn find_last(
this: &Array,
predicate: &mut dyn FnMut(JsValue, u32, Array) -> bool,
) -> JsValue;

/// The `findLastIndex()` method of Array instances iterates the array in reverse order
/// and returns the index of the first element that satisfies the provided testing function.
/// If no elements satisfy the testing function, -1 is returned.
///
/// [MDN documentation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findLastIndex)
#[wasm_bindgen(method, js_name = findLastIndex)]
pub fn find_last_index(
this: &Array,
predicate: &mut dyn FnMut(JsValue, u32, Array) -> bool,
) -> i32;

/// The `flat()` method creates a new array with all sub-array elements concatenated into it
/// recursively up to the specified depth.
///
Expand Down Expand Up @@ -6174,6 +6196,13 @@ macro_rules! arrays {
#[wasm_bindgen(method)]
pub fn at(this: &$name, idx: i32) -> Option<$ty>;

/// The `copyWithin()` method shallow copies part of a typed array to another
/// location in the same typed array and returns it, without modifying its size.
///
/// [MDN documentation](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray/copyWithin)
#[wasm_bindgen(method, js_name = copyWithin)]
pub fn copy_within(this: &$name, target: i32, start: i32, end: i32) -> $name;

/// Gets the value at `idx`, equivalent to the javascript `my_var = arr[idx]`.
#[wasm_bindgen(method, structural, indexing_getter)]
pub fn get_index(this: &$name, idx: u32) -> $ty;
Expand Down
38 changes: 38 additions & 0 deletions crates/js-sys/tests/wasm/Array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,25 @@ fn find() {
);
}

#[wasm_bindgen_test]
fn find_last() {
let even = js_array![2, 4, 6, 8];
assert_eq!(
even.find_last(&mut |x, _, _| x.as_f64().unwrap() % 2.0 == 0.0),
8
);
let odd = js_array![1, 3, 5, 7];
assert_eq!(
odd.find_last(&mut |x, _, _| x.as_f64().unwrap() % 2.0 == 0.0),
JsValue::undefined(),
);
let mixed = js_array![3, 5, 7, 10];
assert_eq!(
mixed.find_last(&mut |x, _, _| x.as_f64().unwrap() % 2.0 != 0.0),
7
);
}

#[wasm_bindgen_test]
fn map() {
let numbers = js_array![1, 4, 9];
Expand Down Expand Up @@ -511,6 +530,25 @@ fn find_index() {
);
}

#[wasm_bindgen_test]
fn find_last_index() {
let even = js_array![2, 4, 6, 8];
assert_eq!(
even.find_last_index(&mut |e, _, _| e.as_f64().unwrap() % 2. == 0.),
3
);
let odd = js_array![1, 3, 5, 7];
assert_eq!(
odd.find_last_index(&mut |e, _, _| e.as_f64().unwrap() % 2. == 0.),
-1
);
let mixed = js_array![3, 5, 7, 10];
assert_eq!(
mixed.find_last_index(&mut |e, _, _| e.as_f64().unwrap() % 2. != 0.),
2
);
}

#[wasm_bindgen_test]
fn to_locale_string() {
let output = js_array![1, "a", Date::new(&"21 Dec 1997 14:12:00 UTC".into())]
Expand Down
18 changes: 18 additions & 0 deletions crates/js-sys/tests/wasm/TypedArray.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,24 @@ fn new_at() {
each!(test_at);
}

macro_rules! test_copy_within {
($arr:ident) => {{
let x: Vec<_> = vec![8, 5, 4, 3, 1, 2];
let array = $arr::from(x.into_iter().map(|v| v as _).collect::<Vec<_>>().as_slice());
array.copy_within(1, 4, 5);

assert_eq!(array.get_index(1) as f64, 1f64);

// if negatives were used
array.copy_within(-1, -3, -2);
assert_eq!(array.get_index(5) as f64, 3f64);
}};
}
#[wasm_bindgen_test]
fn new_copy_within() {
each!(test_copy_within);
}

macro_rules! test_get_set {
($arr:ident) => {{
let arr = $arr::new(&1.into());
Expand Down