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

Ensure the callback of _.filter can't modify the resulting value.

Browse Source 
Former-commit-id: 6652dc5926390e8418b524c7ffd2347c2fa65c82
This commit is contained in:
John-David Dalton
2012-07-26 23:20:36 -07:00
parent 4ff12e0426
commit 943004844a
3 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/pre-compile.js
View File

@@ -285,15 +285,25 @@
// minify properties
properties.forEach(function(property, index) {
var reBracketProp = RegExp("\\['" + property + '\\b', 'g'),
reDotProp = RegExp('\\.' + property + '\\b', 'g'),
rePropColon = RegExp('\\b' + property + ' *:', 'g');
// add quotes around properties in the inlined `_.sortBy` of the mobile
// build so Closure Compiler won't mung them
if (isSortBy && isInlined) {
modified = modified
.replace(RegExp('\\.' + property + '\\b', 'g'), "['" + minNames[index] + "']")
.replace(RegExp('\\b' + property + ' *:', 'g'), "'" + minNames[index] + "':");
.replace(reDotProp, "['" + minNames[index] + "']")
.replace(rePropColon, "'" + minNames[index] + "':");
}
else {
modified = modified
.replace(reBracketProp, "['" + minNames[index])
.replace(reDotProp, '.' + minNames[index])
.replace(rePropColon, minNames[index] + ':');
}
modified = modified.replace(RegExp('\\b' + property + '\\b', 'g'), minNames[index]);
});
// replace with modified snippet
source = source.replace(snippet, modified);
});

59
lodash.js
View File

