es-toolkit 1.32.0-dev.1005 → 1.32.0-dev.1007

package/dist/compat/index.js

@@ -728,45 +728,27 @@ function filter(source, predicate) {
     }
 }
 
-function find(source, doesMatch, fromIndex = 0) {
+function find(source, _doesMatch, fromIndex = 0) {
     if (!source) {
         return undefined;
     }
     if (fromIndex < 0) {
         fromIndex = Math.max(source.length + fromIndex, 0);
     }
+    const doesMatch = iteratee(_doesMatch);
     const values = Array.isArray(source) ? source.slice(fromIndex) : Object.values(source).slice(fromIndex);
-    switch (typeof doesMatch) {
-        case 'function': {
-            if (!Array.isArray(source)) {
-                const keys = Object.keys(source);
-                for (let i = 0; i < keys.length; i++) {
-                    const key = keys[i];
-                    const value = source[key];
-                    if (doesMatch(value, key, source)) {
-                        return value;
-                    }
-                }
-                return undefined;
+    if (typeof doesMatch === 'function' && !Array.isArray(source)) {
+        const keys = Object.keys(source).slice(fromIndex);
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i];
+            const value = source[key];
+            if (doesMatch(value, key, source)) {
+                return value;
             }
-            return values.find(doesMatch);
-        }
-        case 'object': {
-            if (Array.isArray(doesMatch) && doesMatch.length === 2) {
-                const key = doesMatch[0];
-                const value = doesMatch[1];
-                return values.find(matchesProperty(key, value));
-            }
-            else {
-                return values.find(matches(doesMatch));
-            }
-        }
-        case 'symbol':
-        case 'number':
-        case 'string': {
-            return values.find(property(doesMatch));
         }
+        return undefined;
     }
+    return values.find(doesMatch);
 }
 
 function findIndex(arr, doesMatch, fromIndex = 0) {
@@ -803,6 +785,34 @@ function findIndex(arr, doesMatch, fromIndex = 0) {
     return index === -1 ? -1 : index + fromIndex;
 }
 
+function findLast(source, _doesMatch, fromIndex) {
+    if (!source) {
+        return undefined;
+    }
+    const length = Array.isArray(source) ? source.length : Object.keys(source).length;
+    fromIndex = toInteger(fromIndex ?? length - 1);
+    if (fromIndex < 0) {
+        fromIndex = Math.max(length + fromIndex, 0);
+    }
+    else {
+        fromIndex = Math.min(fromIndex, length - 1);
+    }
+    const doesMatch = iteratee(_doesMatch);
+    const values = Array.isArray(source) ? source.slice(0, fromIndex + 1) : Object.values(source).slice(0, fromIndex + 1);
+    if (typeof doesMatch === 'function' && !Array.isArray(source)) {
+        const keys = Object.keys(source).slice(0, fromIndex + 1);
+        for (let i = fromIndex; i >= 0; i--) {
+            const key = keys[i];
+            const value = source[key];
+            if (doesMatch(value, key, source)) {
+                return value;
+            }
+        }
+        return undefined;
+    }
+    return values.findLast(doesMatch);
+}
+
 function findLastIndex(arr, doesMatch, fromIndex = arr ? arr.length - 1 : 0) {
     if (!arr) {
         return -1;
@@ -996,6 +1006,50 @@ function intersectionBy(array, ...values) {
     return result;
 }
 
+function uniq(arr) {
+    if (!isArrayLike(arr)) {
+        return [];
+    }
+    return zipWith.uniq(Array.from(arr));
+}
+
+function intersectionWith(firstArr, ...otherArrs) {
+    console.log(firstArr);
+    if (firstArr == null) {
+        return [];
+    }
+    const _comparator = last(otherArrs);
+    let comparator = isWeakSet$1.eq;
+    let uniq$1 = uniq;
+    if (typeof _comparator === 'function') {
+        comparator = _comparator;
+        uniq$1 = uniqPreserve0;
+        otherArrs.pop();
+    }
+    let result = uniq$1(Array.from(firstArr));
+    for (let i = 0; i < otherArrs.length; ++i) {
+        const otherArr = otherArrs[i];
+        if (otherArr == null) {
+            return [];
+        }
+        result = zipWith.intersectionWith(result, Array.from(otherArr), comparator);
+    }
+    return result;
+}
+function uniqPreserve0(arr) {
+    const result = [];
+    const added = new Set();
+    for (let i = 0; i < arr.length; i++) {
+        const item = arr[i];
+        if (added.has(item)) {
+            continue;
+        }
+        result.push(item);
+        added.add(item);
+    }
+    return result;
+}
+
 function join(array, separator = ',') {
     if (!isArrayLike(array)) {
         return '';
@@ -1438,13 +1492,6 @@ function union(...arrays) {
     return zipWith.uniq(flattened);
 }
 
-function uniq(arr) {
-    if (!isArrayLike(arr)) {
-        return [];
-    }
-    return zipWith.uniq(Array.from(arr));
-}
-
 function uniqBy(array, iteratee$1) {
     if (!isArrayLikeObject(array)) {
         return [];
@@ -3173,7 +3220,6 @@ exports.flatMapDeep = zipWith.flatMapDeep;
 exports.forEachRight = zipWith.forEachRight;
 exports.groupBy = zipWith.groupBy;
 exports.initial = zipWith.initial;
-exports.intersectionWith = zipWith.intersectionWith;
 exports.isSubset = zipWith.isSubset;
 exports.isSubsetWith = zipWith.isSubsetWith;
 exports.keyBy = zipWith.keyBy;
@@ -3286,6 +3332,7 @@ exports.filter = filter;
 exports.find = find;
 exports.findIndex = findIndex;
 exports.findKey = findKey;
+exports.findLast = findLast;
 exports.findLastIndex = findLastIndex;
 exports.first = head;
 exports.flatten = flatten;
@@ -3307,6 +3354,7 @@ exports.includes = includes;
 exports.indexOf = indexOf;
 exports.intersection = intersection;
 exports.intersectionBy = intersectionBy;
+exports.intersectionWith = intersectionWith;
 exports.invertBy = invertBy;
 exports.invoke = invoke;
 exports.isArguments = isArguments;

package/dist/compat/index.mjs

@@ -5,7 +5,6 @@ export { flatMapDeep } from '../array/flatMapDeep.mjs';
 export { forEachRight } from '../array/forEachRight.mjs';
 export { groupBy } from '../array/groupBy.mjs';
 export { initial } from '../array/initial.mjs';
-export { intersectionWith } from '../array/intersectionWith.mjs';
 export { isSubset } from '../array/isSubset.mjs';
 export { isSubsetWith } from '../array/isSubsetWith.mjs';
 export { keyBy } from '../array/keyBy.mjs';
@@ -87,6 +86,7 @@ export { fill } from './array/fill.mjs';
 export { filter } from './array/filter.mjs';
 export { find } from './array/find.mjs';
 export { findIndex } from './array/findIndex.mjs';
+export { findLast } from './array/findLast.mjs';
 export { findLastIndex } from './array/findLastIndex.mjs';
 export { flatten } from './array/flatten.mjs';
 export { flattenDeep } from './array/flattenDeep.mjs';
@@ -97,6 +97,7 @@ export { includes } from './array/includes.mjs';
 export { indexOf } from './array/indexOf.mjs';
 export { intersection } from './array/intersection.mjs';
 export { intersectionBy } from './array/intersectionBy.mjs';
+export { intersectionWith } from './array/intersectionWith.mjs';
 export { join } from './array/join.mjs';
 export { last } from './array/last.mjs';
 export { lastIndexOf } from './array/lastIndexOf.mjs';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "es-toolkit",
   "description": "A state-of-the-art, high-performance JavaScript utility library with a small bundle size and strong type annotations.",
-  "version": "1.32.0-dev.1005+bf9aae9a",
+  "version": "1.32.0-dev.1007+9bc5fa98",
   "homepage": "https://es-toolkit.slash.page",
   "bugs": "https://github.com/toss/es-toolkit/issues",
   "repository": {