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

Make build.js remove extraneous semicolons from inlined methods.

Browse Source 
Former-commit-id: 061ed370a4c95a64669335c6b2a5da7ebc1015fd
This commit is contained in:
John-David Dalton
2013-05-14 08:11:56 -07:00
parent 4b3009a195
commit d3df072a22
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.js
View File

@@ -536,7 +536,7 @@
var filePath = path.join(directory, filename); var filePath = path.join(directory, filename);
if (pattern.test(filename)) { if (pattern.test(filename)) {
var text = fs.readFileSync(filePath, 'utf8'), var text = fs.readFileSync(filePath, 'utf8'),
precompiled = getFunctionSource(_.template(text, null, options)), precompiled = cleanupCompiled(getFunctionSource(_.template(text, null, options))),
prop = filename.replace(/\..*$/, ''); prop = filename.replace(/\..*$/, '');
source.push(" templates['" + prop.replace(/['\n\r\t]/g, '\\$&') + "'] = " + precompiled + ';', ''); source.push(" templates['" + prop.replace(/['\n\r\t]/g, '\\$&') + "'] = " + precompiled + ';', '');
@@ -576,6 +576,17 @@
return string[0].toUpperCase() + string.toLowerCase().slice(1); return string[0].toUpperCase() + string.toLowerCase().slice(1);
} }
/**
* Removes unnecessary semicolons and whitespace from compiled code.
*
* @private
* @param {String} source The source to process.
* @returns {String} Returns the modified source.
*/
function cleanupCompiled(source) {
return source.replace(/([{}]) *;/g, '$1');
}
/** /**
* Removes unnecessary comments, whitespace, and pseudo private properties. * Removes unnecessary comments, whitespace, and pseudo private properties.
* *
@@ -2788,7 +2799,7 @@
// extract, format, and inject the compiled function's source code // extract, format, and inject the compiled function's source code
source = source.replace(reFunc, function(match, indent, left) { source = source.replace(reFunc, function(match, indent, left) {
return (indent + left) + return (indent + left) +
getFunctionSource(lodash[methodName], indent) + ';\n'; cleanupCompiled(getFunctionSource(lodash[methodName], indent)) + ';\n';
}); });
} }
}); });
@@ -2851,7 +2862,7 @@
// inline `iteratorTemplate` template // inline `iteratorTemplate` template
source = source.replace(getIteratorTemplate(source), function(match) { source = source.replace(getIteratorTemplate(source), function(match) {
var indent = getIndent(match), var indent = getIndent(match),
snippet = getFunctionSource(lodash._iteratorTemplate, indent); snippet = cleanupCompiled(getFunctionSource(lodash._iteratorTemplate, indent));
// prepend data object references to property names to avoid having to // prepend data object references to property names to avoid having to
// use a with-statement // use a with-statement
@@ -2867,7 +2878,6 @@
.replace(/__p *\+= *' *';/g, '') .replace(/__p *\+= *' *';/g, '')
.replace(/\s*\+\s*'';/g, ';') .replace(/\s*\+\s*'';/g, ';')
.replace(/(__p *\+= *)' *' *\+/g, '$1') .replace(/(__p *\+= *)' *' *\+/g, '$1')
.replace(/(?:; *)([{}])|([{}])(?: *;)/g, '$1$2')
.replace(/\(\(__t *= *\( *([^)]+?) *\)\) *== *null *\? *'' *: *__t\)/g, '($1)'); .replace(/\(\(__t *= *\( *([^)]+?) *\)\) *== *null *\? *'' *: *__t\)/g, '($1)');
// remove the with-statement // remove the with-statement