From fc131ee97e6c778a2568fe89f5eccb579418be4a Mon Sep 17 00:00:00 2001 From: Jannik Keye Date: Thu, 28 Jun 2018 21:59:11 +0200 Subject: [PATCH] feat(Map/MapIterator): add Map.keys --- src/js.rs | 7 +++++++ tests/all/js_globals/MapIterator.rs | 32 +++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/js.rs b/src/js.rs index 21b51203..7336d658 100644 --- a/src/js.rs +++ b/src/js.rs @@ -367,6 +367,13 @@ extern { /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/entries #[wasm_bindgen(method)] pub fn entries(this: &Map) -> MapIterator; + + /// The keys() method returns a new Iterator object that contains the + /// keys for each element in the Map object in insertion order. + /// + /// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/keys + #[wasm_bindgen(method)] + pub fn keys(this: &Map) -> MapIterator; } // Math diff --git a/tests/all/js_globals/MapIterator.rs b/tests/all/js_globals/MapIterator.rs index 54a4f4ab..bb560e42 100644 --- a/tests/all/js_globals/MapIterator.rs +++ b/tests/all/js_globals/MapIterator.rs @@ -33,4 +33,36 @@ fn entries() { } "#) .test() +} + +#[test] +fn keys() { + project() + .file("src/lib.rs", r#" + #![feature(proc_macro, wasm_custom_section)] + + extern crate wasm_bindgen; + use wasm_bindgen::prelude::*; + use wasm_bindgen::js; + + #[wasm_bindgen] + pub fn get_keys(this: &js::Map) -> js::MapIterator { + this.keys() + } + "#) + .file("test.ts", r#" + import * as assert from "assert"; + import * as wasm from "./out"; + + export function test() { + const map = new Map(); + const iterator = map.keys(); + const wasmIterator = wasm.get_keys(map); + map.set('foo', 'bar'); + map.set('bar', 'baz'); + + assert.equal(iterator.toString(), wasmIterator.toString()); + } + "#) + .test() } \ No newline at end of file