Bump to v3.7.0.

collection/at.js

@@ -1,5 +1,6 @@
 import baseAt from '../internal/baseAt';
 import baseFlatten from '../internal/baseFlatten';
+import getLength from '../internal/getLength';
 import isLength from '../internal/isLength';
 import restParam from '../function/restParam';
 import toIterable from '../internal/toIterable';
@@ -25,7 +26,7 @@ import toIterable from '../internal/toIterable';
  * // => ['barney', 'pebbles']
  */
 var at = restParam(function(collection, props) {
-  var length = collection ? collection.length : 0;
+  var length = collection ? getLength(collection) : 0;
   if (isLength(length)) {
     collection = toIterable(collection);
   }

collection/every.js

@@ -57,7 +57,7 @@ function every(collection, predicate, thisArg) {
   if (thisArg && isIterateeCall(collection, predicate, thisArg)) {
     predicate = null;
   }
-  if (typeof predicate != 'function' || typeof thisArg != 'undefined') {
+  if (typeof predicate != 'function' || thisArg !== undefined) {
     predicate = baseCallback(predicate, thisArg, 3);
   }
   return func(collection, predicate);

collection/forEach.js

@@ -5,10 +5,10 @@ import createForEach from '../internal/createForEach';
 /**
  * Iterates over elements of `collection` invoking `iteratee` for each element.
  * The `iteratee` is bound to `thisArg` and invoked with three arguments:
- * (value, index|key, collection). Iterator functions may exit iteration early
+ * (value, index|key, collection). Iteratee functions may exit iteration early
  * by explicitly returning `false`.
  *
- * **Note:** As with other "Collections" methods, objects with a `length` property
+ * **Note:** As with other "Collections" methods, objects with a "length" property
  * are iterated like arrays. To avoid this behavior `_.forIn` or `_.forOwn`
  * may be used for object iteration.
  *

collection/includes.js

@@ -1,4 +1,5 @@
 import baseIndexOf from '../internal/baseIndexOf';
+import getLength from '../internal/getLength';
 import isArray from '../lang/isArray';
 import isIterateeCall from '../internal/isIterateeCall';
 import isLength from '../internal/isLength';
@@ -41,7 +42,7 @@ var nativeMax = Math.max;
  * // => true
  */
 function includes(collection, target, fromIndex, guard) {
-  var length = collection ? collection.length : 0;
+  var length = collection ? getLength(collection) : 0;
   if (!isLength(length)) {
     collection = values(collection);
     length = collection.length;

collection/invoke.js

@@ -1,18 +1,21 @@
 import baseEach from '../internal/baseEach';
+import getLength from '../internal/getLength';
+import invokePath from '../internal/invokePath';
+import isKey from '../internal/isKey';
 import isLength from '../internal/isLength';
 import restParam from '../function/restParam';
 
 /**
- * Invokes the method named by `methodName` on each element in `collection`,
- * returning an array of the results of each invoked method. Any additional
- * arguments are provided to each invoked method. If `methodName` is a function
- * it is invoked for, and `this` bound to, each element in `collection`.
+ * Invokes the method at `path` on each element in `collection`, returning
+ * an array of the results of each invoked method. Any additional arguments
+ * are provided to each invoked method. If `methodName` is a function it is
+ * invoked for, and `this` bound to, each element in `collection`.
  *
  * @static
  * @memberOf _
  * @category Collection
  * @param {Array|Object|string} collection The collection to iterate over.
- * @param {Function|string} methodName The name of the method to invoke or
+ * @param {Array|Function|string} path The path of the method to invoke or
  *  the function invoked per iteration.
  * @param {...*} [args] The arguments to invoke the method with.
  * @returns {Array} Returns the array of results.
@@ -24,15 +27,16 @@ import restParam from '../function/restParam';
  * _.invoke([123, 456], String.prototype.split, '');
  * // => [['1', '2', '3'], ['4', '5', '6']]
  */
-var invoke = restParam(function(collection, methodName, args) {
+var invoke = restParam(function(collection, path, args) {
   var index = -1,
-      isFunc = typeof methodName == 'function',
-      length = collection ? collection.length : 0,
+      isFunc = typeof path == 'function',
+      isProp = isKey(path),
+      length = getLength(collection),
       result = isLength(length) ? Array(length) : [];
 
   baseEach(collection, function(value) {
-    var func = isFunc ? methodName : (value != null && value[methodName]);
-    result[++index] = func ? func.apply(value, args) : undefined;
+    var func = isFunc ? path : (isProp && value != null && value[path]);
+    result[++index] = func ? func.apply(value, args) : invokePath(value, path, args);
   });
   return result;
 });

collection/map.js

@@ -35,7 +35,6 @@ import isArray from '../lang/isArray';
  * @param {Array|Object|string} collection The collection to iterate over.
  * @param {Function|Object|string} [iteratee=_.identity] The function invoked
  *  per iteration.
- *  create a `_.property` or `_.matches` style callback respectively.
  * @param {*} [thisArg] The `this` binding of `iteratee`.
  * @returns {Array} Returns the new mapped array.
  * @example

collection/pluck.js

@@ -1,14 +1,14 @@
-import baseProperty from '../internal/baseProperty';
 import map from './map';
+import property from '../utility/property';
 
 /**
- * Gets the value of `key` from all elements in `collection`.
+ * Gets the property value of `path` from all elements in `collection`.
  *
  * @static
  * @memberOf _
  * @category Collection
  * @param {Array|Object|string} collection The collection to iterate over.
- * @param {string} key The key of the property to pluck.
+ * @param {Array|string} path The path of the property to pluck.
  * @returns {Array} Returns the property values.
  * @example
  *
@@ -24,8 +24,8 @@ import map from './map';
  * _.pluck(userIndex, 'age');
  * // => [36, 40] (iteration order is not guaranteed)
  */
-function pluck(collection, key) {
-  return map(collection, baseProperty(key));
+function pluck(collection, path) {
+  return map(collection, property(path));
 }
 
 export default pluck;

collection/reduce.js

@@ -27,8 +27,8 @@ import createReduce from '../internal/createReduce';
  * @returns {*} Returns the accumulated value.
  * @example
  *
- * _.reduce([1, 2], function(sum, n) {
- *   return sum + n;
+ * _.reduce([1, 2], function(total, n) {
+ *   return total + n;
  * });
  * // => 3
  *

collection/size.js

@@ -1,3 +1,4 @@
+import getLength from '../internal/getLength';
 import isLength from '../internal/isLength';
 import keys from '../object/keys';
 
@@ -22,7 +23,7 @@ import keys from '../object/keys';
  * // => 7
  */
 function size(collection) {
-  var length = collection ? collection.length : 0;
+  var length = collection ? getLength(collection) : 0;
   return isLength(length) ? length : keys(collection).length;
 }
 

collection/some.js

@@ -58,7 +58,7 @@ function some(collection, predicate, thisArg) {
   if (thisArg && isIterateeCall(collection, predicate, thisArg)) {
     predicate = null;
   }
-  if (typeof predicate != 'function' || typeof thisArg != 'undefined') {
+  if (typeof predicate != 'function' || thisArg !== undefined) {
     predicate = baseCallback(predicate, thisArg, 3);
   }
   return func(collection, predicate);

collection/sortBy.js

@@ -1,9 +1,8 @@
 import baseCallback from '../internal/baseCallback';
-import baseEach from '../internal/baseEach';
+import baseMap from '../internal/baseMap';
 import baseSortBy from '../internal/baseSortBy';
 import compareAscending from '../internal/compareAscending';
 import isIterateeCall from '../internal/isIterateeCall';
-import isLength from '../internal/isLength';
 
 /**
  * Creates an array of elements, sorted in ascending order by the results of
@@ -27,9 +26,8 @@ import isLength from '../internal/isLength';
  * @memberOf _
  * @category Collection
  * @param {Array|Object|string} collection The collection to iterate over.
- * @param {Array|Function|Object|string} [iteratee=_.identity] The function
- *  invoked per iteration. If a property name or an object is provided it is
- *  used to create a `_.property` or `_.matches` style callback respectively.
+ * @param {Function|Object|string} [iteratee=_.identity] The function invoked
+ *  per iteration.
  * @param {*} [thisArg] The `this` binding of `iteratee`.
  * @returns {Array} Returns the new sorted array.
  * @example
@@ -58,16 +56,14 @@ function sortBy(collection, iteratee, thisArg) {
   if (collection == null) {
     return [];
   }
-  var index = -1,
-      length = collection.length,
-      result = isLength(length) ? Array(length) : [];
-
   if (thisArg && isIterateeCall(collection, iteratee, thisArg)) {
     iteratee = null;
   }
+  var index = -1;
   iteratee = baseCallback(iteratee, thisArg, 3);
-  baseEach(collection, function(value, key, collection) {
-    result[++index] = { 'criteria': iteratee(value, key, collection), 'index': index, 'value': value };
+
+  var result = baseMap(collection, function(value, key, collection) {
+    return { 'criteria': iteratee(value, key, collection), 'index': ++index, 'value': value };
   });
   return baseSortBy(result, compareAscending);
 }

collection/sortByAll.js

@@ -1,48 +1,52 @@
 import baseFlatten from '../internal/baseFlatten';
 import baseSortByOrder from '../internal/baseSortByOrder';
 import isIterateeCall from '../internal/isIterateeCall';
+import restParam from '../function/restParam';
 
 /**
- * This method is like `_.sortBy` except that it sorts by property names
- * instead of an iteratee function.
+ * This method is like `_.sortBy` except that it can sort by multiple iteratees
+ * or property names.
+ *
+ * If a property name is provided for an iteratee the created `_.property`
+ * style callback returns the property value of the given element.
+ *
+ * If an object is provided for an iteratee the created `_.matches` style
+ * callback returns `true` for elements that have the properties of the given
+ * object, else `false`.
  *
  * @static
  * @memberOf _
  * @category Collection
  * @param {Array|Object|string} collection The collection to iterate over.
- * @param {...(string|string[])} props The property names to sort by,
- *  specified as individual property names or arrays of property names.
+ * @param {...(Function|Function[]|Object|Object[]|string|string[])} iteratees
+ *  The iteratees to sort by, specified as individual values or arrays of values.
  * @returns {Array} Returns the new sorted array.
  * @example
  *
  * var users = [
+ *   { 'user': 'fred',   'age': 48 },
  *   { 'user': 'barney', 'age': 36 },
- *   { 'user': 'fred',   'age': 40 },
- *   { 'user': 'barney', 'age': 26 },
- *   { 'user': 'fred',   'age': 30 }
+ *   { 'user': 'fred',   'age': 42 },
+ *   { 'user': 'barney', 'age': 34 }
  * ];
  *
  * _.map(_.sortByAll(users, ['user', 'age']), _.values);
- * // => [['barney', 26], ['barney', 36], ['fred', 30], ['fred', 40]]
+ * // => [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
+ *
+ * _.map(_.sortByAll(users, 'user', function(chr) {
+ *   return Math.floor(chr.age / 10);
+ * }), _.values);
+ * // => [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
  */
-function sortByAll() {
-  var args = arguments,
-      collection = args[0],
-      guard = args[3],
-      index = 0,
-      length = args.length - 1;
-
+var sortByAll = restParam(function(collection, iteratees) {
   if (collection == null) {
     return [];
   }
-  var props = Array(length);
-  while (index < length) {
-    props[index] = args[++index];
+  var guard = iteratees[2];
+  if (guard && isIterateeCall(iteratees[0], iteratees[1], guard)) {
+    iteratees.length = 1;
   }
-  if (guard && isIterateeCall(args[1], args[2], guard)) {
-    props = args[1];
-  }
-  return baseSortByOrder(collection, baseFlatten(props), []);
-}
+  return baseSortByOrder(collection, baseFlatten(iteratees), []);
+});
 
 export default sortByAll;

collection/sortByOrder.js

@@ -4,45 +4,52 @@ import isIterateeCall from '../internal/isIterateeCall';
 
 /**
  * This method is like `_.sortByAll` except that it allows specifying the
- * sort orders of the property names to sort by. A truthy value in `orders`
- * will sort the corresponding property name in ascending order while a
- * falsey value will sort it in descending order.
+ * sort orders of the iteratees to sort by. A truthy value in `orders` will
+ * sort the corresponding property name in ascending order while a falsey
+ * value will sort it in descending order.
+ *
+ * If a property name is provided for an iteratee the created `_.property`
+ * style callback returns the property value of the given element.
+ *
+ * If an object is provided for an iteratee the created `_.matches` style
+ * callback returns `true` for elements that have the properties of the given
+ * object, else `false`.
  *
  * @static
  * @memberOf _
  * @category Collection
  * @param {Array|Object|string} collection The collection to iterate over.
- * @param {string[]} props The property names to sort by.
- * @param {boolean[]} orders The sort orders of `props`.
+ * @param {Function[]|Object[]|string[]} iteratees The iteratees to sort by.
+ * @param {boolean[]} orders The sort orders of `iteratees`.
  * @param- {Object} [guard] Enables use as a callback for functions like `_.reduce`.
  * @returns {Array} Returns the new sorted array.
  * @example
  *
  * var users = [
- *   { 'user': 'barney', 'age': 26 },
- *   { 'user': 'fred',   'age': 40 },
- *   { 'user': 'barney', 'age': 36 },
- *   { 'user': 'fred',   'age': 30 }
+ *   { 'user': 'fred',   'age': 48 },
+ *   { 'user': 'barney', 'age': 34 },
+ *   { 'user': 'fred',   'age': 42 },
+ *   { 'user': 'barney', 'age': 36 }
  * ];
  *
  * // sort by `user` in ascending order and by `age` in descending order
  * _.map(_.sortByOrder(users, ['user', 'age'], [true, false]), _.values);
- * // => [['barney', 36], ['barney', 26], ['fred', 40], ['fred', 30]]
+ * // => [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
  */
-function sortByOrder(collection, props, orders, guard) {
+function sortByOrder(collection, iteratees, orders, guard) {
   if (collection == null) {
     return [];
   }
-  if (guard && isIterateeCall(props, orders, guard)) {
+  if (guard && isIterateeCall(iteratees, orders, guard)) {
     orders = null;
   }
-  if (!isArray(props)) {
-    props = props == null ? [] : [props];
+  if (!isArray(iteratees)) {
+    iteratees = iteratees == null ? [] : [iteratees];
   }
   if (!isArray(orders)) {
     orders = orders == null ? [] : [orders];
   }
-  return baseSortByOrder(collection, props, orders);
+  return baseSortByOrder(collection, iteratees, orders);
 }
 
 export default sortByOrder;