Compare commits

...

4 Commits

Author SHA1 Message Date
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
136 changed files with 1841 additions and 1040 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.2.0 # lodash v3.5.0
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.

View File

@@ -17,20 +17,21 @@ 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() { function difference() {
var index = -1, var args = arguments,
length = arguments.length; index = -1,
length = args.length;
while (++index < length) { while (++index < length) {
var value = arguments[index]; var value = args[index];
if (isArray(value) || isArguments(value)) { if (isArray(value) || isArguments(value)) {
break; break;
} }
} }
return baseDifference(value, baseFlatten(arguments, false, true, ++index)); return baseDifference(value, baseFlatten(args, false, true, ++index));
} }
return difference; return difference;

View File

@@ -26,7 +26,9 @@ define(['../internal/baseCallback', '../internal/baseSlice'], function(baseCallb
* @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 = [
@@ -36,7 +38,7 @@ define(['../internal/baseCallback', '../internal/baseSlice'], function(baseCallb
* ]; * ];
* *
* // using the `_.matches` callback shorthand * // using the `_.matches` callback shorthand
* _.pluck(_.dropRightWhile(users, { 'user': pebbles, 'active': false }), 'user'); * _.pluck(_.dropRightWhile(users, { 'user': 'pebbles', 'active': false }), 'user');
* // => ['barney', 'fred'] * // => ['barney', 'fred']
* *
* // using the `_.matchesProperty` callback shorthand * // using the `_.matchesProperty` callback shorthand

View File

@@ -26,7 +26,9 @@ define(['../internal/baseCallback', '../internal/baseSlice'], function(baseCallb
* @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 = [

View File

@@ -31,7 +31,9 @@ define(['../internal/baseCallback'], function(baseCallback) {
* { 'user': 'pebbles', 'active': true } * { 'user': 'pebbles', 'active': true }
* ]; * ];
* *
* _.findIndex(users, function(chr) { return chr.user == 'barney'; }); * _.findIndex(users, function(chr) {
* return chr.user == 'barney';
* });
* // => 0 * // => 0
* *
* // using the `_.matches` callback shorthand * // using the `_.matches` callback shorthand

View File

@@ -31,16 +31,18 @@ define(['../internal/baseCallback'], function(baseCallback) {
* { 'user': 'pebbles', 'active': false } * { 'user': 'pebbles', 'active': false }
* ]; * ];
* *
* _.findLastIndex(users, function(chr) { return chr.user == 'pebbles'; }); * _.findLastIndex(users, function(chr) {
* return chr.user == 'pebbles';
* });
* // => 2 * // => 2
* *
* // using the `_.matches` callback shorthand * // using the `_.matches` callback shorthand
* _.findLastIndex(users, { user': 'barney', 'active': true }); * _.findLastIndex(users, { 'user': 'barney', 'active': true });
* // => 0 * // => 0
* *
* // using the `_.matchesProperty` callback shorthand * // using the `_.matchesProperty` callback shorthand
* _.findLastIndex(users, 'active', false); * _.findLastIndex(users, 'active', false);
* // => 1 * // => 2
* *
* // using the `_.property` callback shorthand * // using the `_.property` callback shorthand
* _.findLastIndex(users, 'active'); * _.findLastIndex(users, 'active');

View File

@@ -13,11 +13,11 @@ 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) {
@@ -25,7 +25,7 @@ define(['../internal/baseFlatten', '../internal/isIterateeCall'], function(baseF
if (guard && isIterateeCall(array, isDeep, guard)) { if (guard && isIterateeCall(array, isDeep, guard)) {
isDeep = false; isDeep = false;
} }
return length ? baseFlatten(array, isDeep) : []; return length ? baseFlatten(array, isDeep, false, 0) : [];
} }
return flatten; return flatten;

View File

@@ -10,12 +10,12 @@ 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;
return length ? baseFlatten(array, true) : []; return length ? baseFlatten(array, true, false, 0) : [];
} }
return flattenDeep; return flattenDeep;

View File

@@ -24,15 +24,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 +41,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

@@ -15,9 +15,8 @@ define(['../internal/baseIndexOf', '../internal/cacheIndexOf', '../internal/crea
* @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() { function intersection() {
var args = [], var args = [],
@@ -31,7 +30,7 @@ define(['../internal/baseIndexOf', '../internal/cacheIndexOf', '../internal/crea
var value = arguments[argsIndex]; var value = arguments[argsIndex];
if (isArray(value) || isArguments(value)) { if (isArray(value) || isArguments(value)) {
args.push(value); args.push(value);
caches.push(isCommon && value.length >= 120 && createCache(argsIndex && value)); caches.push((isCommon && value.length >= 120) ? createCache(argsIndex && value) : null);
} }
} }
argsLength = args.length; argsLength = args.length;
@@ -44,11 +43,11 @@ define(['../internal/baseIndexOf', '../internal/cacheIndexOf', '../internal/crea
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; argsIndex = argsLength;
while (--argsIndex) { while (--argsIndex) {
var cache = caches[argsIndex]; var cache = caches[argsIndex];
if ((cache ? cacheIndexOf(cache, value) : indexOf(args[argsIndex], value)) < 0) { if ((cache ? cacheIndexOf(cache, value) : indexOf(args[argsIndex], value, 0)) < 0) {
continue outer; continue outer;
} }
} }

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

@@ -25,22 +25,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

@@ -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]

View File

@@ -35,7 +35,9 @@ define(['../internal/baseCallback'], function(baseCallback) {
* @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]

View File

@@ -33,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 } };

View File

@@ -17,7 +17,7 @@ define(['../internal/baseCallback', '../internal/binaryIndex', '../internal/bina
* 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) { function sortedLastIndex(array, value, iteratee, thisArg) {

View File

@@ -26,7 +26,9 @@ define(['../internal/baseCallback', '../internal/baseSlice'], function(baseCallb
* @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 = [

View File

@@ -26,7 +26,9 @@ define(['../internal/baseCallback', '../internal/baseSlice'], function(baseCallb
* @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 = [

View File

@@ -16,11 +16,11 @@ 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() { function union() {
return baseUniq(baseFlatten(arguments, false, true)); return baseUniq(baseFlatten(arguments, false, true, 0));
} }
return union; return union;

View File

@@ -43,7 +43,9 @@ define(['../internal/baseCallback', '../internal/baseUniq', '../internal/isItera
* // => [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
@@ -55,8 +57,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

@@ -17,8 +17,8 @@ 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) { function without(array) {
return baseDifference(array, baseSlice(arguments, 1)); return baseDifference(array, baseSlice(arguments, 1));

View File

@@ -12,11 +12,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,

View File

@@ -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'

View File

@@ -1,4 +1,4 @@
define(['../internal/LazyWrapper', '../internal/LodashWrapper', '../lang/isArray', '../internal/isObjectLike', '../internal/wrapperClone'], function(LazyWrapper, LodashWrapper, isArray, isObjectLike, wrapperClone) { 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;
@@ -22,9 +22,14 @@ define(['../internal/LazyWrapper', '../internal/LodashWrapper', '../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 `Array` methods are:
* `concat`, `join`, `pop`, `push`, `reverse`, `shift`, `slice`, `sort`,
* `splice`, and `unshift`
*
* The wrapper `String` methods are:
* `replace` and `split`
* *
* The wrapper methods that support shortcut fusion are: * The wrapper methods that support shortcut fusion are:
* `compact`, `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`, * `compact`, `drop`, `dropRight`, `dropRightWhile`, `dropWhile`, `filter`,
@@ -44,26 +49,26 @@ define(['../internal/LazyWrapper', '../internal/LodashWrapper', '../lang/isArray
* `mixin`, `negate`, `noop`, `omit`, `once`, `pairs`, `partial`, `partialRight`, * `mixin`, `negate`, `noop`, `omit`, `once`, `pairs`, `partial`, `partialRight`,
* `partition`, `pick`, `plant`, `pluck`, `property`, `propertyOf`, `pull`, * `partition`, `pick`, `plant`, `pluck`, `property`, `propertyOf`, `pull`,
* `pullAt`, `push`, `range`, `rearg`, `reject`, `remove`, `rest`, `reverse`, * `pullAt`, `push`, `range`, `rearg`, `reject`, `remove`, `rest`, `reverse`,
* `shuffle`, `slice`, `sort`, `sortBy`, `sortByAll`, `splice`, `spread`, * `shuffle`, `slice`, `sort`, `sortBy`, `sortByAll`, `sortByOrder`, `splice`,
* `take`, `takeRight`, `takeRightWhile`, `takeWhile`, `tap`, `throttle`, * `spread`, `take`, `takeRight`, `takeRightWhile`, `takeWhile`, `tap`,
* `thru`, `times`, `toArray`, `toPlainObject`, `transform`, `union`, `uniq`, * `throttle`, `thru`, `times`, `toArray`, `toPlainObject`, `transform`,
* `unshift`, `unzip`, `values`, `valuesIn`, `where`, `without`, `wrap`, `xor`, * `union`, `uniq`, `unshift`, `unzip`, `values`, `valuesIn`, `where`,
* `zip`, and `zipObject` * `without`, `wrap`, `xor`, `zip`, and `zipObject`
* *
* The wrapper methods 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`, `has`,
* `identity`, `includes`, `indexOf`, `isArguments`, `isArray`, `isBoolean`, * `identity`, `includes`, `indexOf`, `inRange`, `isArguments`, `isArray`,
* `isDate`, `isElement`, `isEmpty`, `isEqual`, `isError`, `isFinite`, * `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`, `max`, `min`,
* `noConflict`, `now`, `pad`, `padLeft`, `padRight`, `parseInt`, `pop`, * `noConflict`, `now`, `pad`, `padLeft`, `padRight`, `parseInt`, `pop`,
* `random`, `reduce`, `reduceRight`, `repeat`, `result`, `runInContext`, * `random`, `reduce`, `reduceRight`, `repeat`, `result`, `runInContext`,
* `shift`, `size`, `snakeCase`, `some`, `sortedIndex`, `sortedLastIndex`, * `shift`, `size`, `snakeCase`, `some`, `sortedIndex`, `sortedLastIndex`,
* `startCase`, `startsWith`, `template`, `trim`, `trimLeft`, `trimRight`, * `startCase`, `startsWith`, `sum`, `template`, `trim`, `trimLeft`,
* `trunc`, `unescape`, `uniqueId`, `value`, and `words` * `trimRight`, `trunc`, `unescape`, `uniqueId`, `value`, and `words`
* *
* The wrapper method `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.
@@ -78,11 +83,15 @@ define(['../internal/LazyWrapper', '../internal/LodashWrapper', '../lang/isArray
* 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(sum, n) {
* return sum + 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
@@ -102,5 +111,8 @@ define(['../internal/LazyWrapper', '../internal/LodashWrapper', '../lang/isArray
return new LodashWrapper(value); return new LodashWrapper(value);
} }
// Ensure wrappers are instances of `baseLodash`.
lodash.prototype = baseLodash.prototype;
return lodash; return lodash;
}); });

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

@@ -14,7 +14,9 @@ define([], function() {
* *
* _([1, 2, 3]) * _([1, 2, 3])
* .last() * .last()
* .thru(function(value) { return [value]; }) * .thru(function(value) {
* return [value];
* })
* .value(); * .value();
* // => [3] * // => [3]
*/ */

View File

@@ -1,4 +1,4 @@
define(['../internal/LodashWrapper', '../internal/wrapperClone'], function(LodashWrapper, wrapperClone) { define(['../internal/baseLodash', '../internal/wrapperClone'], function(baseLodash, wrapperClone) {
/** /**
* Creates a clone of the chained sequence planting `value` as the wrapped value. * Creates a clone of the chained sequence planting `value` as the wrapped value.
@@ -27,7 +27,7 @@ define(['../internal/LodashWrapper', '../internal/wrapperClone'], function(Lodas
var result, var result,
parent = this; parent = this;
while (parent instanceof LodashWrapper) { while (parent instanceof baseLodash) {
var clone = wrapperClone(parent); var clone = wrapperClone(parent);
if (result) { if (result) {
previous.__wrapped__ = clone; previous.__wrapped__ = clone;

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

@@ -14,8 +14,8 @@ 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(['fred', 'barney', 'pebbles'], 0, 2);
* // => ['fred', 'pebbles'] * // => ['fred', 'pebbles']

View File

@@ -34,10 +34,14 @@ define(['../internal/createAggregator'], function(createAggregator) {
* @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

@@ -27,8 +27,10 @@ define(['../internal/arrayFilter', '../internal/baseCallback', '../internal/base
* @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': true }, * { 'user': 'barney', 'age': 36, 'active': true },

View File

@@ -36,7 +36,9 @@ define(['../internal/baseCallback', '../internal/baseEach', '../internal/baseFin
* { 'user': 'pebbles', 'age': 1, 'active': true } * { '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

View File

@@ -14,7 +14,9 @@ define(['../internal/baseCallback', '../internal/baseEachRight', '../internal/ba
* @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) { function findLast(collection, predicate, thisArg) {

View File

@@ -20,10 +20,14 @@ 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) { function forEach(collection, iteratee, thisArg) {

View File

@@ -14,7 +14,9 @@ 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);
* }).join(',');
* // => 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) { function forEachRight(collection, iteratee, thisArg) {

View File

@@ -34,10 +34,14 @@ define(['../internal/createAggregator'], function(createAggregator) {
* @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

View File

@@ -36,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

@@ -37,11 +37,15 @@ define(['../internal/arrayMap', '../internal/baseCallback', '../internal/baseMap
* @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' },

View File

@@ -1,51 +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 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
* 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.
* @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,51 +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 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
* 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.
* @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

@@ -27,11 +27,15 @@ define(['../internal/createAggregator'], function(createAggregator) {
* @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 },
@@ -39,7 +43,9 @@ define(['../internal/createAggregator'], function(createAggregator) {
* { 'user': 'pebbles', 'age': 1, 'active': false } * { 'user': 'pebbles', 'age': 1, 'active': false }
* ]; * ];
* *
* var mapper = function(array) { return _.pluck(array, 'user'); }; * var mapper = function(array) {
* return _.pluck(array, 'user');
* };
* *
* // using the `_.matches` callback shorthand * // using the `_.matches` callback shorthand
* _.map(_.partition(users, { 'age': 1, 'active': false }), mapper); * _.map(_.partition(users, { 'age': 1, 'active': false }), mapper);

View File

@@ -25,14 +25,16 @@ 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(sum, n) {
* // => 6 * return sum + 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) { function reduce(collection, iteratee, accumulator, thisArg) {
var func = isArray(collection) ? arrayReduce : baseReduce; var func = isArray(collection) ? arrayReduce : baseReduce;

View File

@@ -16,7 +16,10 @@ 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) { function reduceRight(collection, iteratee, accumulator, thisArg) {

View File

@@ -25,7 +25,9 @@ define(['../internal/arrayFilter', '../internal/baseCallback', '../internal/base
* @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 = [

View File

@@ -1,8 +1,8 @@
define(['../internal/isLength', '../object/keys'], function(isLength, keys) { define(['../internal/isLength', '../object/keys'], function(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,12 +11,12 @@ 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
*/ */

View File

@@ -38,7 +38,7 @@ define(['../internal/arraySome', '../internal/baseCallback', '../internal/baseSo
* ]; * ];
* *
* // using the `_.matches` callback shorthand * // using the `_.matches` callback shorthand
* _.some(users, { user': 'barney', 'active': false }); * _.some(users, { 'user': 'barney', 'active': false });
* // => false * // => false
* *
* // using the `_.matchesProperty` callback shorthand * // using the `_.matchesProperty` callback shorthand

View File

@@ -29,10 +29,14 @@ define(['../internal/baseCallback', '../internal/baseEach', '../internal/baseSor
* @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 = [
@@ -46,8 +50,11 @@ define(['../internal/baseCallback', '../internal/baseEach', '../internal/baseSor
* // => ['barney', 'fred', 'pebbles'] * // => ['barney', 'fred', 'pebbles']
*/ */
function sortBy(collection, iteratee, thisArg) { function sortBy(collection, iteratee, thisArg) {
if (collection == null) {
return [];
}
var index = -1, var index = -1,
length = collection ? collection.length : 0, length = collection.length,
result = isLength(length) ? Array(length) : []; result = isLength(length) ? Array(length) : [];
if (thisArg && isIterateeCall(collection, iteratee, thisArg)) { if (thisArg && isIterateeCall(collection, iteratee, thisArg)) {

View File

@@ -1,7 +1,4 @@
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(baseFlatten, baseSortByOrder, isIterateeCall) {
/** 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 sorts by property names
@@ -27,25 +24,16 @@ define(['../internal/baseEach', '../internal/baseFlatten', '../internal/baseSort
* // => [['barney', 26], ['barney', 36], ['fred', 30], ['fred', 40]] * // => [['barney', 26], ['barney', 36], ['fred', 30], ['fred', 40]]
*/ */
function sortByAll(collection) { function sortByAll(collection) {
var args = arguments; if (collection == null) {
if (args.length > 3 && isIterateeCall(args[1], args[2], args[3])) { return [];
}
var args = arguments,
guard = args[3];
if (guard && isIterateeCall(args[1], args[2], guard)) {
args = [collection, args[1]]; args = [collection, args[1]];
} }
var index = -1, return baseSortByOrder(collection, baseFlatten(args, false, false, 1), []);
length = collection ? collection.length : 0,
props = baseFlatten(args, false, false, 1),
result = isLength(length) ? Array(length) : [];
baseEach(collection, function(value) {
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;

47
collection/sortByOrder.js Normal file
View File

@@ -0,0 +1,47 @@
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 property names to sort by. A truthy value in `orders`
* will sort the corresponding property name in ascending order while a
* falsey value will sort it in descending order.
*
* @static
* @memberOf _
* @category Collection
* @param {Array|Object|string} collection The collection to iterate over.
* @param {string[]} props The property names to sort by.
* @param {boolean[]} orders The sort orders of `props`.
* @param- {Object} [guard] Enables use as a callback for functions like `_.reduce`.
* @returns {Array} Returns the new sorted array.
* @example
*
* var users = [
* { 'user': 'barney', 'age': 26 },
* { 'user': 'fred', 'age': 40 },
* { 'user': 'barney', 'age': 36 },
* { 'user': 'fred', 'age': 30 }
* ];
*
* // sort by `user` in ascending order and by `age` in descending order
* _.map(_.sortByOrder(users, ['user', 'age'], [true, false]), _.values);
* // => [['barney', 36], ['barney', 26], ['fred', 40], ['fred', 30]]
*/
function sortByOrder(collection, props, orders, guard) {
if (collection == null) {
return [];
}
if (guard && isIterateeCall(props, orders, guard)) {
orders = null;
}
if (!isArray(props)) {
props = props == null ? [] : [props];
}
if (!isArray(orders)) {
orders = orders == null ? [] : [orders];
}
return baseSortByOrder(collection, props, orders);
}
return sortByOrder;
});

3
collection/sum.js Normal file
View File

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

View File

@@ -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

@@ -19,7 +19,9 @@ 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);

View File

@@ -28,7 +28,7 @@ define(['../lang/isObject', '../date/now'], function(isObject, now) {
* @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.
@@ -86,7 +86,7 @@ define(['../lang/isObject', '../date/now'], function(isObject, now) {
if (typeof func != 'function') { 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

@@ -12,7 +12,9 @@ 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) { function defer(func) {

View File

@@ -13,7 +13,9 @@ 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) { function delay(func, wait) {

View File

@@ -1,7 +1,4 @@
define(['../internal/arrayEvery', '../lang/isFunction'], function(arrayEvery, isFunction) { define(['../internal/createComposer'], function(createComposer) {
/** 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 = createComposer();
var funcs = arguments,
length = funcs.length;
if (!length) {
return function() { return arguments[0]; };
}
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/createComposer'], function(createComposer) {
/** 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 = createComposer(true);
var funcs = arguments,
fromIndex = funcs.length - 1;
if (fromIndex < 0) {
return function() { return arguments[0]; };
}
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

@@ -61,13 +61,14 @@ define(['../internal/MapCache'], function(MapCache) {
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]; cache = memoized.cache,
key = resolver ? resolver.apply(this, args) : args[0];
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); cache.set(key, result);
return result; return result;
}; };

View File

@@ -26,7 +26,9 @@ define(['../internal/baseFlatten', '../internal/createWrapper'], function(baseFl
* // => ['a', 'b', 'c'] * // => ['a', 'b', 'c']
* *
* var map = _.rearg(_.map, [1, 0]); * var map = _.rearg(_.map, [1, 0]);
* map(function(n) { return n * 3; }, [1, 2, 3]); * map(function(n) {
* return n * 3;
* }, [1, 2, 3]);
* // => [3, 6, 9] * // => [3, 6, 9]
*/ */
function rearg(func) { function rearg(func) {

View File

@@ -29,7 +29,7 @@ define(['./debounce', '../lang/isObject'], function(debounce, isObject) {
* @memberOf _ * @memberOf _
* @category Function * @category Function
* @param {Function} func The function to throttle. * @param {Function} func The function to throttle.
* @param {number} wait The number of milliseconds to throttle invocations to. * @param {number} [wait=0] The number of milliseconds to throttle invocations to.
* @param {Object} [options] The options object. * @param {Object} [options] The options object.
* @param {boolean} [options.leading=true] Specify invoking on the leading * @param {boolean} [options.leading=true] Specify invoking on the leading
* edge of the timeout. * edge of the timeout.
@@ -42,8 +42,9 @@ define(['./debounce', '../lang/isObject'], function(debounce, isObject) {
* jQuery(window).on('scroll', _.throttle(updatePosition, 100)); * jQuery(window).on('scroll', _.throttle(updatePosition, 100));
* *
* // invoke `renewToken` when the click event is fired, but not more than once every 5 minutes * // invoke `renewToken` when the click event is fired, but not more than once every 5 minutes
* var throttled = _.throttle(renewToken, 300000, { 'trailing': false }) * jQuery('.interactive').on('click', _.throttle(renewToken, 300000, {
* jQuery('.interactive').on('click', throttled); * 'trailing': false
* }));
* *
* // cancel a trailing throttled call * // cancel a trailing throttled call
* jQuery(window).on('popstate', throttled.cancel); * jQuery(window).on('popstate', throttled.cancel);

View File

@@ -1,4 +1,4 @@
define([], function() { define(['./baseCreate', './baseLodash'], function(baseCreate, baseLodash) {
/** Used as references for `-Infinity` and `Infinity`. */ /** Used as references for `-Infinity` and `Infinity`. */
var POSITIVE_INFINITY = Number.POSITIVE_INFINITY; var POSITIVE_INFINITY = Number.POSITIVE_INFINITY;
@@ -20,5 +20,8 @@ define([], function() {
this.__views__ = null; this.__views__ = null;
} }
LazyWrapper.prototype = baseCreate(baseLodash.prototype);
LazyWrapper.prototype.constructor = LazyWrapper;
return LazyWrapper; return LazyWrapper;
}); });

View File

@@ -1,4 +1,4 @@
define([], function() { define(['./baseCreate', './baseLodash'], function(baseCreate, baseLodash) {
/** /**
* The base constructor for creating `lodash` wrapper objects. * The base constructor for creating `lodash` wrapper objects.
@@ -14,5 +14,8 @@ define([], function() {
this.__chain__ = !!chainAll; this.__chain__ = !!chainAll;
} }
LodashWrapper.prototype = baseCreate(baseLodash.prototype);
LodashWrapper.prototype.constructor = LodashWrapper;
return LodashWrapper; return LodashWrapper;
}); });

View File

@@ -23,7 +23,7 @@ define(['./baseCopy', '../object/keys'], function(baseCopy, keys) {
value = object[key], value = object[key],
result = customizer(value, source[key], key, object, source); result = customizer(value, source[key], key, object, source);
if ((result === result ? result !== value : value === value) || if ((result === result ? (result !== value) : (value === value)) ||
(typeof value == 'undefined' && !(key in object))) { (typeof value == 'undefined' && !(key in object))) {
object[key] = result; object[key] = result;
} }

View File

@@ -19,7 +19,7 @@ define(['./baseIndexOf', './cacheIndexOf', './createCache'], function(baseIndexO
var index = -1, var index = -1,
indexOf = baseIndexOf, indexOf = baseIndexOf,
isCommon = true, isCommon = true,
cache = isCommon && values.length >= 200 && createCache(values), cache = (isCommon && values.length >= 200) ? createCache(values) : null,
valuesLength = values.length; valuesLength = values.length;
if (cache) { if (cache) {
@@ -40,7 +40,7 @@ define(['./baseIndexOf', './cacheIndexOf', './createCache'], function(baseIndexO
} }
result.push(value); result.push(value);
} }
else if (indexOf(values, value) < 0) { else if (indexOf(values, value, 0) < 0) {
result.push(value); result.push(value);
} }
} }

View File

@@ -21,7 +21,7 @@ define([], function() {
if (end < 0) { if (end < 0) {
end += length; end += length;
} }
length = start > end ? 0 : end >>> 0; length = start > end ? 0 : (end >>> 0);
start >>>= 0; start >>>= 0;
while (start < length) { while (start < length) {

View File

@@ -6,13 +6,13 @@ define(['../lang/isArguments', '../lang/isArray', './isLength', './isObjectLike'
* *
* @private * @private
* @param {Array} array The array to flatten. * @param {Array} array The array to flatten.
* @param {boolean} [isDeep] Specify a deep flatten. * @param {boolean} isDeep Specify a deep flatten.
* @param {boolean} [isStrict] Restrict flattening to arrays and `arguments` objects. * @param {boolean} isStrict Restrict flattening to arrays and `arguments` objects.
* @param {number} [fromIndex=0] The index to start from. * @param {number} fromIndex The index to start from.
* @returns {Array} Returns the new flattened array. * @returns {Array} Returns the new flattened array.
*/ */
function baseFlatten(array, isDeep, isStrict, fromIndex) { function baseFlatten(array, isDeep, isStrict, fromIndex) {
var index = (fromIndex || 0) - 1, var index = fromIndex - 1,
length = array.length, length = array.length,
resIndex = -1, resIndex = -1,
result = []; result = [];
@@ -23,7 +23,7 @@ define(['../lang/isArguments', '../lang/isArray', './isLength', './isObjectLike'
if (isObjectLike(value) && isLength(value.length) && (isArray(value) || isArguments(value))) { if (isObjectLike(value) && isLength(value.length) && (isArray(value) || isArguments(value))) {
if (isDeep) { if (isDeep) {
// Recursively flatten arrays (susceptible to call stack limits). // Recursively flatten arrays (susceptible to call stack limits).
value = baseFlatten(value, isDeep, isStrict); value = baseFlatten(value, isDeep, isStrict, 0);
} }
var valIndex = -1, var valIndex = -1,
valLength = value.length; valLength = value.length;

View File

@@ -6,14 +6,14 @@ define(['./indexOfNaN'], function(indexOfNaN) {
* @private * @private
* @param {Array} array The array to search. * @param {Array} array The array to search.
* @param {*} value The value to search for. * @param {*} value The value to search for.
* @param {number} [fromIndex=0] The index to search from. * @param {number} fromIndex The index to search from.
* @returns {number} Returns the index of the matched value, else `-1`. * @returns {number} Returns the index of the matched value, else `-1`.
*/ */
function baseIndexOf(array, value, fromIndex) { function baseIndexOf(array, value, fromIndex) {
if (value !== value) { if (value !== value) {
return indexOfNaN(array, fromIndex); return indexOfNaN(array, fromIndex);
} }
var index = (fromIndex || 0) - 1, var index = fromIndex - 1,
length = array.length; length = array.length;
while (++index < length) { while (++index < length) {

View File

@@ -0,0 +1,18 @@
define([], function() {
/**
* The base implementation of `_.isFunction` without support for environments
* with incorrect `typeof` results.
*
* @private
* @param {*} value The value to check.
* @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
*/
function baseIsFunction(value) {
// Avoid a Chakra JIT bug in compatibility modes of IE 11.
// See https://github.com/jashkenas/underscore/issues/1621 for more details.
return typeof value == 'function' || false;
}
return baseIsFunction;
});

13
internal/baseLodash.js Normal file
View File

@@ -0,0 +1,13 @@
define([], function() {
/**
* The function whose prototype all chaining wrappers inherit from.
*
* @private
*/
function baseLodash() {
// No operation performed.
}
return baseLodash;
});

View File

@@ -1,4 +1,4 @@
define(['./arrayEach', './baseForOwn', './baseMergeDeep', '../lang/isArray', './isLength', './isObjectLike', '../lang/isTypedArray'], function(arrayEach, baseForOwn, baseMergeDeep, isArray, isLength, isObjectLike, isTypedArray) { define(['./arrayEach', './baseForOwn', './baseMergeDeep', '../lang/isArray', './isLength', '../lang/isObject', './isObjectLike', '../lang/isTypedArray'], function(arrayEach, baseForOwn, baseMergeDeep, isArray, isLength, isObject, isObjectLike, isTypedArray) {
/** 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;
@@ -16,8 +16,10 @@ define(['./arrayEach', './baseForOwn', './baseMergeDeep', '../lang/isArray', './
* @returns {Object} Returns the destination object. * @returns {Object} Returns the destination object.
*/ */
function baseMerge(object, source, customizer, stackA, stackB) { function baseMerge(object, source, customizer, stackA, stackB) {
if (!isObject(object)) {
return object;
}
var isSrcArr = isLength(source.length) && (isArray(source) || isTypedArray(source)); var isSrcArr = isLength(source.length) && (isArray(source) || isTypedArray(source));
(isSrcArr ? arrayEach : baseForOwn)(source, function(srcValue, key, source) { (isSrcArr ? arrayEach : baseForOwn)(source, function(srcValue, key, source) {
if (isObjectLike(srcValue)) { if (isObjectLike(srcValue)) {
stackA || (stackA = []); stackA || (stackA = []);
@@ -32,7 +34,7 @@ define(['./arrayEach', './baseForOwn', './baseMergeDeep', '../lang/isArray', './
result = srcValue; result = srcValue;
} }
if ((isSrcArr || typeof result != 'undefined') && if ((isSrcArr || typeof result != 'undefined') &&
(isCommon || (result === result ? result !== value : value === value))) { (isCommon || (result === result ? (result !== value) : (value === value)))) {
object[key] = result; object[key] = result;
} }
}); });

View File

@@ -56,7 +56,7 @@ define(['./arrayCopy', '../lang/isArguments', '../lang/isArray', './isLength', '
if (isCommon) { if (isCommon) {
// Recursively merge objects and arrays (susceptible to call stack limits). // Recursively merge objects and arrays (susceptible to call stack limits).
object[key] = mergeFunc(result, srcValue, customizer, stackA, stackB); object[key] = mergeFunc(result, srcValue, customizer, stackA, stackB);
} else if (result === result ? result !== value : value === value) { } else if (result === result ? (result !== value) : (value === value)) {
object[key] = result; object[key] = result;
} }
} }

View File

@@ -21,7 +21,7 @@ define([], function() {
if (end < 0) { if (end < 0) {
end += length; end += length;
} }
length = start > end ? 0 : (end - start) >>> 0; length = start > end ? 0 : ((end - start) >>> 0);
start >>>= 0; start >>>= 0;
var result = Array(length); var result = Array(length);

View File

@@ -1,8 +1,8 @@
define([], function() { define([], function() {
/** /**
* The base implementation of `_.sortBy` and `_.sortByAll` which uses `comparer` * The base implementation of `_.sortBy` which uses `comparer` to define
* to define the sort order of `array` and replaces criteria objects with their * the sort order of `array` and replaces criteria objects with their
* corresponding values. * corresponding values.
* *
* @private * @private

View File

@@ -0,0 +1,36 @@
define(['./baseEach', './baseSortBy', './compareMultiple', './isLength'], function(baseEach, baseSortBy, compareMultiple, isLength) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined;
/**
* The base implementation of `_.sortByOrder` without param guards.
*
* @private
* @param {Array|Object|string} collection The collection to iterate over.
* @param {string[]} props The property names to sort by.
* @param {boolean[]} orders The sort orders of `props`.
* @returns {Array} Returns the new sorted array.
*/
function baseSortByOrder(collection, props, orders) {
var index = -1,
length = collection.length,
result = isLength(length) ? Array(length) : [];
baseEach(collection, function(value) {
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, function(object, other) {
return compareMultiple(object, other, orders);
});
}
return baseSortByOrder;
});

View File

@@ -15,7 +15,7 @@ define(['./baseIndexOf', './cacheIndexOf', './createCache'], function(baseIndexO
length = array.length, length = array.length,
isCommon = true, isCommon = true,
isLarge = isCommon && length >= 200, isLarge = isCommon && length >= 200,
seen = isLarge && createCache(), seen = isLarge ? createCache() : null,
result = []; result = [];
if (seen) { if (seen) {
@@ -42,7 +42,7 @@ define(['./baseIndexOf', './cacheIndexOf', './createCache'], function(baseIndexO
} }
result.push(value); result.push(value);
} }
else if (indexOf(seen, computed) < 0) { else if (indexOf(seen, computed, 0) < 0) {
if (iteratee || isLarge) { if (iteratee || isLarge) {
seen.push(computed); seen.push(computed);
} }

View File

@@ -1,24 +1,33 @@
define(['./baseCompareAscending'], function(baseCompareAscending) { define(['./baseCompareAscending'], function(baseCompareAscending) {
/** /**
* Used by `_.sortByAll` to compare multiple properties of each element * Used by `_.sortByOrder` to compare multiple properties of each element
* in a collection and stable sort them in ascending order. * in a collection and stable sort them in the following order:
*
* If orders is unspecified, sort in ascending order for all properties.
* Otherwise, for each property, sort in ascending order if its corresponding value in
* orders is true, and descending order if false.
* *
* @private * @private
* @param {Object} object The object to compare to `other`. * @param {Object} object The object to compare to `other`.
* @param {Object} other The object to compare to `object`. * @param {Object} other The object to compare to `object`.
* @param {boolean[]} orders The order to sort by for each property.
* @returns {number} Returns the sort order indicator for `object`. * @returns {number} Returns the sort order indicator for `object`.
*/ */
function compareMultipleAscending(object, other) { function compareMultiple(object, other, orders) {
var index = -1, var index = -1,
objCriteria = object.criteria, objCriteria = object.criteria,
othCriteria = other.criteria, othCriteria = other.criteria,
length = objCriteria.length; length = objCriteria.length,
ordersLength = orders.length;
while (++index < length) { while (++index < length) {
var result = baseCompareAscending(objCriteria[index], othCriteria[index]); var result = baseCompareAscending(objCriteria[index], othCriteria[index]);
if (result) { if (result) {
return result; if (index >= ordersLength) {
return result;
}
return result * (orders[index] ? 1 : -1);
} }
} }
// Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications // Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications
@@ -31,5 +40,5 @@ define(['./baseCompareAscending'], function(baseCompareAscending) {
return object.index - other.index; return object.index - other.index;
} }
return compareMultipleAscending; return compareMultiple;
}); });

View File

@@ -10,24 +10,31 @@ define(['./bindCallback', './isIterateeCall'], function(bindCallback, isIteratee
*/ */
function createAssigner(assigner) { function createAssigner(assigner) {
return function() { return function() {
var length = arguments.length, var args = arguments,
object = arguments[0]; length = args.length,
object = args[0];
if (length < 2 || object == null) { if (length < 2 || object == null) {
return object; return object;
} }
if (length > 3 && isIterateeCall(arguments[1], arguments[2], arguments[3])) { var customizer = args[length - 2],
length = 2; thisArg = args[length - 1],
guard = args[3];
if (length > 3 && typeof customizer == 'function') {
customizer = bindCallback(customizer, thisArg, 5);
length -= 2;
} else {
customizer = (length > 2 && typeof thisArg == 'function') ? thisArg : null;
length -= (customizer ? 1 : 0);
} }
// Juggle arguments. if (guard && isIterateeCall(args[1], args[2], guard)) {
if (length > 3 && typeof arguments[length - 2] == 'function') { customizer = length == 3 ? null : customizer;
var customizer = bindCallback(arguments[--length - 1], arguments[length--], 5); length = 2;
} else if (length > 2 && typeof arguments[length - 1] == 'function') {
customizer = arguments[--length];
} }
var index = 0; var index = 0;
while (++index < length) { while (++index < length) {
var source = arguments[index]; var source = args[index];
if (source) { if (source) {
assigner(object, source, customizer); assigner(object, source, customizer);
} }

View File

@@ -1,4 +1,4 @@
define(['./createCtorWrapper'], function(createCtorWrapper) { define(['./createCtorWrapper', './root'], function(createCtorWrapper, root) {
/** /**
* Creates a function that wraps `func` and invokes it with the `this` * Creates a function that wraps `func` and invokes it with the `this`
@@ -13,7 +13,8 @@ define(['./createCtorWrapper'], function(createCtorWrapper) {
var Ctor = createCtorWrapper(func); var Ctor = createCtorWrapper(func);
function wrapper() { function wrapper() {
return (this instanceof wrapper ? Ctor : func).apply(thisArg, arguments); var fn = (this && this !== root && this instanceof wrapper) ? Ctor : func;
return fn.apply(thisArg, arguments);
} }
return wrapper; return wrapper;
} }

View File

@@ -0,0 +1,42 @@
define([], function() {
/** Used as the `TypeError` message for "Functions" methods. */
var FUNC_ERROR_TEXT = 'Expected a function';
/**
* Creates a function to compose other functions into a single function.
*
* @private
* @param {boolean} [fromRight] Specify iterating from right to left.
* @returns {Function} Returns the new composer function.
*/
function createComposer(fromRight) {
return function() {
var length = arguments.length,
index = length,
fromIndex = fromRight ? (length - 1) : 0;
if (!length) {
return function() { return arguments[0]; };
}
var funcs = Array(length);
while (index--) {
funcs[index] = arguments[index];
if (typeof funcs[index] != 'function') {
throw new TypeError(FUNC_ERROR_TEXT);
}
}
return function() {
var index = fromIndex,
result = funcs[index].apply(this, arguments);
while ((fromRight ? index-- : ++index < length)) {
result = funcs[index].call(this, result);
}
return result;
};
};
}
return createComposer;
});

View File

@@ -1,4 +1,4 @@
define(['./arrayCopy', './composeArgs', './composeArgsRight', './createCtorWrapper', './reorder', './replaceHolders'], function(arrayCopy, composeArgs, composeArgsRight, createCtorWrapper, reorder, replaceHolders) { define(['./arrayCopy', './composeArgs', './composeArgsRight', './createCtorWrapper', './reorder', './replaceHolders', './root'], function(arrayCopy, composeArgs, composeArgsRight, createCtorWrapper, reorder, replaceHolders, root) {
/** Used to compose bitmasks for wrapper metadata. */ /** Used to compose bitmasks for wrapper metadata. */
var BIND_FLAG = 1, var BIND_FLAG = 1,
@@ -91,7 +91,8 @@ define(['./arrayCopy', './composeArgs', './composeArgsRight', './createCtorWrapp
if (isAry && ary < args.length) { if (isAry && ary < args.length) {
args.length = ary; args.length = ary;
} }
return (this instanceof wrapper ? (Ctor || createCtorWrapper(func)) : func).apply(thisBinding, args); var fn = (this && this !== root && this instanceof wrapper) ? (Ctor || createCtorWrapper(func)) : func;
return fn.apply(thisBinding, args);
} }
return wrapper; return wrapper;
} }

View File

@@ -1,4 +1,4 @@
define(['./createCtorWrapper'], function(createCtorWrapper) { define(['./createCtorWrapper', './root'], function(createCtorWrapper, root) {
/** Used to compose bitmasks for wrapper metadata. */ /** Used to compose bitmasks for wrapper metadata. */
var BIND_FLAG = 1; var BIND_FLAG = 1;
@@ -34,7 +34,8 @@ define(['./createCtorWrapper'], function(createCtorWrapper) {
while (argsLength--) { while (argsLength--) {
args[leftIndex++] = arguments[++argsIndex]; args[leftIndex++] = arguments[++argsIndex];
} }
return (this instanceof wrapper ? Ctor : func).apply(isBind ? thisArg : this, args); var fn = (this && this !== root && this instanceof wrapper) ? Ctor : func;
return fn.apply(isBind ? thisArg : this, args);
} }
return wrapper; return wrapper;
} }

View File

@@ -64,8 +64,10 @@ define(['../object/keys'], function(keys) {
othCtor = other.constructor; othCtor = other.constructor;
// Non `Object` object instances with different constructors are not equal. // Non `Object` object instances with different constructors are not equal.
if (objCtor != othCtor && ('constructor' in object && 'constructor' in other) && if (objCtor != othCtor &&
!(typeof objCtor == 'function' && objCtor instanceof objCtor && typeof othCtor == 'function' && othCtor instanceof othCtor)) { ('constructor' in object && 'constructor' in other) &&
!(typeof objCtor == 'function' && objCtor instanceof objCtor &&
typeof othCtor == 'function' && othCtor instanceof othCtor)) {
return false; return false;
} }
} }

View File

@@ -23,7 +23,8 @@ define(['./baseEach'], function(baseEach) {
baseEach(collection, function(value, index, collection) { baseEach(collection, function(value, index, collection) {
var current = iteratee(value, index, collection); var current = iteratee(value, index, collection);
if ((isMin ? current < computed : current > computed) || (current === exValue && current === result)) { if ((isMin ? (current < computed) : (current > computed)) ||
(current === exValue && current === result)) {
computed = current; computed = current;
result = value; result = value;
} }

View File

@@ -6,13 +6,13 @@ define([], function() {
* *
* @private * @private
* @param {Array} array The array to search. * @param {Array} array The array to search.
* @param {number} [fromIndex] The index to search from. * @param {number} fromIndex The index to search from.
* @param {boolean} [fromRight] Specify iterating from right to left. * @param {boolean} [fromRight] Specify iterating from right to left.
* @returns {number} Returns the index of the matched `NaN`, else `-1`. * @returns {number} Returns the index of the matched `NaN`, else `-1`.
*/ */
function indexOfNaN(array, fromIndex, fromRight) { function indexOfNaN(array, fromIndex, fromRight) {
var length = array.length, var length = array.length,
index = fromRight ? (fromIndex || length) : ((fromIndex || 0) - 1); index = fromIndex + (fromRight ? 0 : -1);
while ((fromRight ? index-- : ++index < length)) { while ((fromRight ? index-- : ++index < length)) {
var other = array[index]; var other = array[index];

View File

@@ -20,7 +20,11 @@ define(['./isIndex', './isLength', '../lang/isObject'], function(isIndex, isLeng
} else { } else {
prereq = type == 'string' && index in object; prereq = type == 'string' && index in object;
} }
return prereq && object[index] === value; if (prereq) {
var other = object[index];
return value === value ? (value === other) : (other !== other);
}
return false;
} }
return isIterateeCall; return isIterateeCall;

View File

@@ -16,7 +16,6 @@ define(['./LazyWrapper', './arrayCopy'], function(LazyWrapper, arrayCopy) {
result.__actions__ = actions ? arrayCopy(actions) : null; result.__actions__ = actions ? arrayCopy(actions) : null;
result.__dir__ = this.__dir__; result.__dir__ = this.__dir__;
result.__dropCount__ = this.__dropCount__;
result.__filtered__ = this.__filtered__; result.__filtered__ = this.__filtered__;
result.__iteratees__ = iteratees ? arrayCopy(iteratees) : null; result.__iteratees__ = iteratees ? arrayCopy(iteratees) : null;
result.__takeCount__ = this.__takeCount__; result.__takeCount__ = this.__takeCount__;

View File

@@ -1,8 +1,9 @@
define(['./baseWrapperValue', './getView', '../lang/isArray'], function(baseWrapperValue, getView, isArray) { define(['./baseWrapperValue', './getView', '../lang/isArray'], function(baseWrapperValue, getView, isArray) {
/** Used to indicate the type of lazy iteratees. */ /** Used to indicate the type of lazy iteratees. */
var LAZY_FILTER_FLAG = 0, var LAZY_DROP_WHILE_FLAG = 0,
LAZY_MAP_FLAG = 1; LAZY_FILTER_FLAG = 1,
LAZY_MAP_FLAG = 2;
/* 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 nativeMin = Math.min; var nativeMin = Math.min;
@@ -26,9 +27,8 @@ define(['./baseWrapperValue', './getView', '../lang/isArray'], function(baseWrap
start = view.start, start = view.start,
end = view.end, end = view.end,
length = end - start, length = end - start,
dropCount = this.__dropCount__, index = isRight ? end : (start - 1),
takeCount = nativeMin(length, this.__takeCount__), takeCount = nativeMin(length, this.__takeCount__),
index = isRight ? end : start - 1,
iteratees = this.__iteratees__, iteratees = this.__iteratees__,
iterLength = iteratees ? iteratees.length : 0, iterLength = iteratees ? iteratees.length : 0,
resIndex = 0, resIndex = 0,
@@ -44,24 +44,34 @@ define(['./baseWrapperValue', './getView', '../lang/isArray'], function(baseWrap
while (++iterIndex < iterLength) { while (++iterIndex < iterLength) {
var data = iteratees[iterIndex], var data = iteratees[iterIndex],
iteratee = data.iteratee, iteratee = data.iteratee,
computed = iteratee(value, index, array),
type = data.type; type = data.type;
if (type == LAZY_MAP_FLAG) { if (type == LAZY_DROP_WHILE_FLAG) {
value = computed; if (data.done && (isRight ? (index > data.index) : (index < data.index))) {
} else if (!computed) { data.count = 0;
if (type == LAZY_FILTER_FLAG) { data.done = false;
continue outer; }
} else { data.index = index;
break outer; if (!data.done) {
var limit = data.limit;
if (!(data.done = limit > -1 ? (data.count++ >= limit) : !iteratee(value))) {
continue outer;
}
}
} else {
var computed = iteratee(value);
if (type == LAZY_MAP_FLAG) {
value = computed;
} else if (!computed) {
if (type == LAZY_FILTER_FLAG) {
continue outer;
} else {
break outer;
}
} }
} }
} }
if (dropCount) { result[resIndex++] = value;
dropCount--;
} else {
result[resIndex++] = value;
}
} }
return result; return result;
} }

View File

@@ -6,25 +6,25 @@ define([], function() {
'object': true 'object': true
}; };
/**
* Used as a reference to the global object.
*
* The `this` value is used if it is the global object to avoid Greasemonkey's
* restricted `window` object, otherwise the `window` object is used.
*/
var root = (objectTypes[typeof window] && window !== (this && this.window)) ? window : this;
/** Detect free variable `exports`. */ /** Detect free variable `exports`. */
var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports; var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;
/** Detect free variable `module`. */ /** Detect free variable `module`. */
var freeModule = objectTypes[typeof module] && module && !module.nodeType && module; var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
/** Detect free variable `global` from Node.js or Browserified code and use it as `root`. */ /** Detect free variable `global` from Node.js. */
var freeGlobal = freeExports && freeModule && typeof global == 'object' && global; var freeGlobal = freeExports && freeModule && typeof global == 'object' && global;
if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal || freeGlobal.self === freeGlobal)) {
root = freeGlobal; /** Detect free variable `window`. */
} var freeWindow = objectTypes[typeof window] && window;
/**
* Used as a reference to the global object.
*
* The `this` value is used if it is the global object to avoid Greasemonkey's
* restricted `window` object, otherwise the `window` object is used.
*/
var root = freeGlobal || ((freeWindow !== (this && this.window)) && freeWindow) || this;
return root; return root;
}); });

View File

@@ -38,22 +38,26 @@ define(['../internal/baseClone', '../internal/bindCallback', '../internal/isIter
* // => false * // => false
* *
* // using a customizer callback * // using a customizer callback
* var body = _.clone(document.body, function(value) { * var el = _.clone(document.body, function(value) {
* return _.isElement(value) ? value.cloneNode(false) : undefined; * if (_.isElement(value)) {
* return value.cloneNode(false);
* }
* }); * });
* *
* body === document.body * el === document.body
* // => false * // => false
* body.nodeName * el.nodeName
* // => BODY * // => BODY
* body.childNodes.length; * el.childNodes.length;
* // => 0 * // => 0
*/ */
function clone(value, isDeep, customizer, thisArg) { function clone(value, isDeep, customizer, thisArg) {
// Juggle arguments. if (isDeep && typeof isDeep != 'boolean' && isIterateeCall(value, isDeep, customizer)) {
if (typeof isDeep != 'boolean' && isDeep != null) { isDeep = false;
}
else if (typeof isDeep == 'function') {
thisArg = customizer; thisArg = customizer;
customizer = isIterateeCall(value, isDeep, thisArg) ? null : isDeep; customizer = isDeep;
isDeep = false; isDeep = false;
} }
customizer = typeof customizer == 'function' && bindCallback(customizer, thisArg, 1); customizer = typeof customizer == 'function' && bindCallback(customizer, thisArg, 1);

View File

@@ -33,14 +33,16 @@ define(['../internal/baseClone', '../internal/bindCallback'], function(baseClone
* *
* // using a customizer callback * // using a customizer callback
* var el = _.cloneDeep(document.body, function(value) { * var el = _.cloneDeep(document.body, function(value) {
* return _.isElement(value) ? value.cloneNode(true) : undefined; * if (_.isElement(value)) {
* return value.cloneNode(true);
* }
* }); * });
* *
* body === document.body * el === document.body
* // => false * // => false
* body.nodeName * el.nodeName
* // => BODY * // => BODY
* body.childNodes.length; * el.childNodes.length;
* // => 20 * // => 20
*/ */
function cloneDeep(value, customizer, thisArg) { function cloneDeep(value, customizer, thisArg) {

View File

@@ -26,7 +26,7 @@ define(['../internal/isLength', '../internal/isObjectLike'], function(isLength,
* @returns {boolean} Returns `true` if `value` is correctly classified, else `false`. * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
* @example * @example
* *
* (function() { return _.isArguments(arguments); })(); * _.isArguments(function() { return arguments; }());
* // => true * // => true
* *
* _.isArguments([1, 2, 3]); * _.isArguments([1, 2, 3]);

View File

@@ -29,7 +29,7 @@ define(['../internal/isLength', './isNative', '../internal/isObjectLike'], funct
* _.isArray([1, 2, 3]); * _.isArray([1, 2, 3]);
* // => true * // => true
* *
* (function() { return _.isArray(arguments); })(); * _.isArray(function() { return arguments; }());
* // => false * // => false
*/ */
var isArray = nativeIsArray || function(value) { var isArray = nativeIsArray || function(value) {

View File

@@ -28,7 +28,7 @@ define(['../internal/isObjectLike', './isPlainObject', '../support'], function(i
*/ */
function isElement(value) { function isElement(value) {
return (value && value.nodeType === 1 && isObjectLike(value) && return (value && value.nodeType === 1 && isObjectLike(value) &&
objToString.call(value).indexOf('Element') > -1) || false; (objToString.call(value).indexOf('Element') > -1)) || false;
} }
// Fallback for environments without DOM support. // Fallback for environments without DOM support.
if (!support.dom) { if (!support.dom) {

View File

@@ -1,7 +1,7 @@
define(['./isArguments', './isArray', './isFunction', '../internal/isLength', '../internal/isObjectLike', './isString', '../object/keys'], function(isArguments, isArray, isFunction, isLength, isObjectLike, isString, keys) { define(['./isArguments', './isArray', './isFunction', '../internal/isLength', '../internal/isObjectLike', './isString', '../object/keys'], function(isArguments, isArray, isFunction, isLength, isObjectLike, isString, keys) {
/** /**
* Checks if a value is empty. A value is considered empty unless it is an * Checks if `value` is empty. A value is considered empty unless it is an
* `arguments` object, array, string, or jQuery-like collection with a length * `arguments` object, array, string, or jQuery-like collection with a length
* greater than `0` or an object with own enumerable properties. * greater than `0` or an object with own enumerable properties.
* *

View File

@@ -40,7 +40,9 @@ define(['../internal/baseIsEqual', '../internal/bindCallback', '../internal/isSt
* var other = ['hi', 'goodbye']; * var other = ['hi', 'goodbye'];
* *
* _.isEqual(array, other, function(value, other) { * _.isEqual(array, other, function(value, other) {
* return _.every([value, other], RegExp.prototype.test, /^h(?:i|ello)$/) || undefined; * if (_.every([value, other], RegExp.prototype.test, /^h(?:i|ello)$/)) {
* return true;
* }
* }); * });
* // => true * // => true
*/ */

View File

@@ -1,4 +1,4 @@
define(['./isNative', '../internal/root'], function(isNative, root) { define(['../internal/baseIsFunction', './isNative', '../internal/root'], function(baseIsFunction, isNative, root) {
/** `Object#toString` result references. */ /** `Object#toString` result references. */
var funcTag = '[object Function]'; var funcTag = '[object Function]';
@@ -32,20 +32,12 @@ define(['./isNative', '../internal/root'], function(isNative, root) {
* _.isFunction(/abc/); * _.isFunction(/abc/);
* // => false * // => false
*/ */
function isFunction(value) { var isFunction = !(baseIsFunction(/x/) || (Uint8Array && !baseIsFunction(Uint8Array))) ? baseIsFunction : function(value) {
// Avoid a Chakra JIT bug in compatibility modes of IE 11. // The use of `Object#toString` avoids issues with the `typeof` operator
// See https://github.com/jashkenas/underscore/issues/1621 for more details. // in older versions of Chrome and Safari which return 'function' for regexes
return typeof value == 'function' || false; // and Safari 8 equivalents which return 'object' for typed array constructors.
} return objToString.call(value) == funcTag;
// Fallback for environments that return incorrect `typeof` operator results. };
if (isFunction(/x/) || (Uint8Array && !isFunction(Uint8Array))) {
isFunction = function(value) {
// The use of `Object#toString` avoids issues with the `typeof` operator
// in older versions of Chrome and Safari which return 'function' for regexes
// and Safari 8 equivalents which return 'object' for typed array constructors.
return objToString.call(value) == funcTag;
};
}
return isFunction; return isFunction;
}); });

View File

@@ -10,7 +10,9 @@ define(['../internal/arrayCopy', '../internal/isLength', '../object/values'], fu
* @returns {Array} Returns the converted array. * @returns {Array} Returns the converted array.
* @example * @example
* *
* (function() { return _.toArray(arguments).slice(1); })(1, 2, 3); * (function() {
* return _.toArray(arguments).slice(1);
* }(1, 2, 3));
* // => [2, 3] * // => [2, 3]
*/ */
function toArray(value) { function toArray(value) {

1495
main.js

File diff suppressed because it is too large Load Diff

8
math.js Normal file
View File

@@ -0,0 +1,8 @@
define(['./math/add', './math/max', './math/min', './math/sum'], function(add, max, min, sum) {
return {
'add': add,
'max': max,
'min': min,
'sum': sum
};
});

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