[1.0.12] Expose idx and key in Collection#find predicate

AugustArchive · Jun 1, 2021 · eeb7f04 · eeb7f04
1 parent ebbdac2
commit eeb7f04
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -175,7 +175,7 @@ declare module '@augu/collections' {
        * @returns The value found or `null` if not found
        */
       find<ThisArg = Collection<K, V>>(
-        predicate: MinimalPredicate<ThisArg, V, boolean>,
+        predicate: Predicate<ThisArg, V, number, K, boolean>,
         thisArg?: ThisArg
       ): V | null;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@augu/collections",
   "description": "📝 Collections library made in TypeScript",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "types": "index.d.ts",
   "main": "build/index.js",
   "funding": {

diff --git a/src/Collection.ts b/src/Collection.ts
@@ -334,19 +334,13 @@ export class Collection<K, V = unknown> extends Map<K, V> {
    * @returns The value found or `null` if not found
    */
   find<ThisArg = Collection<K, V>>(
-    predicate: MinimalPredicate<ThisArg, V, boolean>,
+    predicate: Predicate<ThisArg, V, number, K, boolean>,
     thisArg?: ThisArg
   ) {
-    let func: UndetailedMinimalPredicate<V, boolean>;
-
-    if (thisArg !== undefined)
-      func = predicate.bind(thisArg);
-    else
-      func = predicate.bind(<any> this);
-
+    let idx = -1;
     let result: V | null = null;
-    for (const value of this.values()) {
-      if (func(value)) {
+    for (const [key, value] of this.entries()) {
+      if (predicate.call(thisArg !== undefined ? thisArg : this as any, value, ++idx, key)) {
         result = value;
         break;
       }