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

Clamp indexes and lengths where appropriate.

Browse Source
This commit is contained in:
John-David Dalton
2014-03-10 21:59:09 -07:00
parent a51c6a7670
commit c70b13a650
1 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
lodash.js
View File

@@ -261,7 +261,7 @@
* @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) {
var index = (fromIndex || 0) - 1, var index = (fromIndex | 0) - 1,
length = array ? array.length : 0; length = array ? array.length : 0;
while (++index < length) { while (++index < length) {
@@ -1011,8 +1011,8 @@
// avoid `arguments` object use disqualifying optimizations by // avoid `arguments` object use disqualifying optimizations by
// converting it to an array before passing it to `composeArgs` // converting it to an array before passing it to `composeArgs`
var index = -1, var index = -1,
length = arguments.length, length = arguments.length,
args = Array(length); args = Array(length);
while (++index < length) { while (++index < length) {
args[index] = arguments[index]; args[index] = arguments[index];
@@ -1328,6 +1328,7 @@
length = collection ? collection.length : 0; length = collection ? collection.length : 0;
if (typeof length == 'number') { if (typeof length == 'number') {
length |= 0;
if (support.unindexedChars && isString(iterable)) { if (support.unindexedChars && isString(iterable)) {
iterable = iterable.split(''); iterable = iterable.split('');
} }
@@ -1356,6 +1357,7 @@
length = collection ? collection.length : 0; length = collection ? collection.length : 0;
if (typeof length == 'number') { if (typeof length == 'number') {
length = (length |= 0) < 0 ? 0 : length;
if (support.unindexedChars && isString(iterable)) { if (support.unindexedChars && isString(iterable)) {
iterable = iterable.split(''); iterable = iterable.split('');
} }
@@ -1382,7 +1384,7 @@
* @returns {Array} Returns the new flattened array. * @returns {Array} Returns the new flattened array.
*/ */
function baseFlatten(array, isShallow, isStrict, fromIndex) { function baseFlatten(array, isShallow, isStrict, fromIndex) {
var index = (fromIndex || 0) - 1, var index = (fromIndex | 0) - 1,
length = array ? array.length : 0, length = array ? array.length : 0,
result = []; result = [];
@@ -1952,7 +1954,7 @@
*/ */
function createPad(string, length, chars) { function createPad(string, length, chars) {
var strLength = string.length; var strLength = string.length;
length = +length || 0; length |= 0;
if (strLength >= length) { if (strLength >= length) {
return ''; return '';
@@ -2518,7 +2520,7 @@
return array ? array[0] : undefined; return array ? array[0] : undefined;
} }
} }
return slice(array, 0, n > 0 ? n : 0); return slice(array, 0, n < 0 ? 0 : n);
} }
/** /**
@@ -2615,7 +2617,7 @@
function indexOf(array, value, fromIndex) { function indexOf(array, value, fromIndex) {
var length = array ? array.length : 0; var length = array ? array.length : 0;
if (typeof fromIndex == 'number') { if (typeof fromIndex == 'number') {
fromIndex = fromIndex < 0 ? nativeMax(0, length + fromIndex) : (fromIndex || 0); fromIndex = (fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex) | 0;
} else if (fromIndex) { } else if (fromIndex) {
var index = sortedIndex(array, value); var index = sortedIndex(array, value);
return (length && array[index] === value) ? index : -1; return (length && array[index] === value) ? index : -1;
@@ -2651,7 +2653,7 @@
n = (predicate == null || thisArg) ? 1 : predicate; n = (predicate == null || thisArg) ? 1 : predicate;
} }
n = length - n; n = length - n;
return slice(array, 0, n > 0 ? n : 0); return slice(array, 0, n < 0 ? 0 : n);
} }
/** /**
@@ -2745,7 +2747,7 @@
} }
} }
n = length - n; n = length - n;
return slice(array, n > 0 ? n : 0); return slice(array, n < 0 ? 0 : n);
} }
/** /**
@@ -2772,6 +2774,7 @@
function lastIndexOf(array, value, fromIndex) { function lastIndexOf(array, value, fromIndex) {
var index = array ? array.length : 0; var index = array ? array.length : 0;
if (typeof fromIndex == 'number') { if (typeof fromIndex == 'number') {
fromIndex |= 0;
index = (fromIndex < 0 ? nativeMax(0, index + fromIndex) : nativeMin(fromIndex, index - 1)) + 1; index = (fromIndex < 0 ? nativeMax(0, index + fromIndex) : nativeMin(fromIndex, index - 1)) + 1;
} }
while (index--) { while (index--) {
@@ -2947,7 +2950,7 @@
} else if (predicate == null || thisArg) { } else if (predicate == null || thisArg) {
n = 1; n = 1;
} else { } else {
n = predicate > 0 ? predicate : 0; n = predicate < 0 ? 0 : predicate;
} }
return slice(array, n); return slice(array, n);
} }
@@ -2984,7 +2987,7 @@
} else if (end > length) { } else if (end > length) {
end = length; end = length;
} }
length = end - start || 0; length = (length = (end - start) | 0) < 0 ? 0 : length;
var result = Array(length); var result = Array(length);
while (++index < length) { while (++index < length) {
@@ -3599,9 +3602,10 @@
*/ */
function contains(collection, target, fromIndex) { function contains(collection, target, fromIndex) {
var length = collection ? collection.length : 0; var length = collection ? collection.length : 0;
fromIndex = typeof fromIndex == 'number' ? fromIndex : 0; fromIndex = typeof fromIndex == 'number' ? fromIndex | 0 : 0;
if (typeof length == 'number') { if (typeof length == 'number') {
length = (length |= 0) < 0 ? 0 : length;
if (fromIndex >= length) { if (fromIndex >= length) {
return false; return false;
} }
@@ -3611,7 +3615,7 @@
: collection.indexOf(target, fromIndex) > -1; : collection.indexOf(target, fromIndex) > -1;
} }
var indexOf = getIndexOf(); var indexOf = getIndexOf();
fromIndex = (fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex) || 0; fromIndex = fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex;
return indexOf(collection, target, fromIndex) > -1; return indexOf(collection, target, fromIndex) > -1;
} }
var index = -1, var index = -1,
@@ -4075,8 +4079,8 @@
var args = slice(arguments, 2), var args = slice(arguments, 2),
index = -1, index = -1,
isFunc = typeof methodName == 'function', isFunc = typeof methodName == 'function',
length = collection ? collection.length : 0, length = collection ? collection.length | 0 : 0,
result = Array(typeof length == 'number' ? length : 0); result = Array(length < 0 ? 0 : length);
baseEach(collection, function(value) { baseEach(collection, function(value) {
result[++index] = (isFunc ? methodName : value[methodName]).apply(value, args); result[++index] = (isFunc ? methodName : value[methodName]).apply(value, args);
@@ -4125,8 +4129,8 @@
*/ */
function map(collection, callback, thisArg) { function map(collection, callback, thisArg) {
var index = -1, var index = -1,
length = collection ? collection.length : 0, length = collection ? collection.length | 0 : 0,
result = Array(typeof length == 'number' ? length : 0); result = Array(length < 0 ? 0 : length);
callback = lodash.createCallback(callback, thisArg, 3); callback = lodash.createCallback(callback, thisArg, 3);
if (isArray(collection)) { if (isArray(collection)) {
@@ -4514,7 +4518,8 @@
collection = collection.split(''); collection = collection.split('');
} }
if (n == null || guard) { if (n == null || guard) {
return collection ? collection[baseRandom(0, collection.length - 1)] : undefined; var length = collection ? collection.length | 0 : 0;
return length > 0 ? collection[baseRandom(0, length - 1)] : undefined;
} }
var result = shuffle(collection); var result = shuffle(collection);
result.length = nativeMin(nativeMax(0, n), result.length); result.length = nativeMin(nativeMax(0, n), result.length);
@@ -4538,8 +4543,8 @@
*/ */
function shuffle(collection) { function shuffle(collection) {
var index = -1, var index = -1,
length = collection ? collection.length : 0, length = collection ? collection.length | 0 : 0,
result = Array(typeof length == 'number' ? length : 0); result = Array(length < 0 ? 0 : length);
baseEach(collection, function(value) { baseEach(collection, function(value) {
var rand = baseRandom(0, ++index); var rand = baseRandom(0, ++index);
@@ -4572,7 +4577,7 @@
*/ */
function size(collection) { function size(collection) {
var length = collection ? collection.length : 0; var length = collection ? collection.length : 0;
return typeof length == 'number' ? length : keys(collection).length; return typeof length == 'number' && length > -1 ? length : keys(collection).length;
} }
/** /**
@@ -4690,8 +4695,8 @@
function sortBy(collection, callback, thisArg) { function sortBy(collection, callback, thisArg) {
var index = -1, var index = -1,
multi = callback && isArray(callback), multi = callback && isArray(callback),
length = collection ? collection.length : 0, length = collection ? collection.length | 0 : 0,
result = Array(typeof length == 'number' ? length : 0); result = Array(length < 0 ? 0 : length);
if (!multi) { if (!multi) {
callback = lodash.createCallback(callback, thisArg, 3); callback = lodash.createCallback(callback, thisArg, 3);
@@ -4732,7 +4737,8 @@
* // => [2, 3, 4] * // => [2, 3, 4]
*/ */
function toArray(collection) { function toArray(collection) {
if (collection && typeof collection.length == 'number') { var length = collection && collection.length;
if (typeof length == 'number' && length > -1) {
return (support.unindexedChars && isString(collection)) return (support.unindexedChars && isString(collection))
? collection.split('') ? collection.split('')
: slice(collection); : slice(collection);
@@ -5063,7 +5069,7 @@
if (!isFunction(func)) { if (!isFunction(func)) {
throw new TypeError; throw new TypeError;
} }
wait = wait > 0 ? wait : 0; wait = wait < 0 ? 0 : wait;
if (options === true) { if (options === true) {
var leading = true; var leading = true;
trailing = false; trailing = false;
@@ -6996,7 +7002,7 @@
target = String(target); target = String(target);
var length = string.length; var length = string.length;
position = (typeof position == 'number' ? nativeMin(nativeMax(position, 0), length) : length) - target.length; position = (typeof position == 'number' ? nativeMin(nativeMax(position | 0, 0), length) : length) - target.length;
return position >= 0 && string.indexOf(target, position) == position; return position >= 0 && string.indexOf(target, position) == position;
} }
@@ -7093,7 +7099,7 @@
*/ */
function pad(string, length, chars) { function pad(string, length, chars) {
string = string == null ? '' : String(string); string = string == null ? '' : String(string);
length = +length || 0; length |= 0;
var strLength = string.length; var strLength = string.length;
if (strLength >= length) { if (strLength >= length) {
@@ -7185,7 +7191,7 @@
*/ */
function repeat(string, n) { function repeat(string, n) {
var result = ''; var result = '';
n = +n || 0; n |= 0;
if (n < 1 || string == null) { if (n < 1 || string == null) {
return result; return result;
@@ -7197,7 +7203,7 @@
} }
n = floor(n / 2); n = floor(n / 2);
string += string; string += string;
} while (n > 0); } while (n);
return result; return result;
} }
@@ -7249,7 +7255,7 @@
*/ */
function startsWith(string, target, position) { function startsWith(string, target, position) {
string = string == null ? '' : String(string); string = string == null ? '' : String(string);
position = typeof position == 'number' ? nativeMin(nativeMax(position, 0), string.length) : 0; position = typeof position == 'number' ? nativeMin(nativeMax(position | 0, 0), string.length) : 0;
return string.lastIndexOf(target, position) == position; return string.lastIndexOf(target, position) == position;
} }
@@ -7555,11 +7561,11 @@
if (options && isObject(options)) { if (options && isObject(options)) {
var separator = 'separator' in options ? options.separator : separator; var separator = 'separator' in options ? options.separator : separator;
length = 'length' in options ? +options.length || 0 : length; length = 'length' in options ? options.length | 0 : length;
omission = 'omission' in options ? String(options.omission) : omission; omission = 'omission' in options ? String(options.omission) : omission;
} }
else if (options != null) { else if (options != null) {
length = +options || 0; length = options | 0;
} }
string = string == null ? '' : String(string); string = string == null ? '' : String(string);
if (length >= string.length) { if (length >= string.length) {
@@ -7733,14 +7739,14 @@
*/ */
function matches(source) { function matches(source) {
source || (source = {}); source || (source = {});
var props = keys(source), var props = keys(source),
propsLength = props.length,
key = props[0], key = props[0],
a = source[key]; a = source[key];
// fast path the common case of providing an object with a single // fast path the common case of providing an object with a single
// property containing a primitive value // property containing a primitive value
if (props.length == 1 && a === a && !isObject(a)) { if (propsLength == 1 && a === a && !isObject(a)) {
return function(object) { return function(object) {
if (!hasOwnProperty.call(object, key)) { if (!hasOwnProperty.call(object, key)) {
return false; return false;
@@ -7751,13 +7757,13 @@
}; };
} }
return function(object) { return function(object) {
var length = props.length, var length = propsLength,
result = false; result = false;
while (length--) { while (length--) {
var key = props[length]; var key = props[length];
if (!(result = hasOwnProperty.call(object, key) && if (!(result = hasOwnProperty.call(object, key) &&
baseIsEqual(object[key], source[key], null, true))) { baseIsEqual(object[key], source[key], null, true))) {
break; break;
} }
} }