ut2 1.8.1 → 1.9.1

package/es/countBy.js

@@ -4,8 +4,8 @@ import createIteratee from './internals/createIteratee.js';
 var countBy = function (collection, iteratee) {
     var result = {};
     var internalIteratee = createIteratee(iteratee);
-    forEach(collection, function (item) {
-        var key = internalIteratee(item);
+    forEach(collection, function (item, index, arr) {
+        var key = internalIteratee(item, index, arr);
         if (key in result) {
             ++result[key];
         }

package/es/groupBy.js

@@ -6,8 +6,8 @@ var groupBy = function (collection, iteratee) {
     if (iteratee === void 0) { iteratee = identity; }
     var result = {};
     var internalIteratee = createIteratee(iteratee);
-    forEach(collection, function (item) {
-        var key = internalIteratee(item);
+    forEach(collection, function (item, index, arr) {
+        var key = internalIteratee(item, index, arr);
         if (key in result) {
             result[key].push(item);
         }

package/es/internals/compare.js

@@ -1,31 +1,24 @@
+import isNumber from '../isNumber.js';
 import isSymbol from '../isSymbol.js';
 import toString from '../toString.js';
 
-function compareAsc(value, other) {
-    var valueIsSymbol = isSymbol(value);
-    var otherIsSymbol = isSymbol(other);
-    var valueStr = toString(value);
-    var otherStr = toString(other);
-    if (!otherIsSymbol && (valueIsSymbol || valueStr > otherStr)) {
-        return 1;
-    }
-    if (!valueIsSymbol && (otherIsSymbol || valueStr < otherStr)) {
-        return -1;
-    }
-    return 0;
-}
-function compareDesc(value, other) {
-    var valueIsSymbol = isSymbol(value);
-    var otherIsSymbol = isSymbol(other);
-    var valueStr = toString(value);
-    var otherStr = toString(other);
-    if (!otherIsSymbol && (valueIsSymbol || valueStr > otherStr)) {
-        return -1;
-    }
-    if (!valueIsSymbol && (otherIsSymbol || valueStr < otherStr)) {
-        return 1;
+function createCompare(dir) {
+    var asc = dir === 1;
+    function wrapper(value, other) {
+        var valueIsSymbol = isSymbol(value);
+        var otherIsSymbol = isSymbol(other);
+        var isNeedConvertString = !valueIsSymbol && !otherIsSymbol && !(isNumber(value) && isNumber(other));
+        var _value = isNeedConvertString ? toString(value) : value;
+        var _other = isNeedConvertString ? toString(other) : other;
+        if (!otherIsSymbol && (valueIsSymbol || _value > _other)) {
+            return asc ? 1 : -1;
+        }
+        if (!valueIsSymbol && (otherIsSymbol || _value < _other)) {
+            return asc ? -1 : 1;
+        }
+        return 0;
     }
-    return 0;
+    return wrapper;
 }
 function compareMultiple(object, other, orders) {
     var objCriteria = object.criteria;
@@ -34,7 +27,7 @@ function compareMultiple(object, other, orders) {
     var index = -1;
     while (++index < length) {
         var order = orders[index];
-        var cmpFn = typeof order === 'function' ? order : order === 'desc' ? compareDesc : compareAsc;
+        var cmpFn = typeof order === 'function' ? order : order === 'desc' ? createCompare(0) : createCompare(1);
         var result = cmpFn(objCriteria[index], othCriteria[index]);
         if (result) {
             return result;
@@ -43,4 +36,4 @@ function compareMultiple(object, other, orders) {
     return object.index - other.index;
 }
 
-export { compareAsc, compareDesc, compareMultiple };
+export { compareMultiple };

package/es/internals/createExtremum.js

@@ -9,8 +9,8 @@ function createExtremum(array, comparator, iteratee) {
     }
     var result, computed;
     var internalIteratee = createIteratee(iteratee);
-    array.forEach(function (value) {
-        var current = internalIteratee(value);
+    array.forEach(function (value, index) {
+        var current = internalIteratee(value, index, array);
         if (current != null && (computed === nativeUndefined ? current === current && !isSymbol(current) : comparator(current, computed))) {
             computed = current;
             result = value;

package/es/internals/createForEach.js

@@ -1,11 +1,11 @@
+import allKeys from '../allKeys.js';
 import identity from '../identity.js';
 import isArrayLike from '../isArrayLike.js';
-import keys from '../keys.js';
 
 function createForEach(dir) {
     var forEach = function (collection, iteratee) {
         if (iteratee === void 0) { iteratee = identity; }
-        var _keys = !isArrayLike(collection) && keys(collection);
+        var _keys = !isArrayLike(collection) && allKeys(collection);
         var len = (_keys || collection).length;
         var i = dir > 0 ? 0 : len - 1;
         while (i >= 0 && i < len) {

package/es/internals/createReduce.js

@@ -1,10 +1,10 @@
+import allKeys from '../allKeys.js';
 import identity from '../identity.js';
 import isArrayLike from '../isArrayLike.js';
-import keys from '../keys.js';
 
 function createReduce(dir) {
     function reducer(collection, iteratee, memo, initial) {
-        var _keys = !isArrayLike(collection) && keys(collection);
+        var _keys = !isArrayLike(collection) && allKeys(collection);
         var len = (_keys || collection).length;
         var i = dir > 0 ? 0 : len - 1;
         if (!initial && len > 0) {

package/es/internals/helpers.js

@@ -1,7 +1,7 @@
 import getTag from './getTag.js';
 import { argumentsTag, functionProtoToString } from './native.js';
 
-var VERSION = "1.8.1";
+var VERSION = "1.9.1";
 var supportedArgumentsType = getTag((function () { return arguments; })()) === argumentsTag;
 var FUNC_ERROR_TEXT = 'Expected a function';
 function toSource(func) {

package/es/invert.js

@@ -1,10 +1,10 @@
+import allKeys from './allKeys.js';
 import { stubTrue } from './internals/helpers.js';
 import { objectProtoToString } from './internals/native.js';
-import keys from './keys.js';
 
 function invert(object, predicate) {
     if (predicate === void 0) { predicate = stubTrue; }
-    var _keys = keys(object);
+    var _keys = allKeys(object);
     var result = {};
     _keys.forEach(function (key) {
         var value = object[key];

package/es/isEmpty.js

@@ -1,9 +1,9 @@
 import getTag from './internals/getTag.js';
-import keys from './internals/specialKeys.js';
 import { mapTag, setTag } from './internals/native.js';
 import isArrayLike from './isArrayLike.js';
 import isNil from './isNil.js';
 import isObjectLike from './isObjectLike.js';
+import allKeys from './allKeys.js';
 
 function isEmpty(value) {
     if (isNil(value)) {
@@ -14,7 +14,7 @@ function isEmpty(value) {
         return !value.size;
     }
     if (isObjectLike(value)) {
-        return !keys(value).length;
+        return !allKeys(value).length;
     }
     if (isArrayLike(value)) {
         return !value.length;

package/es/keyBy.js

@@ -6,8 +6,8 @@ var keyBy = function (collection, iteratee) {
     if (iteratee === void 0) { iteratee = identity; }
     var result = {};
     var internalIteratee = createIteratee(iteratee);
-    forEach(collection, function (item) {
-        var key = internalIteratee(item);
+    forEach(collection, function (item, index, arr) {
+        var key = internalIteratee(item, index, arr);
         result[key] = item;
     });
     return result;

package/es/max.js

@@ -1,8 +1,9 @@
 import { baseGt } from './internals/comparator.js';
 import createExtremum from './internals/createExtremum.js';
 
-function max(array, iteratee) {
+var max = function (array, iteratee) {
     return createExtremum(array, baseGt, iteratee);
-}
+};
+var max$1 = max;
 
-export { max as default };
+export { max$1 as default };

package/es/merge.js

@@ -1,9 +1,9 @@
-import keysIn from './keysIn.js';
 import isArray from './isArray.js';
 import isObject from './isObject.js';
 import isObjectLike from './isObjectLike.js';
 import isPlainObject from './isPlainObject.js';
 import { nativeUndefined } from './internals/native.js';
+import allKeys from './allKeys.js';
 
 function baseMerge(object, source, getKeys, customizer, stack) {
     if (stack === void 0) { stack = new WeakMap(); }
@@ -48,7 +48,7 @@ function baseMerge(object, source, getKeys, customizer, stack) {
     return obj;
 }
 function merge(object, source, customizer, getKeys) {
-    if (getKeys === void 0) { getKeys = keysIn; }
+    if (getKeys === void 0) { getKeys = allKeys; }
     return baseMerge(object, source, getKeys, customizer);
 }
 

package/es/min.js

@@ -1,8 +1,9 @@
 import { baseLt } from './internals/comparator.js';
 import createExtremum from './internals/createExtremum.js';
 
-function min(array, iteratee) {
+var min = function (array, iteratee) {
     return createExtremum(array, baseLt, iteratee);
-}
+};
+var min$1 = min;
 
-export { min as default };
+export { min$1 as default };

package/es/orderBy.js

@@ -10,8 +10,8 @@ var orderBy = function (collection, iteratees, orders) {
     iteratees = (isArray(iteratees) ? iteratees : iteratees !== nativeUndefined ? [iteratees] : [identity]);
     orders = (isArray(orders) ? orders : orders !== nativeUndefined ? [orders] : []);
     var index = -1;
-    forEach(collection, function (item) {
-        var criteria = iteratees.map(function (iteratee) { return createIteratee(iteratee)(item); });
+    forEach(collection, function (item, key, arr) {
+        var criteria = iteratees.map(function (iteratee) { return createIteratee(iteratee)(item, key, arr); });
         result.push({
             criteria: criteria,
             index: ++index,

package/es/partition.js

@@ -6,8 +6,8 @@ var partition = function (collection, predicate) {
     if (predicate === void 0) { predicate = identity; }
     var result = [[], []];
     var internalIteratee = createIteratee(predicate);
-    forEach(collection, function (item) {
-        result[internalIteratee(item) ? 0 : 1].push(item);
+    forEach(collection, function (item, index, arr) {
+        result[internalIteratee(item, index, arr) ? 0 : 1].push(item);
     });
     return result;
 };

package/es/pick.js

@@ -1,8 +1,12 @@
 import castArray from './castArray.js';
+import isObject from './isObject.js';
 
 var pick = function (object, fields) {
     if (fields === void 0) { fields = []; }
     var result = {};
+    if (!isObject(object)) {
+        return result;
+    }
     var fieldArr = castArray(fields);
     fieldArr.forEach(function (field) {
         if (field in object) {

package/es/pickBy.js

@@ -1,13 +1,9 @@
 import allKeysIn from './allKeysIn.js';
 import { stubFlase } from './internals/helpers.js';
-import isNil from './isNil.js';
 
 function pickBy(object, predicate) {
     if (predicate === void 0) { predicate = stubFlase; }
     var result = {};
-    if (isNil(object)) {
-        return result;
-    }
     var keys = allKeysIn(object);
     keys.forEach(function (key) {
         if (predicate(object[key], key)) {

package/lib/countBy.js

@@ -6,8 +6,8 @@ var createIteratee = require('./internals/createIteratee.js');
 var countBy = function (collection, iteratee) {
     var result = {};
     var internalIteratee = createIteratee(iteratee);
-    forEach(collection, function (item) {
-        var key = internalIteratee(item);
+    forEach(collection, function (item, index, arr) {
+        var key = internalIteratee(item, index, arr);
         if (key in result) {
             ++result[key];
         }

package/lib/groupBy.js

@@ -8,8 +8,8 @@ var groupBy = function (collection, iteratee) {
     if (iteratee === void 0) { iteratee = identity; }
     var result = {};
     var internalIteratee = createIteratee(iteratee);
-    forEach(collection, function (item) {
-        var key = internalIteratee(item);
+    forEach(collection, function (item, index, arr) {
+        var key = internalIteratee(item, index, arr);
         if (key in result) {
             result[key].push(item);
         }

package/lib/internals/compare.js

@@ -1,33 +1,26 @@
 'use strict';
 
+var isNumber = require('../isNumber.js');
 var isSymbol = require('../isSymbol.js');
 var toString = require('../toString.js');
 
-function compareAsc(value, other) {
-    var valueIsSymbol = isSymbol(value);
-    var otherIsSymbol = isSymbol(other);
-    var valueStr = toString(value);
-    var otherStr = toString(other);
-    if (!otherIsSymbol && (valueIsSymbol || valueStr > otherStr)) {
-        return 1;
-    }
-    if (!valueIsSymbol && (otherIsSymbol || valueStr < otherStr)) {
-        return -1;
-    }
-    return 0;
-}
-function compareDesc(value, other) {
-    var valueIsSymbol = isSymbol(value);
-    var otherIsSymbol = isSymbol(other);
-    var valueStr = toString(value);
-    var otherStr = toString(other);
-    if (!otherIsSymbol && (valueIsSymbol || valueStr > otherStr)) {
-        return -1;
-    }
-    if (!valueIsSymbol && (otherIsSymbol || valueStr < otherStr)) {
-        return 1;
+function createCompare(dir) {
+    var asc = dir === 1;
+    function wrapper(value, other) {
+        var valueIsSymbol = isSymbol(value);
+        var otherIsSymbol = isSymbol(other);
+        var isNeedConvertString = !valueIsSymbol && !otherIsSymbol && !(isNumber(value) && isNumber(other));
+        var _value = isNeedConvertString ? toString(value) : value;
+        var _other = isNeedConvertString ? toString(other) : other;
+        if (!otherIsSymbol && (valueIsSymbol || _value > _other)) {
+            return asc ? 1 : -1;
+        }
+        if (!valueIsSymbol && (otherIsSymbol || _value < _other)) {
+            return asc ? -1 : 1;
+        }
+        return 0;
     }
-    return 0;
+    return wrapper;
 }
 function compareMultiple(object, other, orders) {
     var objCriteria = object.criteria;
@@ -36,7 +29,7 @@ function compareMultiple(object, other, orders) {
     var index = -1;
     while (++index < length) {
         var order = orders[index];
-        var cmpFn = typeof order === 'function' ? order : order === 'desc' ? compareDesc : compareAsc;
+        var cmpFn = typeof order === 'function' ? order : order === 'desc' ? createCompare(0) : createCompare(1);
         var result = cmpFn(objCriteria[index], othCriteria[index]);
         if (result) {
             return result;
@@ -45,6 +38,4 @@ function compareMultiple(object, other, orders) {
     return object.index - other.index;
 }
 
-exports.compareAsc = compareAsc;
-exports.compareDesc = compareDesc;
 exports.compareMultiple = compareMultiple;

package/lib/internals/createExtremum.js

@@ -11,8 +11,8 @@ function createExtremum(array, comparator, iteratee) {
     }
     var result, computed;
     var internalIteratee = createIteratee(iteratee);
-    array.forEach(function (value) {
-        var current = internalIteratee(value);
+    array.forEach(function (value, index) {
+        var current = internalIteratee(value, index, array);
         if (current != null && (computed === native.nativeUndefined ? current === current && !isSymbol(current) : comparator(current, computed))) {
             computed = current;
             result = value;

package/lib/internals/createForEach.js

@@ -1,13 +1,13 @@
 'use strict';
 
+var allKeys = require('../allKeys.js');
 var identity = require('../identity.js');
 var isArrayLike = require('../isArrayLike.js');
-var keys = require('../keys.js');
 
 function createForEach(dir) {
     var forEach = function (collection, iteratee) {
         if (iteratee === void 0) { iteratee = identity; }
-        var _keys = !isArrayLike(collection) && keys(collection);
+        var _keys = !isArrayLike(collection) && allKeys(collection);
         var len = (_keys || collection).length;
         var i = dir > 0 ? 0 : len - 1;
         while (i >= 0 && i < len) {

package/lib/internals/createReduce.js

@@ -1,12 +1,12 @@
 'use strict';
 
+var allKeys = require('../allKeys.js');
 var identity = require('../identity.js');
 var isArrayLike = require('../isArrayLike.js');
-var keys = require('../keys.js');
 
 function createReduce(dir) {
     function reducer(collection, iteratee, memo, initial) {
-        var _keys = !isArrayLike(collection) && keys(collection);
+        var _keys = !isArrayLike(collection) && allKeys(collection);
         var len = (_keys || collection).length;
         var i = dir > 0 ? 0 : len - 1;
         if (!initial && len > 0) {

package/lib/internals/helpers.js

@@ -3,7 +3,7 @@
 var getTag = require('./getTag.js');
 var native = require('./native.js');
 
-exports.VERSION = "1.8.1";
+exports.VERSION = "1.9.1";
 exports.supportedArgumentsType = getTag((function () { return arguments; })()) === native.argumentsTag;
 exports.FUNC_ERROR_TEXT = 'Expected a function';
 function toSource(func) {

package/lib/invert.js

@@ -1,12 +1,12 @@
 'use strict';
 
+var allKeys = require('./allKeys.js');
 var helpers = require('./internals/helpers.js');
 var native = require('./internals/native.js');
-var keys = require('./keys.js');
 
 function invert(object, predicate) {
     if (predicate === void 0) { predicate = helpers.stubTrue; }
-    var _keys = keys(object);
+    var _keys = allKeys(object);
     var result = {};
     _keys.forEach(function (key) {
         var value = object[key];

package/lib/isEmpty.js

@@ -1,11 +1,11 @@
 'use strict';
 
 var getTag = require('./internals/getTag.js');
-var specialKeys = require('./internals/specialKeys.js');
 var native = require('./internals/native.js');
 var isArrayLike = require('./isArrayLike.js');
 var isNil = require('./isNil.js');
 var isObjectLike = require('./isObjectLike.js');
+var allKeys = require('./allKeys.js');
 
 function isEmpty(value) {
     if (isNil(value)) {
@@ -16,7 +16,7 @@ function isEmpty(value) {
         return !value.size;
     }
     if (isObjectLike(value)) {
-        return !specialKeys(value).length;
+        return !allKeys(value).length;
     }
     if (isArrayLike(value)) {
         return !value.length;

package/lib/keyBy.js

@@ -8,8 +8,8 @@ var keyBy = function (collection, iteratee) {
     if (iteratee === void 0) { iteratee = identity; }
     var result = {};
     var internalIteratee = createIteratee(iteratee);
-    forEach(collection, function (item) {
-        var key = internalIteratee(item);
+    forEach(collection, function (item, index, arr) {
+        var key = internalIteratee(item, index, arr);
         result[key] = item;
     });
     return result;

package/lib/max.js

@@ -3,8 +3,9 @@
 var comparator = require('./internals/comparator.js');
 var createExtremum = require('./internals/createExtremum.js');
 
-function max(array, iteratee) {
+var max = function (array, iteratee) {
     return createExtremum(array, comparator.baseGt, iteratee);
-}
+};
+var max$1 = max;
 
-module.exports = max;
+module.exports = max$1;

package/lib/merge.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var keysIn = require('./keysIn.js');
 var isArray = require('./isArray.js');
 var isObject = require('./isObject.js');
 var isObjectLike = require('./isObjectLike.js');
 var isPlainObject = require('./isPlainObject.js');
 var native = require('./internals/native.js');
+var allKeys = require('./allKeys.js');
 
 function baseMerge(object, source, getKeys, customizer, stack) {
     if (stack === void 0) { stack = new WeakMap(); }
@@ -50,7 +50,7 @@ function baseMerge(object, source, getKeys, customizer, stack) {
     return obj;
 }
 function merge(object, source, customizer, getKeys) {
-    if (getKeys === void 0) { getKeys = keysIn; }
+    if (getKeys === void 0) { getKeys = allKeys; }
     return baseMerge(object, source, getKeys, customizer);
 }
 

package/lib/min.js

@@ -3,8 +3,9 @@
 var comparator = require('./internals/comparator.js');
 var createExtremum = require('./internals/createExtremum.js');
 
-function min(array, iteratee) {
+var min = function (array, iteratee) {
     return createExtremum(array, comparator.baseLt, iteratee);
-}
+};
+var min$1 = min;
 
-module.exports = min;
+module.exports = min$1;

package/lib/orderBy.js

@@ -12,8 +12,8 @@ var orderBy = function (collection, iteratees, orders) {
     iteratees = (isArray(iteratees) ? iteratees : iteratees !== native.nativeUndefined ? [iteratees] : [identity]);
     orders = (isArray(orders) ? orders : orders !== native.nativeUndefined ? [orders] : []);
     var index = -1;
-    forEach(collection, function (item) {
-        var criteria = iteratees.map(function (iteratee) { return createIteratee(iteratee)(item); });
+    forEach(collection, function (item, key, arr) {
+        var criteria = iteratees.map(function (iteratee) { return createIteratee(iteratee)(item, key, arr); });
         result.push({
             criteria: criteria,
             index: ++index,

package/lib/partition.js

@@ -8,8 +8,8 @@ var partition = function (collection, predicate) {
     if (predicate === void 0) { predicate = identity; }
     var result = [[], []];
     var internalIteratee = createIteratee(predicate);
-    forEach(collection, function (item) {
-        result[internalIteratee(item) ? 0 : 1].push(item);
+    forEach(collection, function (item, index, arr) {
+        result[internalIteratee(item, index, arr) ? 0 : 1].push(item);
     });
     return result;
 };

package/lib/pick.js

@@ -1,10 +1,14 @@
 'use strict';
 
 var castArray = require('./castArray.js');
+var isObject = require('./isObject.js');
 
 var pick = function (object, fields) {
     if (fields === void 0) { fields = []; }
     var result = {};
+    if (!isObject(object)) {
+        return result;
+    }
     var fieldArr = castArray(fields);
     fieldArr.forEach(function (field) {
         if (field in object) {

package/lib/pickBy.js

@@ -2,14 +2,10 @@
 
 var allKeysIn = require('./allKeysIn.js');
 var helpers = require('./internals/helpers.js');
-var isNil = require('./isNil.js');
 
 function pickBy(object, predicate) {
     if (predicate === void 0) { predicate = helpers.stubFlase; }
     var result = {};
-    if (isNil(object)) {
-        return result;
-    }
     var keys = allKeysIn(object);
     keys.forEach(function (key) {
         if (predicate(object[key], key)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ut2",
-  "version": "1.8.1",
+  "version": "1.9.1",
   "author": "caijf",
   "license": "MIT",
   "main": "lib/index.js",

package/types/countBy.d.ts

@@ -1,18 +1,20 @@
-import { CollectionList, CollectionObject, IterateeParam } from './internals/types';
+import { ArrayLikeIterator, CollectionList, CollectionObject, ObjectIterator, PropertyName } from './internals/types';
 interface CountBy {
-    <T>(collection: CollectionList<T>, iteratee?: IterateeParam<T>): Record<string, number>;
-    <T extends object, V extends T[keyof T]>(collection: CollectionObject<T>, iteratee?: IterateeParam<V>): Record<string, number>;
+    <T extends object>(collection: CollectionList<T>, iteratee?: ArrayLikeIterator<T, PropertyName> | keyof T): Record<PropertyName, number>;
+    <T>(collection: CollectionList<T>, iteratee?: ArrayLikeIterator<T, PropertyName> | PropertyName): Record<PropertyName, number>;
+    <T extends object>(collection: CollectionObject<T>, iteratee?: ObjectIterator<T, PropertyName> | keyof T): Record<PropertyName, number>;
+    <T extends object>(collection: CollectionObject<T>, iteratee?: PropertyName): Record<PropertyName, number>;
 }
 /**
  * 创建一个组成对象， `key` 是经过 `iteratee` 执行处理 `collection` 中每个元素后返回的结果，每个 `key` 对应的值是 `iteratee` 返回该 `key` 的次数。
  *
- * `iteratee` 调用时会传入 1 个参数 `value` 。
+ * `iteratee` 调用时会传入三个参数 `value` `index|key` `collection` 。
  *
  * @function
  * @alias module:Collection.countBy
  * @since 1.0.0
  * @param {ArrayLike<any> | object} collection 一个用来迭代的集合。
- * @param {Function | string} [iteratee=identity] 迭代函数，用来转换键。
+ * @param {Function | string | number | Symbol} [iteratee=identity] 迭代函数，用来转换键。
  * @returns {Object} 组成集合对象。
  * @example
  *