Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-08 02:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make more methods use isIterateeCall.

Browse Source
This commit is contained in:
John-David Dalton
2014-11-26 23:46:11 -08:00
parent 02a862684d
commit 8b43b2b69d
1 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
lodash.js
View File

@@ -3605,8 +3605,11 @@
* // => [['a', 'b', 'c'], ['d']] * // => [['a', 'b', 'c'], ['d']]
*/ */
function chunk(array, size, guard) { function chunk(array, size, guard) {
size = (guard || size == null) ? 1 : nativeMax(+size || 1, 1); if (guard ? isIterateeCall(array, size, guard) : size == null) {
size = 1;
} else {
size = nativeMax(+size || 1, 1);
}
var index = 0, var index = 0,
length = array ? array.length : 0, length = array ? array.length : 0,
resIndex = -1, resIndex = -1,
@@ -3706,7 +3709,9 @@
* // => [1, 2, 3] * // => [1, 2, 3]
*/ */
function drop(array, n, guard) { function drop(array, n, guard) {
n = (guard || n == null) ? 1 : n; if (guard ? isIterateeCall(array, n, guard) : n == null) {
n = 1;
}
return slice(array, n < 0 ? 0 : n); return slice(array, n < 0 ? 0 : n);
} }
@@ -3736,9 +3741,10 @@
* // => [1, 2, 3] * // => [1, 2, 3]
*/ */
function dropRight(array, n, guard) { function dropRight(array, n, guard) {
var length = array ? array.length : 0; if (guard ? isIterateeCall(array, n, guard) : n == null) {
n = (guard || n == null) ? 1 : n; n = 1;
n = length - (n || 0); }
n = array ? (array.length - (+n || 0)) : 0;
return slice(array, 0, n < 0 ? 0 : n); return slice(array, 0, n < 0 ? 0 : n);
} }
@@ -3985,7 +3991,10 @@
*/ */
function flatten(array, isDeep, guard) { function flatten(array, isDeep, guard) {
var length = array ? array.length : 0; var length = array ? array.length : 0;
return length ? baseFlatten(array, guard ? false : isDeep) : []; if (guard && isIterateeCall(array, isDeep, guard)) {
isDeep = false;
}
return length ? baseFlatten(array, isDeep) : [];
} }
/** /**
@@ -4486,7 +4495,9 @@
* // => [] * // => []
*/ */
function take(array, n, guard) { function take(array, n, guard) {
n = (guard || n == null) ? 1 : n; if (guard ? isIterateeCall(array, n, guard) : n == null) {
n = 1;
}
return slice(array, 0, n < 0 ? 0 : n); return slice(array, 0, n < 0 ? 0 : n);
} }
@@ -4516,9 +4527,10 @@
* // => [] * // => []
*/ */
function takeRight(array, n, guard) { function takeRight(array, n, guard) {
var length = array ? array.length : 0; if (guard ? isIterateeCall(array, n, guard) : n == null) {
n = (guard || n == null) ? 1 : n; n = 1;
n = length - (n || 0); }
n = array ? (array.length - (+n || 0)) : 0;
return slice(array, n < 0 ? 0 : n); return slice(array, n < 0 ? 0 : n);
} }
@@ -5913,7 +5925,7 @@
* // => [3, 1] * // => [3, 1]
*/ */
function sample(collection, n, guard) { function sample(collection, n, guard) {
if (guard || n == null) { if (guard ? isIterateeCall(collection, n, guard) : n == null) {
collection = toIterable(collection); collection = toIterable(collection);
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;
@@ -6414,7 +6426,10 @@
* // => [1, 2, 3] * // => [1, 2, 3]
*/ */
function curry(func, arity, guard) { function curry(func, arity, guard) {
var result = createWrapper(func, CURRY_FLAG, null, null, null, null, guard ? null : arity); if (guard && isIterateeCall(func, arity, guard)) {
arity = null;
}
var result = createWrapper(func, CURRY_FLAG, null, null, null, null, arity);
result.placeholder = curry.placeholder; result.placeholder = curry.placeholder;
return result; return result;
} }
@@ -6448,6 +6463,9 @@
* // => [1, 2, 3] * // => [1, 2, 3]
*/ */
function curryRight(func, arity, guard) { function curryRight(func, arity, guard) {
if (guard && isIterateeCall(func, arity, guard)) {
arity = null;
}
var result = createWrapper(func, CURRY_RIGHT_FLAG, null, null, null, null, guard ? null : arity); var result = createWrapper(func, CURRY_RIGHT_FLAG, null, null, null, null, guard ? null : arity);
result.placeholder = curryRight.placeholder; result.placeholder = curryRight.placeholder;
return result; return result;
@@ -7759,7 +7777,9 @@
*/ */
function create(prototype, properties, guard) { function create(prototype, properties, guard) {
var result = baseCreate(prototype); var result = baseCreate(prototype);
properties = guard ? null : properties; if (guard && isIterateeCall(prototype, properties, guard)) {
properties = null;
}
return properties ? baseAssign(result, properties) : result; return properties ? baseAssign(result, properties) : result;
} }
@@ -8057,8 +8077,9 @@
* // => { 'fred': ['first', 'third'], 'barney': ['second'] } * // => { 'fred': ['first', 'third'], 'barney': ['second'] }
*/ */
function invert(object, multiValue, guard) { function invert(object, multiValue, guard) {
multiValue = guard ? null : multiValue; if (guard && isIterateeCall(object, multiValue, guard)) {
multiValue = null;
}
var index = -1, var index = -1,
props = keys(object), props = keys(object),
length = props.length, length = props.length,
@@ -9084,7 +9105,7 @@
if (!string) { if (!string) {
return string; return string;
} }
if (guard || chars == null) { if (guard ? isIterateeCall(string, chars, guard) : chars == null) {
return string.slice(trimmedLeftIndex(string), trimmedRightIndex(string) + 1); return string.slice(trimmedLeftIndex(string), trimmedRightIndex(string) + 1);
} }
chars = String(chars); chars = String(chars);
@@ -9109,12 +9130,12 @@
* _.trimLeft('-_-fred-_-', '_-'); * _.trimLeft('-_-fred-_-', '_-');
* // => 'fred-_-' * // => 'fred-_-'
*/ */
function trimLeft(string, chars, guards) { function trimLeft(string, chars, guard) {
string = string == null ? '' : String(string); string = string == null ? '' : String(string);
if (!string) { if (!string) {
return string; return string;
} }
if (guards || chars == null) { if (guard ? isIterateeCall(string, chars, guard) : chars == null) {
return string.slice(trimmedLeftIndex(string)) return string.slice(trimmedLeftIndex(string))
} }
chars = String(chars); chars = String(chars);
@@ -9144,7 +9165,7 @@
if (!string) { if (!string) {
return string; return string;
} }
if (guard || chars == null) { if (guard ? isIterateeCall(string, chars, guard) : chars == null) {
return string.slice(0, trimmedRightIndex(string) + 1) return string.slice(0, trimmedRightIndex(string) + 1)
} }
chars = String(chars); chars = String(chars);
@@ -9184,8 +9205,9 @@
* // => 'hi-diddly-ho there, neig [...]' * // => 'hi-diddly-ho there, neig [...]'
*/ */
function trunc(string, options, guard) { function trunc(string, options, guard) {
options = guard ? null : options; if (guard && isIterateeCall(string, options, guard)) {
options = null;
}
var length = DEFAULT_TRUNC_LENGTH, var length = DEFAULT_TRUNC_LENGTH,
omission = DEFAULT_TRUNC_OMISSION; omission = DEFAULT_TRUNC_OMISSION;
@@ -9278,7 +9300,9 @@
*/ */
function words(string, pattern, guard) { function words(string, pattern, guard) {
string = string != null && String(string); string = string != null && String(string);
pattern = guard ? null : pattern; if (guard && isIterateeCall(string, pattern, guard)) {
pattern = null;
}
return (string && string.match(pattern || reWords)) || []; return (string && string.match(pattern || reWords)) || [];
} }
@@ -9348,7 +9372,10 @@
* // => [{ 'user': 'fred', 'age': 40 }] * // => [{ 'user': 'fred', 'age': 40 }]
*/ */
function callback(func, thisArg, guard) { function callback(func, thisArg, guard) {
return baseCallback(func, guard ? undefined : thisArg); if (guard && isIterateeCall(func, thisArg, guard)) {
thisArg = null;
}
return baseCallback(func, thisArg);
} }
/** /**
@@ -9617,7 +9644,10 @@
* // => 8 * // => 8
*/ */
function parseInt(value, radix, guard) { function parseInt(value, radix, guard) {
return nativeParseInt(value, guard ? 0 : radix); if (guard && isIterateeCall(value, radix, guard)) {
radix = 0;
}
return nativeParseInt(value, radix);
} }
// Fallback for environments with pre-ES5 implementations. // Fallback for environments with pre-ES5 implementations.
if (nativeParseInt(whitespace + '08') != 8) { if (nativeParseInt(whitespace + '08') != 8) {
@@ -9626,7 +9656,7 @@
// Chrome fails to trim leading <BOM> whitespace characters. // Chrome fails to trim leading <BOM> whitespace characters.
// See https://code.google.com/p/v8/issues/detail?id=3109. // See https://code.google.com/p/v8/issues/detail?id=3109.
value = trim(value); value = trim(value);
radix = guard ? 0 : +radix; radix = (guard && isIterateeCall(value, radix, guard)) ? 0 : +radix;
return nativeParseInt(value, radix || (reHexPrefix.test(value) ? 16 : 10)); return nativeParseInt(value, radix || (reHexPrefix.test(value) ? 16 : 10));
}; };
} }
@@ -10147,8 +10177,7 @@
// Add functions capable of returning wrapped and unwrapped values when chaining. // Add functions capable of returning wrapped and unwrapped values when chaining.
lodash.sample = sample; lodash.sample = sample;
lodash.prototype.sample = function(n, guard) { lodash.prototype.sample = function(n) {
n = guard ? null : n;
if (!this.__chain__ && n == null) { if (!this.__chain__ && n == null) {
return lodash.sample(this.value()); return lodash.sample(this.value());
} }