Compare commits

...

10 Commits

Author SHA1 Message Date
John-David Dalton
d2754e0b9b Bump to v3.9.2. 2015-12-16 17:51:09 -08:00
John-David Dalton
81e41ca0c8 Bump to v3.9.0. 2015-12-16 17:50:42 -08:00
John-David Dalton
26837e7fe2 Bump to v3.8.0. 2015-12-16 17:50:05 -08:00
John-David Dalton
fec213a98c Bump to v3.7.0. 2015-12-16 17:49:35 -08:00
John-David Dalton
9724afd7a6 Bump to v3.6.0. 2015-12-16 17:49:07 -08:00
John-David Dalton
707fe171fc Bump to v3.5.0. 2015-12-16 17:48:35 -08:00
John-David Dalton
4ce1d5ddd3 Bump to v3.4.0. 2015-12-16 17:48:03 -08:00
John-David Dalton
7a82a3d77b Bump to v3.3.1. 2015-12-16 17:47:30 -08:00
John-David Dalton
f8e4370129 Bump to v3.3.0. 2015-12-16 17:46:57 -08:00
John-David Dalton
3ccb5e7da3 Bump to v3.2.0. 2015-12-16 17:46:22 -08:00
335 changed files with 7492 additions and 4397 deletions

View File

@@ -1,5 +1,5 @@
Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/> Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
Based on Underscore.js 1.7.0, copyright 2009-2015 Jeremy Ashkenas, Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/> DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining

View File

