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

Update dependencies, rename removePseudoPrivate to removePseudoPrivates, and optimize how dead variables are removed in build.js.

Browse Source 
Former-commit-id: e80616a6caa148c954dab611ddde0fc7f5b22cde
This commit is contained in:
John-David Dalton
2013-06-21 20:24:24 -07:00
parent 83c2420038
commit 220b2dc912
1 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
build.js
View File

@@ -80,7 +80,7 @@
/** Used to track function dependencies */ /** Used to track function dependencies */
var dependencyMap = { var dependencyMap = {
'after': [], 'after': [],
'assign': ['createIterator', 'isArguments', 'keys'], 'assign': ['createIterator'],
'at': ['isString'], 'at': ['isString'],
'bind': ['createBound'], 'bind': ['createBound'],
'bindAll': ['bind', 'functions'], 'bindAll': ['bind', 'functions'],
@@ -93,7 +93,7 @@
'countBy': ['createCallback', 'forEach'], 'countBy': ['createCallback', 'forEach'],
'createCallback': ['identity', 'isEqual', 'keys'], 'createCallback': ['identity', 'isEqual', 'keys'],
'debounce': ['isObject'], 'debounce': ['isObject'],
'defaults': ['createIterator', 'isArguments', 'keys'], 'defaults': ['createIterator'],
'defer': ['bind'], 'defer': ['bind'],
'delay': [], 'delay': [],
'difference': ['cacheIndexOf', 'createCache', 'getIndexOf', 'releaseObject'], 'difference': ['cacheIndexOf', 'createCache', 'getIndexOf', 'releaseObject'],
@@ -106,8 +106,8 @@
'first': ['slice'], 'first': ['slice'],
'flatten': ['isArray', 'overloadWrapper'], 'flatten': ['isArray', 'overloadWrapper'],
'forEach': ['basicEach', 'createCallback', 'isArray'], 'forEach': ['basicEach', 'createCallback', 'isArray'],
'forIn': ['createCallback', 'createIterator', 'isArguments'], 'forIn': ['createIterator'],
'forOwn': ['createCallback', 'createIterator', 'isArguments', 'keys'], 'forOwn': ['createIterator'],
'functions': ['forIn', 'isFunction'], 'functions': ['forIn', 'isFunction'],
'groupBy': ['createCallback', 'forEach'], 'groupBy': ['createCallback', 'forEach'],
'has': [], 'has': [],
@@ -185,7 +185,7 @@
'zipObject': [], 'zipObject': [],
// private methods // private methods
'basicEach': ['createIterator', 'isArguments', 'isArray', 'isString', 'keys'], 'basicEach': ['createIterator'],
'basicIndexOf': [], 'basicIndexOf': [],
'cacheIndexOf': ['basicIndexOf'], 'cacheIndexOf': ['basicIndexOf'],
'cachePush': [], 'cachePush': [],
@@ -193,7 +193,7 @@
'compareAscending': [], 'compareAscending': [],
'createBound': ['createObject', 'isFunction', 'isObject'], 'createBound': ['createObject', 'isFunction', 'isObject'],
'createCache': ['cachePush', 'getObject', 'releaseObject'], 'createCache': ['cachePush', 'getObject', 'releaseObject'],
'createIterator': ['getObject', 'iteratorTemplate', 'releaseObject'], 'createIterator': ['getObject', 'isArguments', 'isArray', 'isString', 'iteratorTemplate', 'keys', 'releaseObject'],
'createObject': [ 'isObject', 'noop'], 'createObject': [ 'isObject', 'noop'],
'escapeHtmlChar': [], 'escapeHtmlChar': [],
'escapeStringChar': [], 'escapeStringChar': [],
@@ -208,7 +208,7 @@
'releaseArray': [], 'releaseArray': [],
'releaseObject': [], 'releaseObject': [],
'shimIsPlainObject': ['forIn', 'isArguments', 'isFunction', 'isNode'], 'shimIsPlainObject': ['forIn', 'isArguments', 'isFunction', 'isNode'],
'shimKeys': ['createIterator', 'isArguments'], 'shimKeys': ['createIterator'],
'slice': [], 'slice': [],
'unescapeHtmlChar': [], 'unescapeHtmlChar': [],
@@ -219,19 +219,15 @@
/** Used to track property dependencies */ /** Used to track property dependencies */
var propDependencyMap = { var propDependencyMap = {
'assign': ['objectTypes'],
'at': ['support'], 'at': ['support'],
'basicEach': ['objectTypes'],
'bind': ['support'], 'bind': ['support'],
'bindKey': ['indicatorObject'], 'bindKey': ['indicatorObject'],
'clone': ['support'], 'clone': ['support'],
'createCallback': ['indicatorObject'], 'createCallback': ['indicatorObject'],
'defaults': ['objectTypes'], 'createIterator': ['objectTypes', 'support'],
'forIn': ['objectTypes'],
'forOwn': ['objectTypes'],
'isArguments': ['support'], 'isArguments': ['support'],
'isEmpty': ['indicatorObject', 'support'], 'isEmpty': ['support'],
'isEqual': ['support'], 'isEqual': ['indicatorObject', 'support'],
'isObject': ['objectTypes'], 'isObject': ['objectTypes'],
'isPlainObject': ['support'], 'isPlainObject': ['support'],
'isRegExp': ['objectTypes'], 'isRegExp': ['objectTypes'],
@@ -241,7 +237,6 @@
'partialRight': ['indicatorObject'], 'partialRight': ['indicatorObject'],
'reduceRight': ['support'], 'reduceRight': ['support'],
'shimIsPlainObject': ['support'], 'shimIsPlainObject': ['support'],
'shimKeys': ['objectTypes'],
'template': ['templateSettings'], 'template': ['templateSettings'],
'toArray': ['support'] 'toArray': ['support']
}; };
@@ -707,7 +702,7 @@
* @returns {String} Returns the modified source. * @returns {String} Returns the modified source.
*/ */
function cleanupSource(source) { function cleanupSource(source) {
source = removePseudoPrivate(source); source = removePseudoPrivates(source);
return source return source
// consolidate consecutive horizontal rule comment separators // consolidate consecutive horizontal rule comment separators
@@ -1086,8 +1081,7 @@
indentB = isShallow ? ' {6}' : ' {6,8}', indentB = isShallow ? ' {6}' : ' {6,8}',
result = []; result = [];
var snippet = removeComments(source); source.replace(RegExp(
snippet.replace(RegExp(
'^(' + indentA + ')var (\\w+) *(?:|= *(?:.+?(?:|&&\\n[^;]+)|(?:\\w+\\(|[{[(]\\n)[\\s\\S]+?\\n\\1[^\\n ]+?));\\n|' + '^(' + indentA + ')var (\\w+) *(?:|= *(?:.+?(?:|&&\\n[^;]+)|(?:\\w+\\(|[{[(]\\n)[\\s\\S]+?\\n\\1[^\\n ]+?));\\n|' +
'^' + indentA + 'var (\\w+) *=.+?,\\n(?= *\\w+ *=)|' + '^' + indentA + 'var (\\w+) *=.+?,\\n(?= *\\w+ *=)|' +
'^' + indentB + '(\\w+) *=.+?[,;]\\n' '^' + indentB + '(\\w+) *=.+?[,;]\\n'
@@ -1111,22 +1105,19 @@
var indentA = isShallow ? ' {2}' : ' {2,4}', var indentA = isShallow ? ' {2}' : ' {2,4}',
indentB = isShallow ? ' {6}' : ' {6,8}'; indentB = isShallow ? ' {6}' : ' {6,8}';
var snippet = removePseudoPrivate(source);
snippet = removeComments(source);
var match = RegExp( var match = RegExp(
'^(' + indentA + ')var ' + varName + ' *(?:|= *(?:.+?(?:|&&\\n[^;]+)|(?:\\w+\\(|[{[(]\\n)[\\s\\S]+?\\n\\1[^\\n ]+?));\\n|' + '^(' + indentA + ')var ' + varName + ' *(?:|= *(?:.+?(?:|&&\\n[^;]+)|(?:\\w+\\(|[{[(]\\n)[\\s\\S]+?\\n\\1[^\\n ]+?));\\n|' +
'^' + indentA + 'var ' + varName + ' *=.+?,\\n(?= *\\w+ *=)|' + '^' + indentA + 'var ' + varName + ' *=.+?,\\n(?= *\\w+ *=)|' +
'^' + indentB + varName + ' *=.+?[,;]\\n' '^' + indentB + varName + ' *=.+?[,;]\\n'
, 'm') , 'm')
.exec(snippet); .exec(source);
if (!match) { if (!match) {
return false; return false;
} }
// remove the variable assignment from the source // remove the variable assignment from the source
snippet = snippet.slice(0, match.index) + snippet.slice(match.index + match[0].length); source = source.slice(0, match.index) + source.slice(match.index + match[0].length);
return RegExp('[^.\\w"\']' + varName + '\\b').test(snippet); return RegExp('[^.\\w"\']' + varName + '\\b').test(source);
} }
/** /**
@@ -1325,7 +1316,7 @@
snippet = getMethodAssignments(source); snippet = getMethodAssignments(source);
source = removePseudoPrivate(source, funcName); source = removePseudoPrivates(source, funcName);
// remove method assignment from `lodash.prototype` // remove method assignment from `lodash.prototype`
source = source.replace(RegExp('^ *lodash\\.prototype\\.' + funcName + ' *=[\\s\\S]+?;\\n', 'm'), ''); source = source.replace(RegExp('^ *lodash\\.prototype\\.' + funcName + ' *=[\\s\\S]+?;\\n', 'm'), '');
@@ -1441,15 +1432,15 @@
} }
/** /**
* Removes the specified pseudo private property from `source`. If a `propName` * Removes all pseudo private properties from `source`. If a `propName` is
* is not specified, all pseudo private properties are removed. * specified, only the specified property is removed.
* *
* @private * @private
* @param {String} source The source to process. * @param {String} source The source to process.
* @param {String} [funcName] The name of the property to remove. * @param {String} [funcName] The name of the property to remove.
* @returns {String} Returns the modified source. * @returns {String} Returns the modified source.
*/ */
function removePseudoPrivate(source, propName) { function removePseudoPrivates(source, propName) {
propName || (propName = '\\w+'); propName || (propName = '\\w+');
return source.replace(RegExp('^(?: *//.*\\s*)* *lodash\\._' + propName + ' *=[\\s\\S]+?;\\n', 'gm'), ''); return source.replace(RegExp('^(?: *//.*\\s*)* *lodash\\._' + propName + ' *=[\\s\\S]+?;\\n', 'gm'), '');
} }
@@ -1465,6 +1456,9 @@
// replace reference in `reThis` assignment // replace reference in `reThis` assignment
source = source.replace(/\btest\(runInContext\)/, 'test(function() { return this; })'); source = source.replace(/\btest\(runInContext\)/, 'test(function() { return this; })');
// remove assignment
source = source.replace(/^(?: *\/\/.*\s*)* *lodash\.runInContext *=[\s\S]+?;\n/m, '');
// remove function scaffolding, leaving most of its content // remove function scaffolding, leaving most of its content
source = source.replace(matchFunction(source, 'runInContext'), function(match) { source = source.replace(matchFunction(source, 'runInContext'), function(match) {
return match return match
@@ -2209,7 +2203,7 @@
dependencyMap.where.push('find', 'isEmpty'); dependencyMap.where.push('find', 'isEmpty');
} }
if (!isLodashMethod('forOwn')) { if (!isLodashMethod('forOwn')) {
_.each(['contains', 'every', 'find', 'transform', 'forOwn', 'some'], function(methodName) { _.each(['contains', 'every', 'find', 'forOwn', 'some', 'transform'], function(methodName) {
(propDependencyMap[methodName] || (propDependencyMap[methodName] = [])).push('indicatorObject'); (propDependencyMap[methodName] || (propDependencyMap[methodName] = [])).push('indicatorObject');
}); });
} }
@@ -2270,15 +2264,29 @@
if (isModern || isUnderscore) { if (isModern || isUnderscore) {
dependencyMap.reduceRight = _.without(dependencyMap.reduceRight, 'isString'); dependencyMap.reduceRight = _.without(dependencyMap.reduceRight, 'isString');
_.each(['at', 'clone', 'isArguments', 'isEmpty', 'isEqual', 'isPlainObject', 'reduceRight', 'shimIsPlainObject', 'toArray'], function(methodName) { _.forOwn(propDependencyMap, function(methodName, dependencies) {
if (!(isUnderscore && isLodashMethod(methodName))) { if (methodName != 'bind' &&
propDependencyMap[methodName] = _.without(propDependencyMap[methodName], 'support'); !(isMobile && methodName == 'keys') &&
!(isUnderscore && isLodashMethod(methodName))) {
propDependencyMap[methodName] = _.without(dependencies, 'support');
} }
}); });
_.each(['assign', 'basicEach', 'defaults', 'forIn', 'forOwn', 'shimKeys'], function(methodName) { _.each(['assign', 'basicEach', 'defaults', 'forIn', 'forOwn', 'shimKeys'], function(methodName) {
if (!(isUnderscore && isLodashMethod(methodName))) { if (!(isUnderscore && isLodashMethod(methodName))) {
dependencyMap[methodName] = _.without(dependencyMap[methodName], 'createIterator'); var dependencies = dependencyMap[methodName] = _.without(dependencyMap[methodName], 'createIterator');
(propDependencyMap[methodName] || (propDependencyMap[methodName] = [])).push('objectTypes', 'support');
dependencies.push('isArguments');
if (methodName == 'basicEach') {
dependencies.push('isArray', 'isString');
}
if (methodName != 'shimKeys') {
dependencies.push('createCallback');
}
if (/^(?:assign|basicEach|defaults|forOwn)$/.test(methodName)) {
dependencies.push('keys');
}
} }
}); });
@@ -2316,10 +2324,6 @@
dependencyMap[methodName].push('forEach'); dependencyMap[methodName].push('forEach');
} }
}); });
if (!(isUnderscore && isLodashMethod('keys'))) {
propDependencyMap.keys = _.without(propDependencyMap.keys, 'support');
}
} }
} }
// add method names explicitly // add method names explicitly
@@ -3250,7 +3254,7 @@
// replace `basicEach` references with `forEach` and `forOwn` // replace `basicEach` references with `forEach` and `forOwn`
if (isUnderscore || (isModern && !isMobile)) { if (isUnderscore || (isModern && !isMobile)) {
source = removeFunction(source, 'basicEach'); source = removeFunction(source, 'basicEach');
source = removePseudoPrivate(source, 'basicEach'); source = removePseudoPrivates(source, 'basicEach');
// replace `basicEach` with `_.forOwn` in "Collections" methods // replace `basicEach` with `_.forOwn` in "Collections" methods
source = source.replace(/\bbasicEach(?=\(collection)/g, 'forOwn'); source = source.replace(/\bbasicEach(?=\(collection)/g, 'forOwn');
@@ -3558,10 +3562,10 @@
_.each(getAliases(methodName), function(alias) { _.each(getAliases(methodName), function(alias) {
source = removeFunction(source, alias); source = removeFunction(source, alias);
}); });
});
_.each(propDependencyMap[methodName], function(varName) { _.each(['indicatorObject', 'objectTypes', 'support', 'templateSettings'], function(varName) {
source = removeVar(source, varName); source = removeVar(source, varName);
});
}); });
// remove all horizontal rule comment separators // remove all horizontal rule comment separators
@@ -3656,11 +3660,12 @@
(function() { (function() {
var isShallow = isExcluded('runInContext'), var isShallow = isExcluded('runInContext'),
useMap = {}, useMap = {},
varNames = getVars(source, isShallow); snippet = removePseudoPrivates(removeComments(source)),
varNames = getVars(snippet, isShallow);
while (varNames.length) { while (varNames.length) {
varNames = _.sortBy(varNames, function(varName) { varNames = _.sortBy(varNames, function(varName) {
var result = isVarUsed(source, varName, isShallow); var result = isVarUsed(snippet, varName, isShallow);
useMap[varName] = result; useMap[varName] = result;
return result; return result;
}); });
@@ -3670,6 +3675,7 @@
} }
else { else {
while (varNames.length && !useMap[varNames[0]]) { while (varNames.length && !useMap[varNames[0]]) {
snippet = removeVar(snippet, varNames[0]);
source = removeVar(source, varNames[0]); source = removeVar(source, varNames[0]);
varNames.shift(); varNames.shift();
} }
@@ -3686,7 +3692,7 @@
if (!isAMD && !isCommonJS && !isGlobal && !isNode) { if (!isAMD && !isCommonJS && !isGlobal && !isNode) {
source = removeFunction(source, 'lodash'); source = removeFunction(source, 'lodash');
source = removeLodashWrapper(source); source = removeLodashWrapper(source);
source = removePseudoPrivate(source); source = removePseudoPrivates(source);
source = removeMethodAssignments(source); source = removeMethodAssignments(source);
} }