@@ -294,7 +294,7 @@
'<% if (useStrict) { %>\'use strict\';\n<% } %>' +
// the `iteratee` may be reassigned by the `top` snippet
'var index, iteratee = <%= firstArg %>, ' +
'var index, value, iteratee = <%= firstArg %>, ' +
// assign the `result` variable an initial value
'result<% if (init) { %> = <%= init %><% } %>;\n' +
// add code to exit early or do so if the first argument is falsey
@@ -316,6 +316,7 @@
' <%= arrayBranch.beforeLoop %>;\n' +
' while (++index < length) {\n' +
' value = iteratee[index];\n' +
' <%= arrayBranch.inLoop %>\n' +
' }' +
' <% if (objectBranch) { %>\n}<% } %>' +
@@ -338,6 +339,7 @@
' while (++propIndex < length) {\n' +
' index = props[propIndex];\n' +
' if (!(skipProto && index == \'prototype\')) {\n' +
' value = iteratee[index];\n' +
' <%= objectBranch.inLoop %>\n' +
' }\n' +
' }' +
@@ -348,6 +350,7 @@
' for (index in iteratee) {' +
' <% if (hasDontEnumBug) { %>\n' +
' <% if (useHas) { %>if (hasOwnProperty.call(iteratee, index)) {\n <% } %>' +
' value = iteratee[index];\n' +
' <%= objectBranch.inLoop %>;\n' +
' <% if (useHas) { %>}<% } %>' +
' <% } else { %>\n' +
@@ -360,6 +363,7 @@
// [[Enumerable]] value.
' if (!(skipProto && index == \'prototype\')<% if (useHas) { %> &&\n' +
' hasOwnProperty.call(iteratee, index)<% } %>) {\n' +
' value = iteratee[index];\n' +
' <%= objectBranch.inLoop %>\n' +
' }' +
' <% } %>\n' +
@@ -378,6 +382,7 @@
' if (shadowed[k] == \'constructor\') {' +
' %>!(ctor && ctor.prototype === iteratee) && <%' +
' } %>hasOwnProperty.call(iteratee, index)) {\n' +
' value = iteratee[index];\n' +
' <%= objectBranch.inLoop %>\n' +
' }' +
' <% } %>' +
@@ -406,7 +411,7 @@
'else if (thisArg) {\n' +
' callback = iteratorBind(callback, thisArg)\n' +
'}',
'inLoop': 'callback(iteratee[index], index, collection)'
'inLoop': 'callback(value, index, collection)'
};
/** Reusable iterator options for `countBy`, `groupBy`, and `sortBy` */
@@ -422,14 +427,14 @@
' callback = iteratorBind(callback, thisArg)\n' +
'}',
'inLoop':
'prop = callback(iteratee[index], index, collection);\n' +
'prop = callback(value, index, collection);\n' +
'(hasOwnProperty.call(result, prop) ? result[prop]++ : result[prop] = 1)'
};
/** Reusable iterator options for `every` and `some` */
var everyIteratorOptions = {
'init': 'true',
'inLoop': 'if (!callback(iteratee[index], index, collection)) return !result'
'inLoop': 'if (!callback(value, index, collection)) return !result'
};
/** Reusable iterator options for `defaults` and `extend` */
@@ -442,14 +447,14 @@
'for (var iterateeIndex = 1, length = arguments.length; iterateeIndex < length; iterateeIndex++) {\n' +
' iteratee = arguments[iterateeIndex];\n' +
(hasDontEnumBug ? ' if (iteratee) {' : ''),
'inLoop': 'result[index] = iteratee[index]',
'inLoop': 'result[index] = value',
'bottom': (hasDontEnumBug ? ' }\n' : '') + '}'
};
/** Reusable iterator options for `filter` and `reject` */
var filterIteratorOptions = {
'init': '[]',
'inLoop': 'callback(iteratee[index], index, collection) && result.push(iteratee[index])'
'inLoop': 'callback(value, index, collection) && result.push(value)'
};
/** Reusable iterator options for `find`, `forEach`, `forIn`, and `forOwn` */
@@ -473,8 +478,8 @@
'object': 'result = ' + (isKeysFast ? 'Array(length)' : '[]')
},
'inLoop': {
'array': 'result[index] = callback(iteratee[index], index, collection)',
'object': 'result' + (isKeysFast ? '[propIndex] = ' : '.push') + '(callback(iteratee[index], index, collection))'
'array': 'result[index] = callback(value, index, collection)',
'object': 'result' + (isKeysFast ? '[propIndex] = ' : '.push') + '(callback(value, index, collection))'
}
};
@@ -807,7 +812,7 @@
'beforeLoop': {
'array': 'if (toString.call(iteratee) == stringClass) return collection.indexOf(target) > -1'
},
'inLoop': 'if (iteratee[index] === target) return true'
'inLoop': 'if (value === target) return true'
});
/**
@@ -899,7 +904,7 @@
*/
var find = createIterator(baseIteratorOptions, forEachIteratorOptions, {
'init': '',
'inLoop': 'if (callback(iteratee[index], index, collection)) return iteratee[index]'
'inLoop': 'if (callback(value, index, collection)) return value'
});
/**
@@ -953,8 +958,8 @@
*/
var groupBy = createIterator(baseIteratorOptions, countByIteratorOptions, {
'inLoop':
'prop = callback(iteratee[index], index, collection);\n' +
'(hasOwnProperty.call(result, prop) ? result[prop] : result[prop] = []).push(iteratee[index])'
'prop = callback(value, index, collection);\n' +
'(hasOwnProperty.call(result, prop) ? result[prop] : result[prop] = []).push(value)'
});
/**
@@ -986,11 +991,11 @@
' isFunc = typeof methodName == \'function\'',
'inLoop': {
'array':
'result[index] = (isFunc ? methodName : iteratee[index][methodName])' +
'.apply(iteratee[index], args)',
'result[index] = (isFunc ? methodName : value[methodName])' +
'.apply(value, args)',
'object':
'result' + (isKeysFast ? '[propIndex] = ' : '.push') +
'((isFunc ? methodName : iteratee[index][methodName]).apply(iteratee[index], args))'
'((isFunc ? methodName : value[methodName]).apply(value, args))'
}
});
@@ -1041,8 +1046,8 @@
var pluck = createIterator(mapIteratorOptions, {
'args': 'collection, property',
'inLoop': {
'array': 'result[index] = iteratee[index][property]',
'object': 'result' + (isKeysFast ? '[propIndex] = ' : '.push') + '(iteratee[index][property])'
'array': 'result[index] = value[property]',
'object': 'result' + (isKeysFast ? '[propIndex] = ' : '.push') + '(value[property])'
}
});
@@ -1077,11 +1082,11 @@
},
'inLoop': {
'array':
'result = callback(result, iteratee[index], index, collection)',
'result = callback(result, value, index, collection)',
'object':
'result = noaccum\n' +
' ? (noaccum = false, iteratee[index])\n' +
' : callback(result, iteratee[index], index, collection)'
' ? (noaccum = false, value)\n' +
' : callback(result, value, index, collection)'
}
});
@@ -1215,13 +1220,13 @@
'inLoop': {
'array':
'result[index] = {\n' +
' criteria: callback(iteratee[index], index, collection),\n' +
' value: iteratee[index]\n' +
' criteria: callback(value, index, collection),\n' +
' value: value\n' +
'}',
'object':
'result' + (isKeysFast ? '[propIndex] = ' : '.push') + '({\n' +
' criteria: callback(iteratee[index], index, collection),\n' +
' value: iteratee[index]\n' +
' criteria: callback(value, index, collection),\n' +
' value: value\n' +
'})'
},
'bottom':
@@ -2644,7 +2649,7 @@
'args': 'object',
'init': '{}',
'top': 'var props = concat.apply(ArrayProto, arguments)',
'inLoop': 'if (indexOf(props, index) < 0) result[index] = iteratee[index]'
'inLoop': 'if (indexOf(props, index) < 0) result[index] = value'
});
/**
@@ -2736,7 +2741,7 @@
'useHas': false,
'args': 'object',
'init': '[]',
'inLoop': 'if (toString.call(iteratee[index]) == funcClass) result.push(index)',
'inLoop': 'if (toString.call(value) == funcClass) result.push(index)',
'bottom': 'result.sort()'
});
@@ -3330,7 +3335,7 @@
var values = createIterator({
'args': 'object',
'init': '[]',
'inLoop': 'result.push(iteratee[index])'
'inLoop': 'result.push(value)'
});
/*--------------------------------------------------------------------------*/

14
test/test.js
View File

@@ -427,6 +427,20 @@
/*--------------------------------------------------------------------------*/
QUnit.module('lodash.filter');
(function() {
test('should not modify the resulting value from within `callback`', function() {
var actual = _.filter([0], function(value, index, array) {
return (array[index] = 1);
});
deepEqual(actual, [0]);
});
}());
/*--------------------------------------------------------------------------*/
QUnit.module('lodash.find');
(function() {