diff --git a/src/js.rs b/src/js.rs index 33524bd2..e9212e80 100644 --- a/src/js.rs +++ b/src/js.rs @@ -172,6 +172,13 @@ extern "C" { #[wasm_bindgen(method)] pub fn find(this: &Array, predicate: &mut FnMut(JsValue, u32, Array) -> bool) -> JsValue; + /// The findIndex() method returns the index of the first element in the array that + /// satisfies the provided testing function. Otherwise -1 is returned. + /// + /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex + #[wasm_bindgen(method, js_name = findIndex)] + pub fn find_index(this: &Array, predicate: &mut FnMut(JsValue, u32, Array) -> bool, this_arg: &JsValue) -> u32; + /// The includes() method determines whether an array includes a certain /// element, returning true or false as appropriate. /// @@ -294,6 +301,14 @@ extern "C" { #[wasm_bindgen(method)] pub fn sort(this: &Array) -> Array; + /// The toLocaleString() method returns a string representing the elements of the array. + /// The elements are converted to Strings using their toLocaleString methods and these + /// Strings are separated by a locale-specific String (such as a comma “,”). + /// + /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toLocaleString + #[wasm_bindgen(method, js_name = toLocaleString)] + pub fn to_locale_string(this: &Array, locales: &JsValue, options: &JsValue) -> JsString; + /// The toString() method returns a string representing the specified array /// and its elements. /// diff --git a/tests/all/js_globals/Array.rs b/tests/all/js_globals/Array.rs index c9a0d55b..47979d73 100644 --- a/tests/all/js_globals/Array.rs +++ b/tests/all/js_globals/Array.rs @@ -895,4 +895,76 @@ fn reduce_right() { "#, ) .test() +} + +#[test] +fn find_index() { + project() + .file( + "src/lib.rs", + r#" + #![feature(proc_macro, wasm_custom_section)] + + extern crate wasm_bindgen; + use wasm_bindgen::prelude::*; + use wasm_bindgen::js; + use JsValue; + + #[wasm_bindgen] + pub fn array_find_first_even_number_index(array: &js::Array) -> u32 { + array.find_index(&mut |el, _, _| el.as_f64().unwrap() % 2. == 0., &JsValue::undefined()) + } + "#, + ) + .file( + "test.js", + r#" + import * as assert from "assert"; + import * as wasm from "./out"; + + export function test() { + const arrayEven = [2, 4, 6, 8]; + const arrayOdd = [1, 3, 5, 7]; + const arrayMixed = [3, 5, 7, 10]; + + assert.equal(wasm.array_find_first_even_number_index(arrayEven), 0); + assert.equal(wasm.array_find_first_even_number_index(arrayOdd), -1); + assert.equal(wasm.array_find_first_even_number_index(arrayMixed), 3); + } + "#, + ) + .test() +} + +#[test] +fn to_locale_string() { + project() + .file( + "src/lib.rs", + r#" + #![feature(proc_macro, wasm_custom_section)] + + extern crate wasm_bindgen; + use wasm_bindgen::prelude::*; + use wasm_bindgen::js; + use JsValue; + + #[wasm_bindgen] + pub fn array_to_locale_string(array: &js::Array, locale: &JsValue, options: &JsValue) -> js::JsString { + array.to_locale_string(locale, options) + } + "#, + ) + .file( + "test.js", + r#" + import * as assert from "assert"; + import * as wasm from "./out"; + + export function test() { + assert.equal(wasm.array_to_locale_string([1, 'a', new Date('21 Dec 1997 14:12:00 UTC')], 'en', {timeZone: 'UTC'}), '1,a,12/21/1997, 2:12:00 PM'); + } + "#, + ) + .test() } \ No newline at end of file