@@ -1,4 +1,4 @@
# lodash v3.1.0 # lodash v3.9.2
The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash](https://lodash.com/) exported as [AMD](https://github.com/amdjs/amdjs-api/wiki/AMD) modules. The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash](https://lodash.com/) exported as [AMD](https://github.com/amdjs/amdjs-api/wiki/AMD) modules.
@@ -10,6 +10,13 @@ $ lodash modern exports=amd -d -o ./main.js
## Installation ## Installation
Using bower or volo:
```bash
$ bower i lodash#3.9.2-amd
$ volo add lodash/3.9.2-amd
```
Defining a build as `'lodash'`. Defining a build as `'lodash'`.
```js ```js

View File

@@ -1,4 +1,4 @@
define(['./array/chunk', './array/compact', './array/difference', './array/drop', './array/dropRight', './array/dropRightWhile', './array/dropWhile', './array/findIndex', './array/findLastIndex', './array/first', './array/flatten', './array/flattenDeep', './array/head', './array/indexOf', './array/initial', './array/intersection', './array/last', './array/lastIndexOf', './array/object', './array/pull', './array/pullAt', './array/remove', './array/rest', './array/slice', './array/sortedIndex', './array/sortedLastIndex', './array/tail', './array/take', './array/takeRight', './array/takeRightWhile', './array/takeWhile', './array/union', './array/uniq', './array/unique', './array/unzip', './array/without', './array/xor', './array/zip', './array/zipObject'], function(chunk, compact, difference, drop, dropRight, dropRightWhile, dropWhile, findIndex, findLastIndex, first, flatten, flattenDeep, head, indexOf, initial, intersection, last, lastIndexOf, object, pull, pullAt, remove, rest, slice, sortedIndex, sortedLastIndex, tail, take, takeRight, takeRightWhile, takeWhile, union, uniq, unique, unzip, without, xor, zip, zipObject) { define(['./array/chunk', './array/compact', './array/difference', './array/drop', './array/dropRight', './array/dropRightWhile', './array/dropWhile', './array/fill', './array/findIndex', './array/findLastIndex', './array/first', './array/flatten', './array/flattenDeep', './array/head', './array/indexOf', './array/initial', './array/intersection', './array/last', './array/lastIndexOf', './array/object', './array/pull', './array/pullAt', './array/remove', './array/rest', './array/slice', './array/sortedIndex', './array/sortedLastIndex', './array/tail', './array/take', './array/takeRight', './array/takeRightWhile', './array/takeWhile', './array/union', './array/uniq', './array/unique', './array/unzip', './array/unzipWith', './array/without', './array/xor', './array/zip', './array/zipObject', './array/zipWith'], function(chunk, compact, difference, drop, dropRight, dropRightWhile, dropWhile, fill, findIndex, findLastIndex, first, flatten, flattenDeep, head, indexOf, initial, intersection, last, lastIndexOf, object, pull, pullAt, remove, rest, slice, sortedIndex, sortedLastIndex, tail, take, takeRight, takeRightWhile, takeWhile, union, uniq, unique, unzip, unzipWith, without, xor, zip, zipObject, zipWith) {
return { return {
'chunk': chunk, 'chunk': chunk,
'compact': compact, 'compact': compact,
@@ -7,6 +7,7 @@ define(['./array/chunk', './array/compact', './array/difference', './array/drop'
'dropRight': dropRight, 'dropRight': dropRight,
'dropRightWhile': dropRightWhile, 'dropRightWhile': dropRightWhile,
'dropWhile': dropWhile, 'dropWhile': dropWhile,
'fill': fill,
'findIndex': findIndex, 'findIndex': findIndex,
'findLastIndex': findLastIndex, 'findLastIndex': findLastIndex,
'first': first, 'first': first,
@@ -35,9 +36,11 @@ define(['./array/chunk', './array/compact', './array/difference', './array/drop'
'uniq': uniq, 'uniq': uniq,
'unique': unique, 'unique': unique,
'unzip': unzip, 'unzip': unzip,
'unzipWith': unzipWith,
'without': without, 'without': without,
'xor': xor, 'xor': xor,
'zip': zip, 'zip': zip,
'zipObject': zipObject 'zipObject': zipObject,
'zipWith': zipWith
}; };
}); });

View File

@@ -15,7 +15,7 @@ define(['../internal/baseSlice', '../internal/isIterateeCall'], function(baseSli
* @memberOf _ * @memberOf _
* @category Array * @category Array
* @param {Array} array The array to process. * @param {Array} array The array to process.
* @param {numer} [size=1] The length of each chunk. * @param {number} [size=1] The length of each chunk.
* @param- {Object} [guard] Enables use as a callback for functions like `_.map`. * @param- {Object} [guard] Enables use as a callback for functions like `_.map`.
* @returns {Array} Returns the new array containing chunks. * @returns {Array} Returns the new array containing chunks.
* @example * @example

View File

@@ -1,13 +1,9 @@
define(['../internal/baseDifference', '../internal/baseFlatten', '../lang/isArguments', '../lang/isArray'], function(baseDifference, baseFlatten, isArguments, isArray) { define(['../internal/baseDifference', '../internal/baseFlatten', '../internal/isArrayLike', '../function/restParam'], function(baseDifference, baseFlatten, isArrayLike, restParam) {
/** /**
* Creates an array excluding all values of the provided arrays using * Creates an array of unique `array` values not included in the other
* `SameValueZero` for equality comparisons. * provided arrays using [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* * for equality comparisons.
* **Note:** `SameValueZero` comparisons are like strict equality comparisons,
* e.g. `===`, except that `NaN` matches `NaN`. See the
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for more details.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -17,21 +13,14 @@ define(['../internal/baseDifference', '../internal/baseFlatten', '../lang/isArgu
* @returns {Array} Returns the new array of filtered values. * @returns {Array} Returns the new array of filtered values.
* @example * @example
* *
* _.difference([1, 2, 3], [5, 2, 10]); * _.difference([1, 2, 3], [4, 2]);
* // => [1, 3] * // => [1, 3]
*/ */
function difference() { var difference = restParam(function(array, values) {
var index = -1, return isArrayLike(array)
length = arguments.length; ? baseDifference(array, baseFlatten(values, false, true))
: [];
while (++index < length) { });
var value = arguments[index];
if (isArray(value) || isArguments(value)) {
break;
}
}
return baseDifference(value, baseFlatten(arguments, false, true, ++index));
}
return difference; return difference;
}); });

View File

@@ -5,7 +5,6 @@ define(['../internal/baseSlice', '../internal/isIterateeCall'], function(baseSli
* *
* @static * @static
* @memberOf _ * @memberOf _
* @type Function
* @category Array * @category Array
* @param {Array} array The array to query. * @param {Array} array The array to query.
* @param {number} [n=1] The number of elements to drop. * @param {number} [n=1] The number of elements to drop.

View File

@@ -5,7 +5,6 @@ define(['../internal/baseSlice', '../internal/isIterateeCall'], function(baseSli
* *
* @static * @static
* @memberOf _ * @memberOf _
* @type Function
* @category Array * @category Array
* @param {Array} array The array to query. * @param {Array} array The array to query.
* @param {number} [n=1] The number of elements to drop. * @param {number} [n=1] The number of elements to drop.

View File

@@ -1,53 +1,58 @@
define(['../internal/baseCallback', '../internal/baseSlice'], function(baseCallback, baseSlice) { define(['../internal/baseCallback', '../internal/baseWhile'], function(baseCallback, baseWhile) {
/** /**
* Creates a slice of `array` excluding elements dropped from the end. * Creates a slice of `array` excluding elements dropped from the end.
* Elements are dropped until `predicate` returns falsey. The predicate is * Elements are dropped until `predicate` returns falsey. The predicate is
* bound to `thisArg` and invoked with three arguments; (value, index, array). * bound to `thisArg` and invoked with three arguments: (value, index, array).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* callback returns `true` for elements that have the properties of the given * style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that match the properties of the given
* object, else `false`. * object, else `false`.
* *
* @static * @static
* @memberOf _ * @memberOf _
* @type Function
* @category Array * @category Array
* @param {Array} array The array to query. * @param {Array} array The array to query.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per element. * per iteration.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {Array} Returns the slice of `array`. * @returns {Array} Returns the slice of `array`.
* @example * @example
* *
* _.dropRightWhile([1, 2, 3], function(n) { return n > 1; }); * _.dropRightWhile([1, 2, 3], function(n) {
* return n > 1;
* });
* // => [1] * // => [1]
* *
* var users = [ * var users = [
* { 'user': 'barney', 'status': 'busy', 'active': false }, * { 'user': 'barney', 'active': true },
* { 'user': 'fred', 'status': 'busy', 'active': true }, * { 'user': 'fred', 'active': false },
* { 'user': 'pebbles', 'status': 'away', 'active': true } * { 'user': 'pebbles', 'active': false }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.matches` callback shorthand
* _.pluck(_.dropRightWhile(users, 'active'), 'user'); * _.pluck(_.dropRightWhile(users, { 'user': 'pebbles', 'active': false }), 'user');
* // => ['barney', 'fred']
*
* // using the `_.matchesProperty` callback shorthand
* _.pluck(_.dropRightWhile(users, 'active', false), 'user');
* // => ['barney'] * // => ['barney']
* *
* // using the "_.matches" callback shorthand * // using the `_.property` callback shorthand
* _.pluck(_.dropRightWhile(users, { 'status': 'away' }), 'user'); * _.pluck(_.dropRightWhile(users, 'active'), 'user');
* // => ['barney', 'fred'] * // => ['barney', 'fred', 'pebbles']
*/ */
function dropRightWhile(array, predicate, thisArg) { function dropRightWhile(array, predicate, thisArg) {
var length = array ? array.length : 0; return (array && array.length)
if (!length) { ? baseWhile(array, baseCallback(predicate, thisArg, 3), true, true)
return []; : [];
}
predicate = baseCallback(predicate, thisArg, 3);
while (length-- && predicate(array[length], length, array)) {}
return baseSlice(array, 0, length + 1);
} }
return dropRightWhile; return dropRightWhile;

View File

@@ -1,54 +1,58 @@
define(['../internal/baseCallback', '../internal/baseSlice'], function(baseCallback, baseSlice) { define(['../internal/baseCallback', '../internal/baseWhile'], function(baseCallback, baseWhile) {
/** /**
* Creates a slice of `array` excluding elements dropped from the beginning. * Creates a slice of `array` excluding elements dropped from the beginning.
* Elements are dropped until `predicate` returns falsey. The predicate is * Elements are dropped until `predicate` returns falsey. The predicate is
* bound to `thisArg` and invoked with three arguments; (value, index, array). * bound to `thisArg` and invoked with three arguments: (value, index, array).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
* @static * @static
* @memberOf _ * @memberOf _
* @type Function
* @category Array * @category Array
* @param {Array} array The array to query. * @param {Array} array The array to query.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per element. * per iteration.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {Array} Returns the slice of `array`. * @returns {Array} Returns the slice of `array`.
* @example * @example
* *
* _.dropWhile([1, 2, 3], function(n) { return n < 3; }); * _.dropWhile([1, 2, 3], function(n) {
* return n < 3;
* });
* // => [3] * // => [3]
* *
* var users = [ * var users = [
* { 'user': 'barney', 'status': 'busy', 'active': true }, * { 'user': 'barney', 'active': false },
* { 'user': 'fred', 'status': 'busy', 'active': false }, * { 'user': 'fred', 'active': false },
* { 'user': 'pebbles', 'status': 'away', 'active': true } * { 'user': 'pebbles', 'active': true }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.matches` callback shorthand
* _.pluck(_.dropWhile(users, 'active'), 'user'); * _.pluck(_.dropWhile(users, { 'user': 'barney', 'active': false }), 'user');
* // => ['fred', 'pebbles'] * // => ['fred', 'pebbles']
* *
* // using the "_.matches" callback shorthand * // using the `_.matchesProperty` callback shorthand
* _.pluck(_.dropWhile(users, { 'status': 'busy' }), 'user'); * _.pluck(_.dropWhile(users, 'active', false), 'user');
* // => ['pebbles'] * // => ['pebbles']
*
* // using the `_.property` callback shorthand
* _.pluck(_.dropWhile(users, 'active'), 'user');
* // => ['barney', 'fred', 'pebbles']
*/ */
function dropWhile(array, predicate, thisArg) { function dropWhile(array, predicate, thisArg) {
var length = array ? array.length : 0; return (array && array.length)
if (!length) { ? baseWhile(array, baseCallback(predicate, thisArg, 3), true)
return []; : [];
}
var index = -1;
predicate = baseCallback(predicate, thisArg, 3);
while (++index < length && predicate(array[index], index, array)) {}
return baseSlice(array, index);
} }
return dropWhile; return dropWhile;

44
array/fill.js Normal file
View File

@@ -0,0 +1,44 @@
define(['../internal/baseFill', '../internal/isIterateeCall'], function(baseFill, isIterateeCall) {
/**
* Fills elements of `array` with `value` from `start` up to, but not
* including, `end`.
*
* **Note:** This method mutates `array`.
*
* @static
* @memberOf _
* @category Array
* @param {Array} array The array to fill.
* @param {*} value The value to fill `array` with.
* @param {number} [start=0] The start position.
* @param {number} [end=array.length] The end position.
* @returns {Array} Returns `array`.
* @example
*
* var array = [1, 2, 3];
*
* _.fill(array, 'a');
* console.log(array);
* // => ['a', 'a', 'a']
*
* _.fill(Array(3), 2);
* // => [2, 2, 2]
*
* _.fill([4, 6, 8], '*', 1, 2);
* // => [4, '*', 8]
*/
function fill(array, value, start, end) {
var length = array ? array.length : 0;
if (!length) {
return [];
}
if (start && typeof start != 'number' && isIterateeCall(array, value, start)) {
start = 0;
end = length;
}
return baseFill(array, value, start, end);
}
return fill;
});

View File

@@ -1,13 +1,17 @@
define(['../internal/baseCallback'], function(baseCallback) { define(['../internal/createFindIndex'], function(createFindIndex) {
/** /**
* This method is like `_.find` except that it returns the index of the first * This method is like `_.find` except that it returns the index of the first
* element `predicate` returns truthy for, instead of the element itself. * element `predicate` returns truthy for instead of the element itself.
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -16,41 +20,35 @@ define(['../internal/baseCallback'], function(baseCallback) {
* @category Array * @category Array
* @param {Array} array The array to search. * @param {Array} array The array to search.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {number} Returns the index of the found element, else `-1`. * @returns {number} Returns the index of the found element, else `-1`.
* @example * @example
* *
* var users = [ * var users = [
* { 'user': 'barney', 'age': 36, 'active': false }, * { 'user': 'barney', 'active': false },
* { 'user': 'fred', 'age': 40, 'active': true }, * { 'user': 'fred', 'active': false },
* { 'user': 'pebbles', 'age': 1, 'active': false } * { 'user': 'pebbles', 'active': true }
* ]; * ];
* *
* _.findIndex(users, function(chr) { return chr.age < 40; }); * _.findIndex(users, function(chr) {
* return chr.user == 'barney';
* });
* // => 0 * // => 0
* *
* // using the "_.matches" callback shorthand * // using the `_.matches` callback shorthand
* _.findIndex(users, { 'age': 1 }); * _.findIndex(users, { 'user': 'fred', 'active': false });
* // => 2
*
* // using the "_.property" callback shorthand
* _.findIndex(users, 'active');
* // => 1 * // => 1
*
* // using the `_.matchesProperty` callback shorthand
* _.findIndex(users, 'active', false);
* // => 0
*
* // using the `_.property` callback shorthand
* _.findIndex(users, 'active');
* // => 2
*/ */
function findIndex(array, predicate, thisArg) { var findIndex = createFindIndex();
var index = -1,
length = array ? array.length : 0;
predicate = baseCallback(predicate, thisArg, 3);
while (++index < length) {
if (predicate(array[index], index, array)) {
return index;
}
}
return -1;
}
return findIndex; return findIndex;
}); });

View File

@@ -1,13 +1,17 @@
define(['../internal/baseCallback'], function(baseCallback) { define(['../internal/createFindIndex'], function(createFindIndex) {
/** /**
* This method is like `_.findIndex` except that it iterates over elements * This method is like `_.findIndex` except that it iterates over elements
* of `collection` from right to left. * of `collection` from right to left.
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -16,39 +20,35 @@ define(['../internal/baseCallback'], function(baseCallback) {
* @category Array * @category Array
* @param {Array} array The array to search. * @param {Array} array The array to search.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {number} Returns the index of the found element, else `-1`. * @returns {number} Returns the index of the found element, else `-1`.
* @example * @example
* *
* var users = [ * var users = [
* { 'user': 'barney', 'age': 36, 'active': true }, * { 'user': 'barney', 'active': true },
* { 'user': 'fred', 'age': 40, 'active': false }, * { 'user': 'fred', 'active': false },
* { 'user': 'pebbles', 'age': 1, 'active': false } * { 'user': 'pebbles', 'active': false }
* ]; * ];
* *
* _.findLastIndex(users, function(chr) { return chr.age < 40; }); * _.findLastIndex(users, function(chr) {
* return chr.user == 'pebbles';
* });
* // => 2 * // => 2
* *
* // using the "_.matches" callback shorthand * // using the `_.matches` callback shorthand
* _.findLastIndex(users, { 'age': 40 }); * _.findLastIndex(users, { 'user': 'barney', 'active': true });
* // => 1 * // => 0
* *
* // using the "_.property" callback shorthand * // using the `_.matchesProperty` callback shorthand
* _.findLastIndex(users, 'active', false);
* // => 2
*
* // using the `_.property` callback shorthand
* _.findLastIndex(users, 'active'); * _.findLastIndex(users, 'active');
* // => 0 * // => 0
*/ */
function findLastIndex(array, predicate, thisArg) { var findLastIndex = createFindIndex(true);
var length = array ? array.length : 0;
predicate = baseCallback(predicate, thisArg, 3);
while (length--) {
if (predicate(array[length], length, array)) {
return length;
}
}
return -1;
}
return findLastIndex; return findLastIndex;
}); });

View File

@@ -13,12 +13,12 @@ define(['../internal/baseFlatten', '../internal/isIterateeCall'], function(baseF
* @returns {Array} Returns the new flattened array. * @returns {Array} Returns the new flattened array.
* @example * @example
* *
* _.flatten([1, [2], [3, [[4]]]]); * _.flatten([1, [2, 3, [4]]]);
* // => [1, 2, 3, [[4]]]; * // => [1, 2, 3, [4]]
* *
* // using `isDeep` * // using `isDeep`
* _.flatten([1, [2], [3, [[4]]]], true); * _.flatten([1, [2, 3, [4]]], true);
* // => [1, 2, 3, 4]; * // => [1, 2, 3, 4]
*/ */
function flatten(array, isDeep, guard) { function flatten(array, isDeep, guard) {
var length = array ? array.length : 0; var length = array ? array.length : 0;

View File

@@ -10,8 +10,8 @@ define(['../internal/baseFlatten'], function(baseFlatten) {
* @returns {Array} Returns the new flattened array. * @returns {Array} Returns the new flattened array.
* @example * @example
* *
* _.flattenDeep([1, [2], [3, [[4]]]]); * _.flattenDeep([1, [2, 3, [4]]]);
* // => [1, 2, 3, 4]; * // => [1, 2, 3, 4]
*/ */
function flattenDeep(array) { function flattenDeep(array) {
var length = array ? array.length : 0; var length = array ? array.length : 0;

View File

@@ -5,14 +5,10 @@ define(['../internal/baseIndexOf', '../internal/binaryIndex'], function(baseInde
/** /**
* Gets the index at which the first occurrence of `value` is found in `array` * Gets the index at which the first occurrence of `value` is found in `array`
* using `SameValueZero` for equality comparisons. If `fromIndex` is negative, * using [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* it is used as the offset from the end of `array`. If `array` is sorted * for equality comparisons. If `fromIndex` is negative, it is used as the offset
* providing `true` for `fromIndex` performs a faster binary search. * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`
* * performs a faster binary search.
* **Note:** `SameValueZero` comparisons are like strict equality comparisons,
* e.g. `===`, except that `NaN` matches `NaN`. See the
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for more details.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -24,15 +20,15 @@ define(['../internal/baseIndexOf', '../internal/binaryIndex'], function(baseInde
* @returns {number} Returns the index of the matched value, else `-1`. * @returns {number} Returns the index of the matched value, else `-1`.
* @example * @example
* *
* _.indexOf([1, 2, 3, 1, 2, 3], 2); * _.indexOf([1, 2, 1, 2], 2);
* // => 1 * // => 1
* *
* // using `fromIndex` * // using `fromIndex`
* _.indexOf([1, 2, 3, 1, 2, 3], 2, 3); * _.indexOf([1, 2, 1, 2], 2, 2);
* // => 4 * // => 3
* *
* // performing a binary search * // performing a binary search
* _.indexOf([4, 4, 5, 5, 6, 6], 5, true); * _.indexOf([1, 1, 2, 2], 2, true);
* // => 2 * // => 2
*/ */
function indexOf(array, value, fromIndex) { function indexOf(array, value, fromIndex) {
@@ -41,14 +37,17 @@ define(['../internal/baseIndexOf', '../internal/binaryIndex'], function(baseInde
return -1; return -1;
} }
if (typeof fromIndex == 'number') { if (typeof fromIndex == 'number') {
fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0); fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : fromIndex;
} else if (fromIndex) { } else if (fromIndex) {
var index = binaryIndex(array, value), var index = binaryIndex(array, value),
other = array[index]; other = array[index];
return (value === value ? value === other : other !== other) ? index : -1; if (value === value ? (value === other) : (other !== other)) {
return index;
}
return -1;
} }
return baseIndexOf(array, value, fromIndex); return baseIndexOf(array, value, fromIndex || 0);
} }
return indexOf; return indexOf;

View File

@@ -1,54 +1,44 @@
define(['../internal/baseIndexOf', '../internal/cacheIndexOf', '../internal/createCache', '../lang/isArguments', '../lang/isArray'], function(baseIndexOf, cacheIndexOf, createCache, isArguments, isArray) { define(['../internal/baseIndexOf', '../internal/cacheIndexOf', '../internal/createCache', '../internal/isArrayLike', '../function/restParam'], function(baseIndexOf, cacheIndexOf, createCache, isArrayLike, restParam) {
/** /**
* Creates an array of unique values in all provided arrays using `SameValueZero` * Creates an array of unique values that are included in all of the provided
* arrays using [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for equality comparisons. * for equality comparisons.
* *
* **Note:** `SameValueZero` comparisons are like strict equality comparisons,
* e.g. `===`, except that `NaN` matches `NaN`. See the
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for more details.
*
* @static * @static
* @memberOf _ * @memberOf _
* @category Array * @category Array
* @param {...Array} [arrays] The arrays to inspect. * @param {...Array} [arrays] The arrays to inspect.
* @returns {Array} Returns the new array of shared values. * @returns {Array} Returns the new array of shared values.
* @example * @example
* * _.intersection([1, 2], [4, 2], [2, 1]);
* _.intersection([1, 2, 3], [5, 2, 1, 4], [2, 1]); * // => [2]
* // => [1, 2]
*/ */
function intersection() { var intersection = restParam(function(arrays) {
var args = [], var othLength = arrays.length,
argsIndex = -1, othIndex = othLength,
argsLength = arguments.length, caches = Array(length),
caches = [],
indexOf = baseIndexOf, indexOf = baseIndexOf,
isCommon = true; isCommon = true,
result = [];
while (++argsIndex < argsLength) { while (othIndex--) {
var value = arguments[argsIndex]; var value = arrays[othIndex] = isArrayLike(value = arrays[othIndex]) ? value : [];
if (isArray(value) || isArguments(value)) { caches[othIndex] = (isCommon && value.length >= 120) ? createCache(othIndex && value) : null;
args.push(value);
caches.push(isCommon && value.length >= 120 && createCache(argsIndex && value));
}
} }
argsLength = args.length; var array = arrays[0],
var array = args[0],
index = -1, index = -1,
length = array ? array.length : 0, length = array ? array.length : 0,
result = [],
seen = caches[0]; seen = caches[0];
outer: outer:
while (++index < length) { while (++index < length) {
value = array[index]; value = array[index];
if ((seen ? cacheIndexOf(seen, value) : indexOf(result, value)) < 0) { if ((seen ? cacheIndexOf(seen, value) : indexOf(result, value, 0)) < 0) {
argsIndex = argsLength; var othIndex = othLength;
while (--argsIndex) { while (--othIndex) {
var cache = caches[argsIndex]; var cache = caches[othIndex];
if ((cache ? cacheIndexOf(cache, value) : indexOf(args[argsIndex], value)) < 0) { if ((cache ? cacheIndexOf(cache, value) : indexOf(arrays[othIndex], value, 0)) < 0) {
continue outer; continue outer;
} }
} }
@@ -59,7 +49,7 @@ define(['../internal/baseIndexOf', '../internal/cacheIndexOf', '../internal/crea
} }
} }
return result; return result;
} });
return intersection; return intersection;
}); });

View File

@@ -18,15 +18,15 @@ define(['../internal/binaryIndex', '../internal/indexOfNaN'], function(binaryInd
* @returns {number} Returns the index of the matched value, else `-1`. * @returns {number} Returns the index of the matched value, else `-1`.
* @example * @example
* *
* _.lastIndexOf([1, 2, 3, 1, 2, 3], 2); * _.lastIndexOf([1, 2, 1, 2], 2);
* // => 4 * // => 3
* *
* // using `fromIndex` * // using `fromIndex`
* _.lastIndexOf([1, 2, 3, 1, 2, 3], 2, 3); * _.lastIndexOf([1, 2, 1, 2], 2, 2);
* // => 1 * // => 1
* *
* // performing a binary search * // performing a binary search
* _.lastIndexOf([4, 4, 5, 5, 6, 6], 5, true); * _.lastIndexOf([1, 1, 2, 2], 2, true);
* // => 3 * // => 3
*/ */
function lastIndexOf(array, value, fromIndex) { function lastIndexOf(array, value, fromIndex) {
@@ -40,7 +40,10 @@ define(['../internal/binaryIndex', '../internal/indexOfNaN'], function(binaryInd
} else if (fromIndex) { } else if (fromIndex) {
index = binaryIndex(array, value, true) - 1; index = binaryIndex(array, value, true) - 1;
var other = array[index]; var other = array[index];
return (value === value ? value === other : other !== other) ? index : -1; if (value === value ? (value === other) : (other !== other)) {
return index;
}
return -1;
} }
if (value !== value) { if (value !== value) {
return indexOfNaN(array, index, true); return indexOfNaN(array, index, true);

View File

@@ -7,14 +7,11 @@ define(['../internal/baseIndexOf'], function(baseIndexOf) {
var splice = arrayProto.splice; var splice = arrayProto.splice;
/** /**
* Removes all provided values from `array` using `SameValueZero` for equality * Removes all provided values from `array` using
* comparisons. * [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for equality comparisons.
* *
* **Notes:** * **Note:** Unlike `_.without`, this method mutates `array`.
* - Unlike `_.without`, this method mutates `array`.
* - `SameValueZero` comparisons are like strict equality comparisons, e.g. `===`,
* except that `NaN` matches `NaN`. See the [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for more details.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -25,22 +22,25 @@ define(['../internal/baseIndexOf'], function(baseIndexOf) {
* @example * @example
* *
* var array = [1, 2, 3, 1, 2, 3]; * var array = [1, 2, 3, 1, 2, 3];
*
* _.pull(array, 2, 3); * _.pull(array, 2, 3);
* console.log(array); * console.log(array);
* // => [1, 1] * // => [1, 1]
*/ */
function pull() { function pull() {
var array = arguments[0]; var args = arguments,
array = args[0];
if (!(array && array.length)) { if (!(array && array.length)) {
return array; return array;
} }
var index = 0, var index = 0,
indexOf = baseIndexOf, indexOf = baseIndexOf,
length = arguments.length; length = args.length;
while (++index < length) { while (++index < length) {
var fromIndex = 0, var fromIndex = 0,
value = arguments[index]; value = args[index];
while ((fromIndex = indexOf(array, value, fromIndex)) > -1) { while ((fromIndex = indexOf(array, value, fromIndex)) > -1) {
splice.call(array, fromIndex, 1); splice.call(array, fromIndex, 1);

View File

@@ -1,4 +1,4 @@
define(['../internal/baseFlatten', '../internal/basePullAt'], function(baseFlatten, basePullAt) { define(['../internal/baseAt', '../internal/baseCompareAscending', '../internal/baseFlatten', '../internal/basePullAt', '../function/restParam'], function(baseAt, baseCompareAscending, baseFlatten, basePullAt, restParam) {
/** /**
* Removes elements from `array` corresponding to the given indexes and returns * Removes elements from `array` corresponding to the given indexes and returns
@@ -17,7 +17,7 @@ define(['../internal/baseFlatten', '../internal/basePullAt'], function(baseFlatt
* @example * @example
* *
* var array = [5, 10, 15, 20]; * var array = [5, 10, 15, 20];
* var evens = _.pullAt(array, [1, 3]); * var evens = _.pullAt(array, 1, 3);
* *
* console.log(array); * console.log(array);
* // => [5, 15] * // => [5, 15]
@@ -25,9 +25,13 @@ define(['../internal/baseFlatten', '../internal/basePullAt'], function(baseFlatt
* console.log(evens); * console.log(evens);
* // => [10, 20] * // => [10, 20]
*/ */
function pullAt(array) { var pullAt = restParam(function(array, indexes) {
return basePullAt(array || [], baseFlatten(arguments, false, false, 1)); indexes = baseFlatten(indexes);
}
var result = baseAt(array, indexes);
basePullAt(array, indexes.sort(baseCompareAscending));
return result;
});
return pullAt; return pullAt;
}); });

View File

@@ -1,20 +1,18 @@
define(['../internal/baseCallback'], function(baseCallback) { define(['../internal/baseCallback', '../internal/basePullAt'], function(baseCallback, basePullAt) {
/** Used for native method references. */
var arrayProto = Array.prototype;
/** Native method references. */
var splice = arrayProto.splice;
/** /**
* Removes all elements from `array` that `predicate` returns truthy for * Removes all elements from `array` that `predicate` returns truthy for
* and returns an array of the removed elements. The predicate is bound to * and returns an array of the removed elements. The predicate is bound to
* `thisArg` and invoked with three arguments; (value, index, array). * `thisArg` and invoked with three arguments: (value, index, array).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -25,14 +23,15 @@ define(['../internal/baseCallback'], function(baseCallback) {
* @category Array * @category Array
* @param {Array} array The array to modify. * @param {Array} array The array to modify.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {Array} Returns the new array of removed elements. * @returns {Array} Returns the new array of removed elements.
* @example * @example
* *
* var array = [1, 2, 3, 4]; * var array = [1, 2, 3, 4];
* var evens = _.remove(array, function(n) { return n % 2 == 0; }); * var evens = _.remove(array, function(n) {
* return n % 2 == 0;
* });
* *
* console.log(array); * console.log(array);
* // => [1, 3] * // => [1, 3]
@@ -41,19 +40,23 @@ define(['../internal/baseCallback'], function(baseCallback) {
* // => [2, 4] * // => [2, 4]
*/ */
function remove(array, predicate, thisArg) { function remove(array, predicate, thisArg) {
var result = [];
if (!(array && array.length)) {
return result;
}
var index = -1, var index = -1,
length = array ? array.length : 0, indexes = [],
result = []; length = array.length;
predicate = baseCallback(predicate, thisArg, 3); predicate = baseCallback(predicate, thisArg, 3);
while (++index < length) { while (++index < length) {
var value = array[index]; var value = array[index];
if (predicate(value, index, array)) { if (predicate(value, index, array)) {
result.push(value); result.push(value);
splice.call(array, index--, 1); indexes.push(index);
length--;
} }
} }
basePullAt(array, indexes);
return result; return result;
} }

View File

@@ -3,7 +3,7 @@ define(['../internal/baseSlice', '../internal/isIterateeCall'], function(baseSli
/** /**
* Creates a slice of `array` from `start` up to, but not including, `end`. * Creates a slice of `array` from `start` up to, but not including, `end`.
* *
* **Note:** This function is used instead of `Array#slice` to support node * **Note:** This method is used instead of `Array#slice` to support node
* lists in IE < 9 and to ensure dense arrays are returned. * lists in IE < 9 and to ensure dense arrays are returned.
* *
* @static * @static

View File

@@ -1,4 +1,4 @@
define(['../internal/baseCallback', '../internal/binaryIndex', '../internal/binaryIndexBy'], function(baseCallback, binaryIndex, binaryIndexBy) { define(['../internal/createSortedIndex'], function(createSortedIndex) {
/** /**
* Uses a binary search to determine the lowest index at which `value` should * Uses a binary search to determine the lowest index at which `value` should
@@ -7,10 +7,14 @@ define(['../internal/baseCallback', '../internal/binaryIndex', '../internal/bina
* to compute their sort ranking. The iteratee is bound to `thisArg` and * to compute their sort ranking. The iteratee is bound to `thisArg` and
* invoked with one argument; (value). * invoked with one argument; (value).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `iteratee` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `iteratee` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -20,8 +24,7 @@ define(['../internal/baseCallback', '../internal/binaryIndex', '../internal/bina
* @param {Array} array The sorted array to inspect. * @param {Array} array The sorted array to inspect.
* @param {*} value The value to evaluate. * @param {*} value The value to evaluate.
* @param {Function|Object|string} [iteratee=_.identity] The function invoked * @param {Function|Object|string} [iteratee=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`. * @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {number} Returns the index at which `value` should be inserted * @returns {number} Returns the index at which `value` should be inserted
* into `array`. * into `array`.
@@ -30,7 +33,7 @@ define(['../internal/baseCallback', '../internal/binaryIndex', '../internal/bina
* _.sortedIndex([30, 50], 40); * _.sortedIndex([30, 50], 40);
* // => 1 * // => 1
* *
* _.sortedIndex([4, 4, 5, 5, 6, 6], 5); * _.sortedIndex([4, 4, 5, 5], 5);
* // => 2 * // => 2
* *
* var dict = { 'data': { 'thirty': 30, 'forty': 40, 'fifty': 50 } }; * var dict = { 'data': { 'thirty': 30, 'forty': 40, 'fifty': 50 } };
@@ -41,15 +44,11 @@ define(['../internal/baseCallback', '../internal/binaryIndex', '../internal/bina
* }, dict); * }, dict);
* // => 1 * // => 1
* *
* // using the "_.property" callback shorthand * // using the `_.property` callback shorthand
* _.sortedIndex([{ 'x': 30 }, { 'x': 50 }], { 'x': 40 }, 'x'); * _.sortedIndex([{ 'x': 30 }, { 'x': 50 }], { 'x': 40 }, 'x');
* // => 1 * // => 1
*/ */
function sortedIndex(array, value, iteratee, thisArg) { var sortedIndex = createSortedIndex();
return iteratee == null
? binaryIndex(array, value)
: binaryIndexBy(array, value, baseCallback(iteratee, thisArg, 1));
}
return sortedIndex; return sortedIndex;
}); });

View File

@@ -1,4 +1,4 @@
define(['../internal/baseCallback', '../internal/binaryIndex', '../internal/binaryIndexBy'], function(baseCallback, binaryIndex, binaryIndexBy) { define(['../internal/createSortedIndex'], function(createSortedIndex) {
/** /**
* This method is like `_.sortedIndex` except that it returns the highest * This method is like `_.sortedIndex` except that it returns the highest
@@ -11,21 +11,16 @@ define(['../internal/baseCallback', '../internal/binaryIndex', '../internal/bina
* @param {Array} array The sorted array to inspect. * @param {Array} array The sorted array to inspect.
* @param {*} value The value to evaluate. * @param {*} value The value to evaluate.
* @param {Function|Object|string} [iteratee=_.identity] The function invoked * @param {Function|Object|string} [iteratee=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`. * @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {number} Returns the index at which `value` should be inserted * @returns {number} Returns the index at which `value` should be inserted
* into `array`. * into `array`.
* @example * @example
* *
* _.sortedLastIndex([4, 4, 5, 5, 6, 6], 5); * _.sortedLastIndex([4, 4, 5, 5], 5);
* // => 4 * // => 4
*/ */
function sortedLastIndex(array, value, iteratee, thisArg) { var sortedLastIndex = createSortedIndex(true);
return iteratee == null
? binaryIndex(array, value, true)
: binaryIndexBy(array, value, baseCallback(iteratee, thisArg, 1), true);
}
return sortedLastIndex; return sortedLastIndex;
}); });

View File

@@ -5,7 +5,6 @@ define(['../internal/baseSlice', '../internal/isIterateeCall'], function(baseSli
* *
* @static * @static
* @memberOf _ * @memberOf _
* @type Function
* @category Array * @category Array
* @param {Array} array The array to query. * @param {Array} array The array to query.
* @param {number} [n=1] The number of elements to take. * @param {number} [n=1] The number of elements to take.

View File

@@ -5,7 +5,6 @@ define(['../internal/baseSlice', '../internal/isIterateeCall'], function(baseSli
* *
* @static * @static
* @memberOf _ * @memberOf _
* @type Function
* @category Array * @category Array
* @param {Array} array The array to query. * @param {Array} array The array to query.
* @param {number} [n=1] The number of elements to take. * @param {number} [n=1] The number of elements to take.

View File

@@ -1,53 +1,58 @@
define(['../internal/baseCallback', '../internal/baseSlice'], function(baseCallback, baseSlice) { define(['../internal/baseCallback', '../internal/baseWhile'], function(baseCallback, baseWhile) {
/** /**
* Creates a slice of `array` with elements taken from the end. Elements are * Creates a slice of `array` with elements taken from the end. Elements are
* taken until `predicate` returns falsey. The predicate is bound to `thisArg` * taken until `predicate` returns falsey. The predicate is bound to `thisArg`
* and invoked with three arguments; (value, index, array). * and invoked with three arguments: (value, index, array).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
* @static * @static
* @memberOf _ * @memberOf _
* @type Function
* @category Array * @category Array
* @param {Array} array The array to query. * @param {Array} array The array to query.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per element. * per iteration.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {Array} Returns the slice of `array`. * @returns {Array} Returns the slice of `array`.
* @example * @example
* *
* _.takeRightWhile([1, 2, 3], function(n) { return n > 1; }); * _.takeRightWhile([1, 2, 3], function(n) {
* return n > 1;
* });
* // => [2, 3] * // => [2, 3]
* *
* var users = [ * var users = [
* { 'user': 'barney', 'status': 'busy', 'active': false }, * { 'user': 'barney', 'active': true },
* { 'user': 'fred', 'status': 'busy', 'active': true }, * { 'user': 'fred', 'active': false },
* { 'user': 'pebbles', 'status': 'away', 'active': true } * { 'user': 'pebbles', 'active': false }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.matches` callback shorthand
* _.pluck(_.takeRightWhile(users, 'active'), 'user'); * _.pluck(_.takeRightWhile(users, { 'user': 'pebbles', 'active': false }), 'user');
* // => ['pebbles']
*
* // using the `_.matchesProperty` callback shorthand
* _.pluck(_.takeRightWhile(users, 'active', false), 'user');
* // => ['fred', 'pebbles'] * // => ['fred', 'pebbles']
* *
* // using the "_.matches" callback shorthand * // using the `_.property` callback shorthand
* _.pluck(_.takeRightWhile(users, { 'status': 'away' }), 'user'); * _.pluck(_.takeRightWhile(users, 'active'), 'user');
* // => ['pebbles'] * // => []
*/ */
function takeRightWhile(array, predicate, thisArg) { function takeRightWhile(array, predicate, thisArg) {
var length = array ? array.length : 0; return (array && array.length)
if (!length) { ? baseWhile(array, baseCallback(predicate, thisArg, 3), false, true)
return []; : [];
}
predicate = baseCallback(predicate, thisArg, 3);
while (length-- && predicate(array[length], length, array)) {}
return baseSlice(array, length + 1);
} }
return takeRightWhile; return takeRightWhile;

View File

@@ -1,54 +1,58 @@
define(['../internal/baseCallback', '../internal/baseSlice'], function(baseCallback, baseSlice) { define(['../internal/baseCallback', '../internal/baseWhile'], function(baseCallback, baseWhile) {
/** /**
* Creates a slice of `array` with elements taken from the beginning. Elements * Creates a slice of `array` with elements taken from the beginning. Elements
* are taken until `predicate` returns falsey. The predicate is bound to * are taken until `predicate` returns falsey. The predicate is bound to
* `thisArg` and invoked with three arguments; (value, index, array). * `thisArg` and invoked with three arguments: (value, index, array).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
* @static * @static
* @memberOf _ * @memberOf _
* @type Function
* @category Array * @category Array
* @param {Array} array The array to query. * @param {Array} array The array to query.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per element. * per iteration.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {Array} Returns the slice of `array`. * @returns {Array} Returns the slice of `array`.
* @example * @example
* *
* _.takeWhile([1, 2, 3], function(n) { return n < 3; }); * _.takeWhile([1, 2, 3], function(n) {
* return n < 3;
* });
* // => [1, 2] * // => [1, 2]
* *
* var users = [ * var users = [
* { 'user': 'barney', 'status': 'busy', 'active': true }, * { 'user': 'barney', 'active': false },
* { 'user': 'fred', 'status': 'busy', 'active': false }, * { 'user': 'fred', 'active': false},
* { 'user': 'pebbles', 'status': 'away', 'active': true } * { 'user': 'pebbles', 'active': true }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.matches` callback shorthand
* _.pluck(_.takeWhile(users, 'active'), 'user'); * _.pluck(_.takeWhile(users, { 'user': 'barney', 'active': false }), 'user');
* // => ['barney'] * // => ['barney']
* *
* // using the "_.matches" callback shorthand * // using the `_.matchesProperty` callback shorthand
* _.pluck(_.takeWhile(users, { 'status': 'busy' }), 'user'); * _.pluck(_.takeWhile(users, 'active', false), 'user');
* // => ['barney', 'fred'] * // => ['barney', 'fred']
*
* // using the `_.property` callback shorthand
* _.pluck(_.takeWhile(users, 'active'), 'user');
* // => []
*/ */
function takeWhile(array, predicate, thisArg) { function takeWhile(array, predicate, thisArg) {
var length = array ? array.length : 0; return (array && array.length)
if (!length) { ? baseWhile(array, baseCallback(predicate, thisArg, 3))
return []; : [];
}
var index = -1;
predicate = baseCallback(predicate, thisArg, 3);
while (++index < length && predicate(array[index], index, array)) {}
return baseSlice(array, 0, index);
} }
return takeWhile; return takeWhile;

View File

@@ -1,13 +1,9 @@
define(['../internal/baseFlatten', '../internal/baseUniq'], function(baseFlatten, baseUniq) { define(['../internal/baseFlatten', '../internal/baseUniq', '../function/restParam'], function(baseFlatten, baseUniq, restParam) {
/** /**
* Creates an array of unique values, in order, of the provided arrays using * Creates an array of unique values, in order, from all of the provided arrays
* `SameValueZero` for equality comparisons. * using [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* * for equality comparisons.
* **Note:** `SameValueZero` comparisons are like strict equality comparisons,
* e.g. `===`, except that `NaN` matches `NaN`. See the
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for more details.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -16,12 +12,12 @@ define(['../internal/baseFlatten', '../internal/baseUniq'], function(baseFlatten
* @returns {Array} Returns the new array of combined values. * @returns {Array} Returns the new array of combined values.
* @example * @example
* *
* _.union([1, 2, 3], [5, 2, 1, 4], [2, 1]); * _.union([1, 2], [4, 2], [2, 1]);
* // => [1, 2, 3, 5, 4] * // => [1, 2, 4]
*/ */
function union() { var union = restParam(function(arrays) {
return baseUniq(baseFlatten(arguments, false, true)); return baseUniq(baseFlatten(arrays, false, true));
} });
return union; return union;
}); });

View File

@@ -1,25 +1,26 @@
define(['../internal/baseCallback', '../internal/baseUniq', '../internal/isIterateeCall', '../internal/sortedUniq'], function(baseCallback, baseUniq, isIterateeCall, sortedUniq) { define(['../internal/baseCallback', '../internal/baseUniq', '../internal/isIterateeCall', '../internal/sortedUniq'], function(baseCallback, baseUniq, isIterateeCall, sortedUniq) {
/** /**
* Creates a duplicate-value-free version of an array using `SameValueZero` * Creates a duplicate-free version of an array, using
* for equality comparisons. Providing `true` for `isSorted` performs a faster * [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* search algorithm for sorted arrays. If an iteratee function is provided it * for equality comparisons, in which only the first occurence of each element
* is invoked for each value in the array to generate the criterion by which * is kept. Providing `true` for `isSorted` performs a faster search algorithm
* uniqueness is computed. The `iteratee` is bound to `thisArg` and invoked * for sorted arrays. If an iteratee function is provided it is invoked for
* with three arguments; (value, index, array). * each element in the array to generate the criterion by which uniqueness
* is computed. The `iteratee` is bound to `thisArg` and invoked with three
* arguments: (value, index, array).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `iteratee` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `iteratee` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
* **Note:** `SameValueZero` comparisons are like strict equality comparisons,
* e.g. `===`, except that `NaN` matches `NaN`. See the
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for more details.
*
* @static * @static
* @memberOf _ * @memberOf _
* @alias unique * @alias unique
@@ -27,24 +28,24 @@ define(['../internal/baseCallback', '../internal/baseUniq', '../internal/isItera
* @param {Array} array The array to inspect. * @param {Array} array The array to inspect.
* @param {boolean} [isSorted] Specify the array is sorted. * @param {boolean} [isSorted] Specify the array is sorted.
* @param {Function|Object|string} [iteratee] The function invoked per iteration. * @param {Function|Object|string} [iteratee] The function invoked per iteration.
* If a property name or object is provided it is used to create a "_.property"
* or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`. * @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {Array} Returns the new duplicate-value-free array. * @returns {Array} Returns the new duplicate-value-free array.
* @example * @example
* *
* _.uniq([1, 2, 1]); * _.uniq([2, 1, 2]);
* // => [1, 2] * // => [2, 1]
* *
* // using `isSorted` * // using `isSorted`
* _.uniq([1, 1, 2], true); * _.uniq([1, 1, 2], true);
* // => [1, 2] * // => [1, 2]
* *
* // using an iteratee function * // using an iteratee function
* _.uniq([1, 2.5, 1.5, 2], function(n) { return this.floor(n); }, Math); * _.uniq([1, 2.5, 1.5, 2], function(n) {
* return this.floor(n);
* }, Math);
* // => [1, 2.5] * // => [1, 2.5]
* *
* // using the "_.property" callback shorthand * // using the `_.property` callback shorthand
* _.uniq([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x'); * _.uniq([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
* // => [{ 'x': 1 }, { 'x': 2 }] * // => [{ 'x': 1 }, { 'x': 2 }]
*/ */
@@ -53,8 +54,7 @@ define(['../internal/baseCallback', '../internal/baseUniq', '../internal/isItera
if (!length) { if (!length) {
return []; return [];
} }
// Juggle arguments. if (isSorted != null && typeof isSorted != 'boolean') {
if (typeof isSorted != 'boolean' && isSorted != null) {
thisArg = iteratee; thisArg = iteratee;
iteratee = isIterateeCall(array, isSorted, thisArg) ? null : isSorted; iteratee = isIterateeCall(array, isSorted, thisArg) ? null : isSorted;
isSorted = false; isSorted = false;

View File

@@ -1,11 +1,11 @@
define(['../internal/arrayMap', '../internal/arrayMax', '../internal/baseProperty'], function(arrayMap, arrayMax, baseProperty) { define(['../internal/arrayFilter', '../internal/arrayMap', '../internal/baseProperty', '../internal/isArrayLike'], function(arrayFilter, arrayMap, baseProperty, isArrayLike) {
/** Used to the length of n-tuples for `_.unzip`. */ /* Native method references for those with the same name as other `lodash` methods. */
var getLength = baseProperty('length'); var nativeMax = Math.max;
/** /**
* This method is like `_.zip` except that it accepts an array of grouped * This method is like `_.zip` except that it accepts an array of grouped
* elements and creates an array regrouping the elements to their pre-`_.zip` * elements and creates an array regrouping the elements to their pre-zip
* configuration. * configuration.
* *
* @static * @static
@@ -22,10 +22,19 @@ define(['../internal/arrayMap', '../internal/arrayMax', '../internal/basePropert
* // => [['fred', 'barney'], [30, 40], [true, false]] * // => [['fred', 'barney'], [30, 40], [true, false]]
*/ */
function unzip(array) { function unzip(array) {
if (!(array && array.length)) {
return [];
}
var index = -1, var index = -1,
length = (array && array.length && arrayMax(arrayMap(array, getLength))) >>> 0, length = 0;
result = Array(length);
array = arrayFilter(array, function(group) {
if (isArrayLike(group)) {
length = nativeMax(group.length, length);
return true;
}
});
var result = Array(length);
while (++index < length) { while (++index < length) {
result[index] = arrayMap(array, baseProperty(index)); result[index] = arrayMap(array, baseProperty(index));
} }

42
array/unzipWith.js Normal file
View File

@@ -0,0 +1,42 @@
define(['../internal/arrayMap', '../internal/arrayReduce', '../internal/bindCallback', './unzip'], function(arrayMap, arrayReduce, bindCallback, unzip) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined;
/**
* This method is like `_.unzip` except that it accepts an iteratee to specify
* how regrouped values should be combined. The `iteratee` is bound to `thisArg`
* and invoked with four arguments: (accumulator, value, index, group).
*
* @static
* @memberOf _
* @category Array
* @param {Array} array The array of grouped elements to process.
* @param {Function} [iteratee] The function to combine regrouped values.
* @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {Array} Returns the new array of regrouped elements.
* @example
*
* var zipped = _.zip([1, 2], [10, 20], [100, 200]);
* // => [[1, 10, 100], [2, 20, 200]]
*
* _.unzipWith(zipped, _.add);
* // => [3, 30, 300]
*/
function unzipWith(array, iteratee, thisArg) {
var length = array ? array.length : 0;
if (!length) {
return [];
}
var result = unzip(array);
if (iteratee == null) {
return result;
}
iteratee = bindCallback(iteratee, thisArg, 4);
return arrayMap(result, function(group) {
return arrayReduce(group, iteratee, undefined, true);
});
}
return unzipWith;
});

View File

@@ -1,13 +1,9 @@
define(['../internal/baseDifference', '../internal/baseSlice'], function(baseDifference, baseSlice) { define(['../internal/baseDifference', '../internal/isArrayLike', '../function/restParam'], function(baseDifference, isArrayLike, restParam) {
/** /**
* Creates an array excluding all provided values using `SameValueZero` for * Creates an array excluding all provided values using
* equality comparisons. * [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* * for equality comparisons.
* **Note:** `SameValueZero` comparisons are like strict equality comparisons,
* e.g. `===`, except that `NaN` matches `NaN`. See the
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for more details.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -17,12 +13,14 @@ define(['../internal/baseDifference', '../internal/baseSlice'], function(baseDif
* @returns {Array} Returns the new array of filtered values. * @returns {Array} Returns the new array of filtered values.
* @example * @example
* *
* _.without([1, 2, 1, 0, 3, 1, 4], 0, 1); * _.without([1, 2, 1, 3], 1, 2);
* // => [2, 3, 4] * // => [3]
*/ */
function without(array) { var without = restParam(function(array, values) {
return baseDifference(array, baseSlice(arguments, 1)); return isArrayLike(array)
} ? baseDifference(array, values)
: [];
});
return without; return without;
}); });

View File

@@ -1,9 +1,8 @@
define(['../internal/baseDifference', '../internal/baseUniq', '../lang/isArguments', '../lang/isArray'], function(baseDifference, baseUniq, isArguments, isArray) { define(['../internal/baseDifference', '../internal/baseUniq', '../internal/isArrayLike'], function(baseDifference, baseUniq, isArrayLike) {
/** /**
* Creates an array that is the symmetric difference of the provided arrays. * Creates an array of unique values that is the [symmetric difference](https://en.wikipedia.org/wiki/Symmetric_difference)
* See [Wikipedia](https://en.wikipedia.org/wiki/Symmetric_difference) for * of the provided arrays.
* more details.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -12,11 +11,8 @@ define(['../internal/baseDifference', '../internal/baseUniq', '../lang/isArgumen
* @returns {Array} Returns the new array of values. * @returns {Array} Returns the new array of values.
* @example * @example
* *
* _.xor([1, 2, 3], [5, 2, 1, 4]); * _.xor([1, 2], [4, 2]);
* // => [3, 5, 4] * // => [1, 4]
*
* _.xor([1, 2, 5], [2, 3, 5], [3, 4, 5]);
* // => [1, 4, 5]
*/ */
function xor() { function xor() {
var index = -1, var index = -1,
@@ -24,7 +20,7 @@ define(['../internal/baseDifference', '../internal/baseUniq', '../lang/isArgumen
while (++index < length) { while (++index < length) {
var array = arguments[index]; var array = arguments[index];
if (isArray(array) || isArguments(array)) { if (isArrayLike(array)) {
var result = result var result = result
? baseDifference(result, array).concat(baseDifference(array, result)) ? baseDifference(result, array).concat(baseDifference(array, result))
: array; : array;

View File

@@ -1,4 +1,4 @@
define(['./unzip'], function(unzip) { define(['../function/restParam', './unzip'], function(restParam, unzip) {
/** /**
* Creates an array of grouped elements, the first of which contains the first * Creates an array of grouped elements, the first of which contains the first
@@ -15,15 +15,7 @@ define(['./unzip'], function(unzip) {
* _.zip(['fred', 'barney'], [30, 40], [true, false]); * _.zip(['fred', 'barney'], [30, 40], [true, false]);
* // => [['fred', 30, true], ['barney', 40, false]] * // => [['fred', 30, true], ['barney', 40, false]]
*/ */
function zip() { var zip = restParam(unzip);
var length = arguments.length,
array = Array(length);
while (length--) {
array[length] = arguments[length];
}
return unzip(array);
}
return zip; return zip;
}); });

View File

@@ -1,9 +1,10 @@
define(['../lang/isArray'], function(isArray) { define(['../lang/isArray'], function(isArray) {
/** /**
* Creates an object composed from arrays of property names and values. Provide * The inverse of `_.pairs`; this method returns an object composed from arrays
* either a single two dimensional array, e.g. `[[key1, value1], [key2, value2]]` * of property names and values. Provide either a single two dimensional array,
* or two arrays, one of property names and one of corresponding values. * e.g. `[[key1, value1], [key2, value2]]` or two arrays, one of property names
* and one of corresponding values.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -14,6 +15,9 @@ define(['../lang/isArray'], function(isArray) {
* @returns {Object} Returns the new object. * @returns {Object} Returns the new object.
* @example * @example
* *
* _.zipObject([['fred', 30], ['barney', 40]]);
* // => { 'fred': 30, 'barney': 40 }
*
* _.zipObject(['fred', 'barney'], [30, 40]); * _.zipObject(['fred', 'barney'], [30, 40]);
* // => { 'fred': 30, 'barney': 40 } * // => { 'fred': 30, 'barney': 40 }
*/ */

39
array/zipWith.js Normal file
View File

@@ -0,0 +1,39 @@
define(['../function/restParam', './unzipWith'], function(restParam, unzipWith) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined;
/**
* This method is like `_.zip` except that it accepts an iteratee to specify
* how grouped values should be combined. The `iteratee` is bound to `thisArg`
* and invoked with four arguments: (accumulator, value, index, group).
*
* @static
* @memberOf _
* @category Array
* @param {...Array} [arrays] The arrays to process.
* @param {Function} [iteratee] The function to combine grouped values.
* @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {Array} Returns the new array of grouped elements.
* @example
*
* _.zipWith([1, 2], [10, 20], [100, 200], _.add);
* // => [111, 222]
*/
var zipWith = restParam(function(arrays) {
var length = arrays.length,
iteratee = length > 2 ? arrays[length - 2] : undefined,
thisArg = length > 1 ? arrays[length - 1] : undefined;
if (length > 2 && typeof iteratee == 'function') {
length -= 2;
} else {
iteratee = (length > 1 && typeof thisArg == 'function') ? (--length, thisArg) : undefined;
thisArg = undefined;
}
arrays.length = length;
return unzipWith(arrays, iteratee, thisArg);
});
return zipWith;
});

View File

@@ -1,8 +1,11 @@
define(['./chain/chain', './chain/lodash', './chain/reverse', './chain/tap', './chain/thru', './chain/toJSON', './chain/toString', './chain/value', './chain/valueOf', './chain/wrapperChain'], function(chain, lodash, reverse, tap, thru, toJSON, toString, value, valueOf, wrapperChain) { define(['./chain/chain', './chain/commit', './chain/lodash', './chain/plant', './chain/reverse', './chain/run', './chain/tap', './chain/thru', './chain/toJSON', './chain/toString', './chain/value', './chain/valueOf', './chain/wrapperChain'], function(chain, commit, lodash, plant, reverse, run, tap, thru, toJSON, toString, value, valueOf, wrapperChain) {
return { return {
'chain': chain, 'chain': chain,
'commit': commit,
'lodash': lodash, 'lodash': lodash,
'plant': plant,
'reverse': reverse, 'reverse': reverse,
'run': run,
'tap': tap, 'tap': tap,
'thru': thru, 'thru': thru,
'toJSON': toJSON, 'toJSON': toJSON,

View File

@@ -8,7 +8,7 @@ define(['./lodash'], function(lodash) {
* @memberOf _ * @memberOf _
* @category Chain * @category Chain
* @param {*} value The value to wrap. * @param {*} value The value to wrap.
* @returns {Object} Returns the new `lodash` object. * @returns {Object} Returns the new `lodash` wrapper instance.
* @example * @example
* *
* var users = [ * var users = [
@@ -19,7 +19,9 @@ define(['./lodash'], function(lodash) {
* *
* var youngest = _.chain(users) * var youngest = _.chain(users)
* .sortBy('age') * .sortBy('age')
* .map(function(chr) { return chr.user + ' is ' + chr.age; }) * .map(function(chr) {
* return chr.user + ' is ' + chr.age;
* })
* .first() * .first()
* .value(); * .value();
* // => 'pebbles is 1' * // => 'pebbles is 1'

3
chain/commit.js Normal file
View File

@@ -0,0 +1,3 @@
define(["./wrapperCommit"], function(wrapperCommit) {
return wrapperCommit;
});

View File

@@ -1,4 +1,4 @@
define(['../internal/LodashWrapper', '../internal/arrayCopy', '../lang/isArray', '../internal/isObjectLike'], function(LodashWrapper, arrayCopy, isArray, isObjectLike) { define(['../internal/LazyWrapper', '../internal/LodashWrapper', '../internal/baseLodash', '../lang/isArray', '../internal/isObjectLike', '../internal/wrapperClone'], function(LazyWrapper, LodashWrapper, baseLodash, isArray, isObjectLike, wrapperClone) {
/** Used for native method references. */ /** Used for native method references. */
var objectProto = Object.prototype; var objectProto = Object.prototype;
@@ -7,7 +7,7 @@ define(['../internal/LodashWrapper', '../internal/arrayCopy', '../lang/isArray',
var hasOwnProperty = objectProto.hasOwnProperty; var hasOwnProperty = objectProto.hasOwnProperty;
/** /**
* Creates a `lodash` object which wraps `value` to enable intuitive chaining. * Creates a `lodash` object which wraps `value` to enable implicit chaining.
* Methods that operate on and return arrays, collections, and functions can * Methods that operate on and return arrays, collections, and functions can
* be chained together. Methods that return a boolean or single value will * be chained together. Methods that return a boolean or single value will
* automatically end the chain returning the unwrapped value. Explicit chaining * automatically end the chain returning the unwrapped value. Explicit chaining
@@ -22,65 +22,77 @@ define(['../internal/LodashWrapper', '../internal/arrayCopy', '../lang/isArray',
* Chaining is supported in custom builds as long as the `_#value` method is * Chaining is supported in custom builds as long as the `_#value` method is
* directly or indirectly included in the build. * directly or indirectly included in the build.
* *
* In addition to lodash methods, wrappers also have the following `Array` methods: * In addition to lodash methods, wrappers have `Array` and `String` methods.
* `concat`, `join`, `pop`, `push`, `reverse`, `shift`, `slice`, `sort`, `splice`,
* and `unshift`
* *
* The wrapper functions that support shortcut fusion are: * The wrapper `Array` methods are:
* `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`, `first`, * `concat`, `join`, `pop`, `push`, `reverse`, `shift`, `slice`, `sort`,
* `initial`, `last`, `map`, `pluck`, `reject`, `rest`, `reverse`, `slice`, * `splice`, and `unshift`
* `take`, `takeRight`, `takeRightWhile`, `takeWhile`, and `where`
* *
* The chainable wrapper functions are: * The wrapper `String` methods are:
* `replace` and `split`
*
* The wrapper methods that support shortcut fusion are:
* `compact`, `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`,
* `first`, `initial`, `last`, `map`, `pluck`, `reject`, `rest`, `reverse`,
* `slice`, `take`, `takeRight`, `takeRightWhile`, `takeWhile`, `toArray`,
* and `where`
*
* The chainable wrapper methods are:
* `after`, `ary`, `assign`, `at`, `before`, `bind`, `bindAll`, `bindKey`, * `after`, `ary`, `assign`, `at`, `before`, `bind`, `bindAll`, `bindKey`,
* `callback`, `chain`, `chunk`, `compact`, `concat`, `constant`, `countBy`, * `callback`, `chain`, `chunk`, `commit`, `compact`, `concat`, `constant`,
* `create`, `curry`, `debounce`, `defaults`, `defer`, `delay`, `difference`, * `countBy`, `create`, `curry`, `debounce`, `defaults`, `defer`, `delay`,
* `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`, `flatten`, * `difference`, `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `fill`,
* `flattenDeep`, `flow`, `flowRight`, `forEach`, `forEachRight`, `forIn`, * `filter`, `flatten`, `flattenDeep`, `flow`, `flowRight`, `forEach`,
* `forInRight`, `forOwn`, `forOwnRight`, `functions`, `groupBy`, `indexBy`, * `forEachRight`, `forIn`, `forInRight`, `forOwn`, `forOwnRight`, `functions`,
* `initial`, `intersection`, `invert`, `invoke`, `keys`, `keysIn`, `map`, * `groupBy`, `indexBy`, `initial`, `intersection`, `invert`, `invoke`, `keys`,
* `mapValues`, `matches`, `memoize`, `merge`, `mixin`, `negate`, `noop`, * `keysIn`, `map`, `mapKeys`, `mapValues`, `matches`, `matchesProperty`,
* `omit`, `once`, `pairs`, `partial`, `partialRight`, `partition`, `pick`, * `memoize`, `merge`, `method`, `methodOf`, `mixin`, `negate`, `omit`, `once`,
* `pluck`, `property`, `propertyOf`, `pull`, `pullAt`, `push`, `range`, * `pairs`, `partial`, `partialRight`, `partition`, `pick`, `plant`, `pluck`,
* `rearg`, `reject`, `remove`, `rest`, `reverse`, `shuffle`, `slice`, `sort`, * `property`, `propertyOf`, `pull`, `pullAt`, `push`, `range`, `rearg`,
* `sortBy`, `sortByAll`, `splice`, `take`, `takeRight`, `takeRightWhile`, * `reject`, `remove`, `rest`, `restParam`, `reverse`, `set`, `shuffle`,
* `takeWhile`, `tap`, `throttle`, `thru`, `times`, `toArray`, `toPlainObject`, * `slice`, `sort`, `sortBy`, `sortByAll`, `sortByOrder`, `splice`, `spread`,
* `transform`, `union`, `uniq`, `unshift`, `unzip`, `values`, `valuesIn`, * `take`, `takeRight`, `takeRightWhile`, `takeWhile`, `tap`, `throttle`,
* `where`, `without`, `wrap`, `xor`, `zip`, and `zipObject` * `thru`, `times`, `toArray`, `toPlainObject`, `transform`, `union`, `uniq`,
* `unshift`, `unzip`, `unzipWith`, `values`, `valuesIn`, `where`, `without`,
* `wrap`, `xor`, `zip`, `zipObject`, `zipWith`
* *
* The wrapper functions that are **not** chainable by default are: * The wrapper methods that are **not** chainable by default are:
* `attempt`, `camelCase`, `capitalize`, `clone`, `cloneDeep`, `deburr`, * `add`, `attempt`, `camelCase`, `capitalize`, `clone`, `cloneDeep`, `deburr`,
* `endsWith`, `escape`, `escapeRegExp`, `every`, `find`, `findIndex`, `findKey`, * `endsWith`, `escape`, `escapeRegExp`, `every`, `find`, `findIndex`, `findKey`,
* `findLast`, `findLastIndex`, `findLastKey`, `findWhere`, `first`, `has`, * `findLast`, `findLastIndex`, `findLastKey`, `findWhere`, `first`, `get`,
* `identity`, `includes`, `indexOf`, `isArguments`, `isArray`, `isBoolean`, * `gt`, `gte`, `has`, `identity`, `includes`, `indexOf`, `inRange`, `isArguments`,
* `isDate`, `isElement`, `isEmpty`, `isEqual`, `isError`, `isFinite`, * `isArray`, `isBoolean`, `isDate`, `isElement`, `isEmpty`, `isEqual`, `isError`,
* `isFunction`, `isMatch`, `isNative`, `isNaN`, `isNull`, `isNumber`, * `isFinite` `isFunction`, `isMatch`, `isNative`, `isNaN`, `isNull`, `isNumber`,
* `isObject`, `isPlainObject`, `isRegExp`, `isString`, `isUndefined`, * `isObject`, `isPlainObject`, `isRegExp`, `isString`, `isUndefined`,
* `isTypedArray`, `join`, `kebabCase`, `last`, `lastIndexOf`, `max`, `min`, * `isTypedArray`, `join`, `kebabCase`, `last`, `lastIndexOf`, `lt`, `lte`,
* `noConflict`, `now`, `pad`, `padLeft`, `padRight`, `parseInt`, `pop`, * `max`, `min`, `noConflict`, `noop`, `now`, `pad`, `padLeft`, `padRight`,
* `random`, `reduce`, `reduceRight`, `repeat`, `result`, `runInContext`, * `parseInt`, `pop`, `random`, `reduce`, `reduceRight`, `repeat`, `result`,
* `shift`, `size`, `snakeCase`, `some`, `sortedIndex`, `sortedLastIndex`, * `runInContext`, `shift`, `size`, `snakeCase`, `some`, `sortedIndex`,
* `startCase`, `startsWith`, `template`, `trim`, `trimLeft`, `trimRight`, * `sortedLastIndex`, `startCase`, `startsWith`, `sum`, `template`, `trim`,
* `trunc`, `unescape`, `uniqueId`, `value`, and `words` * `trimLeft`, `trimRight`, `trunc`, `unescape`, `uniqueId`, `value`, and `words`
* *
* The wrapper function `sample` will return a wrapped value when `n` is provided, * The wrapper method `sample` will return a wrapped value when `n` is provided,
* otherwise an unwrapped value is returned. * otherwise an unwrapped value is returned.
* *
* @name _ * @name _
* @constructor * @constructor
* @category Chain * @category Chain
* @param {*} value The value to wrap in a `lodash` instance. * @param {*} value The value to wrap in a `lodash` instance.
* @returns {Object} Returns a `lodash` instance. * @returns {Object} Returns the new `lodash` wrapper instance.
* @example * @example
* *
* var wrapped = _([1, 2, 3]); * var wrapped = _([1, 2, 3]);
* *
* // returns an unwrapped value * // returns an unwrapped value
* wrapped.reduce(function(sum, n) { return sum + n; }); * wrapped.reduce(function(total, n) {
* return total + n;
* });
* // => 6 * // => 6
* *
* // returns a wrapped value * // returns a wrapped value
* var squares = wrapped.map(function(n) { return n * n; }); * var squares = wrapped.map(function(n) {
* return n * n;
* });
* *
* _.isArray(squares); * _.isArray(squares);
* // => false * // => false
@@ -89,19 +101,19 @@ define(['../internal/LodashWrapper', '../internal/arrayCopy', '../lang/isArray',
* // => true * // => true
*/ */
function lodash(value) { function lodash(value) {
if (isObjectLike(value) && !isArray(value)) { if (isObjectLike(value) && !isArray(value) && !(value instanceof LazyWrapper)) {
if (value instanceof LodashWrapper) { if (value instanceof LodashWrapper) {
return value; return value;
} }
if (hasOwnProperty.call(value, '__wrapped__')) { if (hasOwnProperty.call(value, '__chain__') && hasOwnProperty.call(value, '__wrapped__')) {
return new LodashWrapper(value.__wrapped__, value.__chain__, arrayCopy(value.__actions__)); return wrapperClone(value);
} }
} }
return new LodashWrapper(value); return new LodashWrapper(value);
} }
// Ensure `new LodashWrapper` is an instance of `lodash`. // Ensure wrappers are instances of `baseLodash`.
LodashWrapper.prototype = lodash.prototype; lodash.prototype = baseLodash.prototype;
return lodash; return lodash;
}); });

3
chain/plant.js Normal file
View File

@@ -0,0 +1,3 @@
define(["./wrapperPlant"], function(wrapperPlant) {
return wrapperPlant;
});

3
chain/run.js Normal file
View File

@@ -0,0 +1,3 @@
define(["./wrapperValue"], function(wrapperValue) {
return wrapperValue;
});

View File

@@ -16,7 +16,9 @@ define([], function() {
* @example * @example
* *
* _([1, 2, 3]) * _([1, 2, 3])
* .tap(function(array) { array.pop(); }) * .tap(function(array) {
* array.pop();
* })
* .reverse() * .reverse()
* .value(); * .value();
* // => [2, 1] * // => [2, 1]

View File

@@ -12,11 +12,14 @@ define([], function() {
* @returns {*} Returns the result of `interceptor`. * @returns {*} Returns the result of `interceptor`.
* @example * @example
* *
* _([1, 2, 3]) * _(' abc ')
* .last() * .chain()
* .thru(function(value) { return [value]; }) * .trim()
* .thru(function(value) {
* return [value];
* })
* .value(); * .value();
* // => [3] * // => ['abc']
*/ */
function thru(value, interceptor, thisArg) { function thru(value, interceptor, thisArg) {
return interceptor.call(thisArg, value); return interceptor.call(thisArg, value);

View File

@@ -6,7 +6,7 @@ define(['./chain'], function(chain) {
* @name chain * @name chain
* @memberOf _ * @memberOf _
* @category Chain * @category Chain
* @returns {*} Returns the `lodash` object. * @returns {Object} Returns the new `lodash` wrapper instance.
* @example * @example
* *
* var users = [ * var users = [

33
chain/wrapperCommit.js Normal file
View File

@@ -0,0 +1,33 @@
define(['../internal/LodashWrapper'], function(LodashWrapper) {
/**
* Executes the chained sequence and returns the wrapped result.
*
* @name commit
* @memberOf _
* @category Chain
* @returns {Object} Returns the new `lodash` wrapper instance.
* @example
*
* var array = [1, 2];
* var wrapper = _(array).push(3);
*
* console.log(array);
* // => [1, 2]
*
* wrapper = wrapper.commit();
* console.log(array);
* // => [1, 2, 3]
*
* wrapper.last();
* // => 3
*
* console.log(array);
* // => [1, 2, 3]
*/
function wrapperCommit() {
return new LodashWrapper(this.value(), this.__chain__);
}
return wrapperCommit;
});

45
chain/wrapperPlant.js Normal file
View File

@@ -0,0 +1,45 @@
define(['../internal/baseLodash', '../internal/wrapperClone'], function(baseLodash, wrapperClone) {
/**
* Creates a clone of the chained sequence planting `value` as the wrapped value.
*
* @name plant
* @memberOf _
* @category Chain
* @returns {Object} Returns the new `lodash` wrapper instance.
* @example
*
* var array = [1, 2];
* var wrapper = _(array).map(function(value) {
* return Math.pow(value, 2);
* });
*
* var other = [3, 4];
* var otherWrapper = wrapper.plant(other);
*
* otherWrapper.value();
* // => [9, 16]
*
* wrapper.value();
* // => [1, 4]
*/
function wrapperPlant(value) {
var result,
parent = this;
while (parent instanceof baseLodash) {
var clone = wrapperClone(parent);
if (result) {
previous.__wrapped__ = clone;
} else {
result = clone;
}
var previous = clone;
parent = parent.__wrapped__;
}
previous.__wrapped__ = value;
return result;
}
return wrapperPlant;
});

View File

@@ -9,7 +9,7 @@ define(['../internal/LazyWrapper', '../internal/LodashWrapper', './thru'], funct
* @name reverse * @name reverse
* @memberOf _ * @memberOf _
* @category Chain * @category Chain
* @returns {Object} Returns the new reversed `lodash` object. * @returns {Object} Returns the new reversed `lodash` wrapper instance.
* @example * @example
* *
* var array = [1, 2, 3]; * var array = [1, 2, 3];
@@ -26,7 +26,7 @@ define(['../internal/LazyWrapper', '../internal/LodashWrapper', './thru'], funct
if (this.__actions__.length) { if (this.__actions__.length) {
value = new LazyWrapper(this); value = new LazyWrapper(this);
} }
return new LodashWrapper(value.reverse()); return new LodashWrapper(value.reverse(), this.__chain__);
} }
return this.thru(function(value) { return this.thru(function(value) {
return value.reverse(); return value.reverse();

View File

@@ -5,7 +5,7 @@ define(['../internal/baseWrapperValue'], function(baseWrapperValue) {
* *
* @name value * @name value
* @memberOf _ * @memberOf _
* @alias toJSON, valueOf * @alias run, toJSON, valueOf
* @category Chain * @category Chain
* @returns {*} Returns the resolved unwrapped value. * @returns {*} Returns the resolved unwrapped value.
* @example * @example

View File

@@ -1,4 +1,4 @@
define(['./collection/all', './collection/any', './collection/at', './collection/collect', './collection/contains', './collection/countBy', './collection/detect', './collection/each', './collection/eachRight', './collection/every', './collection/filter', './collection/find', './collection/findLast', './collection/findWhere', './collection/foldl', './collection/foldr', './collection/forEach', './collection/forEachRight', './collection/groupBy', './collection/include', './collection/includes', './collection/indexBy', './collection/inject', './collection/invoke', './collection/map', './collection/max', './collection/min', './collection/partition', './collection/pluck', './collection/reduce', './collection/reduceRight', './collection/reject', './collection/sample', './collection/select', './collection/shuffle', './collection/size', './collection/some', './collection/sortBy', './collection/sortByAll', './collection/where'], function(all, any, at, collect, contains, countBy, detect, each, eachRight, every, filter, find, findLast, findWhere, foldl, foldr, forEach, forEachRight, groupBy, include, includes, indexBy, inject, invoke, map, max, min, partition, pluck, reduce, reduceRight, reject, sample, select, shuffle, size, some, sortBy, sortByAll, where) { define(['./collection/all', './collection/any', './collection/at', './collection/collect', './collection/contains', './collection/countBy', './collection/detect', './collection/each', './collection/eachRight', './collection/every', './collection/filter', './collection/find', './collection/findLast', './collection/findWhere', './collection/foldl', './collection/foldr', './collection/forEach', './collection/forEachRight', './collection/groupBy', './collection/include', './collection/includes', './collection/indexBy', './collection/inject', './collection/invoke', './collection/map', './math/max', './math/min', './collection/partition', './collection/pluck', './collection/reduce', './collection/reduceRight', './collection/reject', './collection/sample', './collection/select', './collection/shuffle', './collection/size', './collection/some', './collection/sortBy', './collection/sortByAll', './collection/sortByOrder', './math/sum', './collection/where'], function(all, any, at, collect, contains, countBy, detect, each, eachRight, every, filter, find, findLast, findWhere, foldl, foldr, forEach, forEachRight, groupBy, include, includes, indexBy, inject, invoke, map, max, min, partition, pluck, reduce, reduceRight, reject, sample, select, shuffle, size, some, sortBy, sortByAll, sortByOrder, sum, where) {
return { return {
'all': all, 'all': all,
'any': any, 'any': any,
@@ -39,6 +39,8 @@ define(['./collection/all', './collection/any', './collection/at', './collection
'some': some, 'some': some,
'sortBy': sortBy, 'sortBy': sortBy,
'sortByAll': sortByAll, 'sortByAll': sortByAll,
'sortByOrder': sortByOrder,
'sum': sum,
'where': where 'where': where
}; };
}); });

View File

@@ -1,4 +1,4 @@
define(['../internal/baseAt', '../internal/baseFlatten', '../internal/isLength', '../internal/toIterable'], function(baseAt, baseFlatten, isLength, toIterable) { define(['../internal/baseAt', '../internal/baseFlatten', '../function/restParam'], function(baseAt, baseFlatten, restParam) {
/** /**
* Creates an array of elements corresponding to the given keys, or indexes, * Creates an array of elements corresponding to the given keys, or indexes,
@@ -14,19 +14,15 @@ define(['../internal/baseAt', '../internal/baseFlatten', '../internal/isLength',
* @returns {Array} Returns the new array of picked elements. * @returns {Array} Returns the new array of picked elements.
* @example * @example
* *
* _.at(['a', 'b', 'c', 'd', 'e'], [0, 2, 4]); * _.at(['a', 'b', 'c'], [0, 2]);
* // => ['a', 'c', 'e'] * // => ['a', 'c']
* *
* _.at(['fred', 'barney', 'pebbles'], 0, 2); * _.at(['barney', 'fred', 'pebbles'], 0, 2);
* // => ['fred', 'pebbles'] * // => ['barney', 'pebbles']
*/ */
function at(collection) { var at = restParam(function(collection, props) {
var length = collection ? collection.length : 0; return baseAt(collection, baseFlatten(props));
if (isLength(length)) { });
collection = toIterable(collection);
}
return baseAt(collection, baseFlatten(arguments, false, false, 1));
}
return at; return at;
}); });

View File

@@ -10,13 +10,17 @@ define(['../internal/createAggregator'], function(createAggregator) {
* Creates an object composed of keys generated from the results of running * Creates an object composed of keys generated from the results of running
* each element of `collection` through `iteratee`. The corresponding value * each element of `collection` through `iteratee`. The corresponding value
* of each key is the number of times the key was returned by `iteratee`. * of each key is the number of times the key was returned by `iteratee`.
* The `iteratee` is bound to `thisArg` and invoked with three arguments; * The `iteratee` is bound to `thisArg` and invoked with three arguments:
* (value, index|key, collection). * (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `iteratee` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `iteratee` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -25,16 +29,19 @@ define(['../internal/createAggregator'], function(createAggregator) {
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function|Object|string} [iteratee=_.identity] The function invoked * @param {Function|Object|string} [iteratee=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`. * @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {Object} Returns the composed aggregate object. * @returns {Object} Returns the composed aggregate object.
* @example * @example
* *
* _.countBy([4.3, 6.1, 6.4], function(n) { return Math.floor(n); }); * _.countBy([4.3, 6.1, 6.4], function(n) {
* return Math.floor(n);
* });
* // => { '4': 1, '6': 2 } * // => { '4': 1, '6': 2 }
* *
* _.countBy([4.3, 6.1, 6.4], function(n) { return this.floor(n); }, Math); * _.countBy([4.3, 6.1, 6.4], function(n) {
* return this.floor(n);
* }, Math);
* // => { '4': 1, '6': 2 } * // => { '4': 1, '6': 2 }
* *
* _.countBy(['one', 'two', 'three'], 'length'); * _.countBy(['one', 'two', 'three'], 'length');

View File

@@ -1,14 +1,21 @@
define(['../internal/arrayEvery', '../internal/baseCallback', '../internal/baseEvery', '../lang/isArray'], function(arrayEvery, baseCallback, baseEvery, isArray) { define(['../internal/arrayEvery', '../internal/baseCallback', '../internal/baseEvery', '../lang/isArray', '../internal/isIterateeCall'], function(arrayEvery, baseCallback, baseEvery, isArray, isIterateeCall) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined;
/** /**
* Checks if `predicate` returns truthy for **all** elements of `collection`. * Checks if `predicate` returns truthy for **all** elements of `collection`.
* The predicate is bound to `thisArg` and invoked with three arguments; * The predicate is bound to `thisArg` and invoked with three arguments:
* (value, index|key, collection). * (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -18,32 +25,38 @@ define(['../internal/arrayEvery', '../internal/baseCallback', '../internal/baseE
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {boolean} Returns `true` if all elements pass the predicate check, * @returns {boolean} Returns `true` if all elements pass the predicate check,
* else `false`. * else `false`.
* @example * @example
* *
* _.every([true, 1, null, 'yes']); * _.every([true, 1, null, 'yes'], Boolean);
* // => false * // => false
* *
* var users = [ * var users = [
* { 'user': 'barney', 'age': 36 }, * { 'user': 'barney', 'active': false },
* { 'user': 'fred', 'age': 40 } * { 'user': 'fred', 'active': false }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.matches` callback shorthand
* _.every(users, 'age'); * _.every(users, { 'user': 'barney', 'active': false });
* // => false
*
* // using the `_.matchesProperty` callback shorthand
* _.every(users, 'active', false);
* // => true * // => true
* *
* // using the "_.matches" callback shorthand * // using the `_.property` callback shorthand
* _.every(users, { 'age': 36 }); * _.every(users, 'active');
* // => false * // => false
*/ */
function every(collection, predicate, thisArg) { function every(collection, predicate, thisArg) {
var func = isArray(collection) ? arrayEvery : baseEvery; var func = isArray(collection) ? arrayEvery : baseEvery;
if (typeof predicate != 'function' || typeof thisArg != 'undefined') { if (thisArg && isIterateeCall(collection, predicate, thisArg)) {
predicate = null;
}
if (typeof predicate != 'function' || thisArg !== undefined) {
predicate = baseCallback(predicate, thisArg, 3); predicate = baseCallback(predicate, thisArg, 3);
} }
return func(collection, predicate); return func(collection, predicate);

View File

@@ -3,12 +3,16 @@ define(['../internal/arrayFilter', '../internal/baseCallback', '../internal/base
/** /**
* Iterates over elements of `collection`, returning an array of all elements * Iterates over elements of `collection`, returning an array of all elements
* `predicate` returns truthy for. The predicate is bound to `thisArg` and * `predicate` returns truthy for. The predicate is bound to `thisArg` and
* invoked with three arguments; (value, index|key, collection). * invoked with three arguments: (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -18,26 +22,31 @@ define(['../internal/arrayFilter', '../internal/baseCallback', '../internal/base
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {Array} Returns the new filtered array. * @returns {Array} Returns the new filtered array.
* @example * @example
* *
* var evens = _.filter([1, 2, 3, 4], function(n) { return n % 2 == 0; }); * _.filter([4, 5, 6], function(n) {
* // => [2, 4] * return n % 2 == 0;
* });
* // => [4, 6]
* *
* var users = [ * var users = [
* { 'user': 'barney', 'age': 36, 'active': false }, * { 'user': 'barney', 'age': 36, 'active': true },
* { 'user': 'fred', 'age': 40, 'active': true } * { 'user': 'fred', 'age': 40, 'active': false }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.matches` callback shorthand
* _.pluck(_.filter(users, 'active'), 'user'); * _.pluck(_.filter(users, { 'age': 36, 'active': true }), 'user');
* // => ['barney']
*
* // using the `_.matchesProperty` callback shorthand
* _.pluck(_.filter(users, 'active', false), 'user');
* // => ['fred'] * // => ['fred']
* *
* // using the "_.matches" callback shorthand * // using the `_.property` callback shorthand
* _.pluck(_.filter(users, { 'age': 36 }), 'user'); * _.pluck(_.filter(users, 'active'), 'user');
* // => ['barney'] * // => ['barney']
*/ */
function filter(collection, predicate, thisArg) { function filter(collection, predicate, thisArg) {

View File

@@ -1,17 +1,18 @@
define(['../internal/baseCallback', '../internal/baseEach', '../internal/baseFind', '../array/findIndex', '../lang/isArray'], function(baseCallback, baseEach, baseFind, findIndex, isArray) { define(['../internal/baseEach', '../internal/createFind'], function(baseEach, createFind) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined;
/** /**
* Iterates over elements of `collection`, returning the first element * Iterates over elements of `collection`, returning the first element
* `predicate` returns truthy for. The predicate is bound to `thisArg` and * `predicate` returns truthy for. The predicate is bound to `thisArg` and
* invoked with three arguments; (value, index|key, collection). * invoked with three arguments: (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -21,37 +22,35 @@ define(['../internal/baseCallback', '../internal/baseEach', '../internal/baseFin
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to search. * @param {Array|Object|string} collection The collection to search.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {*} Returns the matched element, else `undefined`. * @returns {*} Returns the matched element, else `undefined`.
* @example * @example
* *
* var users = [ * var users = [
* { 'user': 'barney', 'age': 36, 'active': false }, * { 'user': 'barney', 'age': 36, 'active': true },
* { 'user': 'fred', 'age': 40, 'active': true }, * { 'user': 'fred', 'age': 40, 'active': false },
* { 'user': 'pebbles', 'age': 1, 'active': false } * { 'user': 'pebbles', 'age': 1, 'active': true }
* ]; * ];
* *
* _.result(_.find(users, function(chr) { return chr.age < 40; }), 'user'); * _.result(_.find(users, function(chr) {
* return chr.age < 40;
* }), 'user');
* // => 'barney' * // => 'barney'
* *
* // using the "_.matches" callback shorthand * // using the `_.matches` callback shorthand
* _.result(_.find(users, { 'age': 1 }), 'user'); * _.result(_.find(users, { 'age': 1, 'active': true }), 'user');
* // => 'pebbles' * // => 'pebbles'
* *
* // using the "_.property" callback shorthand * // using the `_.matchesProperty` callback shorthand
* _.result(_.find(users, 'active'), 'user'); * _.result(_.find(users, 'active', false), 'user');
* // => 'fred' * // => 'fred'
*
* // using the `_.property` callback shorthand
* _.result(_.find(users, 'active'), 'user');
* // => 'barney'
*/ */
function find(collection, predicate, thisArg) { var find = createFind(baseEach);
if (isArray(collection)) {
var index = findIndex(collection, predicate, thisArg);
return index > -1 ? collection[index] : undefined;
}
predicate = baseCallback(predicate, thisArg, 3);
return baseFind(collection, predicate, baseEach);
}
return find; return find;
}); });

View File

@@ -1,4 +1,4 @@
define(['../internal/baseCallback', '../internal/baseEachRight', '../internal/baseFind'], function(baseCallback, baseEachRight, baseFind) { define(['../internal/baseEachRight', '../internal/createFind'], function(baseEachRight, createFind) {
/** /**
* This method is like `_.find` except that it iterates over elements of * This method is like `_.find` except that it iterates over elements of
@@ -9,19 +9,17 @@ define(['../internal/baseCallback', '../internal/baseEachRight', '../internal/ba
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to search. * @param {Array|Object|string} collection The collection to search.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {*} Returns the matched element, else `undefined`. * @returns {*} Returns the matched element, else `undefined`.
* @example * @example
* *
* _.findLast([1, 2, 3, 4], function(n) { return n % 2 == 1; }); * _.findLast([1, 2, 3, 4], function(n) {
* return n % 2 == 1;
* });
* // => 3 * // => 3
*/ */
function findLast(collection, predicate, thisArg) { var findLast = createFind(baseEachRight, true);
predicate = baseCallback(predicate, thisArg, 3);
return baseFind(collection, predicate, baseEachRight);
}
return findLast; return findLast;
}); });

View File

@@ -5,6 +5,11 @@ define(['../internal/baseMatches', './find'], function(baseMatches, find) {
* source object, returning the first element that has equivalent property * source object, returning the first element that has equivalent property
* values. * values.
* *
* **Note:** This method supports comparing arrays, booleans, `Date` objects,
* numbers, `Object` objects, regexes, and strings. Objects are compared by
* their own, not inherited, enumerable properties. For comparing a single
* own or inherited property value see `_.matchesProperty`.
*
* @static * @static
* @memberOf _ * @memberOf _
* @category Collection * @category Collection
@@ -14,14 +19,14 @@ define(['../internal/baseMatches', './find'], function(baseMatches, find) {
* @example * @example
* *
* var users = [ * var users = [
* { 'user': 'barney', 'age': 36, 'status': 'busy' }, * { 'user': 'barney', 'age': 36, 'active': true },
* { 'user': 'fred', 'age': 40, 'status': 'busy' } * { 'user': 'fred', 'age': 40, 'active': false }
* ]; * ];
* *
* _.result(_.findWhere(users, { 'status': 'busy' }), 'user'); * _.result(_.findWhere(users, { 'age': 36, 'active': true }), 'user');
* // => 'barney' * // => 'barney'
* *
* _.result(_.findWhere(users, { 'age': 40 }), 'user'); * _.result(_.findWhere(users, { 'age': 40, 'active': false }), 'user');
* // => 'fred' * // => 'fred'
*/ */
function findWhere(collection, source) { function findWhere(collection, source) {

View File

@@ -1,12 +1,12 @@
define(['../internal/arrayEach', '../internal/baseEach', '../internal/bindCallback', '../lang/isArray'], function(arrayEach, baseEach, bindCallback, isArray) { define(['../internal/arrayEach', '../internal/baseEach', '../internal/createForEach'], function(arrayEach, baseEach, createForEach) {
/** /**
* Iterates over elements of `collection` invoking `iteratee` for each element. * Iterates over elements of `collection` invoking `iteratee` for each element.
* The `iteratee` is bound to `thisArg` and invoked with three arguments; * 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`. * 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` * are iterated like arrays. To avoid this behavior `_.forIn` or `_.forOwn`
* may be used for object iteration. * may be used for object iteration.
* *
@@ -20,17 +20,17 @@ define(['../internal/arrayEach', '../internal/baseEach', '../internal/bindCallba
* @returns {Array|Object|string} Returns `collection`. * @returns {Array|Object|string} Returns `collection`.
* @example * @example
* *
* _([1, 2, 3]).forEach(function(n) { console.log(n); }).value(); * _([1, 2]).forEach(function(n) {
* console.log(n);
* }).value();
* // => logs each value from left to right and returns the array * // => logs each value from left to right and returns the array
* *
* _.forEach({ 'one': 1, 'two': 2, 'three': 3 }, function(n, key) { console.log(n, key); }); * _.forEach({ 'a': 1, 'b': 2 }, function(n, key) {
* console.log(n, key);
* });
* // => logs each value-key pair and returns the object (iteration order is not guaranteed) * // => logs each value-key pair and returns the object (iteration order is not guaranteed)
*/ */
function forEach(collection, iteratee, thisArg) { var forEach = createForEach(arrayEach, baseEach);
return (typeof iteratee == 'function' && typeof thisArg == 'undefined' && isArray(collection))
? arrayEach(collection, iteratee)
: baseEach(collection, bindCallback(iteratee, thisArg, 3));
}
return forEach; return forEach;
}); });

View File

@@ -1,4 +1,4 @@
define(['../internal/arrayEachRight', '../internal/baseEachRight', '../internal/bindCallback', '../lang/isArray'], function(arrayEachRight, baseEachRight, bindCallback, isArray) { define(['../internal/arrayEachRight', '../internal/baseEachRight', '../internal/createForEach'], function(arrayEachRight, baseEachRight, createForEach) {
/** /**
* This method is like `_.forEach` except that it iterates over elements of * This method is like `_.forEach` except that it iterates over elements of
@@ -14,14 +14,12 @@ define(['../internal/arrayEachRight', '../internal/baseEachRight', '../internal/
* @returns {Array|Object|string} Returns `collection`. * @returns {Array|Object|string} Returns `collection`.
* @example * @example
* *
* _([1, 2, 3]).forEachRight(function(n) { console.log(n); }).join(','); * _([1, 2]).forEachRight(function(n) {
* console.log(n);
* }).value();
* // => logs each value from right to left and returns the array * // => logs each value from right to left and returns the array
*/ */
function forEachRight(collection, iteratee, thisArg) { var forEachRight = createForEach(arrayEachRight, baseEachRight);
return (typeof iteratee == 'function' && typeof thisArg == 'undefined' && isArray(collection))
? arrayEachRight(collection, iteratee)
: baseEachRight(collection, bindCallback(iteratee, thisArg, 3));
}
return forEachRight; return forEachRight;
}); });

View File

@@ -10,13 +10,17 @@ define(['../internal/createAggregator'], function(createAggregator) {
* Creates an object composed of keys generated from the results of running * Creates an object composed of keys generated from the results of running
* each element of `collection` through `iteratee`. The corresponding value * each element of `collection` through `iteratee`. The corresponding value
* of each key is an array of the elements responsible for generating the key. * of each key is an array of the elements responsible for generating the key.
* The `iteratee` is bound to `thisArg` and invoked with three arguments; * The `iteratee` is bound to `thisArg` and invoked with three arguments:
* (value, index|key, collection). * (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `iteratee` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `iteratee` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -25,19 +29,22 @@ define(['../internal/createAggregator'], function(createAggregator) {
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function|Object|string} [iteratee=_.identity] The function invoked * @param {Function|Object|string} [iteratee=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`. * @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {Object} Returns the composed aggregate object. * @returns {Object} Returns the composed aggregate object.
* @example * @example
* *
* _.groupBy([4.2, 6.1, 6.4], function(n) { return Math.floor(n); }); * _.groupBy([4.2, 6.1, 6.4], function(n) {
* return Math.floor(n);
* });
* // => { '4': [4.2], '6': [6.1, 6.4] } * // => { '4': [4.2], '6': [6.1, 6.4] }
* *
* _.groupBy([4.2, 6.1, 6.4], function(n) { return this.floor(n); }, Math); * _.groupBy([4.2, 6.1, 6.4], function(n) {
* return this.floor(n);
* }, Math);
* // => { '4': [4.2], '6': [6.1, 6.4] } * // => { '4': [4.2], '6': [6.1, 6.4] }
* *
* // using the "_.property" callback shorthand * // using the `_.property` callback shorthand
* _.groupBy(['one', 'two', 'three'], 'length'); * _.groupBy(['one', 'two', 'three'], 'length');
* // => { '3': ['one', 'two'], '5': ['three'] } * // => { '3': ['one', 'two'], '5': ['three'] }
*/ */

View File

@@ -1,17 +1,13 @@
define(['../internal/baseIndexOf', '../lang/isArray', '../internal/isLength', '../lang/isString', '../object/values'], function(baseIndexOf, isArray, isLength, isString, values) { define(['../internal/baseIndexOf', '../internal/getLength', '../lang/isArray', '../internal/isIterateeCall', '../internal/isLength', '../lang/isString', '../object/values'], function(baseIndexOf, getLength, isArray, isIterateeCall, isLength, isString, values) {
/* Native method references for those with the same name as other `lodash` methods. */ /* Native method references for those with the same name as other `lodash` methods. */
var nativeMax = Math.max; var nativeMax = Math.max;
/** /**
* Checks if `value` is in `collection` using `SameValueZero` for equality * Checks if `value` is in `collection` using
* comparisons. If `fromIndex` is negative, it is used as the offset from * [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* the end of `collection`. * for equality comparisons. If `fromIndex` is negative, it is used as the offset
* * from the end of `collection`.
* **Note:** `SameValueZero` comparisons are like strict equality comparisons,
* e.g. `===`, except that `NaN` matches `NaN`. See the
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
* for more details.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -20,6 +16,7 @@ define(['../internal/baseIndexOf', '../lang/isArray', '../internal/isLength', '.
* @param {Array|Object|string} collection The collection to search. * @param {Array|Object|string} collection The collection to search.
* @param {*} target The value to search for. * @param {*} target The value to search for.
* @param {number} [fromIndex=0] The index to search from. * @param {number} [fromIndex=0] The index to search from.
* @param- {Object} [guard] Enables use as a callback for functions like `_.reduce`.
* @returns {boolean} Returns `true` if a matching element is found, else `false`. * @returns {boolean} Returns `true` if a matching element is found, else `false`.
* @example * @example
* *
@@ -35,8 +32,8 @@ define(['../internal/baseIndexOf', '../lang/isArray', '../internal/isLength', '.
* _.includes('pebbles', 'eb'); * _.includes('pebbles', 'eb');
* // => true * // => true
*/ */
function includes(collection, target, fromIndex) { function includes(collection, target, fromIndex, guard) {
var length = collection ? collection.length : 0; var length = collection ? getLength(collection) : 0;
if (!isLength(length)) { if (!isLength(length)) {
collection = values(collection); collection = values(collection);
length = collection.length; length = collection.length;
@@ -44,10 +41,10 @@ define(['../internal/baseIndexOf', '../lang/isArray', '../internal/isLength', '.
if (!length) { if (!length) {
return false; return false;
} }
if (typeof fromIndex == 'number') { if (typeof fromIndex != 'number' || (guard && isIterateeCall(target, fromIndex, guard))) {
fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0);
} else {
fromIndex = 0; fromIndex = 0;
} else {
fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0);
} }
return (typeof collection == 'string' || !isArray(collection) && isString(collection)) return (typeof collection == 'string' || !isArray(collection) && isString(collection))
? (fromIndex < length && collection.indexOf(target, fromIndex) > -1) ? (fromIndex < length && collection.indexOf(target, fromIndex) > -1)

View File

@@ -4,13 +4,17 @@ define(['../internal/createAggregator'], function(createAggregator) {
* Creates an object composed of keys generated from the results of running * Creates an object composed of keys generated from the results of running
* each element of `collection` through `iteratee`. The corresponding value * each element of `collection` through `iteratee`. The corresponding value
* of each key is the last element responsible for generating the key. The * of each key is the last element responsible for generating the key. The
* iteratee function is bound to `thisArg` and invoked with three arguments; * iteratee function is bound to `thisArg` and invoked with three arguments:
* (value, index|key, collection). * (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `iteratee` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `iteratee` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -19,8 +23,7 @@ define(['../internal/createAggregator'], function(createAggregator) {
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function|Object|string} [iteratee=_.identity] The function invoked * @param {Function|Object|string} [iteratee=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`. * @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {Object} Returns the composed aggregate object. * @returns {Object} Returns the composed aggregate object.
* @example * @example
@@ -33,10 +36,14 @@ define(['../internal/createAggregator'], function(createAggregator) {
* _.indexBy(keyData, 'dir'); * _.indexBy(keyData, 'dir');
* // => { 'left': { 'dir': 'left', 'code': 97 }, 'right': { 'dir': 'right', 'code': 100 } } * // => { 'left': { 'dir': 'left', 'code': 97 }, 'right': { 'dir': 'right', 'code': 100 } }
* *
* _.indexBy(keyData, function(object) { return String.fromCharCode(object.code); }); * _.indexBy(keyData, function(object) {
* return String.fromCharCode(object.code);
* });
* // => { 'a': { 'dir': 'left', 'code': 97 }, 'd': { 'dir': 'right', 'code': 100 } } * // => { 'a': { 'dir': 'left', 'code': 97 }, 'd': { 'dir': 'right', 'code': 100 } }
* *
* _.indexBy(keyData, function(object) { return this.fromCharCode(object.code); }, String); * _.indexBy(keyData, function(object) {
* return this.fromCharCode(object.code);
* }, String);
* // => { 'a': { 'dir': 'left', 'code': 97 }, 'd': { 'dir': 'right', 'code': 100 } } * // => { 'a': { 'dir': 'left', 'code': 97 }, 'd': { 'dir': 'right', 'code': 100 } }
*/ */
var indexBy = createAggregator(function(result, value, key) { var indexBy = createAggregator(function(result, value, key) {

View File

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

View File

@@ -3,39 +3,56 @@ define(['../internal/arrayMap', '../internal/baseCallback', '../internal/baseMap
/** /**
* Creates an array of values by running each element in `collection` through * Creates an array of values by running each element in `collection` through
* `iteratee`. The `iteratee` is bound to `thisArg` and invoked with three * `iteratee`. The `iteratee` is bound to `thisArg` and invoked with three
* arguments; (value, index|key, collection). * arguments: (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `iteratee` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `iteratee` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
* Many lodash methods are guarded to work as iteratees for methods like
* `_.every`, `_.filter`, `_.map`, `_.mapValues`, `_.reject`, and `_.some`.
*
* The guarded methods are:
* `ary`, `callback`, `chunk`, `clone`, `create`, `curry`, `curryRight`,
* `drop`, `dropRight`, `every`, `fill`, `flatten`, `invert`, `max`, `min`,
* `parseInt`, `slice`, `sortBy`, `take`, `takeRight`, `template`, `trim`,
* `trimLeft`, `trimRight`, `trunc`, `random`, `range`, `sample`, `some`,
* `sum`, `uniq`, and `words`
*
* @static * @static
* @memberOf _ * @memberOf _
* @alias collect * @alias collect
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function|Object|string} [iteratee=_.identity] The function invoked * @param {Function|Object|string} [iteratee=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`. * @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {Array} Returns the new mapped array. * @returns {Array} Returns the new mapped array.
* @example * @example
* *
* _.map([1, 2, 3], function(n) { return n * 3; }); * function timesThree(n) {
* // => [3, 6, 9] * return n * 3;
* }
* *
* _.map({ 'one': 1, 'two': 2, 'three': 3 }, function(n) { return n * 3; }); * _.map([1, 2], timesThree);
* // => [3, 6, 9] (iteration order is not guaranteed) * // => [3, 6]
*
* _.map({ 'a': 1, 'b': 2 }, timesThree);
* // => [3, 6] (iteration order is not guaranteed)
* *
* var users = [ * var users = [
* { 'user': 'barney' }, * { 'user': 'barney' },
* { 'user': 'fred' } * { 'user': 'fred' }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.property` callback shorthand
* _.map(users, 'user'); * _.map(users, 'user');
* // => ['barney', 'fred'] * // => ['barney', 'fred']
*/ */

View File

@@ -1,49 +1,3 @@
define(['../internal/arrayMax', '../internal/createExtremum'], function(arrayMax, createExtremum) { define(["../math/max"], function(max) {
/**
* Gets the maximum value of `collection`. If `collection` is empty or falsey
* `-Infinity` is returned. If an iteratee function is provided it is invoked
* for each value in `collection` to generate the criterion by which the value
* is ranked. The `iteratee` is bound to `thisArg` and invoked with three
* arguments; (value, index, collection).
*
* If a property name is provided for `predicate` the created "_.property"
* style callback returns the property value of the given element.
*
* If an object is provided for `predicate` 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 {Function|Object|string} [iteratee] The function invoked per iteration.
* If a property name or object is provided it is used to create a "_.property"
* or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {*} Returns the maximum value.
* @example
*
* _.max([4, 2, 8, 6]);
* // => 8
*
* _.max([]);
* // => -Infinity
*
* var users = [
* { 'user': 'barney', 'age': 36 },
* { 'user': 'fred', 'age': 40 }
* ];
*
* _.max(users, function(chr) { return chr.age; });
* // => { 'user': 'fred', 'age': 40 };
*
* // using the "_.property" callback shorthand
* _.max(users, 'age');
* // => { 'user': 'fred', 'age': 40 };
*/
var max = createExtremum(arrayMax);
return max; return max;
}); });

View File

@@ -1,49 +1,3 @@
define(['../internal/arrayMin', '../internal/createExtremum'], function(arrayMin, createExtremum) { define(["../math/min"], function(min) {
/**
* Gets the minimum value of `collection`. If `collection` is empty or falsey
* `Infinity` is returned. If an iteratee function is provided it is invoked
* for each value in `collection` to generate the criterion by which the value
* is ranked. The `iteratee` is bound to `thisArg` and invoked with three
* arguments; (value, index, collection).
*
* If a property name is provided for `predicate` the created "_.property"
* style callback returns the property value of the given element.
*
* If an object is provided for `predicate` 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 {Function|Object|string} [iteratee] The function invoked per iteration.
* If a property name or object is provided it is used to create a "_.property"
* or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {*} Returns the minimum value.
* @example
*
* _.min([4, 2, 8, 6]);
* // => 2
*
* _.min([]);
* // => Infinity
*
* var users = [
* { 'user': 'barney', 'age': 36 },
* { 'user': 'fred', 'age': 40 }
* ];
*
* _.min(users, function(chr) { return chr.age; });
* // => { 'user': 'barney', 'age': 36 };
*
* // using the "_.property" callback shorthand
* _.min(users, 'age');
* // => { 'user': 'barney', 'age': 36 };
*/
var min = createExtremum(arrayMin, true);
return min; return min;
}); });

View File

@@ -4,12 +4,16 @@ define(['../internal/createAggregator'], function(createAggregator) {
* Creates an array of elements split into two groups, the first of which * Creates an array of elements split into two groups, the first of which
* contains elements `predicate` returns truthy for, while the second of which * contains elements `predicate` returns truthy for, while the second of which
* contains elements `predicate` returns falsey for. The predicate is bound * contains elements `predicate` returns falsey for. The predicate is bound
* to `thisArg` and invoked with three arguments; (value, index|key, collection). * to `thisArg` and invoked with three arguments: (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -18,17 +22,20 @@ define(['../internal/createAggregator'], function(createAggregator) {
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {Array} Returns the array of grouped elements. * @returns {Array} Returns the array of grouped elements.
* @example * @example
* *
* _.partition([1, 2, 3], function(n) { return n % 2; }); * _.partition([1, 2, 3], function(n) {
* return n % 2;
* });
* // => [[1, 3], [2]] * // => [[1, 3], [2]]
* *
* _.partition([1.2, 2.3, 3.4], function(n) { return this.floor(n) % 2; }, Math); * _.partition([1.2, 2.3, 3.4], function(n) {
* // => [[1, 3], [2]] * return this.floor(n) % 2;
* }, Math);
* // => [[1.2, 3.4], [2.3]]
* *
* var users = [ * var users = [
* { 'user': 'barney', 'age': 36, 'active': false }, * { 'user': 'barney', 'age': 36, 'active': false },
@@ -36,12 +43,20 @@ define(['../internal/createAggregator'], function(createAggregator) {
* { 'user': 'pebbles', 'age': 1, 'active': false } * { 'user': 'pebbles', 'age': 1, 'active': false }
* ]; * ];
* *
* // using the "_.matches" callback shorthand * var mapper = function(array) {
* _.map(_.partition(users, { 'age': 1 }), function(array) { return _.pluck(array, 'user'); }); * return _.pluck(array, 'user');
* };
*
* // using the `_.matches` callback shorthand
* _.map(_.partition(users, { 'age': 1, 'active': false }), mapper);
* // => [['pebbles'], ['barney', 'fred']] * // => [['pebbles'], ['barney', 'fred']]
* *
* // using the "_.property" callback shorthand * // using the `_.matchesProperty` callback shorthand
* _.map(_.partition(users, 'active'), function(array) { return _.pluck(array, 'user'); }); * _.map(_.partition(users, 'active', false), mapper);
* // => [['barney', 'pebbles'], ['fred']]
*
* // using the `_.property` callback shorthand
* _.map(_.partition(users, 'active'), mapper);
* // => [['fred'], ['barney', 'pebbles']] * // => [['fred'], ['barney', 'pebbles']]
*/ */
var partition = createAggregator(function(result, value, key) { var partition = createAggregator(function(result, value, key) {

View File

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

View File

@@ -1,13 +1,19 @@
define(['../internal/arrayReduce', '../internal/baseCallback', '../internal/baseEach', '../internal/baseReduce', '../lang/isArray'], function(arrayReduce, baseCallback, baseEach, baseReduce, isArray) { define(['../internal/arrayReduce', '../internal/baseEach', '../internal/createReduce'], function(arrayReduce, baseEach, createReduce) {
/** /**
* Reduces `collection` to a value which is the accumulated result of running * Reduces `collection` to a value which is the accumulated result of running
* each element in `collection` through `iteratee`, where each successive * each element in `collection` through `iteratee`, where each successive
* invocation is supplied the return value of the previous. If `accumulator` * invocation is supplied the return value of the previous. If `accumulator`
* is not provided the first element of `collection` is used as the initial * is not provided the first element of `collection` is used as the initial
* value. The `iteratee` is bound to `thisArg`and invoked with four arguments; * value. The `iteratee` is bound to `thisArg` and invoked with four arguments:
* (accumulator, value, index|key, collection). * (accumulator, value, index|key, collection).
* *
* Many lodash methods are guarded to work as iteratees for methods like
* `_.reduce`, `_.reduceRight`, and `_.transform`.
*
* The guarded methods are:
* `assign`, `defaults`, `includes`, `merge`, `sortByAll`, and `sortByOrder`
*
* @static * @static
* @memberOf _ * @memberOf _
* @alias foldl, inject * @alias foldl, inject
@@ -19,19 +25,18 @@ define(['../internal/arrayReduce', '../internal/baseCallback', '../internal/base
* @returns {*} Returns the accumulated value. * @returns {*} Returns the accumulated value.
* @example * @example
* *
* var sum = _.reduce([1, 2, 3], function(sum, n) { return sum + n; }); * _.reduce([1, 2], function(total, n) {
* // => 6 * return total + n;
* });
* // => 3
* *
* var mapped = _.reduce({ 'a': 1, 'b': 2, 'c': 3 }, function(result, n, key) { * _.reduce({ 'a': 1, 'b': 2 }, function(result, n, key) {
* result[key] = n * 3; * result[key] = n * 3;
* return result; * return result;
* }, {}); * }, {});
* // => { 'a': 3, 'b': 6, 'c': 9 } (iteration order is not guaranteed) * // => { 'a': 3, 'b': 6 } (iteration order is not guaranteed)
*/ */
function reduce(collection, iteratee, accumulator, thisArg) { var reduce = createReduce(arrayReduce, baseEach);
var func = isArray(collection) ? arrayReduce : baseReduce;
return func(collection, baseCallback(iteratee, thisArg, 4), accumulator, arguments.length < 3, baseEach);
}
return reduce; return reduce;
}); });

View File

@@ -1,4 +1,4 @@
define(['../internal/arrayReduceRight', '../internal/baseCallback', '../internal/baseEachRight', '../internal/baseReduce', '../lang/isArray'], function(arrayReduceRight, baseCallback, baseEachRight, baseReduce, isArray) { define(['../internal/arrayReduceRight', '../internal/baseEachRight', '../internal/createReduce'], function(arrayReduceRight, baseEachRight, createReduce) {
/** /**
* This method is like `_.reduce` except that it iterates over elements of * This method is like `_.reduce` except that it iterates over elements of
@@ -16,13 +16,13 @@ define(['../internal/arrayReduceRight', '../internal/baseCallback', '../internal
* @example * @example
* *
* var array = [[0, 1], [2, 3], [4, 5]]; * var array = [[0, 1], [2, 3], [4, 5]];
* _.reduceRight(array, function(flattened, other) { return flattened.concat(other); }, []); *
* _.reduceRight(array, function(flattened, other) {
* return flattened.concat(other);
* }, []);
* // => [4, 5, 2, 3, 0, 1] * // => [4, 5, 2, 3, 0, 1]
*/ */
function reduceRight(collection, iteratee, accumulator, thisArg) { var reduceRight = createReduce(arrayReduceRight, baseEachRight);
var func = isArray(collection) ? arrayReduceRight : baseReduce;
return func(collection, baseCallback(iteratee, thisArg, 4), accumulator, arguments.length < 3, baseEachRight);
}
return reduceRight; return reduceRight;
}); });

View File

@@ -4,25 +4,19 @@ define(['../internal/arrayFilter', '../internal/baseCallback', '../internal/base
* The opposite of `_.filter`; this method returns the elements of `collection` * The opposite of `_.filter`; this method returns the elements of `collection`
* that `predicate` does **not** return truthy for. * that `predicate` does **not** return truthy for.
* *
* If a property name is provided for `predicate` the created "_.property"
* style callback returns the property value of the given element.
*
* If an object is provided for `predicate` the created "_.matches" style
* callback returns `true` for elements that have the properties of the given
* object, else `false`.
*
* @static * @static
* @memberOf _ * @memberOf _
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {Array} Returns the new filtered array. * @returns {Array} Returns the new filtered array.
* @example * @example
* *
* var odds = _.reject([1, 2, 3, 4], function(n) { return n % 2 == 0; }); * _.reject([1, 2, 3, 4], function(n) {
* return n % 2 == 0;
* });
* // => [1, 3] * // => [1, 3]
* *
* var users = [ * var users = [
@@ -30,13 +24,17 @@ define(['../internal/arrayFilter', '../internal/baseCallback', '../internal/base
* { 'user': 'fred', 'age': 40, 'active': true } * { 'user': 'fred', 'age': 40, 'active': true }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.matches` callback shorthand
* _.pluck(_.reject(users, 'active'), 'user'); * _.pluck(_.reject(users, { 'age': 40, 'active': true }), 'user');
* // => ['barney'] * // => ['barney']
* *
* // using the "_.matches" callback shorthand * // using the `_.matchesProperty` callback shorthand
* _.pluck(_.reject(users, { 'age': 36 }), 'user'); * _.pluck(_.reject(users, 'active', false), 'user');
* // => ['fred'] * // => ['fred']
*
* // using the `_.property` callback shorthand
* _.pluck(_.reject(users, 'active'), 'user');
* // => ['barney']
*/ */
function reject(collection, predicate, thisArg) { function reject(collection, predicate, thisArg) {
var func = isArray(collection) ? arrayFilter : baseFilter; var func = isArray(collection) ? arrayFilter : baseFilter;

View File

@@ -1,4 +1,4 @@
define(['../internal/baseRandom', '../internal/isIterateeCall', './shuffle', '../internal/toIterable'], function(baseRandom, isIterateeCall, shuffle, toIterable) { define(['../internal/baseRandom', '../internal/isIterateeCall', '../lang/toArray', '../internal/toIterable'], function(baseRandom, isIterateeCall, toArray, toIterable) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */ /** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined; var undefined;
@@ -30,8 +30,20 @@ define(['../internal/baseRandom', '../internal/isIterateeCall', './shuffle', '..
var length = collection.length; var length = collection.length;
return length > 0 ? collection[baseRandom(0, length - 1)] : undefined; return length > 0 ? collection[baseRandom(0, length - 1)] : undefined;
} }
var result = shuffle(collection); var index = -1,
result.length = nativeMin(n < 0 ? 0 : (+n || 0), result.length); result = toArray(collection),
length = result.length,
lastIndex = length - 1;
n = nativeMin(n < 0 ? 0 : (+n || 0), length);
while (++index < n) {
var rand = baseRandom(index, lastIndex),
value = result[rand];
result[rand] = result[index];
result[index] = value;
}
result.length = n;
return result; return result;
} }

View File

@@ -1,9 +1,11 @@
define(['../internal/baseRandom', '../internal/toIterable'], function(baseRandom, toIterable) { define(['./sample'], function(sample) {
/** Used as references for `-Infinity` and `Infinity`. */
var POSITIVE_INFINITY = Number.POSITIVE_INFINITY;
/** /**
* Creates an array of shuffled values, using a version of the Fisher-Yates * Creates an array of shuffled values, using a version of the
* shuffle. See [Wikipedia](https://en.wikipedia.org/wiki/Fisher-Yates_shuffle) * [Fisher-Yates shuffle](https://en.wikipedia.org/wiki/Fisher-Yates_shuffle).
* for more details.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -16,20 +18,7 @@ define(['../internal/baseRandom', '../internal/toIterable'], function(baseRandom
* // => [4, 1, 3, 2] * // => [4, 1, 3, 2]
*/ */
function shuffle(collection) { function shuffle(collection) {
collection = toIterable(collection); return sample(collection, POSITIVE_INFINITY);
var index = -1,
length = collection.length,
result = Array(length);
while (++index < length) {
var rand = baseRandom(0, index);
if (index != rand) {
result[index] = result[rand];
}
result[rand] = collection[index];
}
return result;
} }
return shuffle; return shuffle;

View File

@@ -1,8 +1,8 @@
define(['../internal/isLength', '../object/keys'], function(isLength, keys) { define(['../internal/getLength', '../internal/isLength', '../object/keys'], function(getLength, isLength, keys) {
/** /**
* Gets the size of `collection` by returning `collection.length` for * Gets the size of `collection` by returning its length for array-like
* array-like values or the number of own enumerable properties for objects. * values or the number of own enumerable properties for objects.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -11,17 +11,17 @@ define(['../internal/isLength', '../object/keys'], function(isLength, keys) {
* @returns {number} Returns the size of `collection`. * @returns {number} Returns the size of `collection`.
* @example * @example
* *
* _.size([1, 2]); * _.size([1, 2, 3]);
* // => 2
*
* _.size({ 'one': 1, 'two': 2, 'three': 3 });
* // => 3 * // => 3
* *
* _.size({ 'a': 1, 'b': 2 });
* // => 2
*
* _.size('pebbles'); * _.size('pebbles');
* // => 7 * // => 7
*/ */
function size(collection) { function size(collection) {
var length = collection ? collection.length : 0; var length = collection ? getLength(collection) : 0;
return isLength(length) ? length : keys(collection).length; return isLength(length) ? length : keys(collection).length;
} }

View File

@@ -1,15 +1,22 @@
define(['../internal/arraySome', '../internal/baseCallback', '../internal/baseSome', '../lang/isArray'], function(arraySome, baseCallback, baseSome, isArray) { define(['../internal/arraySome', '../internal/baseCallback', '../internal/baseSome', '../lang/isArray', '../internal/isIterateeCall'], function(arraySome, baseCallback, baseSome, isArray, isIterateeCall) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined;
/** /**
* Checks if `predicate` returns truthy for **any** element of `collection`. * Checks if `predicate` returns truthy for **any** element of `collection`.
* The function returns as soon as it finds a passing value and does not iterate * The function returns as soon as it finds a passing value and does not iterate
* over the entire collection. The predicate is bound to `thisArg` and invoked * over the entire collection. The predicate is bound to `thisArg` and invoked
* with three arguments; (value, index|key, collection). * with three arguments: (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `predicate` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `predicate` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -19,8 +26,7 @@ define(['../internal/arraySome', '../internal/baseCallback', '../internal/baseSo
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Function|Object|string} [predicate=_.identity] The function invoked * @param {Function|Object|string} [predicate=_.identity] The function invoked
* per iteration. If a property name or object is provided it is used to * per iteration.
* create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `predicate`. * @param {*} [thisArg] The `this` binding of `predicate`.
* @returns {boolean} Returns `true` if any element passes the predicate check, * @returns {boolean} Returns `true` if any element passes the predicate check,
* else `false`. * else `false`.
@@ -30,21 +36,28 @@ define(['../internal/arraySome', '../internal/baseCallback', '../internal/baseSo
* // => true * // => true
* *
* var users = [ * var users = [
* { 'user': 'barney', 'age': 36, 'active': false }, * { 'user': 'barney', 'active': true },
* { 'user': 'fred', 'age': 40, 'active': true } * { 'user': 'fred', 'active': false }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.matches` callback shorthand
* _.some(users, 'active'); * _.some(users, { 'user': 'barney', 'active': false });
* // => false
*
* // using the `_.matchesProperty` callback shorthand
* _.some(users, 'active', false);
* // => true * // => true
* *
* // using the "_.matches" callback shorthand * // using the `_.property` callback shorthand
* _.some(users, { 'age': 1 }); * _.some(users, 'active');
* // => false * // => true
*/ */
function some(collection, predicate, thisArg) { function some(collection, predicate, thisArg) {
var func = isArray(collection) ? arraySome : baseSome; var func = isArray(collection) ? arraySome : baseSome;
if (typeof predicate != 'function' || typeof thisArg != 'undefined') { if (thisArg && isIterateeCall(collection, predicate, thisArg)) {
predicate = null;
}
if (typeof predicate != 'function' || thisArg !== undefined) {
predicate = baseCallback(predicate, thisArg, 3); predicate = baseCallback(predicate, thisArg, 3);
} }
return func(collection, predicate); return func(collection, predicate);

View File

@@ -1,16 +1,20 @@
define(['../internal/baseCallback', '../internal/baseEach', '../internal/baseSortBy', '../internal/compareAscending', '../internal/isIterateeCall', '../internal/isLength'], function(baseCallback, baseEach, baseSortBy, compareAscending, isIterateeCall, isLength) { define(['../internal/baseCallback', '../internal/baseMap', '../internal/baseSortBy', '../internal/compareAscending', '../internal/isIterateeCall'], function(baseCallback, baseMap, baseSortBy, compareAscending, isIterateeCall) {
/** /**
* Creates an array of elements, sorted in ascending order by the results of * Creates an array of elements, sorted in ascending order by the results of
* running each element in a collection through `iteratee`. This method performs * running each element in a collection through `iteratee`. This method performs
* a stable sort, that is, it preserves the original sort order of equal elements. * a stable sort, that is, it preserves the original sort order of equal elements.
* The `iteratee` is bound to `thisArg` and invoked with three arguments; * The `iteratee` is bound to `thisArg` and invoked with three arguments:
* (value, index|key, collection). * (value, index|key, collection).
* *
* If a property name is provided for `predicate` the created "_.property" * If a property name is provided for `iteratee` the created `_.property`
* style callback returns the property value of the given element. * style callback returns the property value of the given element.
* *
* If an object is provided for `predicate` the created "_.matches" style * If a value is also provided for `thisArg` the created `_.matchesProperty`
* style callback returns `true` for elements that have a matching property
* value, else `false`.
*
* If an object is provided for `iteratee` the created `_.matches` style
* callback returns `true` for elements that have the properties of the given * callback returns `true` for elements that have the properties of the given
* object, else `false`. * object, else `false`.
* *
@@ -18,17 +22,20 @@ define(['../internal/baseCallback', '../internal/baseEach', '../internal/baseSor
* @memberOf _ * @memberOf _
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {Array|Function|Object|string} [iteratee=_.identity] The function * @param {Function|Object|string} [iteratee=_.identity] The function invoked
* invoked per iteration. If a property name or an object is provided it is * per iteration.
* used to create a "_.property" or "_.matches" style callback respectively.
* @param {*} [thisArg] The `this` binding of `iteratee`. * @param {*} [thisArg] The `this` binding of `iteratee`.
* @returns {Array} Returns the new sorted array. * @returns {Array} Returns the new sorted array.
* @example * @example
* *
* _.sortBy([1, 2, 3], function(n) { return Math.sin(n); }); * _.sortBy([1, 2, 3], function(n) {
* return Math.sin(n);
* });
* // => [3, 1, 2] * // => [3, 1, 2]
* *
* _.sortBy([1, 2, 3], function(n) { return this.sin(n); }, Math); * _.sortBy([1, 2, 3], function(n) {
* return this.sin(n);
* }, Math);
* // => [3, 1, 2] * // => [3, 1, 2]
* *
* var users = [ * var users = [
@@ -37,21 +44,22 @@ define(['../internal/baseCallback', '../internal/baseEach', '../internal/baseSor
* { 'user': 'barney' } * { 'user': 'barney' }
* ]; * ];
* *
* // using the "_.property" callback shorthand * // using the `_.property` callback shorthand
* _.pluck(_.sortBy(users, 'user'), 'user'); * _.pluck(_.sortBy(users, 'user'), 'user');
* // => ['barney', 'fred', 'pebbles'] * // => ['barney', 'fred', 'pebbles']
*/ */
function sortBy(collection, iteratee, thisArg) { function sortBy(collection, iteratee, thisArg) {
var index = -1, if (collection == null) {
length = collection ? collection.length : 0, return [];
result = isLength(length) ? Array(length) : []; }
if (thisArg && isIterateeCall(collection, iteratee, thisArg)) { if (thisArg && isIterateeCall(collection, iteratee, thisArg)) {
iteratee = null; iteratee = null;
} }
var index = -1;
iteratee = baseCallback(iteratee, thisArg, 3); 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); return baseSortBy(result, compareAscending);
} }

View File

@@ -1,52 +1,50 @@
define(['../internal/baseEach', '../internal/baseFlatten', '../internal/baseSortBy', '../internal/compareMultipleAscending', '../internal/isIterateeCall', '../internal/isLength'], function(baseEach, baseFlatten, baseSortBy, compareMultipleAscending, isIterateeCall, isLength) { define(['../internal/baseFlatten', '../internal/baseSortByOrder', '../internal/isIterateeCall', '../function/restParam'], function(baseFlatten, baseSortByOrder, isIterateeCall, restParam) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined;
/** /**
* This method is like `_.sortBy` except that it sorts by property names * This method is like `_.sortBy` except that it can sort by multiple iteratees
* instead of an iteratee function. * 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 * @static
* @memberOf _ * @memberOf _
* @category Collection * @category Collection
* @param {Array|Object|string} collection The collection to iterate over. * @param {Array|Object|string} collection The collection to iterate over.
* @param {...(string|string[])} props The property names to sort by, * @param {...(Function|Function[]|Object|Object[]|string|string[])} iteratees
* specified as individual property names or arrays of property names. * The iteratees to sort by, specified as individual values or arrays of values.
* @returns {Array} Returns the new sorted array. * @returns {Array} Returns the new sorted array.
* @example * @example
* *
* var users = [ * var users = [
* { 'user': 'fred', 'age': 48 },
* { 'user': 'barney', 'age': 36 }, * { 'user': 'barney', 'age': 36 },
* { 'user': 'fred', 'age': 40 }, * { 'user': 'fred', 'age': 42 },
* { 'user': 'barney', 'age': 26 }, * { 'user': 'barney', 'age': 34 }
* { 'user': 'fred', 'age': 30 }
* ]; * ];
* *
* _.map(_.sortByAll(users, ['user', 'age']), _.values); * _.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(collection) { var sortByAll = restParam(function(collection, iteratees) {
var args = arguments; if (collection == null) {
if (args.length > 3 && isIterateeCall(args[1], args[2], args[3])) { return [];
args = [collection, args[1]];
} }
var index = -1, var guard = iteratees[2];
length = collection ? collection.length : 0, if (guard && isIterateeCall(iteratees[0], iteratees[1], guard)) {
props = baseFlatten(args, false, false, 1), iteratees.length = 1;
result = isLength(length) ? Array(length) : []; }
return baseSortByOrder(collection, baseFlatten(iteratees), []);
baseEach(collection, function(value, key, collection) { });
var length = props.length,
criteria = Array(length);
while (length--) {
criteria[length] = value == null ? undefined : value[props[length]];
}
result[++index] = { 'criteria': criteria, 'index': index, 'value': value };
});
return baseSortBy(result, compareMultipleAscending);
}
return sortByAll; return sortByAll;
}); });

54
collection/sortByOrder.js Normal file
View File

@@ -0,0 +1,54 @@
define(['../internal/baseSortByOrder', '../lang/isArray', '../internal/isIterateeCall'], function(baseSortByOrder, isArray, isIterateeCall) {
/**
* This method is like `_.sortByAll` except that it allows specifying the
* 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 {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': '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', 34], ['fred', 48], ['fred', 42]]
*/
function sortByOrder(collection, iteratees, orders, guard) {
if (collection == null) {
return [];
}
if (guard && isIterateeCall(iteratees, orders, guard)) {
orders = null;
}
if (!isArray(iteratees)) {
iteratees = iteratees == null ? [] : [iteratees];
}
if (!isArray(orders)) {
orders = orders == null ? [] : [orders];
}
return baseSortByOrder(collection, iteratees, orders);
}
return sortByOrder;
});

3
collection/sum.js Normal file
View File

@@ -0,0 +1,3 @@
define(["../math/sum"], function(sum) {
return sum;
});

View File

@@ -5,6 +5,11 @@ define(['../internal/baseMatches', './filter'], function(baseMatches, filter) {
* source object, returning an array of all elements that have equivalent * source object, returning an array of all elements that have equivalent
* property values. * property values.
* *
* **Note:** This method supports comparing arrays, booleans, `Date` objects,
* numbers, `Object` objects, regexes, and strings. Objects are compared by
* their own, not inherited, enumerable properties. For comparing a single
* own or inherited property value see `_.matchesProperty`.
*
* @static * @static
* @memberOf _ * @memberOf _
* @category Collection * @category Collection
@@ -14,18 +19,15 @@ define(['../internal/baseMatches', './filter'], function(baseMatches, filter) {
* @example * @example
* *
* var users = [ * var users = [
* { 'user': 'barney', 'age': 36, 'status': 'busy', 'pets': ['hoppy'] }, * { 'user': 'barney', 'age': 36, 'active': false, 'pets': ['hoppy'] },
* { 'user': 'fred', 'age': 40, 'status': 'busy', 'pets': ['baby puss', 'dino'] } * { 'user': 'fred', 'age': 40, 'active': true, 'pets': ['baby puss', 'dino'] }
* ]; * ];
* *
* _.pluck(_.where(users, { 'age': 36 }), 'user'); * _.pluck(_.where(users, { 'age': 36, 'active': false }), 'user');
* // => ['barney'] * // => ['barney']
* *
* _.pluck(_.where(users, { 'pets': ['dino'] }), 'user'); * _.pluck(_.where(users, { 'pets': ['dino'] }), 'user');
* // => ['fred'] * // => ['fred']
*
* _.pluck(_.where(users, { 'status': 'busy' }), 'user');
* // => ['barney', 'fred']
*/ */
function where(collection, source) { function where(collection, source) {
return filter(collection, baseMatches(source)); return filter(collection, baseMatches(source));

View File

@@ -1,7 +1,7 @@
define(['../lang/isNative'], function(isNative) { define(['../internal/getNative'], function(getNative) {
/* Native method references for those with the same name as other `lodash` methods. */ /* Native method references for those with the same name as other `lodash` methods. */
var nativeNow = isNative(nativeNow = Date.now) && nativeNow; var nativeNow = getNative(Date, 'now');
/** /**
* Gets the number of milliseconds that have elapsed since the Unix epoch * Gets the number of milliseconds that have elapsed since the Unix epoch
@@ -12,7 +12,9 @@ define(['../lang/isNative'], function(isNative) {
* @category Date * @category Date
* @example * @example
* *
* _.defer(function(stamp) { console.log(_.now() - stamp); }, _.now()); * _.defer(function(stamp) {
* console.log(_.now() - stamp);
* }, _.now());
* // => logs the number of milliseconds it took for the deferred function to be invoked * // => logs the number of milliseconds it took for the deferred function to be invoked
*/ */
var now = nativeNow || function() { var now = nativeNow || function() {

View File

@@ -1,4 +1,4 @@
define(['./function/after', './function/ary', './function/backflow', './function/before', './function/bind', './function/bindAll', './function/bindKey', './function/compose', './function/curry', './function/curryRight', './function/debounce', './function/defer', './function/delay', './function/flow', './function/flowRight', './function/memoize', './function/negate', './function/once', './function/partial', './function/partialRight', './function/rearg', './function/throttle', './function/wrap'], function(after, ary, backflow, before, bind, bindAll, bindKey, compose, curry, curryRight, debounce, defer, delay, flow, flowRight, memoize, negate, once, partial, partialRight, rearg, throttle, wrap) { define(['./function/after', './function/ary', './function/backflow', './function/before', './function/bind', './function/bindAll', './function/bindKey', './function/compose', './function/curry', './function/curryRight', './function/debounce', './function/defer', './function/delay', './function/flow', './function/flowRight', './function/memoize', './function/negate', './function/once', './function/partial', './function/partialRight', './function/rearg', './function/restParam', './function/spread', './function/throttle', './function/wrap'], function(after, ary, backflow, before, bind, bindAll, bindKey, compose, curry, curryRight, debounce, defer, delay, flow, flowRight, memoize, negate, once, partial, partialRight, rearg, restParam, spread, throttle, wrap) {
return { return {
'after': after, 'after': after,
'ary': ary, 'ary': ary,
@@ -21,6 +21,8 @@ define(['./function/after', './function/ary', './function/backflow', './function
'partial': partial, 'partial': partial,
'partialRight': partialRight, 'partialRight': partialRight,
'rearg': rearg, 'rearg': rearg,
'restParam': restParam,
'spread': spread,
'throttle': throttle, 'throttle': throttle,
'wrap': wrap 'wrap': wrap
}; };

View File

@@ -1,4 +1,4 @@
define(['../lang/isFunction', '../internal/root'], function(isFunction, root) { define(['../internal/root'], function(root) {
/** Used as the `TypeError` message for "Functions" methods. */ /** Used as the `TypeError` message for "Functions" methods. */
var FUNC_ERROR_TEXT = 'Expected a function'; var FUNC_ERROR_TEXT = 'Expected a function';
@@ -30,8 +30,8 @@ define(['../lang/isFunction', '../internal/root'], function(isFunction, root) {
* // => logs 'done saving!' after the two async saves have completed * // => logs 'done saving!' after the two async saves have completed
*/ */
function after(n, func) { function after(n, func) {
if (!isFunction(func)) { if (typeof func != 'function') {
if (isFunction(n)) { if (typeof n == 'function') {
var temp = n; var temp = n;
n = func; n = func;
func = temp; func = temp;

View File

@@ -1,7 +1,7 @@
define(['../internal/createWrapper', '../internal/isIterateeCall'], function(createWrapper, isIterateeCall) { define(['../internal/createWrapper', '../internal/isIterateeCall'], function(createWrapper, isIterateeCall) {
/** Used to compose bitmasks for wrapper metadata. */ /** Used to compose bitmasks for wrapper metadata. */
var ARY_FLAG = 256; var ARY_FLAG = 128;
/* Native method references for those with the same name as other `lodash` methods. */ /* Native method references for those with the same name as other `lodash` methods. */
var nativeMax = Math.max; var nativeMax = Math.max;

View File

@@ -1,4 +1,4 @@
define(['../lang/isFunction'], function(isFunction) { define([], function() {
/** Used as the `TypeError` message for "Functions" methods. */ /** Used as the `TypeError` message for "Functions" methods. */
var FUNC_ERROR_TEXT = 'Expected a function'; var FUNC_ERROR_TEXT = 'Expected a function';
@@ -21,8 +21,8 @@ define(['../lang/isFunction'], function(isFunction) {
*/ */
function before(n, func) { function before(n, func) {
var result; var result;
if (!isFunction(func)) { if (typeof func != 'function') {
if (isFunction(n)) { if (typeof n == 'function') {
var temp = n; var temp = n;
n = func; n = func;
func = temp; func = temp;
@@ -33,7 +33,8 @@ define(['../lang/isFunction'], function(isFunction) {
return function() { return function() {
if (--n > 0) { if (--n > 0) {
result = func.apply(this, arguments); result = func.apply(this, arguments);
} else { }
if (n <= 1) {
func = null; func = null;
} }
return result; return result;

View File

@@ -1,4 +1,4 @@
define(['../internal/baseSlice', '../internal/createWrapper', '../internal/replaceHolders'], function(baseSlice, createWrapper, replaceHolders) { define(['../internal/createWrapper', '../internal/replaceHolders', './restParam'], function(createWrapper, replaceHolders, restParam) {
/** Used to compose bitmasks for wrapper metadata. */ /** Used to compose bitmasks for wrapper metadata. */
var BIND_FLAG = 1, var BIND_FLAG = 1,
@@ -12,7 +12,7 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* The `_.bind.placeholder` value, which defaults to `_` in monolithic builds, * The `_.bind.placeholder` value, which defaults to `_` in monolithic builds,
* may be used as a placeholder for partially applied arguments. * may be used as a placeholder for partially applied arguments.
* *
* **Note:** Unlike native `Function#bind` this method does not set the `length` * **Note:** Unlike native `Function#bind` this method does not set the "length"
* property of bound functions. * property of bound functions.
* *
* @static * @static
@@ -20,7 +20,7 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* @category Function * @category Function
* @param {Function} func The function to bind. * @param {Function} func The function to bind.
* @param {*} thisArg The `this` binding of `func`. * @param {*} thisArg The `this` binding of `func`.
* @param {...*} [args] The arguments to be partially applied. * @param {...*} [partials] The arguments to be partially applied.
* @returns {Function} Returns the new bound function. * @returns {Function} Returns the new bound function.
* @example * @example
* *
@@ -39,16 +39,14 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* bound('hi'); * bound('hi');
* // => 'hi fred!' * // => 'hi fred!'
*/ */
function bind(func, thisArg) { var bind = restParam(function(func, thisArg, partials) {
var bitmask = BIND_FLAG; var bitmask = BIND_FLAG;
if (arguments.length > 2) { if (partials.length) {
var partials = baseSlice(arguments, 2), var holders = replaceHolders(partials, bind.placeholder);
holders = replaceHolders(partials, bind.placeholder);
bitmask |= PARTIAL_FLAG; bitmask |= PARTIAL_FLAG;
} }
return createWrapper(func, bitmask, thisArg, partials, holders); return createWrapper(func, bitmask, thisArg, partials, holders);
} });
// Assign default placeholders. // Assign default placeholders.
bind.placeholder = {}; bind.placeholder = {};

View File

@@ -1,4 +1,7 @@
define(['../internal/baseBindAll', '../internal/baseFlatten', '../object/functions'], function(baseBindAll, baseFlatten, functions) { define(['../internal/baseFlatten', '../internal/createWrapper', '../object/functions', './restParam'], function(baseFlatten, createWrapper, functions, restParam) {
/** Used to compose bitmasks for wrapper metadata. */
var BIND_FLAG = 1;
/** /**
* Binds methods of an object to the object itself, overwriting the existing * Binds methods of an object to the object itself, overwriting the existing
@@ -6,7 +9,7 @@ define(['../internal/baseBindAll', '../internal/baseFlatten', '../object/functio
* of method names. If no method names are provided all enumerable function * of method names. If no method names are provided all enumerable function
* properties, own and inherited, of `object` are bound. * properties, own and inherited, of `object` are bound.
* *
* **Note:** This method does not set the `length` property of bound functions. * **Note:** This method does not set the "length" property of bound functions.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -19,20 +22,27 @@ define(['../internal/baseBindAll', '../internal/baseFlatten', '../object/functio
* *
* var view = { * var view = {
* 'label': 'docs', * 'label': 'docs',
* 'onClick': function() { console.log('clicked ' + this.label); } * 'onClick': function() {
* console.log('clicked ' + this.label);
* }
* }; * };
* *
* _.bindAll(view); * _.bindAll(view);
* jQuery('#docs').on('click', view.onClick); * jQuery('#docs').on('click', view.onClick);
* // => logs 'clicked docs' when the element is clicked * // => logs 'clicked docs' when the element is clicked
*/ */
function bindAll(object) { var bindAll = restParam(function(object, methodNames) {
return baseBindAll(object, methodNames = methodNames.length ? baseFlatten(methodNames) : functions(object);
arguments.length > 1
? baseFlatten(arguments, false, false, 1) var index = -1,
: functions(object) length = methodNames.length;
);
} while (++index < length) {
var key = methodNames[index];
object[key] = createWrapper(object[key], BIND_FLAG, object);
}
return object;
});
return bindAll; return bindAll;
}); });

View File

@@ -1,4 +1,4 @@
define(['../internal/baseSlice', '../internal/createWrapper', '../internal/replaceHolders'], function(baseSlice, createWrapper, replaceHolders) { define(['../internal/createWrapper', '../internal/replaceHolders', './restParam'], function(createWrapper, replaceHolders, restParam) {
/** Used to compose bitmasks for wrapper metadata. */ /** Used to compose bitmasks for wrapper metadata. */
var BIND_FLAG = 1, var BIND_FLAG = 1,
@@ -11,7 +11,7 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* *
* This method differs from `_.bind` by allowing bound functions to reference * This method differs from `_.bind` by allowing bound functions to reference
* methods that may be redefined or don't yet exist. * methods that may be redefined or don't yet exist.
* See [Peter Michaux's article](http://michaux.ca/articles/lazy-function-definition-pattern) * See [Peter Michaux's article](http://peter.michaux.ca/articles/lazy-function-definition-pattern)
* for more details. * for more details.
* *
* The `_.bindKey.placeholder` value, which defaults to `_` in monolithic * The `_.bindKey.placeholder` value, which defaults to `_` in monolithic
@@ -22,7 +22,7 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* @category Function * @category Function
* @param {Object} object The object the method belongs to. * @param {Object} object The object the method belongs to.
* @param {string} key The key of the method. * @param {string} key The key of the method.
* @param {...*} [args] The arguments to be partially applied. * @param {...*} [partials] The arguments to be partially applied.
* @returns {Function} Returns the new bound function. * @returns {Function} Returns the new bound function.
* @example * @example
* *
@@ -49,16 +49,14 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* bound('hi'); * bound('hi');
* // => 'hiya fred!' * // => 'hiya fred!'
*/ */
function bindKey(object, key) { var bindKey = restParam(function(object, key, partials) {
var bitmask = BIND_FLAG | BIND_KEY_FLAG; var bitmask = BIND_FLAG | BIND_KEY_FLAG;
if (arguments.length > 2) { if (partials.length) {
var partials = baseSlice(arguments, 2), var holders = replaceHolders(partials, bindKey.placeholder);
holders = replaceHolders(partials, bindKey.placeholder);
bitmask |= PARTIAL_FLAG; bitmask |= PARTIAL_FLAG;
} }
return createWrapper(key, bitmask, object, partials, holders); return createWrapper(key, bitmask, object, partials, holders);
} });
// Assign default placeholders. // Assign default placeholders.
bindKey.placeholder = {}; bindKey.placeholder = {};

View File

@@ -1,4 +1,4 @@
define(['../internal/createWrapper', '../internal/isIterateeCall'], function(createWrapper, isIterateeCall) { define(['../internal/createCurry'], function(createCurry) {
/** Used to compose bitmasks for wrapper metadata. */ /** Used to compose bitmasks for wrapper metadata. */
var CURRY_FLAG = 8; var CURRY_FLAG = 8;
@@ -13,7 +13,7 @@ define(['../internal/createWrapper', '../internal/isIterateeCall'], function(cre
* The `_.curry.placeholder` value, which defaults to `_` in monolithic builds, * The `_.curry.placeholder` value, which defaults to `_` in monolithic builds,
* may be used as a placeholder for provided arguments. * may be used as a placeholder for provided arguments.
* *
* **Note:** This method does not set the `length` property of curried functions. * **Note:** This method does not set the "length" property of curried functions.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -43,14 +43,7 @@ define(['../internal/createWrapper', '../internal/isIterateeCall'], function(cre
* curried(1)(_, 3)(2); * curried(1)(_, 3)(2);
* // => [1, 2, 3] * // => [1, 2, 3]
*/ */
function curry(func, arity, guard) { var curry = createCurry(CURRY_FLAG);
if (guard && isIterateeCall(func, arity, guard)) {
arity = null;
}
var result = createWrapper(func, CURRY_FLAG, null, null, null, null, null, arity);
result.placeholder = curry.placeholder;
return result;
}
// Assign default placeholders. // Assign default placeholders.
curry.placeholder = {}; curry.placeholder = {};

View File

@@ -1,4 +1,4 @@
define(['../internal/createWrapper', '../internal/isIterateeCall'], function(createWrapper, isIterateeCall) { define(['../internal/createCurry'], function(createCurry) {
/** Used to compose bitmasks for wrapper metadata. */ /** Used to compose bitmasks for wrapper metadata. */
var CURRY_RIGHT_FLAG = 16; var CURRY_RIGHT_FLAG = 16;
@@ -10,7 +10,7 @@ define(['../internal/createWrapper', '../internal/isIterateeCall'], function(cre
* The `_.curryRight.placeholder` value, which defaults to `_` in monolithic * The `_.curryRight.placeholder` value, which defaults to `_` in monolithic
* builds, may be used as a placeholder for provided arguments. * builds, may be used as a placeholder for provided arguments.
* *
* **Note:** This method does not set the `length` property of curried functions. * **Note:** This method does not set the "length" property of curried functions.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -40,14 +40,7 @@ define(['../internal/createWrapper', '../internal/isIterateeCall'], function(cre
* curried(3)(1, _)(2); * curried(3)(1, _)(2);
* // => [1, 2, 3] * // => [1, 2, 3]
*/ */
function curryRight(func, arity, guard) { var curryRight = createCurry(CURRY_RIGHT_FLAG);
if (guard && isIterateeCall(func, arity, guard)) {
arity = null;
}
var result = createWrapper(func, CURRY_RIGHT_FLAG, null, null, null, null, null, arity);
result.placeholder = curryRight.placeholder;
return result;
}
// Assign default placeholders. // Assign default placeholders.
curryRight.placeholder = {}; curryRight.placeholder = {};

View File

@@ -1,4 +1,4 @@
define(['../lang/isFunction', '../lang/isObject', '../date/now'], function(isFunction, isObject, now) { define(['../lang/isObject', '../date/now'], function(isObject, now) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */ /** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined; var undefined;
@@ -10,12 +10,13 @@ define(['../lang/isFunction', '../lang/isObject', '../date/now'], function(isFun
var nativeMax = Math.max; var nativeMax = Math.max;
/** /**
* Creates a function that delays invoking `func` until after `wait` milliseconds * Creates a debounced function that delays invoking `func` until after `wait`
* have elapsed since the last time it was invoked. The created function comes * milliseconds have elapsed since the last time the debounced function was
* with a `cancel` method to cancel delayed invocations. Provide an options * invoked. The debounced function comes with a `cancel` method to cancel
* object to indicate that `func` should be invoked on the leading and/or * delayed invocations. Provide an options object to indicate that `func`
* trailing edge of the `wait` timeout. Subsequent calls to the debounced * should be invoked on the leading and/or trailing edge of the `wait` timeout.
* function return the result of the last `func` invocation. * Subsequent calls to the debounced function return the result of the last
* `func` invocation.
* *
* **Note:** If `leading` and `trailing` options are `true`, `func` is invoked * **Note:** If `leading` and `trailing` options are `true`, `func` is invoked
* on the trailing edge of the timeout only if the the debounced function is * on the trailing edge of the timeout only if the the debounced function is
@@ -28,7 +29,7 @@ define(['../lang/isFunction', '../lang/isObject', '../date/now'], function(isFun
* @memberOf _ * @memberOf _
* @category Function * @category Function
* @param {Function} func The function to debounce. * @param {Function} func The function to debounce.
* @param {number} wait The number of milliseconds to delay. * @param {number} [wait=0] The number of milliseconds to delay.
* @param {Object} [options] The options object. * @param {Object} [options] The options object.
* @param {boolean} [options.leading=false] Specify invoking on the leading * @param {boolean} [options.leading=false] Specify invoking on the leading
* edge of the timeout. * edge of the timeout.
@@ -83,10 +84,10 @@ define(['../lang/isFunction', '../lang/isObject', '../date/now'], function(isFun
maxWait = false, maxWait = false,
trailing = true; trailing = true;
if (!isFunction(func)) { if (typeof func != 'function') {
throw new TypeError(FUNC_ERROR_TEXT); throw new TypeError(FUNC_ERROR_TEXT);
} }
wait = wait < 0 ? 0 : wait; wait = wait < 0 ? 0 : (+wait || 0);
if (options === true) { if (options === true) {
var leading = true; var leading = true;
trailing = false; trailing = false;

View File

@@ -1,4 +1,4 @@
define(['../internal/baseDelay'], function(baseDelay) { define(['../internal/baseDelay', './restParam'], function(baseDelay, restParam) {
/** /**
* Defers invoking the `func` until the current call stack has cleared. Any * Defers invoking the `func` until the current call stack has cleared. Any
@@ -12,12 +12,14 @@ define(['../internal/baseDelay'], function(baseDelay) {
* @returns {number} Returns the timer id. * @returns {number} Returns the timer id.
* @example * @example
* *
* _.defer(function(text) { console.log(text); }, 'deferred'); * _.defer(function(text) {
* console.log(text);
* }, 'deferred');
* // logs 'deferred' after one or more milliseconds * // logs 'deferred' after one or more milliseconds
*/ */
function defer(func) { var defer = restParam(function(func, args) {
return baseDelay(func, 1, arguments, 1); return baseDelay(func, 1, args);
} });
return defer; return defer;
}); });

View File

@@ -1,4 +1,4 @@
define(['../internal/baseDelay'], function(baseDelay) { define(['../internal/baseDelay', './restParam'], function(baseDelay, restParam) {
/** /**
* Invokes `func` after `wait` milliseconds. Any additional arguments are * Invokes `func` after `wait` milliseconds. Any additional arguments are
@@ -13,12 +13,14 @@ define(['../internal/baseDelay'], function(baseDelay) {
* @returns {number} Returns the timer id. * @returns {number} Returns the timer id.
* @example * @example
* *
* _.delay(function(text) { console.log(text); }, 1000, 'later'); * _.delay(function(text) {
* console.log(text);
* }, 1000, 'later');
* // => logs 'later' after one second * // => logs 'later' after one second
*/ */
function delay(func, wait) { var delay = restParam(function(func, wait, args) {
return baseDelay(func, wait, arguments, 2); return baseDelay(func, wait, args);
} });
return delay; return delay;
}); });

View File

@@ -1,7 +1,4 @@
define(['../internal/arrayEvery', '../lang/isFunction'], function(arrayEvery, isFunction) { define(['../internal/createFlow'], function(createFlow) {
/** Used as the `TypeError` message for "Functions" methods. */
var FUNC_ERROR_TEXT = 'Expected a function';
/** /**
* Creates a function that returns the result of invoking the provided * Creates a function that returns the result of invoking the provided
@@ -15,38 +12,15 @@ define(['../internal/arrayEvery', '../lang/isFunction'], function(arrayEvery, is
* @returns {Function} Returns the new function. * @returns {Function} Returns the new function.
* @example * @example
* *
* function add(x, y) {
* return x + y;
* }
*
* function square(n) { * function square(n) {
* return n * n; * return n * n;
* } * }
* *
* var addSquare = _.flow(add, square); * var addSquare = _.flow(_.add, square);
* addSquare(1, 2); * addSquare(1, 2);
* // => 9 * // => 9
*/ */
function flow() { var flow = createFlow();
var funcs = arguments,
length = funcs.length;
if (!length) {
return function() {};
}
if (!arrayEvery(funcs, isFunction)) {
throw new TypeError(FUNC_ERROR_TEXT);
}
return function() {
var index = 0,
result = funcs[index].apply(this, arguments);
while (++index < length) {
result = funcs[index].call(this, result);
}
return result;
};
}
return flow; return flow;
}); });

View File

@@ -1,7 +1,4 @@
define(['../internal/arrayEvery', '../lang/isFunction'], function(arrayEvery, isFunction) { define(['../internal/createFlow'], function(createFlow) {
/** Used as the `TypeError` message for "Functions" methods. */
var FUNC_ERROR_TEXT = 'Expected a function';
/** /**
* This method is like `_.flow` except that it creates a function that * This method is like `_.flow` except that it creates a function that
@@ -15,38 +12,15 @@ define(['../internal/arrayEvery', '../lang/isFunction'], function(arrayEvery, is
* @returns {Function} Returns the new function. * @returns {Function} Returns the new function.
* @example * @example
* *
* function add(x, y) {
* return x + y;
* }
*
* function square(n) { * function square(n) {
* return n * n; * return n * n;
* } * }
* *
* var addSquare = _.flowRight(square, add); * var addSquare = _.flowRight(square, _.add);
* addSquare(1, 2); * addSquare(1, 2);
* // => 9 * // => 9
*/ */
function flowRight() { var flowRight = createFlow(true);
var funcs = arguments,
fromIndex = funcs.length - 1;
if (fromIndex < 0) {
return function() {};
}
if (!arrayEvery(funcs, isFunction)) {
throw new TypeError(FUNC_ERROR_TEXT);
}
return function() {
var index = fromIndex,
result = funcs[index].apply(this, arguments);
while (index--) {
result = funcs[index].call(this, result);
}
return result;
};
}
return flowRight; return flowRight;
}); });

View File

@@ -1,4 +1,4 @@
define(['../internal/MapCache', '../lang/isFunction'], function(MapCache, isFunction) { define(['../internal/MapCache'], function(MapCache) {
/** Used as the `TypeError` message for "Functions" methods. */ /** Used as the `TypeError` message for "Functions" methods. */
var FUNC_ERROR_TEXT = 'Expected a function'; var FUNC_ERROR_TEXT = 'Expected a function';
@@ -13,10 +13,8 @@ define(['../internal/MapCache', '../lang/isFunction'], function(MapCache, isFunc
* *
* **Note:** The cache is exposed as the `cache` property on the memoized * **Note:** The cache is exposed as the `cache` property on the memoized
* function. Its creation may be customized by replacing the `_.memoize.Cache` * function. Its creation may be customized by replacing the `_.memoize.Cache`
* constructor with one whose instances implement the ES `Map` method interface * constructor with one whose instances implement the [`Map`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-properties-of-the-map-prototype-object)
* of `get`, `has`, and `set`. See the * method interface of `get`, `has`, and `set`.
* [ES spec](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-properties-of-the-map-prototype-object)
* for more details.
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -57,18 +55,19 @@ define(['../internal/MapCache', '../lang/isFunction'], function(MapCache, isFunc
* // => { 'user': 'barney' } * // => { 'user': 'barney' }
*/ */
function memoize(func, resolver) { function memoize(func, resolver) {
if (!isFunction(func) || (resolver && !isFunction(resolver))) { if (typeof func != 'function' || (resolver && typeof resolver != 'function')) {
throw new TypeError(FUNC_ERROR_TEXT); throw new TypeError(FUNC_ERROR_TEXT);
} }
var memoized = function() { var memoized = function() {
var cache = memoized.cache, var args = arguments,
key = resolver ? resolver.apply(this, arguments) : arguments[0]; key = resolver ? resolver.apply(this, args) : args[0],
cache = memoized.cache;
if (cache.has(key)) { if (cache.has(key)) {
return cache.get(key); return cache.get(key);
} }
var result = func.apply(this, arguments); var result = func.apply(this, args);
cache.set(key, result); memoized.cache = cache.set(key, result);
return result; return result;
}; };
memoized.cache = new memoize.Cache; memoized.cache = new memoize.Cache;

View File

@@ -1,4 +1,4 @@
define(['../lang/isFunction'], function(isFunction) { define([], function() {
/** Used as the `TypeError` message for "Functions" methods. */ /** Used as the `TypeError` message for "Functions" methods. */
var FUNC_ERROR_TEXT = 'Expected a function'; var FUNC_ERROR_TEXT = 'Expected a function';
@@ -23,7 +23,7 @@ define(['../lang/isFunction'], function(isFunction) {
* // => [1, 3, 5] * // => [1, 3, 5]
*/ */
function negate(predicate) { function negate(predicate) {
if (!isFunction(predicate)) { if (typeof predicate != 'function') {
throw new TypeError(FUNC_ERROR_TEXT); throw new TypeError(FUNC_ERROR_TEXT);
} }
return function() { return function() {

View File

@@ -3,11 +3,10 @@ define(['./before'], function(before) {
/** /**
* Creates a function that is restricted to invoking `func` once. Repeat calls * Creates a function that is restricted to invoking `func` once. Repeat calls
* to the function return the value of the first call. The `func` is invoked * to the function return the value of the first call. The `func` is invoked
* with the `this` binding of the created function. * with the `this` binding and arguments of the created function.
* *
* @static * @static
* @memberOf _ * @memberOf _
* @type Function
* @category Function * @category Function
* @param {Function} func The function to restrict. * @param {Function} func The function to restrict.
* @returns {Function} Returns the new restricted function. * @returns {Function} Returns the new restricted function.
@@ -19,7 +18,7 @@ define(['./before'], function(before) {
* // `initialize` invokes `createApplication` once * // `initialize` invokes `createApplication` once
*/ */
function once(func) { function once(func) {
return before(func, 2); return before(2, func);
} }
return once; return once;

View File

@@ -1,4 +1,4 @@
define(['../internal/baseSlice', '../internal/createWrapper', '../internal/replaceHolders'], function(baseSlice, createWrapper, replaceHolders) { define(['../internal/createPartial'], function(createPartial) {
/** Used to compose bitmasks for wrapper metadata. */ /** Used to compose bitmasks for wrapper metadata. */
var PARTIAL_FLAG = 32; var PARTIAL_FLAG = 32;
@@ -11,14 +11,14 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* The `_.partial.placeholder` value, which defaults to `_` in monolithic * The `_.partial.placeholder` value, which defaults to `_` in monolithic
* builds, may be used as a placeholder for partially applied arguments. * builds, may be used as a placeholder for partially applied arguments.
* *
* **Note:** This method does not set the `length` property of partially * **Note:** This method does not set the "length" property of partially
* applied functions. * applied functions.
* *
* @static * @static
* @memberOf _ * @memberOf _
* @category Function * @category Function
* @param {Function} func The function to partially apply arguments to. * @param {Function} func The function to partially apply arguments to.
* @param {...*} [args] The arguments to be partially applied. * @param {...*} [partials] The arguments to be partially applied.
* @returns {Function} Returns the new partially applied function. * @returns {Function} Returns the new partially applied function.
* @example * @example
* *
@@ -35,12 +35,7 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* greetFred('hi'); * greetFred('hi');
* // => 'hi fred' * // => 'hi fred'
*/ */
function partial(func) { var partial = createPartial(PARTIAL_FLAG);
var partials = baseSlice(arguments, 1),
holders = replaceHolders(partials, partial.placeholder);
return createWrapper(func, PARTIAL_FLAG, null, partials, holders);
}
// Assign default placeholders. // Assign default placeholders.
partial.placeholder = {}; partial.placeholder = {};

View File

@@ -1,4 +1,4 @@
define(['../internal/baseSlice', '../internal/createWrapper', '../internal/replaceHolders'], function(baseSlice, createWrapper, replaceHolders) { define(['../internal/createPartial'], function(createPartial) {
/** Used to compose bitmasks for wrapper metadata. */ /** Used to compose bitmasks for wrapper metadata. */
var PARTIAL_RIGHT_FLAG = 64; var PARTIAL_RIGHT_FLAG = 64;
@@ -10,14 +10,14 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* The `_.partialRight.placeholder` value, which defaults to `_` in monolithic * The `_.partialRight.placeholder` value, which defaults to `_` in monolithic
* builds, may be used as a placeholder for partially applied arguments. * builds, may be used as a placeholder for partially applied arguments.
* *
* **Note:** This method does not set the `length` property of partially * **Note:** This method does not set the "length" property of partially
* applied functions. * applied functions.
* *
* @static * @static
* @memberOf _ * @memberOf _
* @category Function * @category Function
* @param {Function} func The function to partially apply arguments to. * @param {Function} func The function to partially apply arguments to.
* @param {...*} [args] The arguments to be partially applied. * @param {...*} [partials] The arguments to be partially applied.
* @returns {Function} Returns the new partially applied function. * @returns {Function} Returns the new partially applied function.
* @example * @example
* *
@@ -34,12 +34,7 @@ define(['../internal/baseSlice', '../internal/createWrapper', '../internal/repla
* sayHelloTo('fred'); * sayHelloTo('fred');
* // => 'hello fred' * // => 'hello fred'
*/ */
function partialRight(func) { var partialRight = createPartial(PARTIAL_RIGHT_FLAG);
var partials = baseSlice(arguments, 1),
holders = replaceHolders(partials, partialRight.placeholder);
return createWrapper(func, PARTIAL_RIGHT_FLAG, null, partials, holders);
}
// Assign default placeholders. // Assign default placeholders.
partialRight.placeholder = {}; partialRight.placeholder = {};

Some files were not shown because too many files have changed in this diff Show More