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

Add a Stack cache helper to avoid linear search of stacks in modern environments.

Browse Source
This commit is contained in:
John-David Dalton
2015-09-30 08:17:21 -07:00
parent 8f431cff52
commit f607c671f8
2 changed files with 208 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

274
lodash.js
View File

@@ -631,6 +631,25 @@
} }
} }
/**
* Gets the index at which the first occurrence of `key` is found in `array`
* of key-value pairs.
*
* @private
* @param {Array} array The array to search.
* @param {*} key The key to search for.
* @returns {number} Returns the index of the matched value, else `-1`.
*/
function assocIndexOf(array, key) {
var length = array.length;
while (length--) {
if (array[length][0] === key) {
return length;
}
}
return -1;
}
/** /**
* The base implementation of methods like `_.find` and `_.findKey` without * The base implementation of methods like `_.find` and `_.findKey` without
* support for callback shorthands, which iterates over `collection` using * support for callback shorthands, which iterates over `collection` using
@@ -1337,8 +1356,9 @@
/** Native value references. */ /** Native value references. */
var ArrayBuffer = context.ArrayBuffer, var ArrayBuffer = context.ArrayBuffer,
Symbol = context.Symbol, Map = getNative(context, 'Map'),
Reflect = context.Reflect, Reflect = context.Reflect,
Symbol = context.Symbol,
Uint8Array = context.Uint8Array, Uint8Array = context.Uint8Array,
WeakMap = getNative(context, 'WeakMap'), WeakMap = getNative(context, 'WeakMap'),
clearTimeout = context.clearTimeout, clearTimeout = context.clearTimeout,
@@ -1358,7 +1378,6 @@
nativeFloor = Math.floor, nativeFloor = Math.floor,
nativeIsFinite = context.isFinite, nativeIsFinite = context.isFinite,
nativeKeys = Object.keys, nativeKeys = Object.keys,
nativeMap = getNative(context, 'Map'),
nativeMax = Math.max, nativeMax = Math.max,
nativeMin = Math.min, nativeMin = Math.min,
nativeParseInt = context.parseInt, nativeParseInt = context.parseInt,
@@ -1369,12 +1388,12 @@
var metaMap = WeakMap && new WeakMap; var metaMap = WeakMap && new WeakMap;
/** Used to detect maps and sets. */ /** Used to detect maps and sets. */
var mapCtorString = nativeMap ? fnToString.call(nativeMap) : '', var mapCtorString = Map ? fnToString.call(Map) : '',
setCtorString = nativeSet ? fnToString.call(nativeSet) : ''; setCtorString = nativeSet ? fnToString.call(nativeSet) : '';
/** Detect lack of support for map and set `toStringTag` values (IE 11). */ /** Detect lack of support for map and set `toStringTag` values (IE 11). */
var noMapSetTag = nativeMap && nativeSet && var noMapSetTag = Map && nativeSet &&
!(objToString.call(new Map) == mapTag && objToString.call(new Set) == setTag); !(objToString.call(new Map) == mapTag && objToString.call(new nativeSet) == setTag);
/** Used to lookup unminified function names. */ /** Used to lookup unminified function names. */
var realNames = {}; var realNames = {};
@@ -1699,19 +1718,19 @@
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
/** /**
* Creates a cache object to store key/value pairs. * Creates a memoize cache object to store key-value pairs.
* *
* @private * @private
* @static * @static
* @name Cache * @name Cache
* @memberOf _.memoize * @memberOf _.memoize
*/ */
function MapCache() { function MemCache() {
this.__data__ = {}; this.__data__ = {};
} }
/** /**
* Removes `key` and its value from the cache. * Removes `key` and its value from the memoize cache.
* *
* @private * @private
* @name delete * @name delete
@@ -1719,7 +1738,7 @@
* @param {string} key The key of the value to remove. * @param {string} key The key of the value to remove.
* @returns {boolean} Returns `true` if the entry was removed successfully, else `false`. * @returns {boolean} Returns `true` if the entry was removed successfully, else `false`.
*/ */
function mapDelete(key) { function memDelete(key) {
return this.has(key) && delete this.__data__[key]; return this.has(key) && delete this.__data__[key];
} }
@@ -1732,7 +1751,7 @@
* @param {string} key The key of the value to get. * @param {string} key The key of the value to get.
* @returns {*} Returns the cached value. * @returns {*} Returns the cached value.
*/ */
function mapGet(key) { function memGet(key) {
return key == '__proto__' ? undefined : this.__data__[key]; return key == '__proto__' ? undefined : this.__data__[key];
} }
@@ -1745,7 +1764,7 @@
* @param {string} key The key of the entry to check. * @param {string} key The key of the entry to check.
* @returns {boolean} Returns `true` if an entry for `key` exists, else `false`. * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
*/ */
function mapHas(key) { function memHas(key) {
return key != '__proto__' && hasOwnProperty.call(this.__data__, key); return key != '__proto__' && hasOwnProperty.call(this.__data__, key);
} }
@@ -1755,11 +1774,11 @@
* @private * @private
* @name set * @name set
* @memberOf _.memoize.Cache * @memberOf _.memoize.Cache
* @param {string} key The key of the value to cache. * @param {string} key The key of the value to set.
* @param {*} value The value to cache. * @param {*} value The value to set.
* @returns {Object} Returns the cache object. * @returns {Object} Returns the memoize cache object.
*/ */
function mapSet(key, value) { function memSet(key, value) {
if (key != '__proto__') { if (key != '__proto__') {
this.__data__[key] = value; this.__data__[key] = value;
} }
@@ -1769,8 +1788,62 @@
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
/** /**
* Creates a stack object to store key-value pairs.
* *
* Creates a cache object to store unique values. * @private
*/
function Stack() {
return Map ? new Map : (this.__data__ = [], this);
}
/**
* Removes `key` and its value from the stack.
*
* @private
* @name delete
* @memberOf Stack
* @param {string} key The key of the value to remove.
* @returns {boolean} Returns `true` if the entry was removed successfully, else `false`.
*/
function stackDelete() {
var data = this.__data__;
return !!data.length && (data.pop(), true);
}
/**
* Gets the stack value for `key`.
*
* @private
* @name get
* @memberOf Stack
* @param {string} key The key of the value to get.
* @returns {*} Returns the cached value.
*/
function stackGet(key) {
var data = this.__data__,
index = assocIndexOf(data, key);
return index < 0 ? undefined : data[index][1];
}
/**
* Sets `value` to `key` of the stack.
*
* @private
* @name set
* @memberOf Stack
* @param {string} key The key of the value to set.
* @param {*} value The value to set.
*/
function stackSet(key, value) {
this.__data__.push([key, value]);
}
/*------------------------------------------------------------------------*/
/**
*
* Creates a set cache object to store unique values.
* *
* @private * @private
* @param {Array} [values] The values to cache. * @param {Array} [values] The values to cache.
@@ -1789,7 +1862,7 @@
* `_.indexOf` by returning `0` if the value is found, else `-1`. * `_.indexOf` by returning `0` if the value is found, else `-1`.
* *
* @private * @private
* @param {Object} cache The cache to search. * @param {Object} cache The set cache to search.
* @param {*} value The value to search for. * @param {*} value The value to search for.
* @returns {number} Returns `0` if `value` is found, else `-1`. * @returns {number} Returns `0` if `value` is found, else `-1`.
*/ */
@@ -1801,7 +1874,7 @@
} }
/** /**
* Adds `value` to the cache. * Adds `value` to the set cache.
* *
* @private * @private
* @name push * @name push
@@ -1862,14 +1935,13 @@
* @param {Function} [customizer] The function to customize cloning. * @param {Function} [customizer] The function to customize cloning.
* @param {string} [key] The key of `value`. * @param {string} [key] The key of `value`.
* @param {Object} [object] The object `value` belongs to. * @param {Object} [object] The object `value` belongs to.
* @param {Array} [stackA=[]] Tracks traversed source objects. * @param {Array} [stack] Tracks traversed sources and their clone counterparts.
* @param {Array} [stackB=[]] Associates clones with source counterparts.
* @returns {*} Returns the cloned value. * @returns {*} Returns the cloned value.
*/ */
function baseClone(value, isDeep, customizer, key, object, stackA, stackB) { function baseClone(value, isDeep, customizer, key, object, stack) {
var result; var result;
if (customizer) { if (customizer) {
result = object ? customizer(value, key, object, stackA, stackB) : customizer(value); result = object ? customizer(value, key, object, stack) : customizer(value);
} }
if (result !== undefined) { if (result !== undefined) {
return result; return result;
@@ -1905,22 +1977,16 @@
} }
} }
// Check for circular references and return its corresponding clone. // Check for circular references and return its corresponding clone.
stackA || (stackA = []); stack || (stack = new Stack);
stackB || (stackB = []); var stacked = stack.get(value);
if (stacked) {
var length = stackA.length; return stacked;
while (length--) {
if (stackA[length] == value) {
return stackB[length];
}
} }
// Add the source value to the stack of traversed objects and associate it with its clone. stack.set(value, result);
stackA.push(value);
stackB.push(result);
// Recursively populate clone (susceptible to call stack limits). // Recursively populate clone (susceptible to call stack limits).
(isArr ? arrayEach : baseForOwn)(value, function(subValue, key) { (isArr ? arrayEach : baseForOwn)(value, function(subValue, key) {
result[key] = baseClone(subValue, isDeep, customizer, key, value, stackA, stackB); result[key] = baseClone(subValue, isDeep, customizer, key, value, stack);
}); });
return result; return result;
} }
@@ -2260,18 +2326,17 @@
* The bitmask may be composed of the following flags: * The bitmask may be composed of the following flags:
* 1 - Unordered comparison * 1 - Unordered comparison
* 2 - Partial comparison * 2 - Partial comparison
* @param {Array} [stackA] Tracks traversed `value` objects. * @param {Array} [stack] Tracks traversed `value` and `other` objects.
* @param {Array} [stackB] Tracks traversed `other` objects.
* @returns {boolean} Returns `true` if the values are equivalent, else `false`. * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
*/ */
function baseIsEqual(value, other, customizer, bitmask, stackA, stackB) { function baseIsEqual(value, other, customizer, bitmask, stack) {
if (value === other) { if (value === other) {
return true; return true;
} }
if (value == null || other == null || (!isObject(value) && !isObjectLike(other))) { if (value == null || other == null || (!isObject(value) && !isObjectLike(other))) {
return value !== value && other !== other; return value !== value && other !== other;
} }
return baseIsEqualDeep(value, other, baseIsEqual, customizer, bitmask, stackA, stackB); return baseIsEqualDeep(value, other, baseIsEqual, customizer, bitmask, stack);
} }
/** /**
@@ -2285,11 +2350,10 @@
* @param {Function} equalFunc The function to determine equivalents of values. * @param {Function} equalFunc The function to determine equivalents of values.
* @param {Function} [customizer] The function to customize comparisons. * @param {Function} [customizer] The function to customize comparisons.
* @param {number} [bitmask] The bitmask of comparison flags. See `baseIsEqual` for more details. * @param {number} [bitmask] The bitmask of comparison flags. See `baseIsEqual` for more details.
* @param {Array} [stackA=[]] Tracks traversed `value` objects. * @param {Array} [stack] Tracks traversed `value` and `other` objects.
* @param {Array} [stackB=[]] Tracks traversed `other` objects.
* @returns {boolean} Returns `true` if the objects are equivalent, else `false`. * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
*/ */
function baseIsEqualDeep(object, other, equalFunc, customizer, bitmask, stackA, stackB) { function baseIsEqualDeep(object, other, equalFunc, customizer, bitmask, stack) {
var objIsArr = isArray(object), var objIsArr = isArray(object),
othIsArr = isArray(other), othIsArr = isArray(other),
objTag = arrayTag, objTag = arrayTag,
@@ -2328,7 +2392,7 @@
othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__'); othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');
if (objIsWrapped || othIsWrapped) { if (objIsWrapped || othIsWrapped) {
return equalFunc(objIsWrapped ? object.value() : object, othIsWrapped ? other.value() : other, customizer, bitmask, stackA, stackB); return equalFunc(objIsWrapped ? object.value() : object, othIsWrapped ? other.value() : other, customizer, bitmask, stack);
} }
} }
if (!isSameTag) { if (!isSameTag) {
@@ -2336,24 +2400,16 @@
} }
// Assume cyclic values are equal. // Assume cyclic values are equal.
// For more information on detecting circular references see https://es5.github.io/#JO. // For more information on detecting circular references see https://es5.github.io/#JO.
stackA || (stackA = []); stack || (stack = new Stack);
stackB || (stackB = []); var stacked = stack.get(object);
if (stacked) {
var length = stackA.length; return stacked == other;
while (length--) {
if (stackA[length] == object) {
return stackB[length] == other;
}
} }
// Add `object` and `other` to the stack of traversed objects. stack.set(object, other);
stackA.push(object);
stackB.push(other);
var result = (objIsArr ? equalArrays : equalObjects)(object, other, equalFunc, customizer, bitmask, stackA, stackB); var result = (objIsArr ? equalArrays : equalObjects)(object, other, equalFunc, customizer, bitmask, stack);
stackA.pop();
stackB.pop();
stack['delete'](object);
return result; return result;
} }
@@ -2396,11 +2452,10 @@
return false; return false;
} }
} else { } else {
var stackA = [], var stack = new Stack,
stackB = [], result = customizer ? customizer(objValue, srcValue, key, object, source, stack) : undefined;
result = customizer ? customizer(objValue, srcValue, key, object, source, stackA, stackB) : undefined;
if (!(result === undefined ? baseIsEqual(srcValue, objValue, customizer, UNORDERED_COMPARE_FLAG | PARTIAL_COMPARE_FLAG, stackA, stackB) : result)) { if (!(result === undefined ? baseIsEqual(srcValue, objValue, customizer, UNORDERED_COMPARE_FLAG | PARTIAL_COMPARE_FLAG, stack) : result)) {
return false; return false;
} }
} }
@@ -2537,10 +2592,9 @@
* @param {Object} object The destination object. * @param {Object} object The destination object.
* @param {Object} source The source object. * @param {Object} source The source object.
* @param {Function} [customizer] The function to customize merged values. * @param {Function} [customizer] The function to customize merged values.
* @param {Array} [stackA=[]] Tracks traversed source objects. * @param {Array} [stack] Tracks traversed sources and their value counterparts.
* @param {Array} [stackB=[]] Associates values with source counterparts.
*/ */
function baseMerge(object, source, customizer, stackA, stackB) { function baseMerge(object, source, customizer, stack) {
if (object === source) { if (object === source) {
return; return;
} }
@@ -2551,12 +2605,11 @@
srcValue = source[key]; srcValue = source[key];
} }
if (isObject(srcValue)) { if (isObject(srcValue)) {
stackA || (stackA = []); stack || (stack = new Stack);
stackB || (stackB = []); baseMergeDeep(object, source, key, baseMerge, customizer, stack);
baseMergeDeep(object, source, key, baseMerge, customizer, stackA, stackB);
} }
else { else {
var newValue = customizer ? customizer(object[key], srcValue, (key + ''), object, source, stackA, stackB) : undefined; var newValue = customizer ? customizer(object[key], srcValue, (key + ''), object, source, stack) : undefined;
if (newValue === undefined) { if (newValue === undefined) {
newValue = srcValue; newValue = srcValue;
} }
@@ -2576,22 +2629,18 @@
* @param {string} key The key of the value to merge. * @param {string} key The key of the value to merge.
* @param {Function} mergeFunc The function to merge values. * @param {Function} mergeFunc The function to merge values.
* @param {Function} [customizer] The function to customize assigned values. * @param {Function} [customizer] The function to customize assigned values.
* @param {Array} [stackA=[]] Tracks traversed source objects. * @param {Array} [stack] Tracks traversed sources and their value counterparts.
* @param {Array} [stackB=[]] Associates values with source counterparts.
*/ */
function baseMergeDeep(object, source, key, mergeFunc, customizer, stackA, stackB) { function baseMergeDeep(object, source, key, mergeFunc, customizer, stack) {
var length = stackA.length, var oldValue = object[key],
oldValue = object[key], srcValue = source[key],
srcValue = source[key]; stacked = stack.get(oldValue) || stack.get(srcValue);
while (length--) { if (stacked) {
var stacked = stackA[length]; assignMergeValue(object, key, stacked);
if (stacked == srcValue || stacked == oldValue) { return;
assignMergeValue(object, key, stackB[length]);
return;
}
} }
var newValue = customizer ? customizer(oldValue, srcValue, (key + ''), object, source, stackA, stackB) : undefined, var newValue = customizer ? customizer(oldValue, srcValue, (key + ''), object, source, stack) : undefined,
isCommon = newValue === undefined; isCommon = newValue === undefined;
if (isCommon) { if (isCommon) {
@@ -2610,14 +2659,11 @@
isCommon = isFunction(srcValue); isCommon = isFunction(srcValue);
} }
} }
// Add the source value to the stack of traversed objects and associate stack.set(srcValue, newValue);
// it with its merged value.
stackA.push(srcValue);
stackB.push(newValue);
if (isCommon) { if (isCommon) {
// Recursively merge objects and arrays (susceptible to call stack limits). // Recursively merge objects and arrays (susceptible to call stack limits).
mergeFunc(newValue, srcValue, customizer, stackA, stackB); mergeFunc(newValue, srcValue, customizer, stack);
} }
assignMergeValue(object, key, newValue); assignMergeValue(object, key, newValue);
} }
@@ -3793,11 +3839,10 @@
* @param {Function} equalFunc The function to determine equivalents of values. * @param {Function} equalFunc The function to determine equivalents of values.
* @param {Function} [customizer] The function to customize comparisons. * @param {Function} [customizer] The function to customize comparisons.
* @param {number} [bitmask] The bitmask of comparison flags. See `baseIsEqual` for more details. * @param {number} [bitmask] The bitmask of comparison flags. See `baseIsEqual` for more details.
* @param {Array} [stackA] Tracks traversed `value` objects. * @param {Array} [stack] Tracks traversed `value` and `other` objects.
* @param {Array} [stackB] Tracks traversed `other` objects.
* @returns {boolean} Returns `true` if the arrays are equivalent, else `false`. * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.
*/ */
function equalArrays(array, other, equalFunc, customizer, bitmask, stackA, stackB) { function equalArrays(array, other, equalFunc, customizer, bitmask, stack) {
var index = -1, var index = -1,
isPartial = bitmask & PARTIAL_COMPARE_FLAG, isPartial = bitmask & PARTIAL_COMPARE_FLAG,
isUnordered = bitmask & UNORDERED_COMPARE_FLAG, isUnordered = bitmask & UNORDERED_COMPARE_FLAG,
@@ -3814,8 +3859,8 @@
if (customizer) { if (customizer) {
var result = isPartial var result = isPartial
? customizer(othValue, arrValue, index, other, array, stackA, stackB) ? customizer(othValue, arrValue, index, other, array, stack)
: customizer(arrValue, othValue, index, array, other, stackA, stackB); : customizer(arrValue, othValue, index, array, other, stack);
} }
if (result !== undefined) { if (result !== undefined) {
if (result) { if (result) {
@@ -3826,11 +3871,11 @@
// Recursively compare arrays (susceptible to call stack limits). // Recursively compare arrays (susceptible to call stack limits).
if (isUnordered) { if (isUnordered) {
if (!arraySome(other, function(othValue) { if (!arraySome(other, function(othValue) {
return arrValue === othValue || equalFunc(arrValue, othValue, customizer, bitmask, stackA, stackB); return arrValue === othValue || equalFunc(arrValue, othValue, customizer, bitmask, stack);
})) { })) {
return false; return false;
} }
} else if (!(arrValue === othValue || equalFunc(arrValue, othValue, customizer, bitmask, stackA, stackB))) { } else if (!(arrValue === othValue || equalFunc(arrValue, othValue, customizer, bitmask, stack))) {
return false; return false;
} }
} }
@@ -3900,11 +3945,10 @@
* @param {Function} equalFunc The function to determine equivalents of values. * @param {Function} equalFunc The function to determine equivalents of values.
* @param {Function} [customizer] The function to customize comparisons. * @param {Function} [customizer] The function to customize comparisons.
* @param {number} [bitmask] The bitmask of comparison flags. See `baseIsEqual` for more details. * @param {number} [bitmask] The bitmask of comparison flags. See `baseIsEqual` for more details.
* @param {Array} [stackA] Tracks traversed `value` objects. * @param {Array} [stack] Tracks traversed `value` and `other` objects.
* @param {Array} [stackB] Tracks traversed `other` objects.
* @returns {boolean} Returns `true` if the objects are equivalent, else `false`. * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
*/ */
function equalObjects(object, other, equalFunc, customizer, bitmask, stackA, stackB) { function equalObjects(object, other, equalFunc, customizer, bitmask, stack) {
var isPartial = bitmask & PARTIAL_COMPARE_FLAG, var isPartial = bitmask & PARTIAL_COMPARE_FLAG,
isUnordered = bitmask & UNORDERED_COMPARE_FLAG, isUnordered = bitmask & UNORDERED_COMPARE_FLAG,
objProps = keys(object), objProps = keys(object),
@@ -3931,12 +3975,12 @@
if (customizer) { if (customizer) {
var result = isPartial var result = isPartial
? customizer(othValue, objValue, key, other, object, stackA, stackB) ? customizer(othValue, objValue, key, other, object, stack)
: customizer(objValue, othValue, key, object, other, stackA, stackB); : customizer(objValue, othValue, key, object, other, stack);
} }
// Recursively compare objects (susceptible to call stack limits). // Recursively compare objects (susceptible to call stack limits).
if (!(result === undefined if (!(result === undefined
? (objValue === othValue || equalFunc(objValue, othValue, customizer, bitmask, stackA, stackB)) ? (objValue === othValue || equalFunc(objValue, othValue, customizer, bitmask, stack))
: result : result
)) { )) {
return false; return false;
@@ -4417,11 +4461,10 @@
* @param {*} srcValue The source object property value. * @param {*} srcValue The source object property value.
* @returns {*} Returns the value to assign to the destination object. * @returns {*} Returns the value to assign to the destination object.
*/ */
function mergeDefaults(objValue, srcValue, key, object, source, stackA, stackB) { function mergeDefaults(objValue, srcValue, key, object, source, stack) {
if (isObject(objValue)) { if (isObject(objValue)) {
stackA.push(objValue); stack.set(objValue, objValue);
stackB.push(objValue); baseMerge(objValue, srcValue, mergeDefaults, stack);
baseMerge(objValue, srcValue, mergeDefaults, stackA, stackB);
} }
return objValue === undefined ? srcValue : objValue; return objValue === undefined ? srcValue : objValue;
} }
@@ -8207,7 +8250,7 @@
* This method is like `_.clone` except that it accepts `customizer` which * This method is like `_.clone` except that it accepts `customizer` which
* is invoked to produce the cloned value. If `customizer` returns `undefined` * is invoked to produce the cloned value. If `customizer` returns `undefined`
* cloning is handled by the method instead. The `customizer` is invoked with * cloning is handled by the method instead. The `customizer` is invoked with
* up to five arguments; (value [, index|key, object, stackA, stackB]). * up to five arguments; (value [, index|key, object, stack]).
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -8563,7 +8606,7 @@
* This method is like `_.isEqual` except that it accepts `customizer` which is * This method is like `_.isEqual` except that it accepts `customizer` which is
* invoked to compare values. If `customizer` returns `undefined` comparisons are * invoked to compare values. If `customizer` returns `undefined` comparisons are
* handled by the method instead. The `customizer` is invoked with up to seven arguments: * handled by the method instead. The `customizer` is invoked with up to seven arguments:
* (objValue, othValue [, index|key, object, other, stackA, stackB]). * (objValue, othValue [, index|key, object, other, stack]).
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -9973,7 +10016,7 @@
* is invoked to produce the merged values of the destination and source * is invoked to produce the merged values of the destination and source
* properties. If `customizer` returns `undefined` merging is handled by the * properties. If `customizer` returns `undefined` merging is handled by the
* method instead. The `customizer` is invoked with seven arguments: * method instead. The `customizer` is invoked with seven arguments:
* (objValue, srcValue, key, object, source, stackA, stackB). * (objValue, srcValue, key, object, source, stack).
* *
* @static * @static
* @memberOf _ * @memberOf _
@@ -10057,7 +10100,7 @@
} }
/** /**
* Creates a two dimensional array of the key-value pairs for `object`, * Creates an array of the key-value pairs for `object`,
* e.g. `[[key1, value1], [key2, value2]]`. * e.g. `[[key1, value1], [key2, value2]]`.
* *
* @static * @static
@@ -12115,17 +12158,22 @@
LazyWrapper.prototype = baseCreate(baseLodash.prototype); LazyWrapper.prototype = baseCreate(baseLodash.prototype);
LazyWrapper.prototype.constructor = LazyWrapper; LazyWrapper.prototype.constructor = LazyWrapper;
// Add functions to the `Map` cache. // Add functions to the `MemCache` cache.
MapCache.prototype['delete'] = mapDelete; MemCache.prototype['delete'] = memDelete;
MapCache.prototype.get = mapGet; MemCache.prototype.get = memGet;
MapCache.prototype.has = mapHas; MemCache.prototype.has = memHas;
MapCache.prototype.set = mapSet; MemCache.prototype.set = memSet;
// Add functions to the `Set` cache. // Add functions to the `Set` cache.
SetCache.prototype.push = cachePush; SetCache.prototype.push = cachePush;
// Add functions to the `Stack` cache.
Stack.prototype['delete'] = stackDelete;
Stack.prototype.get = stackGet;
Stack.prototype.set = stackSet;
// Assign cache to `_.memoize`. // Assign cache to `_.memoize`.
memoize.Cache = MapCache; memoize.Cache = MemCache;
// Add functions that return wrapped values when chaining. // Add functions that return wrapped values when chaining.
lodash.after = after; lodash.after = after;

92
test/test.js
View File

@@ -2259,10 +2259,13 @@
foo = new Foo; foo = new Foo;
func(foo, function() { func(foo, function() {
argsList.push(slice.call(arguments)); var length = arguments.length,
args = slice.call(arguments, 0, length - (length > 1 ? 1 : 0));
argsList.push(args);
}); });
assert.deepEqual(argsList, isDeepWith ? [[foo], [1, 'a', foo, [foo], [{ 'a': 1 }]]] : [[foo]]); assert.deepEqual(argsList, isDeepWith ? [[foo], [1, 'a', foo]] : [[foo]]);
}); });
QUnit.test('`_.' + methodName + '` should handle cloning if `customizer` returns `undefined`', function(assert) { QUnit.test('`_.' + methodName + '` should handle cloning if `customizer` returns `undefined`', function(assert) {
@@ -6025,11 +6028,8 @@
source = { 'a': 2 }, source = { 'a': 2 },
expected = _.map([1, 2, 'a', object, source], _.clone); expected = _.map([1, 2, 'a', object, source], _.clone);
if (isMergeWith) {
expected.push(undefined, undefined);
}
func(object, source, function() { func(object, source, function() {
args || (args = _.map(arguments, _.clone)); args || (args = _.map(slice.call(arguments, 0, 5), _.clone));
}); });
assert.deepEqual(args, expected, 'primitive property values'); assert.deepEqual(args, expected, 'primitive property values');
@@ -6039,11 +6039,8 @@
source = { 'b': 2 }; source = { 'b': 2 };
expected = _.map([undefined, 2, 'b', object, source], _.clone); expected = _.map([undefined, 2, 'b', object, source], _.clone);
if (isMergeWith) {
expected.push(undefined, undefined);
}
func(object, source, function() { func(object, source, function() {
args || (args = _.map(arguments, _.clone)); args || (args = _.map(slice.call(arguments, 0, 5), _.clone));
}); });
assert.deepEqual(args, expected, 'missing destination property'); assert.deepEqual(args, expected, 'missing destination property');
@@ -6057,11 +6054,10 @@
expected = [_.map([objectValue, sourceValue, 'a', object, source], _.cloneDeep)]; expected = [_.map([objectValue, sourceValue, 'a', object, source], _.cloneDeep)];
if (isMergeWith) { if (isMergeWith) {
expected[0].push([], []); expected.push(_.map([undefined, 2, 'b', objectValue, sourceValue], _.cloneDeep));
expected.push(_.map([undefined, 2, 'b', objectValue, sourceValue, [sourceValue], [objectValue]], _.cloneDeep));
} }
func(object, source, function() { func(object, source, function() {
argsList.push(_.map(arguments, _.cloneDeep)); argsList.push(_.map(slice.call(arguments, 0, 5), _.cloneDeep));
}); });
assert.deepEqual(argsList, expected, 'object property values'); assert.deepEqual(argsList, expected, 'object property values');
@@ -8273,18 +8269,21 @@
var expected = [ var expected = [
[object1, object2], [object1, object2],
[object1.a, object2.a, 'a', object1, object2, [], []], [object1.a, object2.a, 'a', object1, object2],
[object1.a[0], object2.a[0], 0, object1.a, object2.a, [], []], [object1.a[0], object2.a[0], 0, object1.a, object2.a],
[object1.a[1], object2.a[1], 1, object1.a, object2.a, [], []], [object1.a[1], object2.a[1], 1, object1.a, object2.a],
[object1.b, object2.b, 'b', object1.b, object2.b, [], []], [object1.b, object2.b, 'b', object1.b, object2.b],
[object1.b.a, object2.b.a, 'a', object1.b, object2.b, [], []], [object1.b.a, object2.b.a, 'a', object1.b, object2.b],
[object1.b.a[0], object2.b.a[0], 0, object1.b.a, object2.b.a, [], []], [object1.b.a[0], object2.b.a[0], 0, object1.b.a, object2.b.a],
[object1.b.a[1], object2.b.a[1], 1, object1.b.a, object2.b.a, [], []], [object1.b.a[1], object2.b.a[1], 1, object1.b.a, object2.b.a],
[object1.b.b, object2.b.b, 'b', object1.b.b, object2.b.b, [], []] [object1.b.b, object2.b.b, 'b', object1.b.b, object2.b.b]
]; ];
_.isEqualWith(object1, object2, function(assert) { _.isEqualWith(object1, object2, function(assert) {
argsList.push(slice.call(arguments)); var length = arguments.length,
args = slice.call(arguments, 0, length - (length > 2 ? 1 : 0));
argsList.push(args);
}); });
assert.deepEqual(argsList, expected); assert.deepEqual(argsList, expected);
@@ -8375,16 +8374,19 @@
var expected = [ var expected = [
[pair[0], pair[1]], [pair[0], pair[1]],
[array[0], array[0], 0, array, array, [], []], [array[0], array[0], 0, array, array],
[array[0][0], array[0][0], 0, array[0], array[0], [], []], [array[0][0], array[0][0], 0, array[0], array[0]],
[array[0][1], array[0][1], 1, array[0], array[0], [], []] [array[0][1], array[0][1], 1, array[0], array[0]]
]; ];
if (index) { if (index) {
expected.length = 2; expected.length = 2;
} }
_.isEqualWith(pair[0], pair[1], function() { _.isEqualWith(pair[0], pair[1], function() {
argsList.push(slice.call(arguments)); var length = arguments.length,
args = slice.call(arguments, 0, length - (length > 2 ? 1 : 0));
argsList.push(args);
}); });
assert.deepEqual(argsList, expected, index ? 'Set' : 'Map'); assert.deepEqual(argsList, expected, index ? 'Set' : 'Map');
@@ -9007,22 +9009,22 @@
object2.b = object1; object2.b = object1;
var expected = [ var expected = [
[object1.a, object2.a, 'a', object1, object2, [], []], [object1.a, object2.a, 'a', object1, object2],
[object1.a[0], object2.a[0], 0, object1.a, object2.a, [], []], [object1.a[0], object2.a[0], 0, object1.a, object2.a],
[object1.a[1], object2.a[1], 1, object1.a, object2.a, [], []], [object1.a[1], object2.a[1], 1, object1.a, object2.a],
[object1.b, object2.b, 'b', object1, object2, [], []], [object1.b, object2.b, 'b', object1, object2],
[object1.b.a, object2.b.a, 'a', object1.b, object2.b, [], []], [object1.b.a, object2.b.a, 'a', object1.b, object2.b],
[object1.b.a[0], object2.b.a[0], 0, object1.b.a, object2.b.a, [], []], [object1.b.a[0], object2.b.a[0], 0, object1.b.a, object2.b.a],
[object1.b.a[1], object2.b.a[1], 1, object1.b.a, object2.b.a, [], []], [object1.b.a[1], object2.b.a[1], 1, object1.b.a, object2.b.a],
[object1.b.b, object2.b.b, 'b', object1.b, object2.b, [], []], [object1.b.b, object2.b.b, 'b', object1.b, object2.b],
[object1.b.b.a, object2.b.b.a, 'a', object1.b.b, object2.b.b, [], []], [object1.b.b.a, object2.b.b.a, 'a', object1.b.b, object2.b.b],
[object1.b.b.a[0], object2.b.b.a[0], 0, object1.b.b.a, object2.b.b.a, [], []], [object1.b.b.a[0], object2.b.b.a[0], 0, object1.b.b.a, object2.b.b.a],
[object1.b.b.a[1], object2.b.b.a[1], 1, object1.b.b.a, object2.b.b.a, [], []], [object1.b.b.a[1], object2.b.b.a[1], 1, object1.b.b.a, object2.b.b.a],
[object1.b.b.b, object2.b.b.b, 'b', object1.b.b, object2.b.b, [], []] [object1.b.b.b, object2.b.b.b, 'b', object1.b.b, object2.b.b]
]; ];
_.isMatchWith(object1, object2, function(assert) { _.isMatchWith(object1, object2, function(assert) {
argsList.push(slice.call(arguments)); argsList.push(slice.call(arguments, 0, -1));
}); });
assert.deepEqual(argsList, expected); assert.deepEqual(argsList, expected);
@@ -9111,17 +9113,17 @@
object2 = { 'a': pair[1] }; object2 = { 'a': pair[1] };
var expected = [ var expected = [
[pair[0], pair[1], 'a', object1, object2, [], []], [pair[0], pair[1], 'a', object1, object2],
[array[0], array[0], 0, array, array, [], []], [array[0], array[0], 0, array, array],
[array[0][0], array[0][0], 0, array[0], array[0], [], []], [array[0][0], array[0][0], 0, array[0], array[0]],
[array[0][1], array[0][1], 1, array[0], array[0], [], []] [array[0][1], array[0][1], 1, array[0], array[0]]
]; ];
if (index) { if (index) {
expected.length = 2; expected.length = 2;
} }
_.isMatchWith({ 'a': pair[0] }, { 'a': pair[1] }, function() { _.isMatchWith({ 'a': pair[0] }, { 'a': pair[1] }, function() {
argsList.push(slice.call(arguments)); argsList.push(slice.call(arguments, 0, -1));
}); });
assert.deepEqual(argsList, expected, index ? 'Set' : 'Map'); assert.deepEqual(argsList, expected, index ? 'Set' : 'Map');
@@ -13091,7 +13093,7 @@
return new Wrapper(value); return new Wrapper(value);
} }
if (_.has(value, '__wrapped__')) { if (_.has(value, '__wrapped__')) {
var actions = _.slice(value.__actions__), var actions = slice.call(value.__actions__),
chain = value.__chain__; chain = value.__chain__;
value = value.__wrapped__; value = value.__wrapped__;