spmjs
diff --git a/‎dist/immutable.d.ts
Copy file name to clipboardExpand all lines: dist/immutable.d.ts
+28-18Lines changed: 28 additions & 18 deletions b/‎dist/immutable.d.ts
Copy file name to clipboardExpand all lines: dist/immutable.d.ts
+28-18Lines changed: 28 additions & 18 deletions
diff --git a/‎dist/immutable.js
Copy file name to clipboardExpand all lines: dist/immutable.js
+28-19Lines changed: 28 additions & 19 deletions b/‎dist/immutable.js
Copy file name to clipboardExpand all lines: dist/immutable.js
+28-19Lines changed: 28 additions & 19 deletions
@@ -463,14 +463,6 @@ declare module 'immutable' {
       context?: any
     ): /*this*/Iterable<K, V>;
 
-    /**
-     * Returns the key for which the `predicate` returns true.
-     */
-    findKey(
-      predicate: (value?: V, key?: K, iter?: /*this*/Iterable<K, V>) => boolean,
-      context?: any
-    ): K;
-
     /**
      * Returns the last value for which the `predicate` returns true.
      *
@@ -482,16 +474,6 @@ declare module 'immutable' {
       notSetValue?: V
     ): V;
 
-    /**
-     * Returns the last key for which the `predicate` returns true.
-     *
-     * Note: `predicate` will be called for each entry in reverse.
-     */
-    findLastKey(
-      predicate: (value?: V, key?: K, iter?: /*this*/Iterable<K, V>) => boolean,
-      context?: any
-    ): K;
-
     /**
      * The first value in the Iterable.
      */
@@ -775,6 +757,34 @@ declare module 'immutable' {
      */
     flip(): /*this*/KeyedIterable<V, K>;
 
+    /**
+     * Returns the key for which the `predicate` returns true.
+     */
+    findKey(
+      predicate: (value?: V, key?: K, iter?: /*this*/KeyedIterable<K, V>) => boolean,
+      context?: any
+    ): K;
+
+    /**
+     * Returns the last key for which the `predicate` returns true.
+     *
+     * Note: `predicate` will be called for each entry in reverse.
+     */
+    findLastKey(
+      predicate: (value?: V, key?: K, iter?: /*this*/KeyedIterable<K, V>) => boolean,
+      context?: any
+    ): K;
+
+    /**
+     * Returns the key associated with the search value, or undefined.
+     */
+    keyOf(searchValue: V): K;
+
+    /**
+     * Returns the last key associated with the search value, or undefined.
+     */
+    lastKeyOf(searchValue: V): K;
+
     /**
      * Returns a new KeyedIterable of the same type with entries
      * ([key, value] tuples) passed through a `mapper` function.
 
@@ -491,22 +491,9 @@ var $Iterable = Iterable;
   filterNot: function(predicate, context) {
     return this.filter(not(predicate), context);
   },
-  findKey: function(predicate, context) {
-    var foundKey;
-    this.__iterate((function(v, k, c) {
-      if (predicate.call(context, v, k, c)) {
-        foundKey = k;
-        return false;
-      }
-    }));
-    return foundKey;
-  },
   findLast: function(predicate, context, notSetValue) {
     return this.toKeyedSeq().reverse().find(predicate, context, notSetValue);
   },
-  findLastKey: function(predicate, context) {
-    return this.toKeyedSeq().reverse().findKey(predicate, context);
-  },
   first: function() {
     return this.find(returnTrue);
   },
@@ -658,6 +645,27 @@ var KeyedIterable = function KeyedIterable(value) {
   flip: function() {
     return reify(this, flipFactory(this));
   },
+  findKey: function(predicate, context) {
+    var foundKey;
+    this.__iterate((function(v, k, c) {
+      if (predicate.call(context, v, k, c)) {
+        foundKey = k;
+        return false;
+      }
+    }));
+    return foundKey;
+  },
+  findLastKey: function(predicate, context) {
+    return this.toSeq().reverse().findKey(predicate, context);
+  },
+  keyOf: function(searchValue) {
+    return this.findKey((function(value) {
+      return is(value, searchValue);
+    }));
+  },
+  lastKeyOf: function(searchValue) {
+    return this.toSeq().reverse().keyOf(searchValue);
+  },
   mapEntries: function(mapper, context) {
     var $__0 = this;
     var iterations = 0;
@@ -711,16 +719,16 @@ var IndexedIterable = function IndexedIterable(value) {
     return reify(this, filterFactory(this, predicate, context, false));
   },
   findIndex: function(predicate, context) {
-    var key = this.findKey(predicate, context);
+    var key = this.toKeyedSeq().findKey(predicate, context);
     return key === undefined ? -1 : key;
   },
   indexOf: function(searchValue) {
-    return this.findIndex((function(value) {
-      return is(value, searchValue);
-    }));
+    var key = this.toKeyedSeq().keyOf(searchValue);
+    return key === undefined ? -1 : key;
   },
   lastIndexOf: function(searchValue) {
-    return this.toKeyedSeq().reverse().indexOf(searchValue);
+    var key = this.toKeyedSeq().lastKeyOf(searchValue);
+    return key === undefined ? -1 : key;
   },
   reverse: function() {
     return reify(this, reverseFactory(this, false));
@@ -736,7 +744,8 @@ var IndexedIterable = function IndexedIterable(value) {
     return reify(this, numArgs === 1 ? spliced : spliced.concat(arrCopy(arguments, 2), this.slice(index + removeNum)));
   },
   findLastIndex: function(predicate, context) {
-    return this.toKeyedSeq().reverse().findIndex(predicate, context);
+    var key = this.toKeyedSeq().findLastKey(predicate, context);
+    return key === undefined ? -1 : key;
   },
   first: function() {
     return this.get(0);