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

Use baseEach, baseForOwn and baseForIn to reduce dependencies on baseCreateCallback.

Browse Source
This commit is contained in:
John-David Dalton
2014-01-19 12:10:09 -08:00
parent 55cbb12701
commit 677fb93494
7 changed files with 491 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
lodash.js
View File

@@ -986,10 +986,7 @@
// exit early if the first argument is not an object
"if (!isObject(object)) {\n" +
' return result;\n' +
'}\n' +
// add code before the iteration branches
'<%= top %>;' +
'}' +
// add support for iterating over `arguments` objects if needed
'<% if (support.nonEnumArgs) { %>\n' +
@@ -1173,7 +1170,7 @@
stackB.push(result);
// recursively populate clone (susceptible to call stack limits)
(isArr ? baseEach : forOwn)(value, function(objValue, key) {
(isArr ? baseEach : baseForOwn)(value, function(objValue, key) {
result[key] = baseClone(objValue, isDeep, callback, stackA, stackB);
});
@@ -1350,24 +1347,19 @@
}
/**
* Iterates `arguments` objects, arrays, objects, and strings consistently
* across environments, executing the callback for each element in the
* collection. The callback is bound to `thisArg` and invoked with three
* arguments; (value, index|key, collection). Callbacks may exit iteration
* early by explicitly returning `false`.
* The base implementation of `_.forEach` without support for callback
* shorthands or `thisArg` binding.
*
* @private
* @param {Array|Object|string} collection The collection to iterate over.
* @param {Function} [callback=identity] The function called per iteration.
* @param {*} [thisArg] The `this` binding of `callback`.
* @param {Function} callback The function called per iteration.
* @returns {Array|Object|string} Returns `collection`.
*/
function baseEach(collection, callback, thisArg) {
function baseEach(collection, callback) {
var index = -1,
iterable = collection,
length = collection ? collection.length : 0;
callback = callback && typeof thisArg == 'undefined' ? callback : baseCreateCallback(callback, thisArg, 3);
if (typeof length == 'number') {
if (support.unindexedChars && isString(iterable)) {
iterable = iterable.split('');
@@ -1378,7 +1370,7 @@
}
}
} else {
forOwn(collection, callback);
baseForOwn(collection, callback);
}
return collection;
}
@@ -1423,6 +1415,29 @@
return result;
}
/**
* The base implementation of `_.forOwn` without support for callback
* shorthands or `thisArg` binding.
*
* @private
* @param {Object} object The object to iterate over.
* @param {Function} callback The function called per iteration.
* @returns {Object} Returns `object`.
*/
function baseForOwn(object, callback) {
var index = -1,
props = keys(object),
length = props.length;
while (++index < length) {
var key = props[index];
if (callback(object[key], key, object) === false) {
break;
}
}
return object;
}
/**
* The base implementation of `_.isEqual`, without support for `thisArg` binding,
* that allows partial "_.where" style comparisons.
@@ -1570,7 +1585,7 @@
else {
// deep compare objects using `forIn`, instead of `forOwn`, to avoid `Object.keys`
// which, in this case, is more costly
forIn(b, function(value, key, b) {
baseForIn(b, function(value, key, b) {
if (hasOwnProperty.call(b, key)) {
// count the number of properties.
size++;
@@ -1581,7 +1596,7 @@
if (result && !isWhere) {
// ensure both objects have the same number of properties
forIn(a, function(value, key, a) {
baseForIn(a, function(value, key, a) {
if (hasOwnProperty.call(a, key)) {
// `size` will be `-1` if `a` has more properties than `b`
return (result = --size > -1);
@@ -1611,7 +1626,7 @@
* @param {Array} [stackB=[]] Associates values with source counterparts.
*/
function baseMerge(object, source, callback, stackA, stackB) {
(isArray(source) ? forEach : forOwn)(source, function(source, key) {
(isArray(source) ? baseEach : baseForOwn)(source, function(source, key) {
var found,
isArr,
result = source,
@@ -1857,7 +1872,6 @@
* @param {Object} [options] The compile options object.
* @param {string} [options.args] A comma separated string of iteration function arguments.
* @param {string} [options.init] The string representation of the initial `result` value.
* @param {string} [options.top] Code to execute before the iteration branches.
* @param {string} [options.loop] Code to execute in the object loop.
* @param {boolean} [options.useHas] Specify using `hasOwnProperty` checks in the object loop.
* @returns {Function} Returns the compiled function.
@@ -1868,15 +1882,15 @@
// create the function factory
var factory = Function(
'baseCreateCallback, errorClass, errorProto, hasOwnProperty, isArguments, ' +
'isObject, objectProto, nonEnumProps, stringClass, stringProto, toString',
'errorClass, errorProto, hasOwnProperty, isArguments, isObject, objectProto, ' +
'nonEnumProps, stringClass, stringProto, toString',
'return function(' + options.args + ') {\n' + iteratorTemplate(options) + '\n}'
);
// return the compiled function
return factory(
baseCreateCallback, errorClass, errorProto, hasOwnProperty, isArguments,
isObject, objectProto, nonEnumProps, stringClass, stringProto, toString
errorClass, errorProto, hasOwnProperty, isArguments, isObject, objectProto,
nonEnumProps, stringClass, stringProto, toString
);
}
@@ -1942,7 +1956,7 @@
// iterated property is an object's own property then there are no inherited
// enumerable properties.
if (support.ownLast) {
forIn(value, function(value, key, object) {
baseForIn(value, function(value, key, object) {
result = hasOwnProperty.call(object, key);
return false;
});
@@ -1951,7 +1965,7 @@
// In most environments an object's own properties are iterated before
// its inherited properties. If the last iterated property is an object's
// own property then there are no inherited enumerable properties.
forIn(value, function(value, key) {
baseForIn(value, function(value, key) {
result = key;
});
return typeof result == 'undefined' || hasOwnProperty.call(value, result);
@@ -1987,6 +2001,22 @@
};
}
/**
* The base implementation of `_.forIn` without support for callback
* shorthands or `thisArg` binding.
*
* @private
* @param {Object} object The object to iterate over.
* @param {Function} callback The function called per iteration.
* @returns {Object} Returns `object`.
*/
var baseForIn = createIterator({
'args': 'object, callback',
'init': 'object',
'loop': 'if (callback(object[key], key, object) === false) {\n return result;\n }',
'useHas': false
});
/**
* A fallback implementation of `Object.keys` which produces an array of the
* given object's own enumerable property names.
@@ -1999,7 +2029,6 @@
var shimKeys = createIterator({
'args': 'object',
'init': '[]',
'top': '',
'loop': 'result.push(key)',
'useHas': true
});
@@ -3620,7 +3649,7 @@
}
}
} else {
baseEach(collection, callback, thisArg);
baseEach(collection, baseCreateCallback(callback, thisArg, 3));
}
return collection;
}
@@ -3783,7 +3812,7 @@
length = collection ? collection.length : 0,
result = Array(typeof length == 'number' ? length : 0);
forEach(collection, function(value) {
baseEach(collection, function(value) {
result[++index] = (isFunc ? methodName : value[methodName]).apply(value, args);
});
return result;
@@ -4201,7 +4230,7 @@
length = collection ? collection.length : 0,
result = Array(typeof length == 'number' ? length : 0);
forEach(collection, function(value) {
baseEach(collection, function(value) {
var rand = baseRandom(0, ++index);
result[index] = result[rand];
result[rand] = value;
@@ -4356,7 +4385,7 @@
if (!multi) {
callback = lodash.createCallback(callback, thisArg, 3);
}
forEach(collection, function(value, key, collection) {
baseEach(collection, function(value, key, collection) {
var object = result[++index] = getObject();
object.index = index;
object.value = value;
@@ -5365,7 +5394,7 @@
function findKey(object, callback, thisArg) {
var result;
callback = lodash.createCallback(callback, thisArg, 3);
forOwn(object, function(value, key, object) {
baseForOwn(object, function(value, key, object) {
if (callback(value, key, object)) {
result = key;
return false;
@@ -5458,13 +5487,10 @@
* });
* // => logs 'x', 'y', and 'move' (property order is not guaranteed across environments)
*/
var forIn = createIterator({
'args': 'object, callback, thisArg',
'init': 'object',
'top': "callback = callback && typeof thisArg == 'undefined' ? callback : baseCreateCallback(callback, thisArg, 3)",
'loop': 'if (callback(object[key], key, object) === false) {\n return result;\n }',
'useHas': false
});
function forIn(object, callback, thisArg) {
callback = callback && typeof thisArg == 'undefined' ? callback : baseCreateCallback(callback, thisArg, 3);
return baseForIn(object, callback);
}
/**
* This method is like `_.forIn` except that it iterates over elements
@@ -5497,7 +5523,7 @@
function forInRight(object, callback, thisArg) {
var pairs = [];
forIn(object, function(value, key) {
baseForIn(object, function(value, key) {
pairs.push(key, value);
});
@@ -5532,18 +5558,8 @@
* // => logs '0', '1', and 'length' (property order is not guaranteed across environments)
*/
function forOwn(object, callback, thisArg) {
var index = -1,
props = keys(object),
length = props.length;
callback = callback && typeof thisArg == 'undefined' ? callback : baseCreateCallback(callback, thisArg, 3);
while (++index < length) {
var key = props[index];
if (callback(object[key], key, object) === false) {
break;
}
}
return object;
return baseForOwn(object, callback);
}
/**
@@ -5595,7 +5611,7 @@
*/
function functions(object) {
var result = [];
forIn(object, function(value, key) {
baseForIn(object, function(value, key) {
if (isFunction(value)) {
result.push(key);
}
@@ -5787,7 +5803,7 @@
(className == objectClass && typeof length == 'number' && isFunction(value.splice))) {
return !length;
}
forOwn(value, function() {
baseForOwn(value, function() {
return (result = false);
});
return result;
@@ -6148,7 +6164,7 @@
var result = {};
callback = lodash.createCallback(callback, thisArg, 3);
forOwn(object, function(value, key, object) {
baseForOwn(object, function(value, key, object) {
result[key] = callback(value, key, object);
});
return result;
@@ -6267,7 +6283,7 @@
var result = {};
if (typeof callback != 'function') {
var props = [];
forIn(object, function(value, key) {
baseForIn(object, function(value, key) {
props.push(key);
});
props = baseDifference(props, baseFlatten(arguments, true, false, 1));
@@ -6281,7 +6297,7 @@
}
} else {
callback = lodash.createCallback(callback, thisArg, 3);
forIn(object, function(value, key, object) {
baseForIn(object, function(value, key, object) {
if (!callback(value, key, object)) {
result[key] = value;
}
@@ -6359,7 +6375,7 @@
}
} else {
callback = lodash.createCallback(callback, thisArg, 3);
forIn(object, function(value, key, object) {
baseForIn(object, function(value, key, object) {
if (callback(value, key, object)) {
result[key] = value;
}
@@ -6413,7 +6429,7 @@
}
if (callback) {
callback = lodash.createCallback(callback, thisArg, 4);
(isArr ? baseEach : forOwn)(object, function(value, index, object) {
(isArr ? baseEach : baseForOwn)(object, function(value, index, object) {
return callback(accumulator, value, index, object);
});
}
@@ -7408,7 +7424,7 @@
mixin(function() {
var source = {}
forOwn(lodash, function(func, methodName) {
baseForOwn(lodash, function(func, methodName) {
if (!lodash.prototype[methodName]) {
source[methodName] = func;
}
@@ -7427,7 +7443,7 @@
lodash.take = first;
lodash.head = first;
forOwn(lodash, function(func, methodName) {
baseForOwn(lodash, function(func, methodName) {
var callbackable = methodName !== 'sample';
if (!lodash.prototype[methodName]) {
lodash.prototype[methodName]= function(n, guard) {
@@ -7511,6 +7527,7 @@
}
// add pseudo private property to be used and removed during the build process
lodash._baseForIn = baseForIn;
lodash._iteratorTemplate = iteratorTemplate;
lodash._shimKeys = shimKeys;